From 2ea64c2b3a3a8cd9b0d8969b6abb597d39d780c7 Mon Sep 17 00:00:00 2001
From: ZZM <1105966949@qq.com>
Date: Wed, 13 Aug 2025 09:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BA=B3=E7=A8=8E=E4=BA=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=95=86=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=BC=80=E4=B8=9A=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kakarote/crm/controller/CrmGsdjxxController.java | 12 ++++++++----
 .../java/com/kakarote/crm/entity/PO/CrmGsdjxx.java   |  1 -
 .../com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml |  2 +-
 .../com/kakarote/crm/service/ICrmGsdjxxService.java  |  6 ++++++
 .../crm/service/impl/CrmGsdjxxServiceImpl.java       | 11 +++++++++++
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmGsdjxxController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmGsdjxxController.java
index 361e89e..967ad55 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmGsdjxxController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmGsdjxxController.java
@@ -9,10 +9,7 @@ import com.kakarote.crm.entity.VO.CrmQueryGsdjxxVO;
 import com.kakarote.crm.service.ICrmGsdjxxService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import java.util.List;
@@ -30,4 +27,11 @@ public class CrmGsdjxxController {
         List<CrmQueryGsdjxxVO> crmQueryGsdjxxVOList = iCrmGsdjxxService.queryByMonthAndXzqhDm(crmQueryGsdjxxDTO);
         return R.ok(crmQueryGsdjxxVOList);
     }
+
+    @PostMapping("/queryByNsrmc/{nsrmc}")
+    @ApiOperation("根据月份和行政区划代码查询工商登记信息")
+    public Result<List<CrmQueryGsdjxxVO>> queryByNsrmc(@PathVariable String nsrmc) {
+        List<CrmQueryGsdjxxVO> crmQueryGsdjxxVOList = iCrmGsdjxxService.queryByNsrmc(nsrmc);
+        return R.ok(crmQueryGsdjxxVOList);
+    }
 }
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 cf218c3..ccbb567 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
@@ -47,7 +47,6 @@ public class CrmGsdjxx implements Serializable {
     /**
      * 企业名称
      */
-    @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR)
     private String nsrmc;  // 对应SQL: nsrmc
 
     /**
diff --git a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml
index 0994b09..b0b24b1 100644
--- a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml	
+++ b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml	
@@ -41,7 +41,7 @@
             (
             #{item.xzqhDm}, #{item.yf},
             #{item.tyshxydm, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter},
-            #{item.nsrmc, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter},
+            #{item.nsrmc},
             #{item.djzclxDm, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter},
             #{item.kyrq, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter},
             #{item.zzhm, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter},
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmGsdjxxService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmGsdjxxService.java
index e9cd706..55cdb28 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmGsdjxxService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmGsdjxxService.java
@@ -14,4 +14,10 @@ public interface ICrmGsdjxxService extends BaseService<CrmGsdjxx> {
      * 根据月份、行政区划代码，查询工商登记信息
      */
     List<CrmQueryGsdjxxVO> queryByMonthAndXzqhDm(CrmQueryGsdjxxDTO crmQueryGsdjxxDTO) throws Exception;
+
+    /**
+     * 根据纳税人名称查询工商登记信息
+     * @return
+     */
+    List<CrmQueryGsdjxxVO> queryByNsrmc(String nsrmc);
 }
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 215093b..9f8eddb 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
@@ -19,6 +19,7 @@ import com.kakarote.crm.webService.config.TaxWebServiceConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 import java.util.stream.Collectors;
@@ -62,6 +63,15 @@ public class CrmGsdjxxServiceImpl extends BaseServiceImpl<CrmGsdjxxMapper,CrmGsd
         return processAndSaveData(crmGsdjxxList, crmQueryGsdjxxDTO);
     }
 
+    @Override
+    public List<CrmQueryGsdjxxVO> queryByNsrmc(String nsrmc) {
+
+        QueryWrapper<CrmGsdjxx> wrapper = new QueryWrapper<CrmGsdjxx>().eq("nsrmc", nsrmc);
+        List<CrmGsdjxx> crmGsdjxxes = crmGsdjxxMapper.selectList(wrapper);
+
+        return convertListToVO(crmGsdjxxes);
+    }
+
     private CrmQueryGsdjxxVO convertToVO(CrmGsdjxx source) {
 
         if (source == null) {
@@ -97,6 +107,7 @@ public class CrmGsdjxxServiceImpl extends BaseServiceImpl<CrmGsdjxxMapper,CrmGsd
     }
 
     private List<CrmQueryGsdjxxVO> convertListToVO(List<CrmGsdjxx> crmGsdjxxList) {
+
         return crmGsdjxxList.stream()
                 .map(this::convertToVO)
                 .collect(Collectors.toList());