zhangwenzan
/
crm_pro-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:

This commit is contained in:
zhangwenzan 2025-09-19 09:02:25 +08:00
parent f1bc56ddf9
commit f873b8e878
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crm/src/main/java/com/kakarote/crm/controller/CrmCustomerPoolController.java
View File

@ -70,17 +70,17 @@ public class CrmCustomerPoolController {
@ApiOperation("查看公海列表页") @ApiOperation("查看公海列表页")
@PostMapping("/queryPageList") @PostMapping("/queryPageList")
public Result<BasePage<Map<String, Object>>> queryPageList(@RequestBody CrmSearchBO crmSearchBO) { public Result<BasePage<Map<String, Object>>> queryPageList(@RequestBody CrmSearchBO crmSearchBO) {
if (crmSearchBO.getPoolId() == 34557) { // if (crmSearchBO.getPoolId() == 34557) {
// 获取当前日期 // // 获取当前日期
LocalDate currentDate = LocalDate.now(); // LocalDate currentDate = LocalDate.now();
// 定义日期格式 // // 定义日期格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 格式化日期 // // 格式化日期
String rq = currentDate.format(formatter); // String rq = currentDate.format(formatter);
CrmQueryGsdjxxDTO dto = new CrmQueryGsdjxxDTO().setRq(rq); // CrmQueryGsdjxxDTO dto = new CrmQueryGsdjxxDTO().setRq(rq);
BasePage<Map<String, Object>> mapBasePage = crmGsdjxxService.queryGsdjxxByDate(dto); // BasePage<Map<String, Object>> mapBasePage = crmGsdjxxService.queryGsdjxxByDate(dto);
return Result.ok(mapBasePage); // return Result.ok(mapBasePage);
} // }
BasePage<Map<String, Object>> basePage = crmCustomerPoolService.queryPageList(crmSearchBO,false); BasePage<Map<String, Object>> basePage = crmCustomerPoolService.queryPageList(crmSearchBO,false);
return Result.ok(basePage); return Result.ok(basePage);
} }

18
crm/src/test/java/com/kakarote/crm/testQyjxfp.java
View File

@ -1,6 +1,7 @@
package com.kakarote.crm; package com.kakarote.crm;
import com.kakarote.core.security.EncryptionService; import com.kakarote.core.security.EncryptionService;
import com.kakarote.core.servlet.ApplicationContextHolder;
import com.kakarote.crm.entity.DTO.CrmQueryGsdjxxDTO; import com.kakarote.crm.entity.DTO.CrmQueryGsdjxxDTO;
import com.kakarote.crm.entity.DTO.CrmSyncQyjbxxDTO; import com.kakarote.crm.entity.DTO.CrmSyncQyjbxxDTO;
import com.kakarote.crm.entity.PO.CrmQyjbxx; import com.kakarote.crm.entity.PO.CrmQyjbxx;
@ -521,19 +522,24 @@ public class testQyjxfp {
// crmQyjbxx3.setShxydm("91360983MA399RN26Y"); // crmQyjbxx3.setShxydm("91360983MA399RN26Y");
// crmQyjbxxService.insertQyjbxx(crmQyjbxx3); // crmQyjbxxService.insertQyjbxx(crmQyjbxx3);
iCrmUserAnalyseService.syncTaxPreCheckUsageByMonth("202506"); // iCrmUserAnalyseService.syncTaxPreCheckUsageByMonth("202506");
iCrmUserAnalyseService.syncTaxPreCheckUsageByMonth("202507"); // iCrmUserAnalyseService.syncTaxPreCheckUsageByMonth("202507");
// crmQyjbxxService.syncQyjbxx(); // crmQyjbxxService.syncQyjbxx();
} }
@Autowired @Autowired
private ICrmGsdjxxService iCrmGsdjxxService; private ICrmGsdjxxService iCrmGsdjxxService;
@Autowired
private IXzqhService iXzqhService;
@Test @Test
public void sysGsdjxx() throws Exception { public void sysGsdjxx() throws Exception {
CrmQueryGsdjxxDTO crmQueryGsdjxxDTO = new CrmQueryGsdjxxDTO(); // String s = ApplicationContextHolder.getBean(EncryptionService.class).encryptAes("14577467874");
crmQueryGsdjxxDTO.setYf("202501"); // String s1 = encryptionService.encryptAes("14577467874");
crmQueryGsdjxxDTO.setXzqhDm("360103"); // System.out.println("加密结果1："+s);
iCrmGsdjxxService.queryByMonthAndXzqhDm(crmQueryGsdjxxDTO); // System.out.println("加密结果2："+s1);
List<String> xzqhCjListByCode = iXzqhService.getXzqhCjListByCode("360103");
System.out.println(xzqhCjListByCode);
} }
} }