税务接口

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,10 +28,10 @@ public class CrmNsrzgController {
         return R.ok(nsrzg);
     }
 
-    @PostMapping("/queryByDjxh/{djxh}")
+    @PostMapping("/queryByNsrsbh/{nsrsbh}")
-    @ApiOperation("根据Djxh查询")
+    @ApiOperation("根据Nsrsbh查询")
-    public Result<CrmNsrzg> queryByDjxh(@PathVariable("djxh") String djxh){
+    public Result<CrmNsrzg> queryByDjxhNsrsbh(@PathVariable("nsrsbh") String nsrsbh){
-        CrmNsrzg nsrzg = crmNsrzgService.getNsrzgByDjxh(djxh);
+        CrmNsrzg nsrzg = crmNsrzgService.getNsrzgByNsrsbh(nsrsbh);
         return R.ok(nsrzg);
     }
 

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,8 +31,8 @@ public class CrmQycbrsController {
         return R.ok(qyjxfp);
     }
 
-    @PostMapping("/queryByDjxhAndTime")
+    @PostMapping("/queryByNsrsbhAndTime")
-    public Result<List<CrmQycbrs>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+    public Result<List<CrmQycbrs>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) {
         List<CrmQycbrs> qycbrsList = crmQycbrsService.getQycbrsListByParamAndTime(vo);
         return R.ok(qycbrsList);
     }

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

@@ -30,9 +30,9 @@ public class CrmQyfxmxController {
         return R.ok(qyfxmx);
     }
 
-    @PostMapping("/queryByDjxhAndTime")
+    @PostMapping("/queryByNsrsbhAndTime")
     @ApiOperation("根据登记序号和月份(选填)查询")
