diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java
index dbad2f7..a4588a6 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java
@@ -28,6 +28,13 @@ public class CrmNsrzgController {
         return R.ok(nsrzg);
     }
 
+    @PostMapping("/queryByDjxh/{djxh}")
+    @ApiOperation("根据Djxh查询")
+    public Result<CrmNsrzg> queryByDjxh(@PathVariable("djxh") String djxh){
+        CrmNsrzg nsrzg = crmNsrzgService.getNsrzgByDjxh(djxh);
+        return R.ok(nsrzg);
+    }
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmNsrzg crmNsrzg) {
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 6ef8363..185830c 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java
@@ -5,6 +5,7 @@ import com.kakarote.core.common.ParamAspect;
 import com.kakarote.core.common.R;
 import com.kakarote.core.common.Result;
 import com.kakarote.crm.entity.PO.CrmQycbrs;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.service.ICrmQycbrsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +13,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/qycbrs")
 @Api(tags = "企业参保人数信息")
@@ -28,6 +31,12 @@ public class CrmQycbrsController {
         return R.ok(qyjxfp);
     }
 
+    @PostMapping("/queryByDjxhAndTime")
+    public Result<List<CrmQycbrs>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+        List<CrmQycbrs> qycbrsList = crmQycbrsService.getQycbrsListByParamAndTime(vo);
+        return R.ok(qycbrsList);
+    }
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmQycbrs crmQycbrs) {
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 d8bccdd..deea4eb 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java
@@ -4,6 +4,7 @@ import com.kakarote.core.common.ParamAspect;
 import com.kakarote.core.common.R;
 import com.kakarote.core.common.Result;
 import com.kakarote.crm.entity.PO.CrmQyfxmx;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.service.ICrmQyfxmxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +12,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/qyfxmx")
 @Api(tags = "企业风险明细信息")
@@ -27,6 +30,13 @@ public class CrmQyfxmxController {
         return R.ok(qyfxmx);
     }
 
+    @PostMapping("/queryByDjxhAndTime")
+    @ApiOperation("根据登记序号和月份(选填)查询")
+    public Result<List<CrmQyfxmx>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){
+        List<CrmQyfxmx> qyfxmxList = crmQyfxmxService.getQyfxmxListByParamAndTime(vo);
+        return R.ok(qyfxmxList);
+    }
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmQyfxmx crmQyfxmx) {
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 151666b..d1a1e07 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java
@@ -4,6 +4,8 @@ import com.kakarote.core.common.ParamAspect;
 import com.kakarote.core.common.R;
 import com.kakarote.core.common.Result;
 import com.kakarote.crm.entity.PO.CrmQyjxfp;
+import com.kakarote.crm.entity.VO.CrmMergeListVO;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.service.ICrmQyjxfpService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +29,13 @@ public class CrmQyjxfpController {
         return R.ok(qyjxfp);
     }
 
+    @PostMapping("/queryMergeListByParamAndTime")
+    @ApiOperation("通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表")
+    public Result queryMergeListByParamAndTime(@RequestBody CrmParamAndTimeVO vo){
+        CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByParamAndTime(vo);
+        return R.ok(mergeList);
+    }
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmQyjxfp crmQyjxfp) {
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 6b78835..147eccb 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java
@@ -5,6 +5,7 @@ import com.kakarote.core.common.ParamAspect;
 import com.kakarote.core.common.R;
 import com.kakarote.core.common.Result;
 import com.kakarote.crm.entity.PO.CrmQynsrdj;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.service.ICrmQynsrdjService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +13,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/qynsrdj")
 @Api(tags = "企业纳税信用登记信息")
@@ -28,6 +31,13 @@ public class CrmQynsrdjController {
         return R.ok(qynsrdj);
     }
 
+    @PostMapping("/queryByDjxhAndTime")
+    @ApiOperation("根据登记序号和评价年度(选填)查询")
+    public Result<List<CrmQynsrdj>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+        List<CrmQynsrdj> qynsrdjList = crmQynsrdjService.getQynsrdjListByParamAndTime(vo);
+        return R.ok(qynsrdjList);
+    }
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmQynsrdj crmQynsrdj) {
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 91f2244..8e76260 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java
@@ -4,6 +4,7 @@ import com.kakarote.core.common.ParamAspect;
 import com.kakarote.core.common.R;
 import com.kakarote.core.common.Result;
 import com.kakarote.crm.entity.PO.CrmQysdsndsb;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.service.ICrmQysdsndsbService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +12,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/qysdsndsb")
 @Api(tags = "企业所得税年度申报信息")
@@ -27,6 +30,13 @@ public class CrmQysdsndsbController {
         return R.ok(qysdsndsb);
     }
 
+    @PostMapping("/queryByDjxhAndTime")
+    @ApiOperation("根据登记序号和年度(选填)查询")
+    public Result<List<CrmQysdsndsb>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+        List<CrmQysdsndsb> qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByParamAndTime(vo);
+        return R.ok(qysdsndsbList);
+    }
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmQysdsndsb crmQysdsndsb) {
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 286d085..e2d2def 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java
@@ -4,8 +4,8 @@ package com.kakarote.crm.controller;
 import com.kakarote.core.common.ParamAspect;
 import com.kakarote.core.common.R;
 import com.kakarote.core.common.Result;
-import com.kakarote.crm.entity.PO.CrmQyjxfp;
 import com.kakarote.crm.entity.PO.CrmQysfl;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.service.ICrmQysflService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +13,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/qysfl")
 @Api(tags = "企业税负率信息")
@@ -29,6 +31,13 @@ public class CrmQysflController {
         return R.ok(qysfl);
     }
 
+    @PostMapping("/queryByDjxhAndTime")
+    @ApiOperation("根据登记序号和评价年度(选填)查询")
+    public Result<List<CrmQysfl>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){
+        List<CrmQysfl> qysflList = crmQysflService.getQysflByParamAndTimeList(vo);
+        return R.ok(qysflList);
+    }
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmQysfl crmQysfl) {
diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java
index c20fc46..753e903 100644
--- a/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java
+++ b/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java
@@ -27,6 +27,13 @@ public class CrmSwjgController {
         return R.ok(swjg);
     }
 
+    @PostMapping("/queryBySwjgDm/{swjgDm}")
+    @ApiOperation("根据swjgDm查询")
+    public Result<CrmSwjg> queryBySwjgDm(@PathVariable("swjgDm") String swjgDm) {
+        CrmSwjg swjg = crmSwjgService.getSwjgBySwjgDm(swjgDm);
+        return R.ok(swjg);
+    }
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmSwjg crmSwjg) {
diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQycbrs.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQycbrs.java
index b08dcb3..d15bb7e 100644
--- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQycbrs.java
+++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQycbrs.java
@@ -55,4 +55,9 @@ public class CrmQycbrs implements Serializable {
      * 更新人
      */
     private String updateBy;
+
+    /**
+     * 登记序号
+     */
+    private String djxh;
 }
diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxmx.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxmx.java
index 45d569b..13a8c56 100644
--- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxmx.java
+++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxmx.java
@@ -62,4 +62,9 @@ public class CrmQyfxmx implements Serializable {
      */
     private String updateBy;
 
+    /**
+     * 登记序号
+     */
+    private String djxh;
+
 }
diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java
new file mode 100644
index 0000000..fecc5b9
--- /dev/null
+++ b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java
@@ -0,0 +1,17 @@
+package com.kakarote.crm.entity.VO;
+
+import com.kakarote.crm.entity.PO.CrmQyjxfp;
+import com.kakarote.crm.entity.PO.CrmQyxxfp;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CrmMergeListVO {
+
+    //企业进项发票集合
+    private List<CrmQyjxfp> qyjxfpList;
+
+    //企业销项发票集合
+    private List<CrmQyxxfp> qyxxfpList;
+}
diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java
new file mode 100644
index 0000000..c982cb0
--- /dev/null
+++ b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java
@@ -0,0 +1,17 @@
+package com.kakarote.crm.entity.VO;
+
+import lombok.Data;
+
+@Data
+public class CrmParamAndTimeVO {
+
+    /**
+     * 根据接口不同，param可能是djxh，也可能是shxydm
+     */
+    private String param;
+
+    /**
+     * 根据接口不同，time可能是nd，也可能是yf
+     */
+    private String time;
+}
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java
index fec59fb..0291408 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java
@@ -36,4 +36,11 @@ public interface ICrmNsrzgService extends BaseService<CrmNsrzg> {
      * @return
      */
     List<CrmNsrzg> getNsrzgList(CrmNsrzg crmNsrzg);
+
+    /**
+     * 根据登记序号查询纳税人资格信息
+     * @param djxh
+     * @return
+     */
+    CrmNsrzg getNsrzgByDjxh(String djxh);
 }
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 4004a68..3e973c1 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java
@@ -2,6 +2,7 @@ package com.kakarote.crm.service;
 
 import com.kakarote.core.servlet.BaseService;
 import com.kakarote.crm.entity.PO.CrmQycbrs;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 
 import java.util.List;
 
@@ -38,4 +39,11 @@ public interface ICrmQycbrsService extends BaseService<CrmQycbrs> {
      * @return
      */
     List<CrmQycbrs> getQycbrsList(CrmQycbrs crmQycbrs);
+
+    /**
+     * 根据等级序号和月份(选填)查询企业参保人数信息列表
+     * @param vo
+     * @return
+     */
+    List<CrmQycbrs> getQycbrsListByParamAndTime(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 901f0ae..f3e6ec5 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java
@@ -2,7 +2,7 @@ package com.kakarote.crm.service;
 
 import com.kakarote.core.servlet.BaseService;
 import com.kakarote.crm.entity.PO.CrmQyfxmx;
-import com.kakarote.crm.entity.PO.CrmQyjxfp;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 
 import java.util.List;
 
@@ -21,23 +21,30 @@ public interface ICrmQyfxmxService  extends BaseService<CrmQyfxmx> {
     int insertQyfxmx(CrmQyfxmx crmQyfxmx);
 
     /**
-     * 更新企业进项发票基本信息
+     * 更新企业风险明细基本信息
      * @param crmQyfxmx
      * @return
      */
     int updateQyfxmx(CrmQyfxmx crmQyfxmx);
 
     /**
-     * 删除企业进项发票基本信息
+     * 删除企业风险明细基本信息
      * @param qyfxmxId
      * @return
      */
     int deleteQyfxmx(String qyfxmxId);
 
     /**
-     * 查询企业进项发票基本信息列表
+     * 查询企业风险明细基本信息列表
      * @param crmQyfxmx
      * @return
      */
     List<CrmQyfxmx> getQyfxmxList(CrmQyfxmx crmQyfxmx);
+
+    /**
+     * 通过登记序号和月份(选填)查询企业风险明细信息列表
+     * @param vo
+     * @return
+     */
+    List<CrmQyfxmx> getQyfxmxListByParamAndTime(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 d2f22b6..fd8be86 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java
@@ -2,7 +2,8 @@ package com.kakarote.crm.service;
 
 import com.kakarote.core.servlet.BaseService;
 import com.kakarote.crm.entity.PO.CrmQyjxfp;
-import org.springframework.stereotype.Service;
+import com.kakarote.crm.entity.VO.CrmMergeListVO;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 
 import java.util.List;
 
@@ -41,5 +42,10 @@ public interface ICrmQyjxfpService extends BaseService<CrmQyjxfp> {
      */
     List<CrmQyjxfp> getQyjxfpList(CrmQyjxfp crmQyjxfp);
 
-
+    /**
+     * 通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表
+     * @param vo
+     * @return
+     */
+    CrmMergeListVO getMergeListByParamAndTime(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 349543d..a4beee9 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java
@@ -1,8 +1,8 @@
 package com.kakarote.crm.service;
 
 import com.kakarote.core.servlet.BaseService;
-import com.kakarote.crm.entity.PO.CrmQyfxmx;
 import com.kakarote.crm.entity.PO.CrmQynsrdj;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 
 import java.util.List;
 
@@ -40,4 +40,11 @@ public interface ICrmQynsrdjService extends BaseService<CrmQynsrdj> {
      * @return
      */
     List<CrmQynsrdj> getQynsrdjList(CrmQynsrdj crmQynsrdj);
+
+    /**
+     * 根据登记序号和评价年度(选填)查询
+     * @param vo
+     * @return
+     */
+    List<CrmQynsrdj> getQynsrdjListByParamAndTime(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 68522d0..efdef73 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java
@@ -3,6 +3,7 @@ package com.kakarote.crm.service;
 
 import com.kakarote.core.servlet.BaseService;
 import com.kakarote.crm.entity.PO.CrmQysdsndsb;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 
 import java.util.List;
 
@@ -40,4 +41,12 @@ public interface ICrmQysdsndsbService extends BaseService<CrmQysdsndsb> {
      * @return
      */
     List<CrmQysdsndsb> getQysdsndsbList(CrmQysdsndsb crmQysdsndsb);
+
+
+    /**
+     * 根据登记序号和年度查询年度(选填)申报信息列表
+     * @param vo
+     * @return
+     */
+    List<CrmQysdsndsb> getQysdsndsbListByParamAndTime(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 c371b3d..f7552a1 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java
@@ -1,8 +1,8 @@
 package com.kakarote.crm.service;
 
 import com.kakarote.core.servlet.BaseService;
-import com.kakarote.crm.entity.PO.CrmQynsrdj;
 import com.kakarote.crm.entity.PO.CrmQysfl;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 
 import java.util.List;
 
@@ -40,4 +40,11 @@ public interface ICrmQysflService extends BaseService<CrmQysfl> {
      * @return
      */
     List<CrmQysfl> getQysflList(CrmQysfl crmQysfl);
+
+    /**
+     * 根据登记序号和月份(月份)
+     * @param vo
+     * @return
+     */
+    List<CrmQysfl> getQysflByParamAndTimeList(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 cdfb978..5a4372e 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java
@@ -2,6 +2,7 @@ package com.kakarote.crm.service;
 
 import com.kakarote.core.servlet.BaseService;
 import com.kakarote.crm.entity.PO.CrmQyxxfp;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 
 import java.util.List;
 
@@ -39,4 +40,12 @@ public interface ICrmQyxxfpService extends BaseService<CrmQyxxfp> {
      * @return
      */
     List<CrmQyxxfp> getQyxxfpList(CrmQyxxfp crmQyxxfp);
+
+
+    /**
+     * 通过社会信用代码和年度(选填)查询企业销项发票信息
+     * @param vo
+     * @return
+     */
+    List<CrmQyxxfp> getQyxxfpListByParamAndTime(CrmParamAndTimeVO vo);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java
index fc47fdc..4240c5c 100644
--- a/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java
+++ b/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java
@@ -8,35 +8,43 @@ import java.util.List;
 public interface ICrmSwjgService extends BaseService<CrmSwjg> {
 
     /**
-     * 通过id获得企业所得税年度申报信息
+     * 通过id获得税务机关信息
      */
     CrmSwjg getSwjg(Integer swjgId);
 
     /**
-     * 插入企业所得税年度申报信息
+     * 插入税务机关信息信息
      * @param crmSwjg
      * @return
      */
     int insertSwjg(CrmSwjg crmSwjg);
 
     /**
-     * 更新企业所得税年度申报信息
+     * 更新税务机关信息信息
      * @param crmSwjg
      * @return
      */
     int updateSwjg(CrmSwjg crmSwjg);
 
     /**
-     * 删除企业所得税年度申报信息
+     * 删除税务机关信息信息
      * @param swjgId
      * @return
      */
     int deleteSwjg(String swjgId);
 
     /**
-     * 查询企业所得税年度申报信息列表
+     * 查询税务机关信息信息列表
      * @param crmSwjg
      * @return
      */
     List<CrmSwjg> getSwjgList(CrmSwjg crmSwjg);
+
+
+    /**
+     *  根据swjgDm查询税务机关信息
+     * @param swjgDm
+     * @return
+     */
+    CrmSwjg getSwjgBySwjgDm(String swjgDm);
 }
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java
index 888018d..319791c 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java
@@ -40,4 +40,11 @@ public class CrmNsrzgServiceImpl extends BaseServiceImpl<CrmNsrzgMapper, CrmNsrz
         QueryWrapper<CrmNsrzg> queryWrapper = new QueryWrapper<>();
         return crmNsrzgMapper.selectList(queryWrapper);
     }
+
+    @Override
+    public CrmNsrzg getNsrzgByDjxh(String djxh) {
+        QueryWrapper<CrmNsrzg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("djxh", djxh);
+        return crmNsrzgMapper.selectOne(queryWrapper);
+    }
 }
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 1d30119..5370aea 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
@@ -3,11 +3,13 @@ package com.kakarote.crm.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kakarote.core.servlet.BaseServiceImpl;
 import com.kakarote.crm.entity.PO.CrmQycbrs;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQycbrsMapper;
 import com.kakarote.crm.service.ICrmQycbrsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -41,4 +43,21 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl<CrmQycbrsMapper, CrmQy
         QueryWrapper<CrmQycbrs> CrmQycbrsQueryWrapper = new QueryWrapper<>();
         return crmQycbrsMapper.selectList(CrmQycbrsQueryWrapper);
     }
+
+    @Override
+    public List<CrmQycbrs> getQycbrsListByParamAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQycbrs> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        if (vo.getTime() != null) {
+            wrapper.eq("yf", vo.getTime());
+            CrmQycbrs qycbrs = crmQycbrsMapper.selectOne(wrapper);
+            return qycbrs != null ?
+                    Collections.singletonList(qycbrs) :
+                    Collections.emptyList();
+        }
+
+        return crmQycbrsMapper.selectList(wrapper);
+    }
 }
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 853d9b6..ffc78f8 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
@@ -3,11 +3,9 @@ package com.kakarote.crm.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kakarote.core.servlet.BaseServiceImpl;
 import com.kakarote.crm.entity.PO.CrmQyfxmx;
-import com.kakarote.crm.entity.PO.CrmQyjxfp;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQyfxmxMapper;
-import com.kakarote.crm.mapper.CrmQyjxfpMapper;
 import com.kakarote.crm.service.ICrmQyfxmxService;
-import com.kakarote.crm.service.ICrmQyjxfpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -70,4 +68,21 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl<CrmQyfxmxMapper, CrmQy
         QueryWrapper<CrmQyfxmx> crmCrmQyfxmxQueryWrapper = new QueryWrapper<>();
         return crmQyfxmxMapper.selectList(crmCrmQyfxmxQueryWrapper);
     }
+
+    @Override
+    public List<CrmQyfxmx> getQyfxmxListByParamAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQyfxmx> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        if (vo.getTime() != null) {
+            wrapper.eq("yf", vo.getTime());
+            CrmQyfxmx qyfxmx = crmQyfxmxMapper.selectOne(wrapper);
+            return qyfxmx != null ?
+                    Collections.singletonList(qyfxmx) :
+                    Collections.emptyList();
+        }
+
+        return crmQyfxmxMapper.selectList(wrapper);
+    }
 }
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 6dc0a65..adc2ff5 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
@@ -2,15 +2,15 @@ package com.kakarote.crm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kakarote.core.servlet.BaseServiceImpl;
-import com.kakarote.crm.entity.PO.CrmQyjbxx;
 import com.kakarote.crm.entity.PO.CrmQyjxfp;
+import com.kakarote.crm.entity.PO.CrmQyxxfp;
+import com.kakarote.crm.entity.VO.CrmMergeListVO;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQyjxfpMapper;
 import com.kakarote.crm.service.ICrmQyjxfpService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.kakarote.crm.service.ICrmQyxxfpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -20,6 +20,9 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl<CrmQyjxfpMapper, CrmQy
     @Autowired
     private CrmQyjxfpMapper crmQyjxfpMapper;
 
+    @Autowired
+    private ICrmQyxxfpService crmQyxxfpService;
+
     /**
      * 通过id查询企业进项发票
      *
@@ -75,4 +78,38 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl<CrmQyjxfpMapper, CrmQy
         QueryWrapper<CrmQyjxfp> crmQyjxfpQueryWrapper = new QueryWrapper<>();
         return crmQyjxfpMapper.selectList(crmQyjxfpQueryWrapper);
     }
+
+    /**
+     *  通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表
+     * @param vo
+     * @return
+     */
+    @Override
+    public CrmMergeListVO getMergeListByParamAndTime(CrmParamAndTimeVO vo) {
+
+        CrmMergeListVO mergeListVO = new CrmMergeListVO();
+
+        // 创建基础QueryWrapper（公共条件）
+        QueryWrapper<CrmQyjxfp> wrapper = new QueryWrapper<>();
+        wrapper.eq("shxydm", vo.getParam());
+
+        // 根据时间条件处理进项发票查询
+        if (vo.getTime() != null) {
+            // 添加时间条件
+            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.getQyxxfpListByParamAndTime(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 ec3a1ed..d9fe816 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
@@ -1,14 +1,11 @@
 package com.kakarote.crm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.kakarote.core.feign.crm.service.CrmService;
 import com.kakarote.core.servlet.BaseServiceImpl;
-import com.kakarote.crm.entity.PO.CrmQyfxmx;
 import com.kakarote.crm.entity.PO.CrmQynsrdj;
-import com.kakarote.crm.mapper.CrmQyfxmxMapper;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQynsrdjMapper;
 import com.kakarote.crm.service.ICrmQynsrdjService;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,4 +44,23 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl<CrmQynsrdjMapper, Crm
         QueryWrapper<CrmQynsrdj> crmCrmQynsrdjQueryWrapper = new QueryWrapper<>();
         return crmQynsrdjMapper.selectList(crmCrmQynsrdjQueryWrapper);
     }
+
+    @Override
+    public List<CrmQynsrdj> getQynsrdjListByParamAndTime(CrmParamAndTimeVO vo){
+
+        QueryWrapper<CrmQynsrdj> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        // 当时间参数存在时添加时间条件并返回单条结果
+        if (vo.getTime() != null) {
+            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 b43da55..206a505 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
@@ -4,10 +4,13 @@ package com.kakarote.crm.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kakarote.core.servlet.BaseServiceImpl;
 import com.kakarote.crm.entity.PO.CrmQysdsndsb;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQysdsndsbMapper;
 import com.kakarote.crm.service.ICrmQysdsndsbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -41,4 +44,21 @@ public class CrmQysdsndsbServiceImpl extends BaseServiceImpl<CrmQysdsndsbMapper,
         QueryWrapper<CrmQysdsndsb> crmQysdsndsbQueryWrapper = new QueryWrapper<>();
         return crmQysdsndsbMapper.selectList(crmQysdsndsbQueryWrapper);
     }
+
+    @Override
+    public List<CrmQysdsndsb> getQysdsndsbListByParamAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQysdsndsb> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        if (vo.getTime() != null) {
+            wrapper.eq("nd", vo.getTime());
+            CrmQysdsndsb qysdsndsb = crmQysdsndsbMapper.selectOne(wrapper);
+            return qysdsndsb != null ?
+                    Collections.singletonList(qysdsndsb) :
+                    Collections.emptyList();
+        }
+
+        return crmQysdsndsbMapper.selectList(wrapper);
+    }
 }
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 36bd840..bd70e6e 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
@@ -2,11 +2,9 @@ package com.kakarote.crm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kakarote.core.servlet.BaseServiceImpl;
-import com.kakarote.crm.entity.PO.CrmQynsrdj;
 import com.kakarote.crm.entity.PO.CrmQysfl;
-import com.kakarote.crm.mapper.CrmQynsrdjMapper;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQysflMapper;
-import com.kakarote.crm.service.ICrmQynsrdjService;
 import com.kakarote.crm.service.ICrmQysflService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,4 +43,21 @@ public class CrmQysflServiceImpl extends BaseServiceImpl<CrmQysflMapper, CrmQysf
         QueryWrapper<CrmQysfl> crmCrmQysflQueryWrapper = new QueryWrapper<>();
         return crmQysflMapper.selectList(crmCrmQysflQueryWrapper);
     }
+
+    @Override
+    public List<CrmQysfl> getQysflByParamAndTimeList(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQysfl> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", vo.getParam());
+
+        if (vo.getTime() != null) {
+            wrapper.eq("yf", vo.getTime());
+            CrmQysfl crmQysfl = crmQysflMapper.selectOne(wrapper);
+            return crmQysfl != null ?
+                    Collections.singletonList(crmQysfl) :
+                    Collections.emptyList();
+        }
+
+        return crmQysflMapper.selectList(wrapper);
+    }
 }
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 4f7cbbb..3802f3e 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
@@ -2,11 +2,15 @@ package com.kakarote.crm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kakarote.core.servlet.BaseServiceImpl;
+import com.kakarote.crm.entity.PO.CrmQyjxfp;
 import com.kakarote.crm.entity.PO.CrmQyxxfp;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQyxxfpMapper;
 import com.kakarote.crm.service.ICrmQyxxfpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -40,5 +44,22 @@ public class CrmQyxxfpServiceImpl extends BaseServiceImpl<CrmQyxxfpMapper, CrmQy
         QueryWrapper<CrmQyxxfp> crmQyxxfpQueryWrapper = new QueryWrapper<>();
         return crmQyxxfpMapper.selectList(crmQyxxfpQueryWrapper);
     }
+
+    @Override
+    public List<CrmQyxxfp> getQyxxfpListByParamAndTime(CrmParamAndTimeVO vo) {
+
+        QueryWrapper<CrmQyxxfp> wrapper = new QueryWrapper<>();
+        wrapper.eq("shxydm", vo.getParam());
+
+        if (vo.getTime() != null) {
+            wrapper.eq("nd", vo.getTime());
+            CrmQyxxfp qyxxfp = crmQyxxfpMapper.selectOne(wrapper);
+            return qyxxfp != null ?
+                    Collections.singletonList(qyxxfp) :
+                    Collections.emptyList();
+        }
+
+        return crmQyxxfpMapper.selectList(wrapper);
+    }
 }
 
diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmSwjgServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmSwjgServiceImpl.java
index f9766d3..6f34bda 100644
--- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmSwjgServiceImpl.java
+++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmSwjgServiceImpl.java
@@ -40,4 +40,11 @@ public class CrmSwjgServiceImpl extends BaseServiceImpl<CrmSwjgMapper, CrmSwjg>
         QueryWrapper<CrmSwjg> crmSwjgQueryWrapper = new QueryWrapper<>();
         return crmSwjgMapper.selectList(crmSwjgQueryWrapper);
     }
+
+    @Override
+    public CrmSwjg getSwjgBySwjgDm(String swjgDm) {
+        QueryWrapper<CrmSwjg> crmSwjgQueryWrapper = new QueryWrapper<>();
+        crmSwjgQueryWrapper.eq("swjg_dm", swjgDm);
+        return crmSwjgMapper.selectOne(crmSwjgQueryWrapper);
+    }
 }