税务接口

crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/nsrzg")
+@RequestMapping("/crmNsrzg")
 @Api(tags = "纳税人资格信息")
 public class CrmNsrzgController {
 
@@ -28,6 +28,13 @@ public class CrmNsrzgController {
         return R.ok(nsrzg);
     }
 
+    @PostMapping("/queryByNsrsbh/{nsrsbh}")
+    @ApiOperation("根据Nsrsbh查询")
+    public Result<CrmNsrzg> queryByNsrsbh(@PathVariable("nsrsbh") String nsrsbh){
+        CrmNsrzg nsrzg = crmNsrzgService.getNsrzgByNsrsbh(nsrsbh);
+        return R.ok(nsrzg);
+    }
+
     @PostMapping("/queryByDjxh/{djxh}")
     @ApiOperation("根据Djxh查询")
     public Result<CrmNsrzg> queryByDjxh(@PathVariable("djxh") String djxh){
@@ -35,6 +42,7 @@ public class CrmNsrzgController {
         return R.ok(nsrzg);
     }
 
+
     @PostMapping("/add")
     @ApiOperation("保存数据")
     public Result add(@RequestBody CrmNsrzg crmNsrzg) {

crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/qycbrs")
+@RequestMapping("/crmQycbrs")
 @Api(tags = "企业参保人数信息")
 public class CrmQycbrsController {
 
@@ -31,9 +31,15 @@ public class CrmQycbrsController {
         return R.ok(qyjxfp);
     }
 
+    @PostMapping("/queryByNsrsbhAndTime")
+    public Result<List<CrmQycbrs>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO 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.getQycbrsListByParamAndTime(vo);
+        List<CrmQycbrs> qycbrsList = crmQycbrsService.getQycbrsListByDjxhAndTime(vo);
         return R.ok(qycbrsList);
     }
 

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 {
 
@@ -30,10 +30,17 @@ public class CrmQyfxmxController {
         return R.ok(qyfxmx);
     }
 
+    @PostMapping("/queryByNsrsbhAndTime")
+    @ApiOperation("根据登记序号和月份(选填)查询")
+    public Result<List<CrmQyfxmx>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO 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.getQyfxmxListByParamAndTime(vo);
+        List<CrmQyfxmx> qyfxmxList = crmQyfxmxService.getQyfxmxListByDjxhAndTime(vo);
         return R.ok(qyfxmxList);
     }
 

crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java

@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/qyjxfp")
+@RequestMapping("/crmQyjxfp")
 @Api(tags = "企业进项发票信息")
 public class CrmQyjxfpController {
 
@@ -29,10 +29,17 @@ public class CrmQyjxfpController {
         return R.ok(qyjxfp);
     }
 
-    @PostMapping("/queryMergeListByParamAndTime")
+    @PostMapping("/queryMergeListByNsrsbhAndTime")
-    @ApiOperation("通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表")
+    @ApiOperation("通过纳税人识别号和年度(选填),查询企业进项发票和企业销项发票信息列表")
-    public Result queryMergeListByParamAndTime(@RequestBody CrmParamAndTimeVO vo){
+    public Result queryMergeListByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){
-        CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByParamAndTime(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);
     }
 

crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/qynsrdj")
+@RequestMapping("/crmQynsrdj")
 @Api(tags = "企业纳税信用登记信息")
 public class CrmQynsrdjController {
 
@@ -31,10 +31,17 @@ public class CrmQynsrdjController {
         return R.ok(qynsrdj);
     }
 
+    @PostMapping("/queryByNsrsbhAndTime")
+    @ApiOperation("根据纳税人识别号和评价年度(选填)查询")
+    public Result<List<CrmQynsrdj>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO 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.getQynsrdjListByParamAndTime(vo);
+        List<CrmQynsrdj> qynsrdjList = crmQynsrdjService.getQynsrdjListByDjxhAndTime(vo);
         return R.ok(qynsrdjList);
     }
 

crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/qysdsndsb")
+@RequestMapping("/crmQysdsndsb")
 @Api(tags = "企业所得税年度申报信息")
 public class CrmQysdsndsbController {
 
@@ -30,10 +30,17 @@ public class CrmQysdsndsbController {
         return R.ok(qysdsndsb);
     }
 
+    @PostMapping("/queryByNsrsbhAndTime")
+    @ApiOperation("根据纳税人识别号和年度(选填)查询")
+    public Result<List<CrmQysdsndsb>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+        List<CrmQysdsndsb> qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByNsrsbhAndTime(vo);
+        return R.ok(qysdsndsbList);
+    }
+
     @PostMapping("/queryByDjxhAndTime")
-    @ApiOperation("根据登记序号和年度(选填)查询")
+    @ApiOperation("根据纳税人识别号和年度(选填)查询")
     public Result<List<CrmQysdsndsb>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
-        List<CrmQysdsndsb> qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByParamAndTime(vo);
+        List<CrmQysdsndsb> qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByDjxhAndTime(vo);
         return R.ok(qysdsndsbList);
     }
 

crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/qysfl")
+@RequestMapping("/crmQysfl")
 @Api(tags = "企业税负率信息")
 public class CrmQysflController {
 
@@ -34,7 +34,14 @@ public class CrmQysflController {
     @PostMapping("/queryByDjxhAndTime")
     @ApiOperation("根据登记序号和评价年度(选填)查询")
     public Result<List<CrmQysfl>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){
-        List<CrmQysfl> qysflList = crmQysflService.getQysflByParamAndTimeList(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.getQysflByNsrsbhAndTimeList(vo);
         return R.ok(qysflList);
     }
 

crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java

@@ -37,6 +37,13 @@ public interface ICrmNsrzgService extends BaseService<CrmNsrzg> {
      */
     List<CrmNsrzg> getNsrzgList(CrmNsrzg crmNsrzg);
 
+    /**
+     * 根据纳税人识别号查询纳税人资格信息
+     * @param nsrsbh
+     * @return
+     */
+    CrmNsrzg getNsrzgByNsrsbh(String nsrsbh);
+
     /**
      * 根据登记序号查询纳税人资格信息
      * @param djxh

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java

@@ -3,7 +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.CrmNsrzg;
+import com.kakarote.crm.entity.PO.CrmQyjbxx;
 import com.kakarote.crm.mapper.CrmNsrzgMapper;
+import com.kakarote.crm.mapper.CrmQyjbxxMapper;
 import com.kakarote.crm.service.ICrmNsrzgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,6 +17,9 @@ public class CrmNsrzgServiceImpl extends BaseServiceImpl<CrmNsrzgMapper, CrmNsrz
     @Autowired
     private CrmNsrzgMapper crmNsrzgMapper;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     @Override
     public CrmNsrzg getNsrzg(Integer nsrdjzgId) {
         return crmNsrzgMapper.selectById(nsrdjzgId);
@@ -41,10 +46,28 @@ public class CrmNsrzgServiceImpl extends BaseServiceImpl<CrmNsrzgMapper, CrmNsrz
         return crmNsrzgMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public CrmNsrzg getNsrzgByNsrsbh(String nsrsbh) {
+
+        CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
+                .select("djxh")
+                .eq("nsrsbh", nsrsbh)
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getDjxh() == null) {
+            return null;
+        }
+
+        return crmNsrzgMapper.selectOne(new QueryWrapper<CrmNsrzg>()
+                .eq("djxh", crmQyjbxx.getDjxh())
+        );
+    }
+
     @Override
     public CrmNsrzg getNsrzgByDjxh(String djxh) {
-        QueryWrapper<CrmNsrzg> queryWrapper = new QueryWrapper<>();
+
-        queryWrapper.eq("djxh", djxh);
+        return crmNsrzgMapper.selectOne(new QueryWrapper<CrmNsrzg>()
-        return crmNsrzgMapper.selectOne(queryWrapper);
+                .eq("djxh", djxh)
+        );
     }
 }

crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java

@@ -3,8 +3,10 @@ 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.PO.CrmQyjbxx;
 import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQycbrsMapper;
+import com.kakarote.crm.mapper.CrmQyjbxxMapper;
 import com.kakarote.crm.service.ICrmQycbrsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,6 +20,9 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl<CrmQycbrsMapper, CrmQy
     @Autowired
     private CrmQycbrsMapper crmQycbrsMapper;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     @Override
     public CrmQycbrs getQycbrs(Integer qycbrsId) {
         return crmQycbrsMapper.selectById(qycbrsId);
@@ -45,12 +50,38 @@ 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) {
+        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")
+                .eq("nsrsbh", vo.getParam())
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getDjxh() == null) {
+            return null;
+        }
+
+        QueryWrapper<CrmQycbrs> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", crmQyjbxx.getDjxh());
+
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
             wrapper.eq("yf", vo.getTime());
             CrmQycbrs qycbrs = crmQycbrsMapper.selectOne(wrapper);
             return qycbrs != null ?

crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java

@@ -3,8 +3,10 @@ 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.CrmQyjbxx;
 import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
 import com.kakarote.crm.mapper.CrmQyfxmxMapper;
+import com.kakarote.crm.mapper.CrmQyjbxxMapper;
 import com.kakarote.crm.service.ICrmQyfxmxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,6 +20,9 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl<CrmQyfxmxMapper, CrmQy
     @Autowired
     private CrmQyfxmxMapper crmQyfxmxMapper;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     /**
      * 通过id查询企业指标明细
      * @param qyfxmxId
@@ -70,12 +75,38 @@ 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) {
+        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")
+                .eq("nsrsbh", vo.getParam())
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getDjxh() == null) {
+            return null;
+        }
+
+        QueryWrapper<CrmQyfxmx> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", crmQyjbxx.getDjxh());
+
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
             wrapper.eq("yf", vo.getTime());
             CrmQyfxmx qyfxmx = crmQyfxmxMapper.selectOne(wrapper);
             return qyfxmx != null ?

crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java

@@ -2,10 +2,12 @@ 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.CrmQyjbxxMapper;
 import com.kakarote.crm.mapper.CrmQyjxfpMapper;
 import com.kakarote.crm.service.ICrmQyjxfpService;
 import com.kakarote.crm.service.ICrmQyxxfpService;
@@ -23,6 +25,9 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl<CrmQyjxfpMapper, CrmQy
     @Autowired
     private ICrmQyxxfpService crmQyxxfpService;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     /**
      * 通过id查询企业进项发票
      *
@@ -79,22 +84,18 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl<CrmQyjxfpMapper, CrmQy
         return crmQyjxfpMapper.selectList(crmQyjxfpQueryWrapper);
     }
 
-    /**
-     *  通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表
-     * @param vo
-     * @return
-     */
     @Override
-    public CrmMergeListVO getMergeListByParamAndTime(CrmParamAndTimeVO vo) {
+    public CrmMergeListVO getMergeListByShxydmAndTime(CrmParamAndTimeVO vo) {
 
         CrmMergeListVO mergeListVO = new CrmMergeListVO();
 
-        // 创建基础QueryWrapper（公共条件）
         QueryWrapper<CrmQyjxfp> wrapper = new QueryWrapper<>();
         wrapper.eq("shxydm", vo.getParam());
 
+        System.out.println(vo.getTime());
+
         // 根据时间条件处理进项发票查询
-        if (vo.getTime() != null) {
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
             // 添加时间条件
             wrapper.eq("nd", vo.getTime());
             CrmQyjxfp qyjxfp = crmQyjxfpMapper.selectOne(wrapper);
@@ -107,7 +108,53 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl<CrmQyjxfpMapper, CrmQy
         }
 
         // 处理销项发票查询
-        List<CrmQyxxfp> qyxxfpList = crmQyxxfpService.getQyxxfpListByParamAndTime(vo);
+        List<CrmQyxxfp> qyxxfpList = crmQyxxfpService.getQyxxfpListByShxydmAndTime(vo);
+        mergeListVO.setQyxxfpList(qyxxfpList);
+
+        return mergeListVO;
+    }
+
+    /**
+     *  通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表
+     * @param vo
+     * @return
+     */
+    @Override
+    public CrmMergeListVO getMergeListByNsrsbhAndTime(CrmParamAndTimeVO vo) {
+
+        CrmMergeListVO mergeListVO = new CrmMergeListVO();
+
+        CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
+                .select("shxydm")
+                .eq("nsrsbh", vo.getParam())
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getShxydm() == null) {
+            return null;
+        }
+
+        System.out.println(crmQyjbxx.getShxydm());
+        // 创建基础QueryWrapper（公共条件）
+        QueryWrapper<CrmQyjxfp> wrapper = new QueryWrapper<>();
+        wrapper.eq("shxydm", crmQyjbxx.getShxydm());
+
+        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.getQyxxfpListByNsrsbhAndTime(vo);
         mergeListVO.setQyxxfpList(qyxxfpList);
 
         return mergeListVO;

crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java

@@ -2,8 +2,10 @@ 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.CrmQynsrdj;
 import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
+import com.kakarote.crm.mapper.CrmQyjbxxMapper;
 import com.kakarote.crm.mapper.CrmQynsrdjMapper;
 import com.kakarote.crm.service.ICrmQynsrdjService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,9 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl<CrmQynsrdjMapper, Crm
     @Autowired
     private CrmQynsrdjMapper crmQynsrdjMapper;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     @Override
     public CrmQynsrdj getQynsrdj(Integer qynsxydjId) {
         return crmQynsrdjMapper.selectById(qynsxydjId);
@@ -46,13 +51,41 @@ 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")
+                .eq("nsrsbh", vo.getParam())
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getDjxh() == null) {
+            return null;
+        }
+
+        QueryWrapper<CrmQynsrdj> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", crmQyjbxx.getDjxh());
+
+        // 当时间参数存在时添加时间条件并返回单条结果
+        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);
+    }
+
+    @Override
+    public List<CrmQynsrdj> getQynsrdjListByDjxhAndTime(CrmParamAndTimeVO vo) {
 
         QueryWrapper<CrmQynsrdj> wrapper = new QueryWrapper<>();
         wrapper.eq("djxh", vo.getParam());
 
         // 当时间参数存在时添加时间条件并返回单条结果
-        if (vo.getTime() != null) {
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
             wrapper.eq("pjnd", vo.getTime());
             CrmQynsrdj entity = crmQynsrdjMapper.selectOne(wrapper);
             return entity != null ?

crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java

@@ -3,8 +3,10 @@ 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.CrmQysdsndsb;
 import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
+import com.kakarote.crm.mapper.CrmQyjbxxMapper;
 import com.kakarote.crm.mapper.CrmQysdsndsbMapper;
 import com.kakarote.crm.service.ICrmQysdsndsbService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,9 @@ public class CrmQysdsndsbServiceImpl extends BaseServiceImpl<CrmQysdsndsbMapper,
     @Autowired
     private CrmQysdsndsbMapper crmQysdsndsbMapper;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     @Override
     public CrmQysdsndsb getQysdsndsb(Integer qysdsndsbId) {
         return crmQysdsndsbMapper.selectById(qysdsndsbId);
@@ -46,12 +51,38 @@ 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) {
+        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")
+                .eq("nsrsbh", vo.getParam())
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getDjxh() == null) {
+            return null;
+        }
+
+        QueryWrapper<CrmQysdsndsb> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", crmQyjbxx.getDjxh());
+
+        if (vo.getTime() != null  && !vo.getTime().isEmpty()) {
             wrapper.eq("nd", vo.getTime());
             CrmQysdsndsb qysdsndsb = crmQysdsndsbMapper.selectOne(wrapper);
             return qysdsndsb != null ?

crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java

@@ -2,8 +2,10 @@ 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.CrmQysfl;
 import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
+import com.kakarote.crm.mapper.CrmQyjbxxMapper;
 import com.kakarote.crm.mapper.CrmQysflMapper;
 import com.kakarote.crm.service.ICrmQysflService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,9 @@ public class CrmQysflServiceImpl extends BaseServiceImpl<CrmQysflMapper, CrmQysf
     @Autowired
     private CrmQysflMapper crmQysflMapper;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     @Override
     public CrmQysfl getQysfl(Integer qysflId) {
         return crmQysflMapper.selectById(qysflId);
@@ -45,12 +50,38 @@ 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) {
+        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")
+                .eq("nsrsbh", vo.getParam())
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getDjxh() == null) {
+            return null;
+        }
+
+        QueryWrapper<CrmQysfl> wrapper = new QueryWrapper<>();
+        wrapper.eq("djxh", crmQyjbxx.getDjxh());
+
+        if (vo.getTime() != null && !vo.getTime().isEmpty()) {
             wrapper.eq("yf", vo.getTime());
             CrmQysfl crmQysfl = crmQysflMapper.selectOne(wrapper);
             return crmQysfl != null ?

crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java

@@ -2,9 +2,11 @@ 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.CrmParamAndTimeVO;
+import com.kakarote.crm.mapper.CrmQyjbxxMapper;
 import com.kakarote.crm.mapper.CrmQyxxfpMapper;
 import com.kakarote.crm.service.ICrmQyxxfpService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,9 @@ public class CrmQyxxfpServiceImpl extends BaseServiceImpl<CrmQyxxfpMapper, CrmQy
     @Autowired
     private CrmQyxxfpMapper crmQyxxfpMapper;
 
+    @Autowired
+    private CrmQyjbxxMapper crmQyjbxxMapper;
+
     @Override
     public CrmQyxxfp getQyxxfp(Integer qyxxfpId) {
         return crmQyxxfpMapper.selectById(qyxxfpId);
@@ -46,12 +51,38 @@ 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) {
+        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")
+                .eq("nsrsbh", vo.getParam())
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getShxydm() == null) {
+            return null;
+        }
+
+        QueryWrapper<CrmQyxxfp> wrapper = new QueryWrapper<>();
+        wrapper.eq("shxydm", crmQyjbxx.getShxydm());
+
+        if (vo.getTime() != null  && !vo.getTime().isEmpty()) {
             wrapper.eq("nd", vo.getTime());
             CrmQyxxfp qyxxfp = crmQyxxfpMapper.selectOne(wrapper);
             return qyxxfp != null ?