From 2e4db533b6dbc1673c790304ef6bb87045c60b1e Mon Sep 17 00:00:00 2001 From: ZZM <1105966949@qq.com> Date: Fri, 13 Jun 2025 14:39:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:controller=5FCRUD=E3=80=81=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kakarote/crm/constant/CrmConst.java | 5 + .../CrmGetV3SysRiskDataController.java | 66 ++----------- .../crm/controller/CrmNsrzgController.java | 48 ++++++++++ .../crm/controller/CrmQycbrsController.java | 48 ++++++++++ .../crm/controller/CrmQyfxmxController.java | 47 ++++++++++ .../crm/controller/CrmQyjxfpController.java | 48 ++++++++++ .../crm/controller/CrmQynsrdjController.java | 48 ++++++++++ .../controller/CrmQysdsndsbController.java | 47 ++++++++++ .../crm/controller/CrmQysflController.java | 49 ++++++++++ .../crm/controller/CrmQyxxfpController.java | 47 ++++++++++ .../crm/controller/CrmSwjgController.java | 47 ++++++++++ .../kakarote/crm/entity/PO/CrmQyfxjcjg.java | 5 + .../entity/VO/CrmV3SysRiskDataExposedVo.java | 16 ++++ .../crm/entity/VO/CrmV3SystemicRiskVO.java | 9 ++ .../crm/mapper/xml/CrmQyfxjcjgMapper.xml | 19 ++++ .../crm/mapper/xml/CrmQyfxjcjgmxMapper.xml | 16 ++++ .../crm/service/ICrmQyfxjcjgService.java | 8 ++ .../service/impl/CrmQyfxjcjgServiceImpl.java | 92 +++++++++++++++++++ .../impl/CrmQyfxjcjgZbmxServiceImpl.java | 1 + .../kakarote/crm/util/OkHttpClientUtil.java | 37 ++++++++ 20 files changed, 643 insertions(+), 60 deletions(-) create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmQyxxfpController.java create mode 100644 crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/VO/CrmV3SysRiskDataExposedVo.java create mode 100644 crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgMapper.xml create mode 100644 crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgmxMapper.xml create mode 100644 crm/src/main/java/com/kakarote/crm/util/OkHttpClientUtil.java diff --git a/crm/src/main/java/com/kakarote/crm/constant/CrmConst.java b/crm/src/main/java/com/kakarote/crm/constant/CrmConst.java index f773de7..22db897 100644 --- a/crm/src/main/java/com/kakarote/crm/constant/CrmConst.java +++ b/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"; + + + } diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmGetV3SysRiskDataController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmGetV3SysRiskDataController.java index 7d9af2e..2407150 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmGetV3SysRiskDataController.java +++ b/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)); } - - } + diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java new file mode 100644 index 0000000..dbad2f7 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java @@ -0,0 +1,48 @@ +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 queryById(@PathVariable("nsrdjzgId") @ApiParam(name = "id", value = "纳税人资格ID") Integer nsrdjzgId) { + CrmNsrzg nsrzg = crmNsrzgService.getNsrzg(nsrdjzgId); + 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)); + } +} diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java new file mode 100644 index 0000000..6ef8363 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java @@ -0,0 +1,48 @@ +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.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.*; + +@RestController +@RequestMapping("/qycbrs") +@Api(tags = "企业参保人数信息") +public class CrmQycbrsController { + + @Autowired + private ICrmQycbrsService crmQycbrsService; + + @PostMapping("/queryById/{qycbrsId}") + @ApiOperation("根据ID查询") + @ParamAspect + public Result queryById(@PathVariable("qycbrsId") @ApiParam(name = "id", value = "企业参保人数ID") Integer qycbrsId) { + CrmQycbrs qyjxfp = crmQycbrsService.getQycbrs(qycbrsId); + return R.ok(qyjxfp); + } + + @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)); + } +} diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java new file mode 100644 index 0000000..d8bccdd --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.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.CrmQyfxmx; +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.*; + +@RestController +@RequestMapping("/qyfxmx") +@Api(tags = "企业风险明细信息") +public class CrmQyfxmxController { + + @Autowired + private ICrmQyfxmxService crmQyfxmxService; + + @PostMapping("/queryById/{qyzbmxId}") + @ApiOperation("根据ID查询") + @ParamAspect + public Result queryById(@PathVariable("qyzbmxId") @ApiParam(name = "id", value = "企业指标明细ID") Integer qyzbmxId) { + CrmQyfxmx qyfxmx = crmQyfxmxService.getQyfxmx(qyzbmxId); + return R.ok(qyfxmx); + } + + @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)); + } +} diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java new file mode 100644 index 0000000..151666b --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java @@ -0,0 +1,48 @@ +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.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 queryById(@PathVariable("qyjxfpId") @ApiParam(name = "id", value = "企业进项发票ID") Integer qyjxfpId) { + CrmQyjxfp qyjxfp = crmQyjxfpService.getQyjxfp(qyjxfpId); + return R.ok(qyjxfp); + } + + @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)); + } + +} \ No newline at end of file diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java new file mode 100644 index 0000000..6b78835 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java @@ -0,0 +1,48 @@ +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.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.*; + +@RestController +@RequestMapping("/qynsrdj") +@Api(tags = "企业纳税信用登记信息") +public class CrmQynsrdjController { + + @Autowired + private ICrmQynsrdjService crmQynsrdjService; + + @PostMapping("/queryById/{qynsrdjId}") + @ApiOperation("根据ID查询") + @ParamAspect + public Result queryById(@PathVariable("qynsrdjId") @ApiParam(name = "id", value = "企业纳税信用登记ID") Integer qynsrdjId) { + CrmQynsrdj qynsrdj = crmQynsrdjService.getQynsrdj(qynsrdjId); + return R.ok(qynsrdj); + } + + @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)); + } +} diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java new file mode 100644 index 0000000..91f2244 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.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.CrmQysdsndsb; +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.*; + +@RestController +@RequestMapping("/qysdsndsb") +@Api(tags = "企业所得税年度申报信息") +public class CrmQysdsndsbController { + + @Autowired + private ICrmQysdsndsbService crmQysdsndsbService; + + @PostMapping("/queryById/{qysdsndsbId}") + @ApiOperation("根据ID查询") + @ParamAspect + public Result queryById(@PathVariable("qysdsndsbId") @ApiParam(name = "id", value = "企业所得税年度申报ID") Integer qysdsndsbId) { + CrmQysdsndsb qysdsndsb = crmQysdsndsbService.getQysdsndsb(qysdsndsbId); + return R.ok(qysdsndsb); + } + + @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)); + } +} diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java new file mode 100644 index 0000000..286d085 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java @@ -0,0 +1,49 @@ +package com.kakarote.crm.controller; + + +import com.kakarote.core.common.ParamAspect; +import com.kakarote.core.common.R; +import com.kakarote.core.common.Result; +import com.kakarote.crm.entity.PO.CrmQyjxfp; +import com.kakarote.crm.entity.PO.CrmQysfl; +import com.kakarote.crm.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.*; + +@RestController +@RequestMapping("/qysfl") +@Api(tags = "企业税负率信息") +public class CrmQysflController { + + @Autowired + private ICrmQysflService crmQysflService; + + @PostMapping("/queryById/{qysflId}") + @ApiOperation("根据ID查询") + @ParamAspect + public Result queryById(@PathVariable("qysflId") @ApiParam(name = "id", value = "企业税负率ID") Integer qysflId) { + CrmQysfl qysfl = crmQysflService.getQysfl(qysflId); + return R.ok(qysfl); + } + + @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)); + } +} diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQyxxfpController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQyxxfpController.java new file mode 100644 index 0000000..35c5684 --- /dev/null +++ b/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 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)); + } +} diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java new file mode 100644 index 0000000..c20fc46 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.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.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 queryById(@PathVariable("swjgId") @ApiParam(name = "id", value = "税务机关ID") Integer swjgId) { + CrmSwjg swjg = crmSwjgService.getSwjg(swjgId); + 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)); + } +} diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxjcjg.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxjcjg.java index 92d0457..fb58c33 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxjcjg.java +++ b/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 crmQyfxjcjgZbmxList; } diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmV3SysRiskDataExposedVo.java b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmV3SysRiskDataExposedVo.java new file mode 100644 index 0000000..d7e48bc --- /dev/null +++ b/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; +} diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmV3SystemicRiskVO.java b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmV3SystemicRiskVO.java index 1ad6d87..739759f 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmV3SystemicRiskVO.java +++ b/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"; } + } diff --git a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgMapper.xml b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgMapper.xml new file mode 100644 index 0000000..688e228 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgmxMapper.xml b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgmxMapper.xml new file mode 100644 index 0000000..ceb7e84 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxjcjgmxMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxjcjgService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxjcjgService.java index ef5cfbf..d4d3163 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxjcjgService.java +++ b/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 { @@ -39,4 +43,8 @@ public interface ICrmQyfxjcjgService extends BaseService { * @return */ List getQyfxjcjgList(CrmQyfxjcjg crmQyfxjcjg); + + List getLocalRiskData(CrmV3SysRiskDataExposedVo crmV3SysRiskDataExposedVo); + + List fetchAndSaveThirdPartyRiskData(CrmV3SysRiskDataExposedVo crmV3SysRiskDataExposedVo) throws IOException; } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxjcjgServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxjcjgServiceImpl.java index db2fd98..69d7342 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxjcjgServiceImpl.java +++ b/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 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 getQyfxjcjgList(CrmQyfxjcjg crmQyfxjcjg) { QueryWrapper CrmQyfxjcjgQueryWrapper = new QueryWrapper<>(); + CrmQyfxjcjgQueryWrapper.eq("jc_ssqQ",crmQyfxjcjg.getJcSsqq()); + CrmQyfxjcjgQueryWrapper.eq("qysbh",crmQyfxjcjg.getQysbh()); return crmQyfxjcjgMapper.selectList(CrmQyfxjcjgQueryWrapper); } + + + + + @Override + public List getLocalRiskData(CrmV3SysRiskDataExposedVo vo){ + + CrmQyfxjcjg crmQyfxjcjg = new CrmQyfxjcjg() + .setJcSsqq(vo.getSsqQ()) + .setQysbh(vo.getNsrsbh()); + + QueryWrapper CrmQyfxjcjgQueryWrapper = new QueryWrapper<>(); + CrmQyfxjcjgQueryWrapper.eq("jc_ssqQ",crmQyfxjcjg.getJcSsqq()); + CrmQyfxjcjgQueryWrapper.eq("qysbh",crmQyfxjcjg.getQysbh()); + + List qyfxjcjgList = crmQyfxjcjgMapper.selectList(CrmQyfxjcjgQueryWrapper); + + for (CrmQyfxjcjg qyfxjcjg : qyfxjcjgList) { + CrmQyfxjcjgZbmx crmQyfxjcjgZbmx = new CrmQyfxjcjgZbmx().setJcpcUuid(qyfxjcjg.getJcpcUuid()); + List 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 fetchAndSaveThirdPartyRiskData(CrmV3SysRiskDataExposedVo vo) throws IOException { + + List 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; + } + } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxjcjgZbmxServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxjcjgZbmxServiceImpl.java index 0cbe6f0..8678ffc 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxjcjgZbmxServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxjcjgZbmxServiceImpl.java @@ -38,6 +38,7 @@ public class CrmQyfxjcjgZbmxServiceImpl extends BaseServiceImpl getQyfxjcjgZbmxList(CrmQyfxjcjgZbmx crmQyfxjcjgZbmx) { QueryWrapper CrmQyfxjcjgZbmxQueryWrapper = new QueryWrapper<>(); + CrmQyfxjcjgZbmxQueryWrapper.eq("jcpc_uuid",crmQyfxjcjgZbmx.getJcpcUuid()); return crmQyfxjcjgZbmxMapper.selectList(CrmQyfxjcjgZbmxQueryWrapper); } } diff --git a/crm/src/main/java/com/kakarote/crm/util/OkHttpClientUtil.java b/crm/src/main/java/com/kakarote/crm/util/OkHttpClientUtil.java new file mode 100644 index 0000000..bf4b21e --- /dev/null +++ b/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(); + } + + +} From 7b0f857f363ab726e1b00c78b114587728d206f9 Mon Sep 17 00:00:00 2001 From: ZZM <1105966949@qq.com> Date: Mon, 16 Jun 2025 17:18:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:CRM=E7=A8=8E=E5=8A=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/controller/CrmNsrzgController.java | 7 +++ .../crm/controller/CrmQycbrsController.java | 9 ++++ .../crm/controller/CrmQyfxmxController.java | 10 +++++ .../crm/controller/CrmQyjxfpController.java | 9 ++++ .../crm/controller/CrmQynsrdjController.java | 10 +++++ .../controller/CrmQysdsndsbController.java | 10 +++++ .../crm/controller/CrmQysflController.java | 11 ++++- .../crm/controller/CrmSwjgController.java | 7 +++ .../com/kakarote/crm/entity/PO/CrmQycbrs.java | 5 +++ .../com/kakarote/crm/entity/PO/CrmQyfxmx.java | 5 +++ .../crm/entity/VO/CrmMergeListVO.java | 17 +++++++ .../crm/entity/VO/CrmParamAndTimeVO.java | 17 +++++++ .../crm/service/ICrmNsrzgService.java | 7 +++ .../crm/service/ICrmQycbrsService.java | 8 ++++ .../crm/service/ICrmQyfxmxService.java | 15 +++++-- .../crm/service/ICrmQyjxfpService.java | 10 ++++- .../crm/service/ICrmQynsrdjService.java | 9 +++- .../crm/service/ICrmQysdsndsbService.java | 9 ++++ .../crm/service/ICrmQysflService.java | 9 +++- .../crm/service/ICrmQyxxfpService.java | 9 ++++ .../kakarote/crm/service/ICrmSwjgService.java | 18 +++++--- .../crm/service/impl/CrmNsrzgServiceImpl.java | 7 +++ .../service/impl/CrmQycbrsServiceImpl.java | 19 ++++++++ .../service/impl/CrmQyfxmxServiceImpl.java | 21 +++++++-- .../service/impl/CrmQyjxfpServiceImpl.java | 45 +++++++++++++++++-- .../service/impl/CrmQynsrdjServiceImpl.java | 24 ++++++++-- .../service/impl/CrmQysdsndsbServiceImpl.java | 20 +++++++++ .../crm/service/impl/CrmQysflServiceImpl.java | 21 +++++++-- .../service/impl/CrmQyxxfpServiceImpl.java | 21 +++++++++ .../crm/service/impl/CrmSwjgServiceImpl.java | 7 +++ 30 files changed, 368 insertions(+), 28 deletions(-) create mode 100644 crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java index dbad2f7..a4588a6 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java @@ -28,6 +28,13 @@ public class CrmNsrzgController { return R.ok(nsrzg); } + @PostMapping("/queryByDjxh/{djxh}") + @ApiOperation("根据Djxh查询") + public Result queryByDjxh(@PathVariable("djxh") String djxh){ + CrmNsrzg nsrzg = crmNsrzgService.getNsrzgByDjxh(djxh); + return R.ok(nsrzg); + } + @PostMapping("/add") @ApiOperation("保存数据") public Result add(@RequestBody CrmNsrzg crmNsrzg) { diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java index 6ef8363..185830c 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java @@ -5,6 +5,7 @@ import com.kakarote.core.common.ParamAspect; import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.PO.CrmQycbrs; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQycbrsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -12,6 +13,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/qycbrs") @Api(tags = "企业参保人数信息") @@ -28,6 +31,12 @@ public class CrmQycbrsController { return R.ok(qyjxfp); } + @PostMapping("/queryByDjxhAndTime") + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) { + List qycbrsList = crmQycbrsService.getQycbrsListByParamAndTime(vo); + return R.ok(qycbrsList); + } + @PostMapping("/add") @ApiOperation("保存数据") public Result add(@RequestBody CrmQycbrs crmQycbrs) { diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java index d8bccdd..deea4eb 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java @@ -4,6 +4,7 @@ import com.kakarote.core.common.ParamAspect; import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.PO.CrmQyfxmx; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQyfxmxService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -11,6 +12,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/qyfxmx") @Api(tags = "企业风险明细信息") @@ -27,6 +30,13 @@ public class CrmQyfxmxController { return R.ok(qyfxmx); } + @PostMapping("/queryByDjxhAndTime") + @ApiOperation("根据登记序号和月份(选填)查询") + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){ + List qyfxmxList = crmQyfxmxService.getQyfxmxListByParamAndTime(vo); + return R.ok(qyfxmxList); + } + @PostMapping("/add") @ApiOperation("保存数据") public Result add(@RequestBody CrmQyfxmx crmQyfxmx) { diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java index 151666b..d1a1e07 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java @@ -4,6 +4,8 @@ import com.kakarote.core.common.ParamAspect; import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.PO.CrmQyjxfp; +import com.kakarote.crm.entity.VO.CrmMergeListVO; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQyjxfpService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,6 +29,13 @@ public class CrmQyjxfpController { return R.ok(qyjxfp); } + @PostMapping("/queryMergeListByParamAndTime") + @ApiOperation("通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表") + public Result queryMergeListByParamAndTime(@RequestBody CrmParamAndTimeVO vo){ + CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByParamAndTime(vo); + return R.ok(mergeList); + } + @PostMapping("/add") @ApiOperation("保存数据") public Result add(@RequestBody CrmQyjxfp crmQyjxfp) { diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java index 6b78835..147eccb 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java @@ -5,6 +5,7 @@ import com.kakarote.core.common.ParamAspect; import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.PO.CrmQynsrdj; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQynsrdjService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -12,6 +13,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/qynsrdj") @Api(tags = "企业纳税信用登记信息") @@ -28,6 +31,13 @@ public class CrmQynsrdjController { return R.ok(qynsrdj); } + @PostMapping("/queryByDjxhAndTime") + @ApiOperation("根据登记序号和评价年度(选填)查询") + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) { + List qynsrdjList = crmQynsrdjService.getQynsrdjListByParamAndTime(vo); + return R.ok(qynsrdjList); + } + @PostMapping("/add") @ApiOperation("保存数据") public Result add(@RequestBody CrmQynsrdj crmQynsrdj) { diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java index 91f2244..8e76260 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java @@ -4,6 +4,7 @@ import com.kakarote.core.common.ParamAspect; import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.PO.CrmQysdsndsb; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQysdsndsbService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -11,6 +12,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/qysdsndsb") @Api(tags = "企业所得税年度申报信息") @@ -27,6 +30,13 @@ public class CrmQysdsndsbController { return R.ok(qysdsndsb); } + @PostMapping("/queryByDjxhAndTime") + @ApiOperation("根据登记序号和年度(选填)查询") + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) { + List qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByParamAndTime(vo); + return R.ok(qysdsndsbList); + } + @PostMapping("/add") @ApiOperation("保存数据") public Result add(@RequestBody CrmQysdsndsb crmQysdsndsb) { diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java index 286d085..e2d2def 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java @@ -4,8 +4,8 @@ package com.kakarote.crm.controller; import com.kakarote.core.common.ParamAspect; import com.kakarote.core.common.R; import com.kakarote.core.common.Result; -import com.kakarote.crm.entity.PO.CrmQyjxfp; import com.kakarote.crm.entity.PO.CrmQysfl; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQysflService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +13,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/qysfl") @Api(tags = "企业税负率信息") @@ -29,6 +31,13 @@ public class CrmQysflController { return R.ok(qysfl); } + @PostMapping("/queryByDjxhAndTime") + @ApiOperation("根据登记序号和评价年度(选填)查询") + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){ + List qysflList = crmQysflService.getQysflByParamAndTimeList(vo); + return R.ok(qysflList); + } + @PostMapping("/add") @ApiOperation("保存数据") public Result add(@RequestBody CrmQysfl crmQysfl) { diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java index c20fc46..753e903 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java @@ -27,6 +27,13 @@ public class CrmSwjgController { return R.ok(swjg); } + @PostMapping("/queryBySwjgDm/{swjgDm}") + @ApiOperation("根据swjgDm查询") + public Result queryBySwjgDm(@PathVariable("swjgDm") String swjgDm) { + CrmSwjg swjg = crmSwjgService.getSwjgBySwjgDm(swjgDm); + return R.ok(swjg); + } + @PostMapping("/add") @ApiOperation("保存数据") public Result add(@RequestBody CrmSwjg crmSwjg) { diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQycbrs.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQycbrs.java index b08dcb3..d15bb7e 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQycbrs.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQycbrs.java @@ -55,4 +55,9 @@ public class CrmQycbrs implements Serializable { * 更新人 */ private String updateBy; + + /** + * 登记序号 + */ + private String djxh; } diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxmx.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxmx.java index 45d569b..13a8c56 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxmx.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyfxmx.java @@ -62,4 +62,9 @@ public class CrmQyfxmx implements Serializable { */ private String updateBy; + /** + * 登记序号 + */ + private String djxh; + } diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java new file mode 100644 index 0000000..fecc5b9 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java @@ -0,0 +1,17 @@ +package com.kakarote.crm.entity.VO; + +import com.kakarote.crm.entity.PO.CrmQyjxfp; +import com.kakarote.crm.entity.PO.CrmQyxxfp; +import lombok.Data; + +import java.util.List; + +@Data +public class CrmMergeListVO { + + //企业进项发票集合 + private List qyjxfpList; + + //企业销项发票集合 + private List qyxxfpList; +} diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java new file mode 100644 index 0000000..c982cb0 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java @@ -0,0 +1,17 @@ +package com.kakarote.crm.entity.VO; + +import lombok.Data; + +@Data +public class CrmParamAndTimeVO { + + /** + * 根据接口不同，param可能是djxh，也可能是shxydm + */ + private String param; + + /** + * 根据接口不同，time可能是nd，也可能是yf + */ + private String time; +} diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java index fec59fb..0291408 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java @@ -36,4 +36,11 @@ public interface ICrmNsrzgService extends BaseService { * @return */ List getNsrzgList(CrmNsrzg crmNsrzg); + + /** + * 根据登记序号查询纳税人资格信息 + * @param djxh + * @return + */ + CrmNsrzg getNsrzgByDjxh(String djxh); } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java index 4004a68..3e973c1 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java @@ -2,6 +2,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.PO.CrmQycbrs; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import java.util.List; @@ -38,4 +39,11 @@ public interface ICrmQycbrsService extends BaseService { * @return */ List getQycbrsList(CrmQycbrs crmQycbrs); + + /** + * 根据等级序号和月份(选填)查询企业参保人数信息列表 + * @param vo + * @return + */ + List getQycbrsListByParamAndTime(CrmParamAndTimeVO vo); } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java index 901f0ae..f3e6ec5 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java @@ -2,7 +2,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.PO.CrmQyfxmx; -import com.kakarote.crm.entity.PO.CrmQyjxfp; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import java.util.List; @@ -21,23 +21,30 @@ public interface ICrmQyfxmxService extends BaseService { int insertQyfxmx(CrmQyfxmx crmQyfxmx); /** - * 更新企业进项发票基本信息 + * 更新企业风险明细基本信息 * @param crmQyfxmx * @return */ int updateQyfxmx(CrmQyfxmx crmQyfxmx); /** - * 删除企业进项发票基本信息 + * 删除企业风险明细基本信息 * @param qyfxmxId * @return */ int deleteQyfxmx(String qyfxmxId); /** - * 查询企业进项发票基本信息列表 + * 查询企业风险明细基本信息列表 * @param crmQyfxmx * @return */ List getQyfxmxList(CrmQyfxmx crmQyfxmx); + + /** + * 通过登记序号和月份(选填)查询企业风险明细信息列表 + * @param vo + * @return + */ + List getQyfxmxListByParamAndTime(CrmParamAndTimeVO vo); } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java index d2f22b6..fd8be86 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java @@ -2,7 +2,8 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.PO.CrmQyjxfp; -import org.springframework.stereotype.Service; +import com.kakarote.crm.entity.VO.CrmMergeListVO; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import java.util.List; @@ -41,5 +42,10 @@ public interface ICrmQyjxfpService extends BaseService { */ List getQyjxfpList(CrmQyjxfp crmQyjxfp); - + /** + * 通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表 + * @param vo + * @return + */ + CrmMergeListVO getMergeListByParamAndTime(CrmParamAndTimeVO vo); } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java index 349543d..a4beee9 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java @@ -1,8 +1,8 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; -import com.kakarote.crm.entity.PO.CrmQyfxmx; import com.kakarote.crm.entity.PO.CrmQynsrdj; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import java.util.List; @@ -40,4 +40,11 @@ public interface ICrmQynsrdjService extends BaseService { * @return */ List getQynsrdjList(CrmQynsrdj crmQynsrdj); + + /** + * 根据登记序号和评价年度(选填)查询 + * @param vo + * @return + */ + List getQynsrdjListByParamAndTime(CrmParamAndTimeVO vo); } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java index 68522d0..efdef73 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java @@ -3,6 +3,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.PO.CrmQysdsndsb; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import java.util.List; @@ -40,4 +41,12 @@ public interface ICrmQysdsndsbService extends BaseService { * @return */ List getQysdsndsbList(CrmQysdsndsb crmQysdsndsb); + + + /** + * 根据登记序号和年度查询年度(选填)申报信息列表 + * @param vo + * @return + */ + List getQysdsndsbListByParamAndTime(CrmParamAndTimeVO vo); } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java index c371b3d..f7552a1 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java @@ -1,8 +1,8 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; -import com.kakarote.crm.entity.PO.CrmQynsrdj; import com.kakarote.crm.entity.PO.CrmQysfl; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import java.util.List; @@ -40,4 +40,11 @@ public interface ICrmQysflService extends BaseService { * @return */ List getQysflList(CrmQysfl crmQysfl); + + /** + * 根据登记序号和月份(月份) + * @param vo + * @return + */ + List getQysflByParamAndTimeList(CrmParamAndTimeVO vo); } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java index cdfb978..5a4372e 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java @@ -2,6 +2,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.PO.CrmQyxxfp; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import java.util.List; @@ -39,4 +40,12 @@ public interface ICrmQyxxfpService extends BaseService { * @return */ List getQyxxfpList(CrmQyxxfp crmQyxxfp); + + + /** + * 通过社会信用代码和年度(选填)查询企业销项发票信息 + * @param vo + * @return + */ + List getQyxxfpListByParamAndTime(CrmParamAndTimeVO vo); } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java index fc47fdc..4240c5c 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java @@ -8,35 +8,43 @@ import java.util.List; public interface ICrmSwjgService extends BaseService { /** - * 通过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 getSwjgList(CrmSwjg crmSwjg); + + + /** + * 根据swjgDm查询税务机关信息 + * @param swjgDm + * @return + */ + CrmSwjg getSwjgBySwjgDm(String swjgDm); } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java index 888018d..319791c 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmNsrzgServiceImpl.java @@ -40,4 +40,11 @@ public class CrmNsrzgServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); return crmNsrzgMapper.selectList(queryWrapper); } + + @Override + public CrmNsrzg getNsrzgByDjxh(String djxh) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("djxh", djxh); + return crmNsrzgMapper.selectOne(queryWrapper); + } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java index 1d30119..5370aea 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQycbrsServiceImpl.java @@ -3,11 +3,13 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kakarote.core.servlet.BaseServiceImpl; import com.kakarote.crm.entity.PO.CrmQycbrs; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.mapper.CrmQycbrsMapper; import com.kakarote.crm.service.ICrmQycbrsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; @Service @@ -41,4 +43,21 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl CrmQycbrsQueryWrapper = new QueryWrapper<>(); return crmQycbrsMapper.selectList(CrmQycbrsQueryWrapper); } + + @Override + public List getQycbrsListByParamAndTime(CrmParamAndTimeVO vo) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", vo.getParam()); + + if (vo.getTime() != null) { + wrapper.eq("yf", vo.getTime()); + CrmQycbrs qycbrs = crmQycbrsMapper.selectOne(wrapper); + return qycbrs != null ? + Collections.singletonList(qycbrs) : + Collections.emptyList(); + } + + return crmQycbrsMapper.selectList(wrapper); + } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java index 853d9b6..ffc78f8 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyfxmxServiceImpl.java @@ -3,11 +3,9 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kakarote.core.servlet.BaseServiceImpl; import com.kakarote.crm.entity.PO.CrmQyfxmx; -import com.kakarote.crm.entity.PO.CrmQyjxfp; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.mapper.CrmQyfxmxMapper; -import com.kakarote.crm.mapper.CrmQyjxfpMapper; import com.kakarote.crm.service.ICrmQyfxmxService; -import com.kakarote.crm.service.ICrmQyjxfpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -70,4 +68,21 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl crmCrmQyfxmxQueryWrapper = new QueryWrapper<>(); return crmQyfxmxMapper.selectList(crmCrmQyfxmxQueryWrapper); } + + @Override + public List getQyfxmxListByParamAndTime(CrmParamAndTimeVO vo) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", vo.getParam()); + + if (vo.getTime() != null) { + wrapper.eq("yf", vo.getTime()); + CrmQyfxmx qyfxmx = crmQyfxmxMapper.selectOne(wrapper); + return qyfxmx != null ? + Collections.singletonList(qyfxmx) : + Collections.emptyList(); + } + + return crmQyfxmxMapper.selectList(wrapper); + } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java index 6dc0a65..adc2ff5 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjxfpServiceImpl.java @@ -2,15 +2,15 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kakarote.core.servlet.BaseServiceImpl; -import com.kakarote.crm.entity.PO.CrmQyjbxx; import com.kakarote.crm.entity.PO.CrmQyjxfp; +import com.kakarote.crm.entity.PO.CrmQyxxfp; +import com.kakarote.crm.entity.VO.CrmMergeListVO; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.mapper.CrmQyjxfpMapper; import com.kakarote.crm.service.ICrmQyjxfpService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.kakarote.crm.service.ICrmQyxxfpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.Collections; import java.util.List; @@ -20,6 +20,9 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl crmQyjxfpQueryWrapper = new QueryWrapper<>(); return crmQyjxfpMapper.selectList(crmQyjxfpQueryWrapper); } + + /** + * 通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表 + * @param vo + * @return + */ + @Override + public CrmMergeListVO getMergeListByParamAndTime(CrmParamAndTimeVO vo) { + + CrmMergeListVO mergeListVO = new CrmMergeListVO(); + + // 创建基础QueryWrapper（公共条件） + QueryWrapper 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 qyxxfpList = crmQyxxfpService.getQyxxfpListByParamAndTime(vo); + mergeListVO.setQyxxfpList(qyxxfpList); + + return mergeListVO; + } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java index ec3a1ed..d9fe816 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQynsrdjServiceImpl.java @@ -1,14 +1,11 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.kakarote.core.feign.crm.service.CrmService; import com.kakarote.core.servlet.BaseServiceImpl; -import com.kakarote.crm.entity.PO.CrmQyfxmx; import com.kakarote.crm.entity.PO.CrmQynsrdj; -import com.kakarote.crm.mapper.CrmQyfxmxMapper; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.mapper.CrmQynsrdjMapper; import com.kakarote.crm.service.ICrmQynsrdjService; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,4 +44,23 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl crmCrmQynsrdjQueryWrapper = new QueryWrapper<>(); return crmQynsrdjMapper.selectList(crmCrmQynsrdjQueryWrapper); } + + @Override + public List getQynsrdjListByParamAndTime(CrmParamAndTimeVO vo){ + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", vo.getParam()); + + // 当时间参数存在时添加时间条件并返回单条结果 + if (vo.getTime() != null) { + wrapper.eq("pjnd", vo.getTime()); + CrmQynsrdj entity = crmQynsrdjMapper.selectOne(wrapper); + return entity != null ? + Collections.singletonList(entity) : + Collections.emptyList(); + } + + // 无时间参数时返回匹配的所有记录 + return crmQynsrdjMapper.selectList(wrapper); + } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java index b43da55..206a505 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysdsndsbServiceImpl.java @@ -4,10 +4,13 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kakarote.core.servlet.BaseServiceImpl; import com.kakarote.crm.entity.PO.CrmQysdsndsb; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.mapper.CrmQysdsndsbMapper; import com.kakarote.crm.service.ICrmQysdsndsbService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.Collections; import java.util.List; @Service @@ -41,4 +44,21 @@ public class CrmQysdsndsbServiceImpl extends BaseServiceImpl crmQysdsndsbQueryWrapper = new QueryWrapper<>(); return crmQysdsndsbMapper.selectList(crmQysdsndsbQueryWrapper); } + + @Override + public List getQysdsndsbListByParamAndTime(CrmParamAndTimeVO vo) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", vo.getParam()); + + if (vo.getTime() != null) { + wrapper.eq("nd", vo.getTime()); + CrmQysdsndsb qysdsndsb = crmQysdsndsbMapper.selectOne(wrapper); + return qysdsndsb != null ? + Collections.singletonList(qysdsndsb) : + Collections.emptyList(); + } + + return crmQysdsndsbMapper.selectList(wrapper); + } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java index 36bd840..bd70e6e 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQysflServiceImpl.java @@ -2,11 +2,9 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kakarote.core.servlet.BaseServiceImpl; -import com.kakarote.crm.entity.PO.CrmQynsrdj; import com.kakarote.crm.entity.PO.CrmQysfl; -import com.kakarote.crm.mapper.CrmQynsrdjMapper; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.mapper.CrmQysflMapper; -import com.kakarote.crm.service.ICrmQynsrdjService; import com.kakarote.crm.service.ICrmQysflService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,4 +43,21 @@ public class CrmQysflServiceImpl extends BaseServiceImpl crmCrmQysflQueryWrapper = new QueryWrapper<>(); return crmQysflMapper.selectList(crmCrmQysflQueryWrapper); } + + @Override + public List getQysflByParamAndTimeList(CrmParamAndTimeVO vo) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", vo.getParam()); + + if (vo.getTime() != null) { + wrapper.eq("yf", vo.getTime()); + CrmQysfl crmQysfl = crmQysflMapper.selectOne(wrapper); + return crmQysfl != null ? + Collections.singletonList(crmQysfl) : + Collections.emptyList(); + } + + return crmQysflMapper.selectList(wrapper); + } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java index 4f7cbbb..3802f3e 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyxxfpServiceImpl.java @@ -2,11 +2,15 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kakarote.core.servlet.BaseServiceImpl; +import com.kakarote.crm.entity.PO.CrmQyjxfp; import com.kakarote.crm.entity.PO.CrmQyxxfp; +import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.mapper.CrmQyxxfpMapper; import com.kakarote.crm.service.ICrmQyxxfpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.Collections; import java.util.List; @Service @@ -40,5 +44,22 @@ public class CrmQyxxfpServiceImpl extends BaseServiceImpl crmQyxxfpQueryWrapper = new QueryWrapper<>(); return crmQyxxfpMapper.selectList(crmQyxxfpQueryWrapper); } + + @Override + public List getQyxxfpListByParamAndTime(CrmParamAndTimeVO vo) { + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("shxydm", vo.getParam()); + + if (vo.getTime() != null) { + wrapper.eq("nd", vo.getTime()); + CrmQyxxfp qyxxfp = crmQyxxfpMapper.selectOne(wrapper); + return qyxxfp != null ? + Collections.singletonList(qyxxfp) : + Collections.emptyList(); + } + + return crmQyxxfpMapper.selectList(wrapper); + } } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmSwjgServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmSwjgServiceImpl.java index f9766d3..6f34bda 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmSwjgServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmSwjgServiceImpl.java @@ -40,4 +40,11 @@ public class CrmSwjgServiceImpl extends BaseServiceImpl QueryWrapper crmSwjgQueryWrapper = new QueryWrapper<>(); return crmSwjgMapper.selectList(crmSwjgQueryWrapper); } + + @Override + public CrmSwjg getSwjgBySwjgDm(String swjgDm) { + QueryWrapper crmSwjgQueryWrapper = new QueryWrapper<>(); + crmSwjgQueryWrapper.eq("swjg_dm", swjgDm); + return crmSwjgMapper.selectOne(crmSwjgQueryWrapper); + } }