-    public Result<List<CrmQyfxmx>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){
+    public Result<List<CrmQyfxmx>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){
         List<CrmQyfxmx> qyfxmxList = crmQyfxmxService.getQyfxmxListByParamAndTime(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 {
 
@@ -30,7 +30,7 @@ public class CrmQyjxfpController {
     }
 
     @PostMapping("/queryMergeListByParamAndTime")
-    @ApiOperation("通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表")
+    @ApiOperation("通过纳税人识别号和年度(选填),查询企业进项发票和企业销项发票信息列表")
     public Result queryMergeListByParamAndTime(@RequestBody CrmParamAndTimeVO vo){
         CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByParamAndTime(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,9 +31,9 @@ public class CrmQynsrdjController {
         return R.ok(qynsrdj);
     }
 
-    @PostMapping("/queryByDjxhAndTime")
+    @PostMapping("/queryByNsrsbhAndTime")
-    @ApiOperation("根据登记序号和评价年度(选填)查询")
+    @ApiOperation("根据纳税人识别号和评价年度(选填)查询")
-    public Result<List<CrmQynsrdj>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+    public Result<List<CrmQynsrdj>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) {
         List<CrmQynsrdj> qynsrdjList = crmQynsrdjService.getQynsrdjListByParamAndTime(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,9 +30,9 @@ public class CrmQysdsndsbController {
         return R.ok(qysdsndsb);
     }
 
-    @PostMapping("/queryByDjxhAndTime")
+    @PostMapping("/queryByNsrsbhAndTime")
-    @ApiOperation("根据登记序号和年度(选填)查询")
+    @ApiOperation("根据纳税人识别号和年度(选填)查询")
-    public Result<List<CrmQysdsndsb>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) {
+    public Result<List<CrmQysdsndsb>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) {
         List<CrmQysdsndsb> qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByParamAndTime(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 {
 
@@ -31,9 +31,9 @@ public class CrmQysflController {
         return R.ok(qysfl);
     }
 
-    @PostMapping("/queryByDjxhAndTime")
+    @PostMapping("/queryByNsrsbhAndTime")
-    @ApiOperation("根据登记序号和评价年度(选填)查询")
+    @ApiOperation("根据纳税人识别号和评价年度(选填)查询")
-    public Result<List<CrmQysfl>> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){
+    public Result<List<CrmQysfl>> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){
         List<CrmQysfl> qysflList = crmQysflService.getQysflByParamAndTimeList(vo);
         return R.ok(qysflList);
     }

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

@@ -39,8 +39,8 @@ public interface ICrmNsrzgService extends BaseService<CrmNsrzg> {
 
     /**
      * 根据登记序号查询纳税人资格信息
-     * @param djxh
+     * @param nsrsbh
      * @return
      */
-    CrmNsrzg getNsrzgByDjxh(String djxh);
+    CrmNsrzg getNsrzgByNsrsbh(String nsrsbh);
 }

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);
@@ -42,9 +47,19 @@ public class CrmNsrzgServiceImpl extends BaseServiceImpl<CrmNsrzgMapper, CrmNsrz
     }
 
     @Override
-    public CrmNsrzg getNsrzgByDjxh(String djxh) {
+    public CrmNsrzg getNsrzgByNsrsbh(String nsrsbh) {
-        QueryWrapper<CrmNsrzg> queryWrapper = new QueryWrapper<>();
+
-        queryWrapper.eq("djxh", djxh);
+        CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
-        return crmNsrzgMapper.selectOne(queryWrapper);
+                .select("djxh")
+                .eq("nsrsbh", nsrsbh)
+        );
+
+        if (crmQyjbxx == null || crmQyjbxx.getDjxh() == null) {
+            return null;
+        }
+
+        return crmNsrzgMapper.selectOne(new QueryWrapper<CrmNsrzg>()
+                .eq("djxh", crmQyjbxx.getDjxh())
+        );
     }
 }

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);
@@ -47,10 +52,19 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl<CrmQycbrsMapper, CrmQy
     @Override
     public List<CrmQycbrs> getQycbrsListByParamAndTime(CrmParamAndTimeVO vo) {
 
-        QueryWrapper<CrmQycbrs> wrapper = new QueryWrapper<>();
+        CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
-        wrapper.eq("djxh", vo.getParam());
+                .select("djxh")
+                .eq("nsrsbh", vo.getParam())
+        );
 
-        if (vo.getTime() != null) {
+        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
@@ -72,8 +77,17 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl<CrmQyfxmxMapper, CrmQy
     @Override
     public List<CrmQyfxmx> getQyfxmxListByParamAndTime(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", vo.getParam());
+        wrapper.eq("djxh", crmQyjbxx.getDjxh());
 
         if (vo.getTime() != null) {
             wrapper.eq("yf", vo.getTime());

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查询企业进项发票
      *
@@ -89,12 +94,24 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl<CrmQyjxfpMapper, CrmQy
 
         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", vo.getParam());
+        wrapper.eq("shxydm", crmQyjbxx.getShxydm());
+
+        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);

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);
@@ -48,11 +53,20 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl<CrmQynsrdjMapper, Crm
     @Override
     public List<CrmQynsrdj> getQynsrdjListByParamAndTime(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", vo.getParam());
+        wrapper.eq("djxh", crmQyjbxx.getDjxh());
 
         // 当时间参数存在时添加时间条件并返回单条结果
-        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);
@@ -48,10 +53,19 @@ public class CrmQysdsndsbServiceImpl extends BaseServiceImpl<CrmQysdsndsbMapper,
     @Override
     public List<CrmQysdsndsb> getQysdsndsbListByParamAndTime(CrmParamAndTimeVO vo) {
 
-        QueryWrapper<CrmQysdsndsb> wrapper = new QueryWrapper<>();
+        CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
-        wrapper.eq("djxh", vo.getParam());
+                .select("djxh")
+                .eq("nsrsbh", vo.getParam())
+        );
 
-        if (vo.getTime() != null) {
+        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);
@@ -47,10 +52,19 @@ public class CrmQysflServiceImpl extends BaseServiceImpl<CrmQysflMapper, CrmQysf
     @Override
     public List<CrmQysfl> getQysflByParamAndTimeList(CrmParamAndTimeVO vo) {
 
-        QueryWrapper<CrmQysfl> wrapper = new QueryWrapper<>();
+        CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
-        wrapper.eq("djxh", vo.getParam());
+                .select("djxh")
+                .eq("nsrsbh", vo.getParam())
+        );
 
-        if (vo.getTime() != null) {
+        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);
@@ -48,10 +53,19 @@ public class CrmQyxxfpServiceImpl extends BaseServiceImpl<CrmQyxxfpMapper, CrmQy
     @Override
     public List<CrmQyxxfp> getQyxxfpListByParamAndTime(CrmParamAndTimeVO vo) {
 
-        QueryWrapper<CrmQyxxfp> wrapper = new QueryWrapper<>();
+        CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper<CrmQyjbxx>()
-        wrapper.eq("shxydm", vo.getParam());
+                .select("shxydm")
+                .eq("nsrsbh", vo.getParam())
+        );
 
-        if (vo.getTime() != null) {
+        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 ?