From c952344f46f239b2ac17106a9225ef636caae1c9 Mon Sep 17 00:00:00 2001
From: ZZM <1105966949@qq.com>
Date: Tue, 24 Jun 2025 16:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8E=E5=8A=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/controller/CrmQycbrsController.java   |  8 ++++-
 .../crm/controller/CrmQyfxmxController.java   | 11 ++++--
 .../crm/controller/CrmQyjxfpController.java   | 13 +++++--
 .../crm/controller/CrmQynsrdjController.java  |  9 ++++-
 .../controller/CrmQysdsndsbController.java    |  9 ++++-
 .../crm/controller/CrmQysflController.java    |  9 ++++-
 .../crm/service/ICrmQycbrsService.java        | 11 ++++--
 .../crm/service/ICrmQyfxmxService.java        |  9 ++++-
 .../crm/service/ICrmQyjxfpService.java        |  9 ++++-
 .../crm/service/ICrmQynsrdjService.java       |  9 ++++-
 .../crm/service/ICrmQysdsndsbService.java     |  9 ++++-
 .../crm/service/ICrmQysflService.java         |  9 ++++-
 .../crm/service/ICrmQyxxfpService.java        |  9 ++++-
 .../service/impl/CrmQycbrsServiceImpl.java    | 19 ++++++++++-
 .../service/impl/CrmQyfxmxServiceImpl.java    | 21 ++++++++++--
 .../service/impl/CrmQyjxfpServiceImpl.java    | 34 +++++++++++++++++--
 .../service/impl/CrmQynsrdjServiceImpl.java   | 21 +++++++++++-
 .../service/impl/CrmQysdsndsbServiceImpl.java | 19 ++++++++++-
 .../crm/service/impl/CrmQysflServiceImpl.java | 19 ++++++++++-
 .../service/impl/CrmQyxxfpServiceImpl.java    | 19 ++++++++++-
 20 files changed, 250 insertions(+), 26 deletions(-)

diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java
index fcdbae5..0a592e8 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java
@@ -33,7 +33,13 @@ public class CrmQycbrsController {
 
     @PostMapping("/queryByNsrsbhAndTime")
     public Result<List<CrmQycbrs>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) {
-        List<CrmQycbrs> qycbrsList = crmQycbrsService.getQycbrsListByParamAndTime(vo);
+        List<CrmQycbrs> qycbrsList = crmQycbrsService.getQycbrsListByNsrsbhAndTime(vo);
+        return R.ok(qycbrsList);
+    }
+
+    @PostMapping("/queryByDjxhAndTime")
+    public Result<List<CrmQycbrs>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+        List<CrmQycbrs> qycbrsList = crmQycbrsService.getQycbrsListByDjxhAndTime(vo);
         return R.ok(qycbrsList);
     }
 
diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java
index 48ee430..f96af96 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/qyfxmx")
+@RequestMapping("/crmQyfxmx")
 @Api(tags = "企业风险明细信息")
 public class CrmQyfxmxController {
 
@@ -33,7 +33,14 @@ public class CrmQyfxmxController {
     @PostMapping("/queryByNsrsbhAndTime")
     @ApiOperation("根据登记序号和月份(选填)查询")
     public Result<List<CrmQyfxmx>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){
-        List<CrmQyfxmx> qyfxmxList = crmQyfxmxService.getQyfxmxListByParamAndTime(vo);
+        List<CrmQyfxmx> qyfxmxList = crmQyfxmxService.getQyfxmxListByNsrsbhAndTime(vo);
+        return R.ok(qyfxmxList);
+    }
+
+    @PostMapping("/queryByDjxhAndTime")
+    @ApiOperation("根据登记序号和月份(选填)查询")
+    public Result<List<CrmQyfxmx>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){
+        List<CrmQyfxmx> qyfxmxList = crmQyfxmxService.getQyfxmxListByDjxhAndTime(vo);
         return R.ok(qyfxmxList);
     }
 
diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java
index 0997cf5..160b777 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java
@@ -29,10 +29,17 @@ public class CrmQyjxfpController {
         return R.ok(qyjxfp);
     }
 
-    @PostMapping("/queryMergeListByParamAndTime")
+    @PostMapping("/queryMergeListByNsrsbhAndTime")
     @ApiOperation("通过纳税人识别号和年度(选填),查询企业进项发票和企业销项发票信息列表")
-    public Result queryMergeListByParamAndTime(@RequestBody CrmParamAndTimeVO vo){
-        CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByParamAndTime(vo);
+    public Result queryMergeListByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){
+        CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByNsrsbhAndTime(vo);
+        return R.ok(mergeList);
+    }
+
+    @PostMapping("/queryMergeListByShxydmAndTime")
+    @ApiOperation("通过纳税人识别号和年度(选填),查询企业进项发票和企业销项发票信息列表")
+    public Result queryMergeListByShxydmAndTime(@RequestBody CrmParamAndTimeVO vo){
+        CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByShxydmAndTime(vo);
         return R.ok(mergeList);
     }
 
diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java
index 5e4f955..4254ba7 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java
@@ -34,7 +34,14 @@ public class CrmQynsrdjController {
     @PostMapping("/queryByNsrsbhAndTime")
     @ApiOperation("根据纳税人识别号和评价年度(选填)查询")
     public Result<List<CrmQynsrdj>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) {
-        List<CrmQynsrdj> qynsrdjList = crmQynsrdjService.getQynsrdjListByParamAndTime(vo);
+        List<CrmQynsrdj> qynsrdjList = crmQynsrdjService.getQynsrdjListByNsrsbhAndTime(vo);
+        return R.ok(qynsrdjList);
+    }
+
+    @PostMapping("/queryByDjxhAndTime")
+    @ApiOperation("根据登记序号和评价年度(选填)查询")
+    public Result<List<CrmQynsrdj>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+        List<CrmQynsrdj> qynsrdjList = crmQynsrdjService.getQynsrdjListByDjxhAndTime(vo);
         return R.ok(qynsrdjList);
     }
 
diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java
index c22cb0c..6049e87 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java
@@ -33,7 +33,14 @@ public class CrmQysdsndsbController {
     @PostMapping("/queryByNsrsbhAndTime")
     @ApiOperation("根据纳税人识别号和年度(选填)查询")
     public Result<List<CrmQysdsndsb>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) {
-        List<CrmQysdsndsb> qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByParamAndTime(vo);
+        List<CrmQysdsndsb> qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByNsrsbhAndTime(vo);
+        return R.ok(qysdsndsbList);
+    }
+
+    @PostMapping("/queryByDjxhAndTime")
+    @ApiOperation("根据纳税人识别号和年度(选填)查询")
+    public Result<List<CrmQysdsndsb>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+        List<CrmQysdsndsb> qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByDjxhAndTime(vo);
         return R.ok(qysdsndsbList);
     }
 
diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java
index f8b0ace..cbe05e6 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java
@@ -31,10 +31,17 @@ public class CrmQysflController {
         return R.ok(qysfl);
     }
 
