From 1c43e1dd61fb5c6fcb545893c03395ccb64cbae6 Mon Sep 17 00:00:00 2001
From: zhangwenzan <zhangwenzan@fxyuns.com>
Date: Tue, 16 Sep 2025 08:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=95=86=E7=99=BB=E8=AE=B0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kakarote/crm/controller/CrmXzqhDmController.java   |  7 +++++++
 .../com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java |  3 +++
 .../java/com/kakarote/crm/entity/PO/CrmGsdjxx.java     |  3 +++
 .../crm/service/impl/CrmCustomerServiceImpl.java       | 10 +++++-----
 .../crm/service/impl/CrmGsdjxxServiceImpl.java         |  1 +
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmXzqhDmController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmXzqhDmController.java
index 1f66774..bcc2c83 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmXzqhDmController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmXzqhDmController.java
@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/crmXzqhDm")
 @Api(tags = "行政区划代码")
@@ -26,6 +28,11 @@ public class CrmXzqhDmController {
         IPage<CrmXzqhDm> xzqhDmPage = crmXzqhDmService.getXzqhDmPage(pageNum, pageSize);
         return R.ok(xzqhDmPage);
     }
+    @GetMapping("/list")
+    @ApiOperation("行政区划列表")
+    public Result<List<CrmXzqhDm>> getXzqhDmList() {
+        return R.ok(crmXzqhDmService.getXzqhDmList());
+    }
 
     @PostMapping("/insert")
     @ApiOperation("插入税务机关代码")
diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java
index 1fabf2f..dac02c0 100644
--- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java
+++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java
@@ -19,6 +19,9 @@ public class CrmQueryGsdjxxDTO implements Serializable {
     // 评价年度
     private String xzqhDm;
 
+    //地址
+    private String xzqhMc;
+
     @Override
     public String toString() {
         return "{" +
diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmGsdjxx.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmGsdjxx.java
index ccbb567..2cd2991 100644
--- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmGsdjxx.java
+++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmGsdjxx.java
@@ -168,4 +168,7 @@ public class CrmGsdjxx implements Serializable {
      */
     @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR)
     private String jyfw;  // 对应SQL: jyfw
+
+    @TableField(exist = false)
+    private String dz;
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java
index 5a783c3..9978c78 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java
@@ -637,7 +637,7 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
         entity.put("email","");
         entity.put("website","");
         entity.put("remark","");
-        entity.put("address",gsdjxx.getScjydz());
+        entity.put("address","");
         crmModel.setEntity(entity);
         List<CrmModelFiledVO> list = new ArrayList<>();
         //加入时间
@@ -647,7 +647,7 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
         fieldDomqff.setName("加入时间");
         fieldDomqff.setFieldType(0);
         fieldDomqff.setType(13);
-        fieldDomqff.setValue(new Date());
+        fieldDomqff.setValue("");
         list.add(fieldDomqff);
         //企业税号
         CrmModelFiledVO fieldZzmdcm = new CrmModelFiledVO();
@@ -692,7 +692,7 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
         fliedKjhmgc.setName("客户详细地址");
         fliedKjhmgc.setFieldType(0);
         fliedKjhmgc.setType(2);
-        fliedKjhmgc.setValue("");
+        fliedKjhmgc.setValue(gsdjxx.getScjydz());
         list.add(fliedKjhmgc);
         //姓名 fliedJeqgso 1101928
         CrmModelFiledVO fliedJeqgso = new CrmModelFiledVO();
@@ -710,7 +710,7 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
         industry.setName("客户所在地区");
         industry.setFieldType(2);
         industry.setType(3);
-        industry.setValue("");
+        industry.setValue(gsdjxx.getDz());
         list.add(industry);
         //客户级别 level 1101833
         CrmModelFiledVO level = new CrmModelFiledVO();
@@ -757,7 +757,7 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
 //        fliedBcethz.setType(5);
 //        fliedBcethz.setValue("");
 //        list.add(fliedBcethz);
-//        crmModel.setField(list);
+        crmModel.setField(list);
         //添加客户数据
         Integer customerId = crmOpenApiService.crmAddCustomer(crmModel, "工商新开业登记信息");
         //添加联系人数据
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmGsdjxxServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmGsdjxxServiceImpl.java
index cbe75e5..6688420 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmGsdjxxServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmGsdjxxServiceImpl.java
@@ -131,6 +131,7 @@ public class CrmGsdjxxServiceImpl extends BaseServiceImpl<CrmGsdjxxMapper,CrmGsd
             if (one == null) {
                 crmGsdjxx.setYf(crmQueryGsdjxxDTO.getYf());
                 crmGsdjxx.setXzqhDm(crmQueryGsdjxxDTO.getXzqhDm());
+                crmGsdjxx.setDz(crmQueryGsdjxxDTO.getXzqhMc());
                 crmGsdjxxesNew.add(crmGsdjxx);
                 customerService.addCustomerByDjxx(crmGsdjxx);
             }