From da4a7059f7e54262d528d4c748da02f49b68d318 Mon Sep 17 00:00:00 2001 From: ZZM <1105966949@qq.com> Date: Thu, 31 Jul 2025 16:21:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81CRM=E7=A8=8E=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3API=E6=8E=A5=E5=85=A5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A7=84=E8=8C=831.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/controller/CrmNsrzgController.java | 8 +- .../crm/controller/CrmQycbrsController.java | 9 +- .../crm/controller/CrmQyfxmxController.java | 12 +- .../crm/controller/CrmQyjxfpController.java | 14 ++- .../crm/controller/CrmQynsrdjController.java | 8 +- .../controller/CrmQysdsndsbController.java | 8 +- .../crm/controller/CrmQysflController.java | 6 +- .../crm/controller/CrmSwjgController.java | 10 +- .../CrmParamAndTimeDTO.java} | 4 +- .../crm/entity/DTO/CrmSyncDataQynsrdjDTO.java | 2 + .../crm/entity/DTO/CrmSyncQycbrsDTO.java | 2 + .../crm/entity/DTO/CrmSyncQyfxmxDTO.java | 2 + .../entity/DTO/CrmSyncQyjxfpAndQyxxfpDTO.java | 2 + .../crm/entity/DTO/CrmSyncQysdsndsbDTO.java | 2 + .../crm/entity/DTO/CrmSyncSwjgDTO.java | 2 + .../com/kakarote/crm/entity/PO/CrmNsrzg.java | 1 - .../com/kakarote/crm/entity/PO/CrmQycbrs.java | 2 - .../com/kakarote/crm/entity/PO/CrmQyfxmx.java | 6 +- .../com/kakarote/crm/entity/PO/CrmQyjxfp.java | 2 - .../kakarote/crm/entity/PO/CrmQynsrdj.java | 2 - .../kakarote/crm/entity/PO/CrmQysdsndsb.java | 2 - .../com/kakarote/crm/entity/PO/CrmQyxxfp.java | 2 - .../com/kakarote/crm/entity/PO/CrmSwjg.java | 2 - .../crm/entity/VO/CrmMergeListVO.java | 2 + .../crm/mapper/xml/CrmQyfxmxMapper.xml | 2 +- .../crm/service/ICrmNsrzgService.java | 6 +- .../crm/service/ICrmQycbrsService.java | 8 +- .../crm/service/ICrmQyfxmxService.java | 8 +- .../crm/service/ICrmQyjxfpService.java | 10 +- .../crm/service/ICrmQynsrdjService.java | 8 +- .../crm/service/ICrmQysdsndsbService.java | 8 +- .../crm/service/ICrmQysflService.java | 6 +- .../crm/service/ICrmQyxxfpService.java | 16 +-- .../kakarote/crm/service/ICrmSwjgService.java | 6 +- .../crm/service/impl/CrmNsrzgServiceImpl.java | 17 ++- .../service/impl/CrmQycbrsServiceImpl.java | 39 ++++-- .../service/impl/CrmQyfxmxServiceImpl.java | 39 ++++-- .../service/impl/CrmQyjxfpServiceImpl.java | 115 ++++++++++++------ .../service/impl/CrmQynsrdjServiceImpl.java | 41 ++++--- .../service/impl/CrmQysdsndsbServiceImpl.java | 39 ++++-- .../crm/service/impl/CrmQysflServiceImpl.java | 6 +- .../service/impl/CrmQyxxfpServiceImpl.java | 7 +- .../crm/service/impl/CrmSwjgServiceImpl.java | 30 ++++- 43 files changed, 329 insertions(+), 194 deletions(-) rename crm/src/main/java/com/kakarote/crm/entity/{VO/CrmParamAndTimeVO.java => DTO/CrmParamAndTimeDTO.java} (77%) 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 33a9dba..f98cda0 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java @@ -38,11 +38,11 @@ public class CrmNsrzgController { return R.ok(nsrzg); } - @PostMapping("/queryByDjxh/{djxh}") + @PostMapping("/queryByDjxh") @ApiOperation("根据Djxh查询") - public Result queryByDjxh(@PathVariable("djxh") String djxh){ - CrmNsrzg nsrzg = crmNsrzgService.getNsrzgByDjxh(djxh); - return R.ok(nsrzg); + public Result> queryByDjxh(@RequestBody CrmSyncNsrzgDTO crmSyncNsrzgDTO) throws Exception { + List nsrzgs = crmNsrzgService.queryByDjxh(crmSyncNsrzgDTO); + return R.ok(nsrzgs); } @PostMapping("/syncDataByDjxh") 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 0c74508..c750d3c 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java @@ -6,7 +6,7 @@ import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.DTO.CrmSyncQycbrsDTO; import com.kakarote.crm.entity.PO.CrmQycbrs; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.service.ICrmQycbrsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -41,14 +41,15 @@ public class CrmQycbrsController { } @PostMapping("/queryByNsrsbhAndTime") - public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) { + public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeDTO vo) { List qycbrsList = crmQycbrsService.getQycbrsListByNsrsbhAndTime(vo); return R.ok(qycbrsList); } @PostMapping("/queryByDjxhAndTime") - public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) { - List qycbrsList = crmQycbrsService.getQycbrsListByDjxhAndTime(vo); + @ApiOperation("根据登记序号和月份(选填)查询") + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeDTO dto) throws Exception { + List qycbrsList = crmQycbrsService.queryByDjxhAndTime(dto); return R.ok(qycbrsList); } 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 534d0e6..313287d 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java @@ -5,7 +5,7 @@ import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.DTO.CrmSyncQyfxmxDTO; import com.kakarote.crm.entity.PO.CrmQyfxmx; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.service.ICrmQyfxmxService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -39,16 +39,16 @@ public class CrmQyfxmxController { } @PostMapping("/queryByNsrsbhAndTime") - @ApiOperation("根据登记序号和月份(选填)查询") - public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){ + @ApiOperation("根据纳税人识别号和月份(选填)查询") + public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeDTO vo){ List qyfxmxList = crmQyfxmxService.getQyfxmxListByNsrsbhAndTime(vo); return R.ok(qyfxmxList); } @PostMapping("/queryByDjxhAndTime") - @ApiOperation("根据登记序号和月份(选填)查询") - public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){ - List qyfxmxList = crmQyfxmxService.getQyfxmxListByDjxhAndTime(vo); + @ApiOperation("根据登记序号和评价年度(选填)查询") + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeDTO dto) throws Exception { + List qyfxmxList = crmQyfxmxService.queryByDjxhAndTime(dto); return R.ok(qyfxmxList); } 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 976be8a..4e6bb40 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java @@ -1,12 +1,13 @@ package com.kakarote.crm.controller; +import cn.hutool.core.date.DateUtil; import com.kakarote.core.common.ParamAspect; import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.DTO.CrmSyncQyjxfpAndQyxxfpDTO; 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.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.service.ICrmQyjxfpService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,7 +26,8 @@ public class CrmQyjxfpController { @PostMapping("/syncDataByShxydm") @ApiOperation("根据社会信用代码同步WebService数据至数据库") public Result syncDataByShxydm(@RequestBody CrmSyncQyjxfpAndQyxxfpDTO dto) throws Exception { - CrmMergeListVO crmMergeListVO = crmQyjxfpService.syncDataByShxydm(dto); + String year = String.valueOf(DateUtil.thisYear()); + CrmMergeListVO crmMergeListVO = crmQyjxfpService.syncDataByShxydm(dto,year); return R.ok(crmMergeListVO); } @@ -40,15 +42,15 @@ public class CrmQyjxfpController { @PostMapping("/queryMergeListByNsrsbhAndTime") @ApiOperation("通过纳税人识别号和年度(选填),查询企业进项发票和企业销项发票信息列表") - public Result queryMergeListByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){ + public Result queryMergeListByNsrsbhAndTime(@RequestBody CrmParamAndTimeDTO vo){ CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByNsrsbhAndTime(vo); return R.ok(mergeList); } @PostMapping("/queryMergeListByShxydmAndTime") - @ApiOperation("通过纳税人识别号和年度(选填),查询企业进项发票和企业销项发票信息列表") - public Result queryMergeListByShxydmAndTime(@RequestBody CrmParamAndTimeVO vo){ - CrmMergeListVO mergeList = crmQyjxfpService.getMergeListByShxydmAndTime(vo); + @ApiOperation("通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表") + public Result queryMergeListByShxydmAndTime(@RequestBody CrmParamAndTimeDTO dto) throws Exception { + CrmMergeListVO mergeList = crmQyjxfpService.queryMergeListByShxydmAndTime(dto); return R.ok(mergeList); } 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 15ebf5a..247efe7 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java @@ -6,7 +6,7 @@ import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.DTO.CrmSyncDataQynsrdjDTO; import com.kakarote.crm.entity.PO.CrmQynsrdj; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.service.ICrmQynsrdjService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -43,15 +43,15 @@ public class CrmQynsrdjController { @PostMapping("/queryByNsrsbhAndTime") @ApiOperation("根据纳税人识别号和评价年度(选填)查询") - public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) { + public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeDTO vo) { List qynsrdjList = crmQynsrdjService.getQynsrdjListByNsrsbhAndTime(vo); return R.ok(qynsrdjList); } @PostMapping("/queryByDjxhAndTime") @ApiOperation("根据登记序号和评价年度(选填)查询") - public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) { - List qynsrdjList = crmQynsrdjService.getQynsrdjListByDjxhAndTime(vo); + public Result queryByDjxhAndTime(@RequestBody CrmParamAndTimeDTO dto) throws Exception { + CrmQynsrdj qynsrdjList = crmQynsrdjService.queryByDjxhAndTime(dto); return R.ok(qynsrdjList); } 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 a067c4c..32e4450 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java @@ -5,7 +5,7 @@ import com.kakarote.core.common.R; import com.kakarote.core.common.Result; import com.kakarote.crm.entity.DTO.CrmSyncQysdsndsbDTO; import com.kakarote.crm.entity.PO.CrmQysdsndsb; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.service.ICrmQysdsndsbService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -42,15 +42,15 @@ public class CrmQysdsndsbController { @PostMapping("/queryByNsrsbhAndTime") @ApiOperation("根据纳税人识别号和年度(选填)查询") - public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo) { + public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeDTO vo) { List qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByNsrsbhAndTime(vo); return R.ok(qysdsndsbList); } @PostMapping("/queryByDjxhAndTime") @ApiOperation("根据登记序号和年度(选填)查询") - public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) { - List qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByDjxhAndTime(vo); + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeDTO dto) throws Exception { + List qysdsndsbList = crmQysdsndsbService.queryByDjxhAndTime(dto); return R.ok(qysdsndsbList); } 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 cbe05e6..daed037 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysflController.java @@ -5,7 +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.CrmQysfl; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.service.ICrmQysflService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,14 +33,14 @@ public class CrmQysflController { @PostMapping("/queryByDjxhAndTime") @ApiOperation("根据登记序号和评价年度(选填)查询") - public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo){ + public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeDTO vo){ List qysflList = crmQysflService.getQysflByDjxhAndTimeList(vo); return R.ok(qysflList); } @PostMapping("/queryByNsrsbhAndTime") @ApiOperation("根据纳税人识别号和评价年度(选填)查询") - public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeVO vo){ + public Result> queryByNsrsbhAndTime(@RequestBody CrmParamAndTimeDTO vo){ List qysflList = crmQysflService.getQysflByNsrsbhAndTimeList(vo); return R.ok(qysflList); } 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 50fdcdb..2128727 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java @@ -38,11 +38,11 @@ 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("/queryBySwjgDmAndSjSwjgDm") + @ApiOperation("根据swjgDm和sjswjgdm查询") + public Result> queryBySwjgDmAndSjSwjgDm(@RequestBody CrmSyncSwjgDTO crmSyncSwjgDTO) throws Exception { + List swjgs = crmSwjgService.queryBySwjgDmAndSjSwjgDm(crmSyncSwjgDTO); + return R.ok(swjgs); } @PostMapping("/add") diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmParamAndTimeDTO.java similarity index 77% rename from crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java rename to crm/src/main/java/com/kakarote/crm/entity/DTO/CrmParamAndTimeDTO.java index c982cb0..f84ba63 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmParamAndTimeVO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmParamAndTimeDTO.java @@ -1,9 +1,9 @@ -package com.kakarote.crm.entity.VO; +package com.kakarote.crm.entity.DTO; import lombok.Data; @Data -public class CrmParamAndTimeVO { +public class CrmParamAndTimeDTO { /** * 根据接口不同，param可能是djxh，也可能是shxydm diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncDataQynsrdjDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncDataQynsrdjDTO.java index e8909cb..897ed5c 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncDataQynsrdjDTO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncDataQynsrdjDTO.java @@ -2,11 +2,13 @@ package com.kakarote.crm.entity.DTO; import lombok.Getter; import lombok.Setter; +import lombok.experimental.Accessors; import java.io.Serializable; @Getter @Setter +@Accessors(chain = true) public class CrmSyncDataQynsrdjDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQycbrsDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQycbrsDTO.java index a70ea5d..269fcd0 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQycbrsDTO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQycbrsDTO.java @@ -2,11 +2,13 @@ package com.kakarote.crm.entity.DTO; import lombok.Getter; import lombok.Setter; +import lombok.experimental.Accessors; import java.io.Serializable; @Getter @Setter +@Accessors(chain = true) public class CrmSyncQycbrsDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyfxmxDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyfxmxDTO.java index a08921d..3477453 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyfxmxDTO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyfxmxDTO.java @@ -1,9 +1,11 @@ package com.kakarote.crm.entity.DTO; import lombok.Data; +import lombok.experimental.Accessors; import java.io.Serializable; @Data +@Accessors(chain = true) public class CrmSyncQyfxmxDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjxfpAndQyxxfpDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjxfpAndQyxxfpDTO.java index 215d868..a88a640 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjxfpAndQyxxfpDTO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjxfpAndQyxxfpDTO.java @@ -2,11 +2,13 @@ package com.kakarote.crm.entity.DTO; import lombok.Getter; import lombok.Setter; +import lombok.experimental.Accessors; import java.io.Serializable; @Getter @Setter +@Accessors(chain = true) public class CrmSyncQyjxfpAndQyxxfpDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQysdsndsbDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQysdsndsbDTO.java index 5c76224..099e6e4 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQysdsndsbDTO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQysdsndsbDTO.java @@ -2,10 +2,12 @@ package com.kakarote.crm.entity.DTO; import lombok.Getter; import lombok.Setter; +import lombok.experimental.Accessors; import java.io.Serializable; @Getter @Setter +@Accessors(chain = true) public class CrmSyncQysdsndsbDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java index de187d5..6abf73c 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java @@ -2,12 +2,14 @@ package com.kakarote.crm.entity.DTO; import lombok.Getter; import lombok.Setter; +import lombok.experimental.Accessors; import java.io.Serializable; @Getter @Setter +@Accessors(chain = true) public class CrmSyncSwjgDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmNsrzg.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmNsrzg.java index 5077c78..9ae47cd 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmNsrzg.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmNsrzg.java @@ -38,7 +38,6 @@ public class CrmNsrzg implements Serializable { /** * 登记序号 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djxh; /** 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 c4acc2a..b2add85 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 @@ -32,7 +32,6 @@ public class CrmQycbrs implements Serializable { /** * 月份 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yf; /** @@ -68,6 +67,5 @@ public class CrmQycbrs implements Serializable { /** * 登记序号 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) 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 f417cc4..02e8dc4 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 @@ -31,10 +31,9 @@ public class CrmQyfxmx implements Serializable { private Integer qyzbmxId; /** - * 月份 + * 评价年度 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) - private String yf; + private String pjnd; /** * 风险指标代码 @@ -75,7 +74,6 @@ public class CrmQyfxmx implements Serializable { /** * 登记序号 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djxh; /** diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjxfp.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjxfp.java index 0afc564..878e129 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjxfp.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjxfp.java @@ -34,7 +34,6 @@ public class CrmQyjxfp implements Serializable { /** * 年度 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nd; /** @@ -61,7 +60,6 @@ public class CrmQyjxfp implements Serializable { /** * 社会信用代码 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String shxydm; /** diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQynsrdj.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQynsrdj.java index 55cd1b1..a0d8aab 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQynsrdj.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQynsrdj.java @@ -32,13 +32,11 @@ public class CrmQynsrdj implements Serializable { /** * 登记序号 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djxh; /** * 评价年度 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String pjnd; /** diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQysdsndsb.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQysdsndsb.java index 0798b2b..1dd7173 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQysdsndsb.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQysdsndsb.java @@ -33,13 +33,11 @@ public class CrmQysdsndsb implements Serializable { /** * 登记序号 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djxh; /** * 年度 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nd; /** diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyxxfp.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyxxfp.java index 16c4619..14c3e72 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyxxfp.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyxxfp.java @@ -33,7 +33,6 @@ public class CrmQyxxfp implements Serializable { /** * 年度 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nd; /** @@ -74,7 +73,6 @@ public class CrmQyxxfp implements Serializable { /** * 社会信用代码 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String shxydm; /** diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmSwjg.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmSwjg.java index eb37dde..e59ebc8 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmSwjg.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmSwjg.java @@ -38,7 +38,6 @@ public class CrmSwjg implements Serializable { /** * 税务机关代码 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String swjgDm; /** @@ -50,7 +49,6 @@ public class CrmSwjg implements Serializable { /** * 上级税务机关代码 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String sjswjgDm; /** 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 index 6be7734..339991d 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/CrmMergeListVO.java @@ -4,10 +4,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.kakarote.crm.entity.PO.CrmQyjxfp; import com.kakarote.crm.entity.PO.CrmQyxxfp; import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @Data +@Accessors(chain = true) public class CrmMergeListVO { //企业进项发票集合 diff --git a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxmxMapper.xml b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxmxMapper.xml index 164c910..9101794 100644 --- a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxmxMapper.xml +++ b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQyfxmxMapper.xml @@ -3,7 +3,7 @@ - + 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 41fa46c..1f66a4c 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java @@ -2,6 +2,8 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.DTO.CrmSyncNsrzgDTO; import com.kakarote.crm.entity.PO.CrmNsrzg; +import org.springframework.web.bind.annotation.RequestBody; + import java.util.List; public interface ICrmNsrzgService extends BaseService { @@ -47,10 +49,10 @@ public interface ICrmNsrzgService extends BaseService { /** * 根据登记序号查询纳税人资格信息 - * @param djxh + * @param crmSyncNsrzgDTO * @return */ - CrmNsrzg getNsrzgByDjxh(String djxh); + List queryByDjxh(CrmSyncNsrzgDTO crmSyncNsrzgDTO) throws Exception; /** * 根据登记序号查询纳税人资格信息(WebService) 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 40d5754..383e321 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java @@ -3,7 +3,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.DTO.CrmSyncQycbrsDTO; import com.kakarote.crm.entity.PO.CrmQycbrs; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import java.util.List; @@ -46,14 +46,14 @@ public interface ICrmQycbrsService extends BaseService { * @param vo * @return */ - List getQycbrsListByNsrsbhAndTime(CrmParamAndTimeVO vo); + List getQycbrsListByNsrsbhAndTime(CrmParamAndTimeDTO vo); /** * 根据登记序号和月份(选填)查询企业参保人数信息列表 - * @param vo + * @param dto * @return */ - List getQycbrsListByDjxhAndTime(CrmParamAndTimeVO vo); + List queryByDjxhAndTime(CrmParamAndTimeDTO dto) throws Exception; /** * 根据登记序号和月份(选填)查询企业参保人数信息列表(WebService) 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 13bed51..4aca5b9 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java @@ -3,7 +3,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.DTO.CrmSyncQyfxmxDTO; import com.kakarote.crm.entity.PO.CrmQyfxmx; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import java.util.List; @@ -47,14 +47,14 @@ public interface ICrmQyfxmxService extends BaseService { * @param vo * @return */ - List getQyfxmxListByNsrsbhAndTime(CrmParamAndTimeVO vo); + List getQyfxmxListByNsrsbhAndTime(CrmParamAndTimeDTO vo); /** * 通过登记序号和月份(选填)查询企业风险明细信息列表 - * @param vo + * @param dto * @return */ - List getQyfxmxListByDjxhAndTime(CrmParamAndTimeVO vo); + List queryByDjxhAndTime(CrmParamAndTimeDTO dto) throws Exception; /** 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 4129d8b..03a4e4f 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java @@ -4,7 +4,7 @@ import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.DTO.CrmSyncQyjxfpAndQyxxfpDTO; 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.entity.DTO.CrmParamAndTimeDTO; import java.util.List; @@ -48,20 +48,20 @@ public interface ICrmQyjxfpService extends BaseService { * @param vo * @return */ - CrmMergeListVO getMergeListByNsrsbhAndTime(CrmParamAndTimeVO vo); + CrmMergeListVO getMergeListByNsrsbhAndTime(CrmParamAndTimeDTO vo); /** * 通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表 - * @param vo + * @param dto * @return */ - CrmMergeListVO getMergeListByShxydmAndTime(CrmParamAndTimeVO vo); + CrmMergeListVO queryMergeListByShxydmAndTime(CrmParamAndTimeDTO dto) throws Exception; /** * 通过社会信用代码,查询企业进项发票和企业销项发票信息列表(WebService) * @param dto * @return */ - CrmMergeListVO syncDataByShxydm(CrmSyncQyjxfpAndQyxxfpDTO dto) throws Exception; + CrmMergeListVO syncDataByShxydm(CrmSyncQyjxfpAndQyxxfpDTO dto,String nd) throws Exception; } 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 7eab4c5..d95da58 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java @@ -3,7 +3,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.DTO.CrmSyncDataQynsrdjDTO; import com.kakarote.crm.entity.PO.CrmQynsrdj; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import java.util.List; @@ -47,14 +47,14 @@ public interface ICrmQynsrdjService extends BaseService { * @param vo * @return */ - List getQynsrdjListByNsrsbhAndTime(CrmParamAndTimeVO vo); + List getQynsrdjListByNsrsbhAndTime(CrmParamAndTimeDTO vo); /** * 根据登记序号和评价年度(选填)查询 - * @param vo + * @param dto * @return */ - List getQynsrdjListByDjxhAndTime(CrmParamAndTimeVO vo); + CrmQynsrdj queryByDjxhAndTime(CrmParamAndTimeDTO dto) throws Exception; /** * 根据登记序号和评价年度查询 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 9baf438..86ba968 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java @@ -4,7 +4,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.DTO.CrmSyncQysdsndsbDTO; import com.kakarote.crm.entity.PO.CrmQysdsndsb; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import java.util.List; @@ -49,14 +49,14 @@ public interface ICrmQysdsndsbService extends BaseService { * @param vo * @return */ - List getQysdsndsbListByNsrsbhAndTime(CrmParamAndTimeVO vo); + List getQysdsndsbListByNsrsbhAndTime(CrmParamAndTimeDTO vo); /** * 根据登记序号和年度查询年度(选填)申报信息列表 - * @param vo + * @param dto * @return */ - List getQysdsndsbListByDjxhAndTime(CrmParamAndTimeVO vo); + List queryByDjxhAndTime(CrmParamAndTimeDTO dto) throws Exception; /** 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 9799c0f..384c894 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysflService.java @@ -2,7 +2,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.PO.CrmQysfl; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import java.util.List; @@ -46,12 +46,12 @@ public interface ICrmQysflService extends BaseService { * @param vo * @return */ - List getQysflByNsrsbhAndTimeList(CrmParamAndTimeVO vo); + List getQysflByNsrsbhAndTimeList(CrmParamAndTimeDTO vo); /** * 根据登记序号和月份(月份) * @param vo * @return */ - List getQysflByDjxhAndTimeList(CrmParamAndTimeVO vo); + List getQysflByDjxhAndTimeList(CrmParamAndTimeDTO 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 384c18e..aad8852 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyxxfpService.java @@ -2,40 +2,40 @@ 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 com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import java.util.List; public interface ICrmQyxxfpService extends BaseService { /** - * 通过id获得企业所得税年度申报信息 + * 通过id获得企业企业销项发票信息 */ CrmQyxxfp getQyxxfp(Integer qyxxfpId); /** - * 插入企业所得税年度申报信息 + * 插入企业企业销项发票信息 * @param crmQyxxfp * @return */ int insertQyxxfp(CrmQyxxfp crmQyxxfp); /** - * 更新企业所得税年度申报信息 + * 更新企业企业销项发票信息 * @param crmQyxxfp * @return */ int updateQyxxfp(CrmQyxxfp crmQyxxfp); /** - * 删除企业所得税年度申报信息 + * 删除企业企业销项发票信息 * @param qyxxfpId * @return */ int deleteQyxxfp(String qyxxfpId); /** - * 查询企业所得税年度申报信息列表 + * 查询企业企业销项发票信息列表 * @param crmQyxxfp * @return */ @@ -47,12 +47,12 @@ public interface ICrmQyxxfpService extends BaseService { * @param vo * @return */ - List getQyxxfpListByNsrsbhAndTime(CrmParamAndTimeVO vo); + List getQyxxfpListByNsrsbhAndTime(CrmParamAndTimeDTO vo); /** * 通过社会信用代码和年度(选填)查询企业销项发票信息 * @param vo * @return */ - List getQyxxfpListByShxydmAndTime(CrmParamAndTimeVO vo); + List getQyxxfpListByShxydmAndTime(CrmParamAndTimeDTO 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 3814258..8b1687c 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java @@ -43,11 +43,11 @@ public interface ICrmSwjgService extends BaseService { /** - * 根据swjgDm查询税务机关信息 - * @param swjgDm + * 根据swjgDm和sjswjgdm(选填)查询 + * @param crmSyncSwjgDTO * @return */ - CrmSwjg getSwjgBySwjgDm(String swjgDm); + List queryBySwjgDmAndSjSwjgDm(CrmSyncSwjgDTO crmSyncSwjgDTO) throws Exception; /** * 根据税务机构代码同步WebService数据至数据库 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 dff3e02..c7a87c5 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 @@ -2,6 +2,7 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; +import com.kakarote.core.security.EncryptionService; import com.kakarote.core.servlet.BaseServiceImpl; import com.kakarote.crm.entity.DTO.CrmSyncNsrzgDTO; import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; @@ -19,6 +20,7 @@ import com.kakarote.crm.webService.util.XmlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; @Service @@ -34,6 +36,9 @@ public class CrmNsrzgServiceImpl extends BaseServiceImpl queryByDjxh(CrmSyncNsrzgDTO crmSyncNsrzgDTO) throws Exception { - return crmNsrzgMapper.selectOne(new QueryWrapper() + String djxh = crmSyncNsrzgDTO.getDjxh(); + + CrmNsrzg crmNsrzg = crmNsrzgMapper.selectOne(new QueryWrapper() .eq("djxh", djxh) ); + + if (crmNsrzg != null) { + return Collections.singletonList(crmNsrzg); + } + + return syncDataByDjxh(crmSyncNsrzgDTO); } @Override 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 9416ddc..a45a3c0 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 @@ -1,5 +1,6 @@ package com.kakarote.crm.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.kakarote.core.servlet.BaseServiceImpl; @@ -7,7 +8,7 @@ import com.kakarote.crm.entity.DTO.CrmSyncQycbrsDTO; import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.entity.PO.CrmQycbrs; import com.kakarote.crm.entity.PO.CrmQyjbxx; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.mapper.CrmQycbrsMapper; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmQycbrsService; @@ -21,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -62,24 +64,35 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl getQycbrsListByDjxhAndTime(CrmParamAndTimeVO vo) { + public List queryByDjxhAndTime(CrmParamAndTimeDTO dto) throws Exception { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("djxh", vo.getParam()); + String effectiveMonth; - if (vo.getTime() != null && !vo.getTime().isEmpty()) { - wrapper.eq("yf", vo.getTime()); - CrmQycbrs qycbrs = crmQycbrsMapper.selectOne(wrapper); - return qycbrs != null ? - Collections.singletonList(qycbrs) : - Collections.emptyList(); + if (dto.getTime() != null && !dto.getTime().isEmpty()) { + effectiveMonth = dto.getTime(); + }else { + effectiveMonth = DateUtil.format(new Date(), "yyyyMM"); } - return crmQycbrsMapper.selectList(wrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", dto.getParam()); + wrapper.eq("yf", effectiveMonth); + + List crmQycbrs = crmQycbrsMapper.selectList(wrapper); + + if (crmQycbrs != null && !crmQycbrs.isEmpty()) { + return crmQycbrs; + } + + CrmSyncQycbrsDTO crmSyncQycbrsDTO = new CrmSyncQycbrsDTO() + .setDjxh(dto.getParam()) + .setYf(effectiveMonth); + + return syncDataByDjxhAndYf(crmSyncQycbrsDTO); } @Override - public List getQycbrsListByNsrsbhAndTime(CrmParamAndTimeVO vo) { + public List getQycbrsListByNsrsbhAndTime(CrmParamAndTimeDTO vo) { CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper() .select("djxh") @@ -134,6 +147,8 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl qycbrsList = dto.getData(); qycbrsList.forEach(qycbrs -> { + qycbrs.setDjxh(crmSyncQycbrsDTO.getDjxh()); + qycbrs.setYf(crmSyncQycbrsDTO.getYf()); crmQycbrsMapper.insert(qycbrs); }); 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 864cc55..0ad69b9 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 @@ -10,7 +10,8 @@ import com.kakarote.crm.entity.DTO.CrmSyncQyfxmxDTO; import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.entity.PO.CrmQyfxmx; import com.kakarote.crm.entity.PO.CrmQyjbxx; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; +import com.kakarote.crm.entity.PO.CrmQynsrdj; import com.kakarote.crm.mapper.CrmQyfxmxMapper; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmQyfxmxService; @@ -90,20 +91,32 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl getQyfxmxListByDjxhAndTime(CrmParamAndTimeVO vo) { + public List queryByDjxhAndTime(CrmParamAndTimeDTO dto) throws Exception { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("djxh", vo.getParam()); + String effectiveYear; - if (vo.getTime() != null && !vo.getTime().isEmpty()) { - wrapper.eq("yf", vo.getTime()); - CrmQyfxmx qyfxmx = crmQyfxmxMapper.selectOne(wrapper); - return qyfxmx != null ? - Collections.singletonList(qyfxmx) : - Collections.emptyList(); + // 时间参数的选择 + if (dto.getTime() != null && !dto.getTime().isEmpty()) { + effectiveYear = dto.getTime(); + } else { + effectiveYear = String.valueOf(DateUtil.thisYear()); } - return crmQyfxmxMapper.selectList(wrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", dto.getParam()); + wrapper.eq("pjnd", effectiveYear); + + List crmQyfxmxes = crmQyfxmxMapper.selectList(wrapper); + + if (crmQyfxmxes != null && !crmQyfxmxes.isEmpty()) { + return crmQyfxmxes; + } + + CrmSyncQyfxmxDTO crmSyncQyfxmxDTO = new CrmSyncQyfxmxDTO() + .setDjxh(dto.getParam()) + .setPjnd(effectiveYear); + + return syncDataByDjxhAndPjnd(crmSyncQyfxmxDTO); } @Override @@ -147,6 +160,8 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl qyfxmxLsit = dto.getData(); qyfxmxLsit.forEach(qyfxmx -> { + qyfxmx.setPjnd(crmSyncQyfxmxDTO.getPjnd()); + qyfxmx.setDjxh(crmSyncQyfxmxDTO.getDjxh()); crmQyfxmxMapper.insert(qyfxmx); }); @@ -154,7 +169,7 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl getQyfxmxListByNsrsbhAndTime(CrmParamAndTimeVO vo) { + public List getQyfxmxListByNsrsbhAndTime(CrmParamAndTimeDTO vo) { CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper() .select("djxh") 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 49772ed..afaae77 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 @@ -1,6 +1,10 @@ package com.kakarote.crm.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fasterxml.jackson.core.type.TypeReference; import com.kakarote.core.servlet.BaseServiceImpl; import com.kakarote.crm.entity.BO.CrmAddMergeListBO; @@ -10,9 +14,10 @@ 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.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.mapper.CrmQyjxfpMapper; +import com.kakarote.crm.mapper.CrmQyxxfpMapper; import com.kakarote.crm.service.ICrmQyjxfpService; import com.kakarote.crm.service.ICrmQyxxfpService; import com.kakarote.crm.util.AecUtils; @@ -21,10 +26,13 @@ import com.kakarote.crm.webService.config.TaxWebServiceConfig; import com.kakarote.crm.webService.entity.Body; import com.kakarote.crm.webService.util.WebServiceUtil; import com.kakarote.crm.webService.util.XmlService; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; @Service public class CrmQyjxfpServiceImpl extends BaseServiceImpl implements ICrmQyjxfpService { @@ -32,6 +40,9 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("shxydm", vo.getParam()); + // 查询两个数据集 + List jxfpList = executeQuery(crmQyjxfpMapper, dto.getParam(), effectiveYear); + List xxfpList = executeQuery(crmQyxxfpMapper, dto.getParam(), effectiveYear); - System.out.println(vo.getTime()); - - // 根据时间条件处理进项发票查询 - if (vo.getTime() != null && !vo.getTime().isEmpty()) { - // 添加时间条件 - wrapper.eq("nd", vo.getTime()); - CrmQyjxfp qyjxfp = crmQyjxfpMapper.selectOne(wrapper); - mergeListVO.setJxfpList(qyjxfp != null ? - Collections.singletonList(qyjxfp) : - Collections.emptyList()); - } else { - // 无时间条件时直接查询列表 - mergeListVO.setJxfpList(crmQyjxfpMapper.selectList(wrapper)); + // 只有当两个列表都有数据时才返回结果 + if (CollUtil.isNotEmpty(jxfpList) && CollUtil.isNotEmpty(xxfpList)) { + return new CrmMergeListVO() + .setJxfpList(jxfpList) + .setXxfpList(xxfpList); } - // 处理销项发票查询 - List qyxxfpList = crmQyxxfpService.getQyxxfpListByShxydmAndTime(vo); - mergeListVO.setXxfpList(qyxxfpList); - - return mergeListVO; + return syncDataByShxydm(new CrmSyncQyjxfpAndQyxxfpDTO().setShxydm(dto.getParam()),effectiveYear); } + + /** * 通过社会信用代码和年度(选填),查询企业进项发票和企业销项发票信息列表 * @param vo * @return */ @Override - public CrmMergeListVO getMergeListByNsrsbhAndTime(CrmParamAndTimeVO vo) { + public CrmMergeListVO getMergeListByNsrsbhAndTime(CrmParamAndTimeDTO vo) { CrmMergeListVO mergeListVO = new CrmMergeListVO(); @@ -174,7 +178,7 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl getQynsrdjListByNsrsbhAndTime(CrmParamAndTimeVO vo){ + public List getQynsrdjListByNsrsbhAndTime(CrmParamAndTimeDTO vo){ CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper() .select("djxh") @@ -117,6 +118,8 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl dto = JsonUtil.toObject(respJson, new TypeReference>() {}); CrmQynsrdj crmQynsrdj = dto.getData(); + crmQynsrdj.setPjnd(crmSyncDataQynsrdjDTO.getPjnd()); + crmQynsrdj.setDjxh(crmSyncDataQynsrdjDTO.getDjxh()); crmQynsrdjMapper.insert(crmQynsrdj); @@ -124,21 +127,31 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl getQynsrdjListByDjxhAndTime(CrmParamAndTimeVO vo) { + public CrmQynsrdj queryByDjxhAndTime(CrmParamAndTimeDTO dto) throws Exception { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("djxh", vo.getParam()); + String effectiveYear; - // 当时间参数存在时添加时间条件并返回单条结果 - if (vo.getTime() != null && !vo.getTime().isEmpty()) { - wrapper.eq("pjnd", vo.getTime()); - CrmQynsrdj entity = crmQynsrdjMapper.selectOne(wrapper); - return entity != null ? - Collections.singletonList(entity) : - Collections.emptyList(); + // 时间参数的选择 + if (dto.getTime() != null && !dto.getTime().isEmpty()) { + effectiveYear = dto.getTime(); + } else { + effectiveYear = String.valueOf(DateUtil.thisYear()); } - // 无时间参数时返回匹配的所有记录 - return crmQynsrdjMapper.selectList(wrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", dto.getParam()); + wrapper.eq("pjnd", effectiveYear); + + CrmQynsrdj qynsrdj = crmQynsrdjMapper.selectOne(wrapper); + + if (qynsrdj != null) { + return qynsrdj; + } + + CrmSyncDataQynsrdjDTO syncDataQynsrdjDTO = new CrmSyncDataQynsrdjDTO() + .setDjxh(dto.getParam()) + .setPjnd(effectiveYear); + + return syncDataByDjxhAndPjnd(syncDataQynsrdjDTO); } } 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 04e3acd..c7fadad 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 @@ -1,14 +1,16 @@ package com.kakarote.crm.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.kakarote.core.servlet.BaseServiceImpl; +import com.kakarote.crm.entity.DTO.CrmSyncDataQynsrdjDTO; import com.kakarote.crm.entity.DTO.CrmSyncQysdsndsbDTO; import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.entity.PO.CrmQyjbxx; import com.kakarote.crm.entity.PO.CrmQysdsndsb; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.mapper.CrmQysdsndsbMapper; import com.kakarote.crm.service.ICrmQysdsndsbService; @@ -63,24 +65,35 @@ public class CrmQysdsndsbServiceImpl extends BaseServiceImpl getQysdsndsbListByDjxhAndTime(CrmParamAndTimeVO vo) { + public List queryByDjxhAndTime(CrmParamAndTimeDTO dto) throws Exception { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("djxh", vo.getParam()); + String effectiveYear; - if (vo.getTime() != null && !vo.getTime().isEmpty()) { - wrapper.eq("nd", vo.getTime()); - CrmQysdsndsb qysdsndsb = crmQysdsndsbMapper.selectOne(wrapper); - return qysdsndsb != null ? - Collections.singletonList(qysdsndsb) : - Collections.emptyList(); + if (dto.getTime() != null && !dto.getTime().isEmpty()) { + effectiveYear = dto.getTime(); + }else { + effectiveYear = String.valueOf(DateUtil.thisYear()); } - return crmQysdsndsbMapper.selectList(wrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("djxh", dto.getParam()); + wrapper.eq("nd", effectiveYear); + + List qysdsndsbList = crmQysdsndsbMapper.selectList(wrapper); + + if (qysdsndsbList != null && !qysdsndsbList.isEmpty()) { + return qysdsndsbList; + } + + CrmSyncQysdsndsbDTO crmSyncQysdsndsbDTO = new CrmSyncQysdsndsbDTO() + .setDjxh(dto.getParam()) + .setNd(effectiveYear); + + return syncDataByDjxhAndNd(crmSyncQysdsndsbDTO); } @Override - public List getQysdsndsbListByNsrsbhAndTime(CrmParamAndTimeVO vo) { + public List getQysdsndsbListByNsrsbhAndTime(CrmParamAndTimeDTO vo) { CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper() .select("djxh") @@ -135,6 +148,8 @@ public class CrmQysdsndsbServiceImpl extends BaseServiceImpl crmQysdsndsbList = dto.getData(); crmQysdsndsbList.forEach(crmQysdsndsb -> { + crmQysdsndsb.setDjxh(crmSyncQysdsndsbDTO.getDjxh()); + crmQysdsndsb.setNd(crmSyncQysdsndsbDTO.getNd()); crmQysdsndsbMapper.insert(crmQysdsndsb); } ); 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 49a5be3..781cd72 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 @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kakarote.core.servlet.BaseServiceImpl; import com.kakarote.crm.entity.PO.CrmQyjbxx; import com.kakarote.crm.entity.PO.CrmQysfl; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.mapper.CrmQysflMapper; import com.kakarote.crm.service.ICrmQysflService; @@ -50,7 +50,7 @@ public class CrmQysflServiceImpl extends BaseServiceImpl getQysflByDjxhAndTimeList(CrmParamAndTimeVO vo) { + public List getQysflByDjxhAndTimeList(CrmParamAndTimeDTO vo) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("djxh", vo.getParam()); @@ -67,7 +67,7 @@ public class CrmQysflServiceImpl extends BaseServiceImpl getQysflByNsrsbhAndTimeList(CrmParamAndTimeVO vo) { + public List getQysflByNsrsbhAndTimeList(CrmParamAndTimeDTO vo) { CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper() .select("djxh") 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 85bda94..285cdcf 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 @@ -3,9 +3,8 @@ package com.kakarote.crm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kakarote.core.servlet.BaseServiceImpl; import com.kakarote.crm.entity.PO.CrmQyjbxx; -import com.kakarote.crm.entity.PO.CrmQyjxfp; import com.kakarote.crm.entity.PO.CrmQyxxfp; -import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmParamAndTimeDTO; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.mapper.CrmQyxxfpMapper; import com.kakarote.crm.service.ICrmQyxxfpService; @@ -51,7 +50,7 @@ public class CrmQyxxfpServiceImpl extends BaseServiceImpl getQyxxfpListByShxydmAndTime(CrmParamAndTimeVO vo) { + public List getQyxxfpListByShxydmAndTime(CrmParamAndTimeDTO vo) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("shxydm", vo.getParam()); @@ -68,7 +67,7 @@ public class CrmQyxxfpServiceImpl extends BaseServiceImpl getQyxxfpListByNsrsbhAndTime(CrmParamAndTimeVO vo) { + public List getQyxxfpListByNsrsbhAndTime(CrmParamAndTimeDTO vo) { CrmQyjbxx crmQyjbxx = crmQyjbxxMapper.selectOne(new QueryWrapper() .select("shxydm") 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 61b797f..510ab8e 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 @@ -16,6 +16,8 @@ import com.kakarote.crm.webService.util.WebServiceUtil; import com.kakarote.crm.webService.util.XmlService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.Collections; import java.util.List; @Service @@ -89,9 +91,29 @@ public class CrmSwjgServiceImpl extends BaseServiceImpl } @Override - public CrmSwjg getSwjgBySwjgDm(String swjgDm) { - QueryWrapper crmSwjgQueryWrapper = new QueryWrapper<>(); - crmSwjgQueryWrapper.eq("swjg_dm", swjgDm); - return crmSwjgMapper.selectOne(crmSwjgQueryWrapper); + public List queryBySwjgDmAndSjSwjgDm(CrmSyncSwjgDTO crmSyncSwjgDTO) throws Exception { + + String swjgdm = crmSyncSwjgDTO.getSwjgdm(); + String sjswjgdm = crmSyncSwjgDTO.getSjswjgdm(); + + // 构建基础查询条件 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("swjg_dm", swjgdm); + + // 添加可选条件 + if (sjswjgdm != null && !sjswjgdm.isEmpty()) { + queryWrapper.eq("sjswjg_dm", sjswjgdm); + } + + // 尝试查询 + CrmSwjg crmSwjg = crmSwjgMapper.selectOne(queryWrapper); + + // 查询成功时返回单元素列表 + if (crmSwjg != null) { + return Collections.singletonList(crmSwjg); + } + + // 查询失败时尝试同步 + return syncDataBySwjgDmAndSjswjgDm(crmSyncSwjgDTO); } }