+    @PostMapping("/queryByDjxhAndTime")
+    @ApiOperation("根据登记序号和评价年度(选填)查询")
+    public Result<List<CrmQysfl>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){
+        List<CrmQysfl> qysflList = crmQysflService.getQysflByDjxhAndTimeList(vo);
+        return R.ok(qysflList);
+    }
+
     @PostMapping("/queryByNsrsbhAndTime")
     @ApiOperation("根据纳税人识别号和评价年度(选填)查询")
     public Result<List<CrmQysfl>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){
-        List<CrmQysfl> qysflList = crmQysflService.getQysflByParamAndTimeList(vo);
+        List<CrmQysfl> qysflList = crmQysflService.getQysflByNsrsbhAndTimeList(vo);
         return R.ok(qysflList);
     }
 
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java
index 3e973c1..bc235d8 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java
@@ -41,9 +41,16 @@ public interface ICrmQycbrsService extends BaseService<CrmQycbrs> {
     List<CrmQycbrs> getQycbrsList(CrmQycbrs crmQycbrs);
 
     /**
-     * 根据等级序号和月份(选填)查询企业参保人数信息列表
+     * 根据纳税人识别号和月份(选填)查询企业参保人数信息列表
      * @param vo
      * @return
      */
-    List<CrmQycbrs> getQycbrsListByParamAndTime(CrmParamAndTimeVO vo);
+    List<CrmQycbrs> getQycbrsListByNsrsbhAndTime(CrmParamAndTimeVO vo);
+
+    /**
+     * 根据登记序号和月份(选填)查询企业参保人数信息列表
+     * @param vo
+     * @return
+     */
+    List<CrmQycbrs> getQycbrsListByDjxhAndTime(CrmParamAndTimeVO vo);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java
index f3e6ec5..823888c 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java
@@ -41,10 +41,17 @@ public interface ICrmQyfxmxService  extends BaseService<CrmQyfxmx> {
      */
     List<CrmQyfxmx> getQyfxmxList(CrmQyfxmx crmQyfxmx);
 
+    /**
+     * 通过纳税人识别号和月份(选填)查询企业风险明细信息列表
+     * @param vo
+     * @return
+     */
+    List<CrmQyfxmx> getQyfxmxListByNsrsbhAndTime(CrmParamAndTimeVO vo);
+
     /**
      * 通过登记序号和月份(选填)查询企业风险明细信息列表
      * @param vo
      * @return
      */
-    List<CrmQyfxmx> getQyfxmxListByParamAndTime(CrmParamAndTimeVO vo);
+    List<CrmQyfxmx> getQyfxmxListByDjxhAndTime(CrmParamAndTimeVO vo);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java
index fd8be86..fa2d824 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java
@@ -42,10 +42,17 @@ public interface ICrmQyjxfpService extends BaseService<CrmQyjxfp> {
      */
     List<CrmQyjxfp> getQyjxfpList(CrmQyjxfp crmQyjxfp);
 
+    /**
+     * 通过纳税人识别号和年度(选填),查询企业进项发票和企业销项发票信息列表
+     * @param vo
+     * @return
+     */
+    CrmMergeListVO getMergeListByNsrsbhAndTime(CrmParamAndTimeVO vo);
+
     /**
      * 通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表
      * @param vo
      * @return
      */
-    CrmMergeListVO getMergeListByParamAndTime(CrmParamAndTimeVO vo);
+    CrmMergeListVO getMergeListByShxydmAndTime(CrmParamAndTimeVO vo);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java
index a4beee9..8ee38ca 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java
@@ -41,10 +41,17 @@ public interface ICrmQynsrdjService extends BaseService<CrmQynsrdj> {
      */
     List<CrmQynsrdj> getQynsrdjList(CrmQynsrdj crmQynsrdj);
 
+    /**
+     * 根据纳税人识别号和评价年度(选填)查询
+     * @param vo
+     * @return
+     */
+    List<CrmQynsrdj> getQynsrdjListByNsrsbhAndTime(CrmParamAndTimeVO vo);
+
     /**
      * 根据登记序号和评价年度(选填)查询
      * @param vo
      * @return
      */
-    List<CrmQynsrdj> getQynsrdjListByParamAndTime(CrmParamAndTimeVO vo);
+    List<CrmQynsrdj> getQynsrdjListByDjxhAndTime(CrmParamAndTimeVO vo);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java
index efdef73..a14b979 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java
@@ -43,10 +43,17 @@ public interface ICrmQysdsndsbService extends BaseService<CrmQysdsndsb> {
     List<CrmQysdsndsb> getQysdsndsbList(CrmQysdsndsb crmQysdsndsb);
 
 
+    /**
+     * 根据纳税人识别号和年度查询年度(选填)申报信息列表
+     * @param vo
+     * @return
+     */
+    List<CrmQysdsndsb> getQysdsndsbListByNsrsbhAndTime(CrmParamAndTimeVO vo);
+
     /**
      * 根据登记序号和年度查询年度(选填)申报信息列表
      * @param vo
      * @return
      */
-    List<CrmQysdsndsb> getQysdsndsbListByParamAndTime(CrmParamAndTimeVO vo);
+    List<CrmQysdsndsb> getQysdsndsbListByDjxhAndTime(CrmParamAndTimeVO vo);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java
index f7552a1..9799c0f 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java
@@ -41,10 +41,17 @@ public interface ICrmQysflService extends BaseService<CrmQysfl> {
      */
     List<CrmQysfl> getQysflList(CrmQysfl crmQysfl);
 
+    /**
+     * 根据纳税人识别号和月份(月份)
+     * @param vo
+     * @return
+     */
+    List<CrmQysfl> getQysflByNsrsbhAndTimeList(CrmParamAndTimeVO vo);
+
     /**
      * 根据登记序号和月份(月份)
      * @param vo
      * @return
      */
-    List<CrmQysfl> getQysflByParamAndTimeList(CrmParamAndTimeVO vo);
+    List<CrmQysfl> getQysflByDjxhAndTimeList(CrmParamAndTimeVO vo);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java
index 5a4372e..384c18e 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java
@@ -42,10 +42,17 @@ public interface ICrmQyxxfpService extends BaseService<CrmQyxxfp> {
     List<CrmQyxxfp> getQyxxfpList(CrmQyxxfp crmQyxxfp);
 
 
+    /**
+     * 通过纳税人识别号和年度(选填)查询企业销项发票信息
+     * @param vo
+     * @return
+     */
+    List<CrmQyxxfp> getQyxxfpListByNsrsbhAndTime(CrmParamAndTimeVO vo);
+
     /**
      * 通过社会信用代码和年度(选填)查询企业销项发票信息
      * @param vo
      * @return
      */
-    List<CrmQyxxfp> getQyxxfpListByParamAndTime(CrmParamAndTimeVO vo);
+    List<CrmQyxxfp> getQyxxfpListByShxydmAndTime(CrmParamAndTimeVO vo);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java
index 67c8998..f586cdf 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java
@@ -50,7 +50,24 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl<CrmQycbrsMapper, CrmQy
     }
 
     @Override
-    public List<CrmQycbrs> getQycbrsListByParamAndTime(CrmParamAndTimeVO vo) {
+    public List<CrmQycbrs> getQycbrsListByDjxhAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQycbrs> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
+            wrapper.eq("yf", vo.getTime());
+            CrmQycbrs qycbrs = crmQycbrsMapper.selectOne(wrapper);
+            return qycbrs != null ?
+                    Collections.singletonList(qycbrs) :
+                    Collections.emptyList();
+        }
+
+        return crmQycbrsMapper.selectList(wrapper);
+    }
+
+    @Override
+    public List<CrmQycbrs> getQycbrsListByNsrsbhAndTime(CrmParamAndTimeVO vo) {
 
         CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
                 .select("djxh")
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java
index b64f6a6..9379087 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java
@@ -75,7 +75,24 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl<CrmQyfxmxMapper, CrmQy
     }
 
     @Override
-    public List<CrmQyfxmx> getQyfxmxListByParamAndTime(CrmParamAndTimeVO vo) {
+    public List<CrmQyfxmx> getQyfxmxListByDjxhAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQyfxmx> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
+            wrapper.eq("yf", vo.getTime());
+            CrmQyfxmx qyfxmx = crmQyfxmxMapper.selectOne(wrapper);
+            return qyfxmx != null ?
+                    Collections.singletonList(qyfxmx) :
+                    Collections.emptyList();
+        }
+
+        return crmQyfxmxMapper.selectList(wrapper);
+    }
+
+    @Override
+    public List<CrmQyfxmx> getQyfxmxListByNsrsbhAndTime(CrmParamAndTimeVO vo) {
 
         CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
                 .select("djxh")
@@ -89,7 +106,7 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl<CrmQyfxmxMapper, CrmQy
         QueryWrapper<CrmQyfxmx> wrapper = new QueryWrapper<>();
         wrapper.eq("djxh", crmQyjbxx.getDjxh());
 
-        if (vo.getTime() != null) {
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
             wrapper.eq("yf", vo.getTime());
             CrmQyfxmx qyfxmx = crmQyfxmxMapper.selectOne(wrapper);
             return qyfxmx != null ?
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java
index 035f3db..7e9fb86 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java
@@ -84,13 +84,43 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl<CrmQyjxfpMapper, CrmQy
         return crmQyjxfpMapper.selectList(crmQyjxfpQueryWrapper);
     }
 
+    @Override
+    public CrmMergeListVO getMergeListByShxydmAndTime(CrmParamAndTimeVO vo) {
+
+        CrmMergeListVO mergeListVO = new CrmMergeListVO();
+
+        QueryWrapper<CrmQyjxfp> wrapper = new QueryWrapper<>();
+        wrapper.eq("shxydm", vo.getParam());
+
+        System.out.println(vo.getTime());
+
+        // 根据时间条件处理进项发票查询
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
+            // 添加时间条件
+            wrapper.eq("nd", vo.getTime());
+            CrmQyjxfp qyjxfp = crmQyjxfpMapper.selectOne(wrapper);
+            mergeListVO.setQyjxfpList(qyjxfp != null ?
+                    Collections.singletonList(qyjxfp) :
+                    Collections.emptyList());
+        } else {
+            // 无时间条件时直接查询列表
+            mergeListVO.setQyjxfpList(crmQyjxfpMapper.selectList(wrapper));
+        }
+
+        // 处理销项发票查询
+        List<CrmQyxxfp> qyxxfpList = crmQyxxfpService.getQyxxfpListByShxydmAndTime(vo);
+        mergeListVO.setQyxxfpList(qyxxfpList);
+
+        return mergeListVO;
+    }
+
     /**
      *  通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表
      * @param vo
      * @return
      */
     @Override
-    public CrmMergeListVO getMergeListByParamAndTime(CrmParamAndTimeVO vo) {
+    public CrmMergeListVO getMergeListByNsrsbhAndTime(CrmParamAndTimeVO vo) {
 
         CrmMergeListVO mergeListVO = new CrmMergeListVO();
 
@@ -124,7 +154,7 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl<CrmQyjxfpMapper, CrmQy
         }
 
         // 处理销项发票查询
-        List<CrmQyxxfp> qyxxfpList = crmQyxxfpService.getQyxxfpListByParamAndTime(vo);
+        List<CrmQyxxfp> qyxxfpList = crmQyxxfpService.getQyxxfpListByNsrsbhAndTime(vo);
         mergeListVO.setQyxxfpList(qyxxfpList);
 
         return mergeListVO;
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java
index 9b0776a..77365c5 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java
@@ -51,7 +51,7 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl<CrmQynsrdjMapper, Crm
     }
 
     @Override
-    public List<CrmQynsrdj> getQynsrdjListByParamAndTime(CrmParamAndTimeVO vo){
+    public List<CrmQynsrdj> getQynsrdjListByNsrsbhAndTime(CrmParamAndTimeVO vo){
 
         CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
                 .select("djxh")
@@ -77,4 +77,23 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl<CrmQynsrdjMapper, Crm
         // 无时间参数时返回匹配的所有记录
         return crmQynsrdjMapper.selectList(wrapper);
     }
+
+    @Override
+    public List<CrmQynsrdj> getQynsrdjListByDjxhAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQynsrdj> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        // 当时间参数存在时添加时间条件并返回单条结果
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
+            wrapper.eq("pjnd", vo.getTime());
+            CrmQynsrdj entity = crmQynsrdjMapper.selectOne(wrapper);
+            return entity != null ?
+                    Collections.singletonList(entity) :
+                    Collections.emptyList();
+        }
+
+        // 无时间参数时返回匹配的所有记录
+        return crmQynsrdjMapper.selectList(wrapper);
+    }
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java
index 8fbd8e3..14de9dc 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java
@@ -51,7 +51,24 @@ public class CrmQysdsndsbServiceImpl extends BaseServiceImpl<CrmQysdsndsbMapper,
     }
 
     @Override
-    public List<CrmQysdsndsb> getQysdsndsbListByParamAndTime(CrmParamAndTimeVO vo) {
+    public List<CrmQysdsndsb> getQysdsndsbListByDjxhAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQysdsndsb> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        if (vo.getTime() != null  && !vo.getTime().isEmpty()) {
+            wrapper.eq("nd", vo.getTime());
+            CrmQysdsndsb qysdsndsb = crmQysdsndsbMapper.selectOne(wrapper);
+            return qysdsndsb != null ?
+                    Collections.singletonList(qysdsndsb) :
+                    Collections.emptyList();
+        }
+
+        return crmQysdsndsbMapper.selectList(wrapper);
+    }
+
+    @Override
+    public List<CrmQysdsndsb> getQysdsndsbListByNsrsbhAndTime(CrmParamAndTimeVO vo) {
 
         CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
                 .select("djxh")
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java
index d1a6f56..49a5be3 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java
@@ -50,7 +50,24 @@ public class CrmQysflServiceImpl extends BaseServiceImpl<CrmQysflMapper, CrmQysf
     }
 
     @Override
-    public List<CrmQysfl> getQysflByParamAndTimeList(CrmParamAndTimeVO vo) {
+    public List<CrmQysfl> getQysflByDjxhAndTimeList(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQysfl> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
+            wrapper.eq("yf", vo.getTime());
+            CrmQysfl crmQysfl = crmQysflMapper.selectOne(wrapper);
+            return crmQysfl != null ?
+                    Collections.singletonList(crmQysfl) :
+                    Collections.emptyList();
+        }
+
+        return crmQysflMapper.selectList(wrapper);
+    }
+
+    @Override
+    public List<CrmQysfl> getQysflByNsrsbhAndTimeList(CrmParamAndTimeVO vo) {
 
         CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
                 .select("djxh")
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java
index 3d2f8ed..85bda94 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java
@@ -51,7 +51,24 @@ public class CrmQyxxfpServiceImpl extends BaseServiceImpl<CrmQyxxfpMapper, CrmQy
     }
 
     @Override
-    public List<CrmQyxxfp> getQyxxfpListByParamAndTime(CrmParamAndTimeVO vo) {
+    public List<CrmQyxxfp> getQyxxfpListByShxydmAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQyxxfp> wrapper = new QueryWrapper<>();
+        wrapper.eq("shxydm", vo.getParam());
+
+        if (vo.getTime() != null  && !vo.getTime().isEmpty()) {
+            wrapper.eq("nd", vo.getTime());
+            CrmQyxxfp qyxxfp = crmQyxxfpMapper.selectOne(wrapper);
+            return qyxxfp != null ?
+                    Collections.singletonList(qyxxfp) :
+                    Collections.emptyList();
+        }
+
+        return crmQyxxfpMapper.selectList(wrapper);
+    }
+
+    @Override
+    public List<CrmQyxxfp> getQyxxfpListByNsrsbhAndTime(CrmParamAndTimeVO vo) {
 
         CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
                 .select("shxydm")