From f873b8e8783c4c024d2a3dea85c1070fb04b197f Mon Sep 17 00:00:00 2001
From: zhangwenzan <zhangwenzan@fxyuns.com>
Date: Fri, 19 Sep 2025 09:02:25 +0800
Subject: [PATCH] fix:

---
 .../controller/CrmCustomerPoolController.java | 22 +++++++++----------
 .../java/com/kakarote/crm/testQyjxfp.java     | 18 ++++++++++-----
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmCustomerPoolController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmCustomerPoolController.java
index b082377..b50048a 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmCustomerPoolController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmCustomerPoolController.java
@@ -70,17 +70,17 @@ public class CrmCustomerPoolController {
     @ApiOperation("查看公海列表页")
     @PostMapping("/queryPageList")
     public Result<BasePage<Map<String, Object>>> queryPageList(@RequestBody CrmSearchBO crmSearchBO) {
-        if (crmSearchBO.getPoolId() == 34557) {
-            // 获取当前日期
-            LocalDate currentDate = LocalDate.now();
-            // 定义日期格式
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            // 格式化日期
-            String rq = currentDate.format(formatter);
-            CrmQueryGsdjxxDTO dto = new CrmQueryGsdjxxDTO().setRq(rq);
-            BasePage<Map<String, Object>> mapBasePage = crmGsdjxxService.queryGsdjxxByDate(dto);
-            return Result.ok(mapBasePage);
-        }
+//        if (crmSearchBO.getPoolId() == 34557) {
+//            // 获取当前日期
+//            LocalDate currentDate = LocalDate.now();
+//            // 定义日期格式
+//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            // 格式化日期
+//            String rq = currentDate.format(formatter);
+//            CrmQueryGsdjxxDTO dto = new CrmQueryGsdjxxDTO().setRq(rq);
+//            BasePage<Map<String, Object>> mapBasePage = crmGsdjxxService.queryGsdjxxByDate(dto);
+//            return Result.ok(mapBasePage);
+//        }
         BasePage<Map<String, Object>> basePage = crmCustomerPoolService.queryPageList(crmSearchBO,false);
         return Result.ok(basePage);
     }
diff --git a/crm/src/test/java/com/kakarote/crm/testQyjxfp.java b/crm/src/test/java/com/kakarote/crm/testQyjxfp.java
index b4798bd..7c08258 100644
--- a/crm/src/test/java/com/kakarote/crm/testQyjxfp.java
+++ b/crm/src/test/java/com/kakarote/crm/testQyjxfp.java
@@ -1,6 +1,7 @@
 package com.kakarote.crm;
 
 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.CrmSyncQyjbxxDTO;
 import com.kakarote.crm.entity.PO.CrmQyjbxx;
@@ -521,19 +522,24 @@ public class testQyjxfp {
 //        crmQyjbxx3.setShxydm("91360983MA399RN26Y");
 //        crmQyjbxxService.insertQyjbxx(crmQyjbxx3);
 
-        iCrmUserAnalyseService.syncTaxPreCheckUsageByMonth("202506");
-        iCrmUserAnalyseService.syncTaxPreCheckUsageByMonth("202507");
+//        iCrmUserAnalyseService.syncTaxPreCheckUsageByMonth("202506");
+//        iCrmUserAnalyseService.syncTaxPreCheckUsageByMonth("202507");
 //        crmQyjbxxService.syncQyjbxx();
     }
     @Autowired
     private ICrmGsdjxxService iCrmGsdjxxService;
 
+    @Autowired
+    private IXzqhService iXzqhService;
+
     @Test
     public void sysGsdjxx() throws Exception {
-        CrmQueryGsdjxxDTO crmQueryGsdjxxDTO = new CrmQueryGsdjxxDTO();
-        crmQueryGsdjxxDTO.setYf("202501");
-        crmQueryGsdjxxDTO.setXzqhDm("360103");
-        iCrmGsdjxxService.queryByMonthAndXzqhDm(crmQueryGsdjxxDTO);
+//        String s = ApplicationContextHolder.getBean(EncryptionService.class).encryptAes("14577467874");
+//        String s1 = encryptionService.encryptAes("14577467874");
+//        System.out.println("加密结果1："+s);
+//        System.out.println("加密结果2："+s1);
+        List<String> xzqhCjListByCode = iXzqhService.getXzqhCjListByCode("360103");
+        System.out.println(xzqhCjListByCode);
     }
 }