Merge pull request 'zzm' (#3) from zzm into test

Reviewed-on: #3

crm/src/main/java/com/kakarote/crm/constant/CrmConst.java

@@ -17,4 +17,9 @@ public class CrmConst extends Const {
      */
     public static final String FIELD_SORT_CACHE_NAME = "CRM:FIELD:SORT:";
 
+
+    public static final String V3_QYFXXX = "/api/risk/fxFxzbJcjgZbmx/openApi/getFxBynsrsbh";
+
+
+
 }

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

@@ -1,22 +1,12 @@
 package com.kakarote.crm.controller;
-
-
-import com.google.gson.Gson;
-import com.kakarote.crm.entity.PO.CrmQyfxjcjg;
-import com.kakarote.crm.entity.PO.CrmQyfxjcjgZbmx;
-import com.kakarote.crm.entity.VO.CrmApiResponseVO;
-import com.kakarote.crm.entity.VO.CrmV3SystemicRiskVO;
-import com.kakarote.crm.entity.VO.CrmRiskCheckResultVO;
+import com.kakarote.core.common.Result;
+import com.kakarote.crm.entity.VO.CrmV3SysRiskDataExposedVo;
 import com.kakarote.crm.service.ICrmQyfxjcjgService;
-import com.kakarote.crm.service.ICrmQyfxjcjgZbmxService;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.io.IOException;
 
+
 @RestController
 @RequestMapping("/crmGetData")
 public class CrmGetV3SysRiskDataController {
@@ -24,53 +14,9 @@ public class CrmGetV3SysRiskDataController {
     @Autowired
     private ICrmQyfxjcjgService iCrmQyfxjcjgService;
 
-    @Autowired
-    private ICrmQyfxjcjgZbmxService iCrmQyfxjcjgZbmxService;
-
     @PostMapping(value = "/resp")
-    public void getV3SysRiskData(@RequestBody CrmV3SystemicRiskVO crmV3SystemicRiskVO) {
-
-        OkHttpClient client = new OkHttpClient();
-
-        MediaType JSON = MediaType.get("application/json; charset=utf-8");
-
-        Gson gson = new Gson();
-        String json = gson.toJson(crmV3SystemicRiskVO);
-
-        okhttp3.RequestBody body = okhttp3.RequestBody.create(JSON, json);
-
-        Request request = new Request.Builder()
-                .url("https://v3-demo.lqyuns.com/api/risk/fxFxzbJcjgZbmx/openApi/getFxBynsrsbh")
-                .post(body)
-                .build();
-
-        try {
-            Response response = client.newCall(request).execute();
-            String respJson = response.body().string();
-
-            CrmApiResponseVO crmApiResponseVO = gson.fromJson(respJson, CrmApiResponseVO.class);
-
-            System.out.println(crmApiResponseVO);
-
-            System.out.println("响应消息:"+crmApiResponseVO.getMsg());
-            System.out.println("响应代码:"+crmApiResponseVO.getCode());
-            System.out.println("响应数据:"+crmApiResponseVO.getData());
-
-            for (CrmRiskCheckResultVO crmRiskCheckResultVO : crmApiResponseVO.getData()) {
-
-                CrmQyfxjcjg crmQyfxjcjg = crmRiskCheckResultVO.getCrmQyfxjcjg();
-                iCrmQyfxjcjgService.insertCrmQyfxjcjg(crmQyfxjcjg);
-
-                for (CrmQyfxjcjgZbmx item : crmRiskCheckResultVO.getCrmQyfxjcjgZbmxList()){
-
-                    iCrmQyfxjcjgZbmxService.insertQyfxjcjgZbmx(item);
-                }
-            }
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+    public Result getV3SysRiskData(@RequestBody CrmV3SysRiskDataExposedVo crmV3SysRiskDataExposedVo) throws IOException {
+        return Result.ok(iCrmQyfxjcjgService.getLocalRiskData(crmV3SysRiskDataExposedVo));
     }
-
-
 }
+

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

@@ -0,0 +1,55 @@
+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.CrmNsrzg;
+import com.kakarote.crm.service.ICrmNsrzgService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/nsrzg")
+@Api(tags = "纳税人资格信息")
+public class CrmNsrzgController {
+
+    @Autowired
+    private ICrmNsrzgService crmNsrzgService;
+
+    @PostMapping("/queryById/{nsrdjzgId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmNsrzg> queryById(@PathVariable("nsrdjzgId") @ApiParam(name = "id", value = "纳税人资格ID") Integer nsrdjzgId) {
+        CrmNsrzg nsrzg = crmNsrzgService.getNsrzg(nsrdjzgId);
+        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) {
+        return R.ok(crmNsrzgService.insertNsrzg(crmNsrzg));
+    }
+
+    @PostMapping("/deleteById/{nsrdjzgId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("nsrdjzgId") String nsrdjzgId){
+        return R.ok(crmNsrzgService.deleteNsrzg(nsrdjzgId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmNsrzg crmNsrzg){
+        return R.ok(crmNsrzgService.updateNsrzg(crmNsrzg));
+    }
+}

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

@@ -0,0 +1,57 @@
+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.CrmQycbrs;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
+import com.kakarote.crm.service.ICrmQycbrsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 = "企业参保人数信息")
+public class CrmQycbrsController {
+
+    @Autowired
+    private ICrmQycbrsService crmQycbrsService;
+
+    @PostMapping("/queryById/{qycbrsId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmQycbrs> queryById(@PathVariable("qycbrsId") @ApiParam(name = "id", value = "企业参保人数ID") Integer qycbrsId) {
+        CrmQycbrs qyjxfp = crmQycbrsService.getQycbrs(qycbrsId);
+        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) {
+        return R.ok(crmQycbrsService.insertQycbrs(crmQycbrs));
+    }
+
+    @PostMapping("/deleteById/{qycbrsId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("qycbrsId") String qycbrsId){
+        return R.ok(crmQycbrsService.deleteQycbrs(qycbrsId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmQycbrs crmQycbrs){
+        return R.ok(crmQycbrsService.updateQycbrs(crmQycbrs));
+    }
+}

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

@@ -0,0 +1,57 @@
+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.CrmQyfxmx;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
+import com.kakarote.crm.service.ICrmQyfxmxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 = "企业风险明细信息")
+public class CrmQyfxmxController {
+
+    @Autowired
+    private ICrmQyfxmxService crmQyfxmxService;
+
+    @PostMapping("/queryById/{qyzbmxId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmQyfxmx> queryById(@PathVariable("qyzbmxId") @ApiParam(name = "id", value = "企业指标明细ID") Integer qyzbmxId) {
+        CrmQyfxmx qyfxmx = crmQyfxmxService.getQyfxmx(qyzbmxId);
+        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) {
+        return R.ok(crmQyfxmxService.insertQyfxmx(crmQyfxmx));
+    }
+
+    @PostMapping("/deleteById/{qyzbmxId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("qyzbmxId") String qyzbmxId){
+        return R.ok(crmQyfxmxService.deleteQyfxmx(qyzbmxId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmQyfxmx crmQyfxmx){
+        return R.ok(crmQyfxmxService.updateQyfxmx(crmQyfxmx));
+    }
+}

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

@@ -0,0 +1,57 @@
+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.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;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/qyjxfp")
+@Api(tags = "企业进项发票信息")
+public class CrmQyjxfpController {
+
+    @Autowired
+    private ICrmQyjxfpService crmQyjxfpService;
+
+    @PostMapping("/queryById/{qyjxfpId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmQyjxfp> queryById(@PathVariable("qyjxfpId") @ApiParam(name = "id", value = "企业进项发票ID") Integer qyjxfpId) {
+        CrmQyjxfp qyjxfp = crmQyjxfpService.getQyjxfp(qyjxfpId);
+        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) {
+        return R.ok(crmQyjxfpService.insertQyjxfp(crmQyjxfp));
+    }
+
+    @PostMapping("/deleteById/{qyjxfpId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("qyjxfpId") String qyjxfpId){
+        return R.ok(crmQyjxfpService.deleteQyjxfp(qyjxfpId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmQyjxfp crmQyjxfp){
+        return R.ok(crmQyjxfpService.updateQyjxfp(crmQyjxfp));
+    }
+
+}

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

@@ -0,0 +1,58 @@
+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.CrmQynsrdj;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
+import com.kakarote.crm.service.ICrmQynsrdjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 = "企业纳税信用登记信息")
+public class CrmQynsrdjController {
+
+    @Autowired
+    private ICrmQynsrdjService crmQynsrdjService;
+
+    @PostMapping("/queryById/{qynsrdjId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmQynsrdj> queryById(@PathVariable("qynsrdjId") @ApiParam(name = "id", value = "企业纳税信用登记ID") Integer qynsrdjId) {
+        CrmQynsrdj qynsrdj = crmQynsrdjService.getQynsrdj(qynsrdjId);
+        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) {
+        return R.ok(crmQynsrdjService.insertQynsrdj(crmQynsrdj));
+    }
+
+    @PostMapping("/deleteById/{qynsrdjId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("qynsrdjId") String qynsrdjId){
+        return R.ok(crmQynsrdjService.deleteQynsrdj(qynsrdjId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmQynsrdj crmQynsrdj){
+        return R.ok(crmQynsrdjService.updateQynsrdj(crmQynsrdj));
+    }
+}

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

@@ -0,0 +1,57 @@
+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.CrmQysdsndsb;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
+import com.kakarote.crm.service.ICrmQysdsndsbService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 = "企业所得税年度申报信息")
+public class CrmQysdsndsbController {
+
+    @Autowired
+    private ICrmQysdsndsbService crmQysdsndsbService;
+
+    @PostMapping("/queryById/{qysdsndsbId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmQysdsndsb> queryById(@PathVariable("qysdsndsbId") @ApiParam(name = "id", value = "企业所得税年度申报ID") Integer qysdsndsbId) {
+        CrmQysdsndsb qysdsndsb = crmQysdsndsbService.getQysdsndsb(qysdsndsbId);
+        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) {
+        return R.ok(crmQysdsndsbService.insertQysdsndsb(crmQysdsndsb));
+    }
+
+    @PostMapping("/deleteById/{qysdsndsbId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("qysdsndsbId") String qysdsndsbId){
+        return R.ok(crmQysdsndsbService.deleteQysdsndsb(qysdsndsbId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmQysdsndsb crmQysdsndsb){
+        return R.ok(crmQysdsndsbService.updateQysdsndsb(crmQysdsndsb));
+    }
+}

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

@@ -0,0 +1,58 @@
+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.CrmQysfl;
+import com.kakarote.crm.entity.VO.CrmParamAndTimeVO;
+import com.kakarote.crm.service.ICrmQysflService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 = "企业税负率信息")
+public class CrmQysflController {
+
+    @Autowired
+    private ICrmQysflService crmQysflService;
+
+    @PostMapping("/queryById/{qysflId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmQysfl> queryById(@PathVariable("qysflId") @ApiParam(name = "id", value = "企业税负率ID") Integer qysflId) {
+        CrmQysfl qysfl = crmQysflService.getQysfl(qysflId);
+        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) {
+        return R.ok(crmQysflService.insertQysfl(crmQysfl));
+    }
+
+    @PostMapping("/deleteById/{qysflId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("qysflId") String qysflId){
+        return R.ok(crmQysflService.deleteQysfl(qysflId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmQysfl crmQysfl){
+        return R.ok(crmQysflService.updateQysfl(crmQysfl));
+    }
+}

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

@@ -0,0 +1,47 @@
+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.CrmQyxxfp;
+import com.kakarote.crm.service.ICrmQyxxfpService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/qyxxfp")
+@Api(tags = "企业销项发票信息")
+public class CrmQyxxfpController {
+
+    @Autowired
+    private ICrmQyxxfpService crmQyxxfpService;
+
+    @PostMapping("/queryById/{qyxxfpId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmQyxxfp> queryById(@PathVariable("qyxxfpId") @ApiParam(name = "id", value = "企业进项发票ID") Integer qyxxfpId) {
+        CrmQyxxfp qyxxfp = crmQyxxfpService.getQyxxfp(qyxxfpId);
+        return R.ok(qyxxfp);
+    }
+
+    @PostMapping("/add")
+    @ApiOperation("保存数据")
+    public Result add(@RequestBody CrmQyxxfp crmQyxxfp) {
+        return R.ok(crmQyxxfpService.insertQyxxfp(crmQyxxfp));
+    }
+
+    @PostMapping("/deleteById/{qyxxfpId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("qyxxfpId") String qyxxfpId){
+        return R.ok(crmQyxxfpService.deleteQyxxfp(qyxxfpId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmQyxxfp crmQyxxfp){
+        return R.ok(crmQyxxfpService.updateQyxxfp(crmQyxxfp));
+    }
+}

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

@@ -0,0 +1,54 @@
+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.CrmSwjg;
+import com.kakarote.crm.service.ICrmSwjgService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/swjg")
+@Api(tags = "税务机关信息")
+public class CrmSwjgController {
+
+    @Autowired
+    private ICrmSwjgService crmSwjgService;
+
+    @PostMapping("/queryById/{swjgId}")
+    @ApiOperation("根据ID查询")
+    @ParamAspect
+    public Result<CrmSwjg> queryById(@PathVariable("swjgId") @ApiParam(name = "id", value = "税务机关ID") Integer swjgId) {
+        CrmSwjg swjg = crmSwjgService.getSwjg(swjgId);
+        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) {
+        return R.ok(crmSwjgService.insertSwjg(crmSwjg));
+    }
+
+    @PostMapping("/deleteById/{swjgId}")
+    @ApiOperation("根据ID删除数据")
+    public Result deleteById(@PathVariable("swjgId") String swjgId){
+        return R.ok(crmSwjgService.deleteSwjg(swjgId));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation("更新数据")
+    public Result update(@RequestBody CrmSwjg crmSwjg){
+        return R.ok(crmSwjgService.updateSwjg(crmSwjg));
+    }
+}

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

crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxjcjg.java

@@ -2,6 +2,7 @@ package com.kakarote.crm.entity.PO;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -11,6 +12,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @Accessors(chain = true)
@@ -86,4 +88,7 @@ public class CrmQyfxjcjg implements Serializable {
      * 批量监测id
      */
     private String pljcId;
+
+    @TableField(exist = false)
+    private List<CrmQyfxjcjgZbmx> crmQyfxjcjgZbmxList;
 }

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

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

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

crm/src/main/java/com/kakarote/crm/entity/VO/CrmV3SysRiskDataExposedVo.java

@@ -0,0 +1,16 @@
+package com.kakarote.crm.entity.VO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class CrmV3SysRiskDataExposedVo {
+
+    private String nsrsbh;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date ssqQ;
+}

crm/src/main/java/com/kakarote/crm/entity/VO/CrmV3SystemicRiskVO.java

@@ -1,8 +1,13 @@
 package com.kakarote.crm.entity.VO;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
 
 @Data
+@Accessors(chain = true)
 public class CrmV3SystemicRiskVO {
 
     private Integer appId;
@@ -11,8 +16,12 @@ public class CrmV3SystemicRiskVO {
 
     private String nsrsbh;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date ssqQ;
+
     public CrmV3SystemicRiskVO() {
         this.appId = 101011;
         this.appSecret = "crmopenapi";
     }
+
 }

crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kakarote.crm.mapper.CrmQyfxjcjgMapper">
+    <resultMap id="BaseResultMap" type="com.kakarote.crm.entity.PO.CrmQyfxjcjg">
+        <result column="jcpc_uuid" jdbcType="VARCHAR" property="jcpcUuid" />
+        <result column="qyid" jdbcType="VARCHAR" property="qyid" />
+        <result column="qysbh" jdbcType="VARCHAR" property="qysbh" />
+        <result column="fxjc_pcjg" jdbcType="VARCHAR" property="fxjcPcjg" />
+        <result column="jcsj" jdbcType="TIMESTAMP" property="jcsj" />
+        <result column="jc_ssqQ" jdbcType="TIMESTAMP" property="jcSsqq" />
+        <result column="jc_ssqZ" jdbcType="TIMESTAMP" property="jcSsqz" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="creat_by" jdbcType="VARCHAR" property="createBy" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+        <result column="nsrmc" jdbcType="VARCHAR" property="nsrmc" />
+        <result column="pljcId" jdbcType="VARCHAR" property="pljcId" />
+    </resultMap>
+</mapper>

crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgmxMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kakarote.crm.mapper.CrmQyfxjcjgZbmxMapper">
+    <resultMap id="BaseResultMap" type="com.kakarote.crm.entity.PO.CrmQyfxjcjgZbmx">
+        <result column="zbmx_uuid" jdbcType="VARCHAR" property="zbmxUuid" />
+        <result column="jcpc_uuid" jdbcType="VARCHAR" property="jcpcUuid" />
+        <result column="fxzb_dm" jdbcType="VARCHAR" property="fxzbDm" />
+        <result column="fxzb_jcjg" jdbcType="VARCHAR" property="fxzbJcjg" />
+        <result column="jcsj" jdbcType="TIMESTAMP" property="jcsj" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="creat_by" jdbcType="VARCHAR" property="createBy" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+        <result column="code" jdbcType="INTEGER" property="code" />
+    </resultMap>
+</mapper>

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

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

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

@@ -2,7 +2,11 @@ package com.kakarote.crm.service;
 
 import com.kakarote.core.servlet.BaseService;
 import com.kakarote.crm.entity.PO.CrmQyfxjcjg;
+import com.kakarote.crm.entity.PO.CrmQyfxjcjgZbmx;
+import com.kakarote.crm.entity.VO.CrmV3SysRiskDataExposedVo;
+import com.kakarote.crm.entity.VO.CrmV3SystemicRiskVO;
 
+import java.io.IOException;
 import java.util.List;
 
 public interface ICrmQyfxjcjgService extends BaseService<CrmQyfxjcjg> {
@@ -39,4 +43,8 @@ public interface ICrmQyfxjcjgService extends BaseService<CrmQyfxjcjg> {
      * @return
      */
     List<CrmQyfxjcjg> getQyfxjcjgList(CrmQyfxjcjg crmQyfxjcjg);
+
+    List<CrmQyfxjcjg> getLocalRiskData(CrmV3SysRiskDataExposedVo crmV3SysRiskDataExposedVo);
+
+    List<CrmQyfxjcjg> fetchAndSaveThirdPartyRiskData(CrmV3SysRiskDataExposedVo crmV3SysRiskDataExposedVo) throws IOException;
 }

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

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

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

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

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

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

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

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

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

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

@@ -2,20 +2,41 @@ package com.kakarote.crm.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.kakarote.core.servlet.BaseServiceImpl;
 import com.kakarote.crm.entity.PO.CrmQyfxjcjg;
+import com.kakarote.crm.entity.PO.CrmQyfxjcjgZbmx;
+import com.kakarote.crm.entity.VO.CrmApiResponseVO;
+import com.kakarote.crm.entity.VO.CrmRiskCheckResultVO;
+import com.kakarote.crm.entity.VO.CrmV3SysRiskDataExposedVo;
+import com.kakarote.crm.entity.VO.CrmV3SystemicRiskVO;
 import com.kakarote.crm.mapper.CrmQyfxjcjgMapper;
 import com.kakarote.crm.service.ICrmQyfxjcjgService;
+import com.kakarote.crm.service.ICrmQyfxjcjgZbmxService;
+import com.kakarote.crm.util.OkHttpClientUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
+import static com.kakarote.crm.constant.CrmConst.V3_QYFXXX;
+
 @Service
 public class CrmQyfxjcjgServiceImpl extends BaseServiceImpl<CrmQyfxjcjgMapper, CrmQyfxjcjg> implements ICrmQyfxjcjgService {
 
     @Autowired
     private CrmQyfxjcjgMapper crmQyfxjcjgMapper;
 
+    @Autowired
+    private ICrmQyfxjcjgZbmxService iCrmQyfxjcjgZbmxService;
+
+    @Value("${app.url}")
+    private String V3_Url;
+
     @Override
     public CrmQyfxjcjg getCrmQyfxjcjg(String jcpcUuid) {
         return crmQyfxjcjgMapper.selectById(jcpcUuid);
@@ -39,6 +60,77 @@ public class CrmQyfxjcjgServiceImpl extends BaseServiceImpl<CrmQyfxjcjgMapper, C
     @Override
     public List<CrmQyfxjcjg> getQyfxjcjgList(CrmQyfxjcjg crmQyfxjcjg) {
         QueryWrapper<CrmQyfxjcjg> CrmQyfxjcjgQueryWrapper = new QueryWrapper<>();
+        CrmQyfxjcjgQueryWrapper.eq("jc_ssqQ",crmQyfxjcjg.getJcSsqq());
+        CrmQyfxjcjgQueryWrapper.eq("qysbh",crmQyfxjcjg.getQysbh());
         return crmQyfxjcjgMapper.selectList(CrmQyfxjcjgQueryWrapper);
     }
+
+
+
+
+    @Override
+    public List<CrmQyfxjcjg> getLocalRiskData(CrmV3SysRiskDataExposedVo vo){
+
+        CrmQyfxjcjg crmQyfxjcjg = new CrmQyfxjcjg()
+                .setJcSsqq(vo.getSsqQ())
+                .setQysbh(vo.getNsrsbh());
+
+        QueryWrapper<CrmQyfxjcjg> CrmQyfxjcjgQueryWrapper = new QueryWrapper<>();
+        CrmQyfxjcjgQueryWrapper.eq("jc_ssqQ",crmQyfxjcjg.getJcSsqq());
+        CrmQyfxjcjgQueryWrapper.eq("qysbh",crmQyfxjcjg.getQysbh());
+
+        List<CrmQyfxjcjg> qyfxjcjgList = crmQyfxjcjgMapper.selectList(CrmQyfxjcjgQueryWrapper);
+
+        for (CrmQyfxjcjg qyfxjcjg : qyfxjcjgList) {
+            CrmQyfxjcjgZbmx crmQyfxjcjgZbmx = new CrmQyfxjcjgZbmx().setJcpcUuid(qyfxjcjg.getJcpcUuid());
+            List<CrmQyfxjcjgZbmx> qyfxjcjgZbmxList = iCrmQyfxjcjgZbmxService.getQyfxjcjgZbmxList(crmQyfxjcjgZbmx);
+            if (!qyfxjcjgZbmxList.isEmpty()) {
+                qyfxjcjg.setCrmQyfxjcjgZbmxList(qyfxjcjgZbmxList);
+            }
+        }
+
+        if (qyfxjcjgList.isEmpty()) {
+            //3.如果该集合不存在，则发送http请求，调用第三方接口获得数据，并将其全部插入数据表中
+            try {
+                qyfxjcjgList = fetchAndSaveThirdPartyRiskData(vo);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return qyfxjcjgList;
+    }
+
+    @Override
+    public List<CrmQyfxjcjg> fetchAndSaveThirdPartyRiskData(CrmV3SysRiskDataExposedVo vo) throws IOException {
+
+        List<CrmQyfxjcjg> qyfxjcjgList = new ArrayList<>();
+
+        Gson gson = new GsonBuilder()
+                .setDateFormat("yyyy-MM-dd") // 匹配 @JsonFormat
+                .create();
+        CrmV3SystemicRiskVO crmV3SystemicRiskVO = new CrmV3SystemicRiskVO().setSsqQ(vo.getSsqQ()).setNsrsbh(vo.getNsrsbh());
+
+        String json = gson.toJson(crmV3SystemicRiskVO);
+
+        String responseJson = OkHttpClientUtil.post(V3_Url+V3_QYFXXX, json);
+
+        CrmApiResponseVO crmApiResponseVO = gson.fromJson(responseJson, CrmApiResponseVO.class);
+
+        for (CrmRiskCheckResultVO crmRiskCheckResultVO : crmApiResponseVO.getData()) {
+
+            CrmQyfxjcjg qyfxjcjg = crmRiskCheckResultVO.getCrmQyfxjcjg();
+
+            crmQyfxjcjgMapper.insert(qyfxjcjg);
+
+            for (CrmQyfxjcjgZbmx item : crmRiskCheckResultVO.getCrmQyfxjcjgZbmxList()){
+                iCrmQyfxjcjgZbmxService.insertQyfxjcjgZbmx(item);
+
+            }
+            qyfxjcjg.setCrmQyfxjcjgZbmxList(crmRiskCheckResultVO.getCrmQyfxjcjgZbmxList());
+            qyfxjcjgList.add(qyfxjcjg);
+
+        }
+        return  qyfxjcjgList;
+    }
+
 }

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

@@ -38,6 +38,7 @@ public class CrmQyfxjcjgZbmxServiceImpl extends BaseServiceImpl<CrmQyfxjcjgZbmxM
     @Override
     public List<CrmQyfxjcjgZbmx> getQyfxjcjgZbmxList(CrmQyfxjcjgZbmx crmQyfxjcjgZbmx) {
         QueryWrapper<CrmQyfxjcjgZbmx> CrmQyfxjcjgZbmxQueryWrapper = new QueryWrapper<>();
+        CrmQyfxjcjgZbmxQueryWrapper.eq("jcpc_uuid",crmQyfxjcjgZbmx.getJcpcUuid());
         return crmQyfxjcjgZbmxMapper.selectList(CrmQyfxjcjgZbmxQueryWrapper);
     }
 }

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

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

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

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

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

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

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

crm/src/main/java/com/kakarote/crm/util/OkHttpClientUtil.java

@@ -0,0 +1,37 @@
+package com.kakarote.crm.util;
+
+import okhttp3.*;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+@Component
+public class OkHttpClientUtil {
+
+    private static final OkHttpClient client = new OkHttpClient();
+
+    /**
+     * 创建一个post请求，并得到响应数据的json形式
+     *
+     * @param url   第三方接口地址
+     * @param json  传入请求体的参数转换成json字符串
+     * @return
+     */
+    public static String post(String url, String json) throws IOException {
+
+        MediaType JSON = MediaType.get("application/json; charset=utf-8");
+
+        RequestBody requestBody = RequestBody.create(JSON, json);
+
+        Request request = new Request.Builder()
+                .url(url)
+                .post(requestBody)
+                .build();
+
+        Response response = client.newCall(request).execute();
+
+        return response.body().string();
+    }
+    
+
+}