From 39229c50aa2855e0a4d6f9c0f53fee92d5b0f4b2 Mon Sep 17 00:00:00 2001 From: ZZM <1105966949@qq.com> Date: Wed, 30 Jul 2025 10:32:27 +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 | 10 +++ .../crm/controller/CrmQycbrsController.java | 9 ++ .../crm/controller/CrmQyfxmxController.java | 8 ++ .../crm/controller/CrmQyjbxxController.java | 14 +++- .../crm/controller/CrmQyjxfpController.java | 9 ++ .../crm/controller/CrmQynsrdjController.java | 10 +++ .../controller/CrmQysdsndsbController.java | 12 ++- .../crm/controller/CrmSwjgController.java | 13 ++- .../crm/entity/BO/CrmAddMergeListBO.java | 21 +++++ .../crm/entity/BO/CrmQueryQyfxmxBO.java | 31 +++++++ .../crm/entity/DTO/CrmSyncDataQynsrdjDTO.java | 27 ++++++ .../crm/entity/DTO/CrmSyncNsrzgDTO.java | 23 +++++ .../crm/entity/DTO/CrmSyncQycbrsDTO.java | 27 ++++++ .../crm/entity/DTO/CrmSyncQyfxmxDTO.java | 17 ++++ .../crm/entity/DTO/CrmSyncQyjbxxDTO.java | 31 +++++++ .../entity/DTO/CrmSyncQyjxfpAndQyxxfpDTO.java | 23 +++++ .../crm/entity/DTO/CrmSyncQysdsndsbDTO.java | 26 ++++++ .../crm/entity/DTO/CrmSyncSwjgDTO.java | 28 +++++++ .../entity/DTO/CrmWebServiceResponseDTO.java | 12 +++ .../com/kakarote/crm/entity/PO/CrmNsrzg.java | 20 +++++ .../com/kakarote/crm/entity/PO/CrmQycbrs.java | 10 +++ .../com/kakarote/crm/entity/PO/CrmQyfxmx.java | 25 +++++- .../com/kakarote/crm/entity/PO/CrmQyjbxx.java | 84 +++++++++++++++++++ .../crm/entity/PO/CrmQyjbxxDjrqDetail.java | 57 +++++++++++++ .../com/kakarote/crm/entity/PO/CrmQyjxfp.java | 16 ++++ .../kakarote/crm/entity/PO/CrmQynsrdj.java | 12 ++- .../kakarote/crm/entity/PO/CrmQysdsndsb.java | 53 +++++++++++- .../com/kakarote/crm/entity/PO/CrmQyxxfp.java | 20 +++++ .../com/kakarote/crm/entity/PO/CrmSwjg.java | 19 ++++- .../crm/entity/VO/CrmMergeListVO.java | 5 +- .../crm/mapper/xml/CrmQyfxmxMapper.xml | 5 +- .../crm/mapper/xml/CrmQynsrdjMapper.xml | 2 +- .../kakarote/crm/mapper/xml/CrmSwjgMapper.xml | 2 +- .../crm/service/ICrmNsrzgService.java | 8 ++ .../crm/service/ICrmQycbrsService.java | 8 ++ .../crm/service/ICrmQyfxmxService.java | 9 ++ .../crm/service/ICrmQyjbxxService.java | 9 ++ .../crm/service/ICrmQyjxfpService.java | 9 ++ .../crm/service/ICrmQynsrdjService.java | 8 ++ .../crm/service/ICrmQysdsndsbService.java | 9 ++ .../kakarote/crm/service/ICrmSwjgService.java | 8 ++ .../crm/service/impl/CrmNsrzgServiceImpl.java | 49 +++++++++++ .../service/impl/CrmQycbrsServiceImpl.java | 48 +++++++++++ .../service/impl/CrmQyfxmxServiceImpl.java | 62 ++++++++++++++ .../service/impl/CrmQyjbxxServiceImpl.java | 82 ++++++++++++++++-- .../service/impl/CrmQyjxfpServiceImpl.java | 71 ++++++++++++++-- .../service/impl/CrmQynsrdjServiceImpl.java | 45 ++++++++++ .../service/impl/CrmQysdsndsbServiceImpl.java | 48 +++++++++++ .../crm/service/impl/CrmSwjgServiceImpl.java | 47 +++++++++++ .../java/com/kakarote/crm/util/JsonUtil.java | 20 +++++ 50 files changed, 1195 insertions(+), 26 deletions(-) create mode 100644 crm/src/main/java/com/kakarote/crm/entity/BO/CrmAddMergeListBO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/BO/CrmQueryQyfxmxBO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncDataQynsrdjDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncNsrzgDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQycbrsDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyfxmxDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjbxxDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjxfpAndQyxxfpDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQysdsndsbDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/CrmWebServiceResponseDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxxDjrqDetail.java create mode 100644 crm/src/main/java/com/kakarote/crm/util/JsonUtil.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 f90d8c5..33a9dba 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmNsrzgController.java @@ -4,6 +4,7 @@ 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.DTO.CrmSyncNsrzgDTO; import com.kakarote.crm.entity.PO.CrmNsrzg; import com.kakarote.crm.service.ICrmNsrzgService; import io.swagger.annotations.Api; @@ -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("/crmNsrzg") @Api(tags = "纳税人资格信息") @@ -42,6 +45,13 @@ public class CrmNsrzgController { return R.ok(nsrzg); } + @PostMapping("/syncDataByDjxh") + @ApiOperation("根据登记序号同步WebService数据至数据库") + public Result> syncDataByDjxh(@RequestBody CrmSyncNsrzgDTO crmSyncNsrzgDTO) throws Exception { + List crmNsrzgs = crmNsrzgService.syncDataByDjxh(crmSyncNsrzgDTO); + return R.ok(crmNsrzgs); + } + @PostMapping("/add") @ApiOperation("保存数据") 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 0a592e8..0c74508 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQycbrsController.java @@ -4,6 +4,7 @@ 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.DTO.CrmSyncQycbrsDTO; import com.kakarote.crm.entity.PO.CrmQycbrs; import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQycbrsService; @@ -23,6 +24,14 @@ public class CrmQycbrsController { @Autowired private ICrmQycbrsService crmQycbrsService; + @PostMapping("/syncDataByDjxhAndYf") + @ApiOperation("根据登记序号和月份同步WebService数据至数据库") + @ParamAspect + public Result> syncDataByDjxhAndYf(@RequestBody CrmSyncQycbrsDTO crmSyncQycbrsDTO) throws Exception { + List crmQycbrs = crmQycbrsService.syncDataByDjxhAndYf(crmSyncQycbrsDTO); + return R.ok(crmQycbrs); + } + @PostMapping("/queryById/{qycbrsId}") @ApiOperation("根据ID查询") @ParamAspect 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 f96af96..534d0e6 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyfxmxController.java @@ -3,6 +3,7 @@ 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.DTO.CrmSyncQyfxmxDTO; import com.kakarote.crm.entity.PO.CrmQyfxmx; import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQyfxmxService; @@ -22,6 +23,13 @@ public class CrmQyfxmxController { @Autowired private ICrmQyfxmxService crmQyfxmxService; + @PostMapping("/syncDataByDjxhAndPjnd") + @ApiOperation("根据登记序号和评价年度同步WebService数据至数据库") + public Result> syncDataByDjxhAndPjnd(@RequestBody CrmSyncQyfxmxDTO crmSyncQyfxmxDTO) throws Exception { + List crmQyfxmxList = crmQyfxmxService.syncDataByDjxhAndPjnd(crmSyncQyfxmxDTO); + return R.ok(crmQyfxmxList); + } + @PostMapping("/queryById/{qyzbmxId}") @ApiOperation("根据ID查询") @ParamAspect diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjbxxController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjbxxController.java index 3dee9d2..0b744a0 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjbxxController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjbxxController.java @@ -3,11 +3,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.core.common.SubModelType; -import com.kakarote.core.common.log.SysLog; -import com.kakarote.crm.common.CrmModel; -import com.kakarote.crm.common.log.CrmProductLog; import com.kakarote.crm.entity.BO.QyjbxxBo; +import com.kakarote.crm.entity.DTO.CrmSyncQyjbxxDTO; import com.kakarote.crm.entity.PO.CrmQyjbxx; import com.kakarote.crm.service.ICrmQyjbxxService; import io.swagger.annotations.Api; @@ -16,13 +13,22 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/crmQyjbxx") @Api(tags = "企业基本信息") public class CrmQyjbxxController { + @Autowired private ICrmQyjbxxService crmQyjbxxService; + @PostMapping("/syncDataBySwjgdmAndTime") + @ApiOperation("根据事务机关代码和起止时间同步WebService数据至数据库") + public Result> syncDataBySwjgdmAndTime(@RequestBody CrmSyncQyjbxxDTO crmSyncQyjbxxDTO) throws Exception { + List crmQyjbxxList = crmQyjbxxService.syncDataBySwjgdmAndTime(crmSyncQyjbxxDTO); + return R.ok(crmQyjbxxList); + } @PostMapping("/queryById/{qyId}") @ApiOperation("根据ID查询") 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 160b777..976be8a 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQyjxfpController.java @@ -3,6 +3,7 @@ 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.DTO.CrmSyncQyjxfpAndQyxxfpDTO; import com.kakarote.crm.entity.PO.CrmQyjxfp; import com.kakarote.crm.entity.VO.CrmMergeListVO; import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; @@ -21,6 +22,14 @@ public class CrmQyjxfpController { @Autowired private ICrmQyjxfpService crmQyjxfpService; + @PostMapping("/syncDataByShxydm") + @ApiOperation("根据社会信用代码同步WebService数据至数据库") + public Result syncDataByShxydm(@RequestBody CrmSyncQyjxfpAndQyxxfpDTO dto) throws Exception { + CrmMergeListVO crmMergeListVO = crmQyjxfpService.syncDataByShxydm(dto); + return R.ok(crmMergeListVO); + } + + @PostMapping("/queryById/{qyjxfpId}") @ApiOperation("根据ID查询") @ParamAspect 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 4254ba7..15ebf5a 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQynsrdjController.java @@ -4,6 +4,7 @@ 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.DTO.CrmSyncDataQynsrdjDTO; import com.kakarote.crm.entity.PO.CrmQynsrdj; import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQynsrdjService; @@ -23,6 +24,15 @@ public class CrmQynsrdjController { @Autowired private ICrmQynsrdjService crmQynsrdjService; + + @PostMapping("/syncDataByDjxhAndPjnd") + @ApiOperation("根据登记序号和评价年度同步WebService数据至数据库") + public Result syncDataByDjxhAndPjnd(@RequestBody CrmSyncDataQynsrdjDTO crmSyncDataQynsrdjDTO) throws Exception { + CrmQynsrdj qynsrdj = crmQynsrdjService.syncDataByDjxhAndPjnd(crmSyncDataQynsrdjDTO); + return R.ok(qynsrdj); + } + + @PostMapping("/queryById/{qynsrdjId}") @ApiOperation("根据ID查询") @ParamAspect 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 6049e87..a067c4c 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmQysdsndsbController.java @@ -3,6 +3,7 @@ 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.DTO.CrmSyncQysdsndsbDTO; import com.kakarote.crm.entity.PO.CrmQysdsndsb; import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; import com.kakarote.crm.service.ICrmQysdsndsbService; @@ -22,6 +23,15 @@ public class CrmQysdsndsbController { @Autowired private ICrmQysdsndsbService crmQysdsndsbService; + @PostMapping("/syncDataByDjxhAndNd") + @ApiOperation("根据登记序号以及年度同步WebService数据至数据库") + @ParamAspect + public Result> syncDataByDjxhAndNd(@RequestBody CrmSyncQysdsndsbDTO crmSyncQysdsndsbDTO) throws Exception { + List qysdsndsbList = crmQysdsndsbService.syncDataByDjxhAndNd(crmSyncQysdsndsbDTO); + return R.ok(qysdsndsbList); + } + + @PostMapping("/queryById/{qysdsndsbId}") @ApiOperation("根据ID查询") @ParamAspect @@ -38,7 +48,7 @@ public class CrmQysdsndsbController { } @PostMapping("/queryByDjxhAndTime") - @ApiOperation("根据纳税人识别号和年度(选填)查询") + @ApiOperation("根据登记序号和年度(选填)查询") public Result> queryByDjxhAndTime(@RequestBody CrmParamAndTimeVO vo) { List qysdsndsbList = crmQysdsndsbService.getQysdsndsbListByDjxhAndTime(vo); return R.ok(qysdsndsbList); 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 753e903..50fdcdb 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmSwjgController.java @@ -3,6 +3,7 @@ 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.DTO.CrmSyncSwjgDTO; import com.kakarote.crm.entity.PO.CrmSwjg; import com.kakarote.crm.service.ICrmSwjgService; import io.swagger.annotations.Api; @@ -11,14 +12,24 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController -@RequestMapping("/swjg") +@RequestMapping("/crmSwjg") @Api(tags = "税务机关信息") public class CrmSwjgController { @Autowired private ICrmSwjgService crmSwjgService; + @PostMapping("/syncDataBySwjgDmAndSjswjgDm") + @ApiOperation("根据税务机构代码同步WebService数据至数据库") + public Result> syncDataBySwjgDmAndSjswjgDm(@RequestBody CrmSyncSwjgDTO crmSyncSwjgDTO) throws Exception { + List crmSwjgs = crmSwjgService.syncDataBySwjgDmAndSjswjgDm(crmSyncSwjgDTO); + return R.ok(crmSwjgs); + } + + @PostMapping("/queryById/{swjgId}") @ApiOperation("根据ID查询") @ParamAspect diff --git a/crm/src/main/java/com/kakarote/crm/entity/BO/CrmAddMergeListBO.java b/crm/src/main/java/com/kakarote/crm/entity/BO/CrmAddMergeListBO.java new file mode 100644 index 0000000..ae5ecf7 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/BO/CrmAddMergeListBO.java @@ -0,0 +1,21 @@ +package com.kakarote.crm.entity.BO; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.kakarote.crm.entity.PO.CrmQyjxfp; +import com.kakarote.crm.entity.PO.CrmQyxxfp; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class CrmAddMergeListBO implements Serializable { + + // 企业销项发票 + @JsonProperty("xxhzList") + private List xxhzList; + + // 企业进项发票 + @JsonProperty("jxhzList") + private List jxhzList; +} diff --git a/crm/src/main/java/com/kakarote/crm/entity/BO/CrmQueryQyfxmxBO.java b/crm/src/main/java/com/kakarote/crm/entity/BO/CrmQueryQyfxmxBO.java new file mode 100644 index 0000000..2b13838 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/BO/CrmQueryQyfxmxBO.java @@ -0,0 +1,31 @@ +package com.kakarote.crm.entity.BO; + +import cn.hutool.core.date.DateTime; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + + +@Getter +@Setter +@AllArgsConstructor +public class CrmQueryQyfxmxBO { + + // 登记序号 + private String djxh; + + // 开始时间 + private String fxscsjq; + + // 结束时间 + private String fxscsjz; + + @Override + public String toString() { + return "{" + + "djxh:'" + djxh + '\'' + + ", fxscsjq:'" + fxscsjq + '\'' + + ", fxscsjz:'" + fxscsjz + '\'' + + '}'; + } +} 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 new file mode 100644 index 0000000..e8909cb --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncDataQynsrdjDTO.java @@ -0,0 +1,27 @@ +package com.kakarote.crm.entity.DTO; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class CrmSyncDataQynsrdjDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + // 登记序号 + private String djxh; + + // 评价年度 + private String pjnd; + + @Override + public String toString() { + return "{" + + "djxh:'" + djxh + '\'' + + ", pjnd:'" + pjnd + '\'' + + '}'; + } +} diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncNsrzgDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncNsrzgDTO.java new file mode 100644 index 0000000..bd3885c --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncNsrzgDTO.java @@ -0,0 +1,23 @@ +package com.kakarote.crm.entity.DTO; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class CrmSyncNsrzgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + // 登记序号 + private String djxh; + + @Override + public String toString() { + return "{" + + "djxh:'" + djxh + '\'' + + '}'; + } +} 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 new file mode 100644 index 0000000..a70ea5d --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQycbrsDTO.java @@ -0,0 +1,27 @@ +package com.kakarote.crm.entity.DTO; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class CrmSyncQycbrsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + // 月份 + private String yf; + + // 登记序号 + private String djxh; + + @Override + public String toString() { + return "{" + + "yf:'" + yf + '\'' + + ", djxh:'" + djxh + '\'' + + '}'; + } +} 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 new file mode 100644 index 0000000..a08921d --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyfxmxDTO.java @@ -0,0 +1,17 @@ +package com.kakarote.crm.entity.DTO; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CrmSyncQyfxmxDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + // 登记序号 + private String djxh; + + // 评价年度 + private String pjnd; + +} diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjbxxDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjbxxDTO.java new file mode 100644 index 0000000..f1487af --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjbxxDTO.java @@ -0,0 +1,31 @@ +package com.kakarote.crm.entity.DTO; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class CrmSyncQyjbxxDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + // 区县税务机关代码 + private String swjgdm; + + // 查询起始时间 + private String cxrqq; + + // 查询终止时间 + private String cxrqz; + + @Override + public String toString() { + return "{" + + "swjgdm:'" + swjgdm + '\'' + + ", cxrqq:'" + cxrqq + '\'' + + ", cxrqz:'" + cxrqz + '\'' + + '}'; + } +} 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 new file mode 100644 index 0000000..215d868 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQyjxfpAndQyxxfpDTO.java @@ -0,0 +1,23 @@ +package com.kakarote.crm.entity.DTO; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +@Getter +@Setter +public class CrmSyncQyjxfpAndQyxxfpDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + // 社会信用代码 + private String shxydm; + + @Override + public String toString() { + return "{" + + "shxydm:'" + shxydm + '\'' + + '}'; + } +} 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 new file mode 100644 index 0000000..5c76224 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncQysdsndsbDTO.java @@ -0,0 +1,26 @@ +package com.kakarote.crm.entity.DTO; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +@Getter +@Setter +public class CrmSyncQysdsndsbDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + // 登记序号 + private String djxh; + + // 年度 + private String nd; + + @Override + public String toString() { + return "{" + + "djxh:'" + djxh + '\'' + + ", nd:'" + nd + '\'' + + '}'; + } +} 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 new file mode 100644 index 0000000..de187d5 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmSyncSwjgDTO.java @@ -0,0 +1,28 @@ +package com.kakarote.crm.entity.DTO; + +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + + +@Getter +@Setter +public class CrmSyncSwjgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + // 税务机关代码(必填) + private String swjgdm; + + // 上级税务机关代码(选填) + private String sjswjgdm; + + @Override + public String toString() { + return "{" + + "swjgdm:'" + swjgdm + '\'' + + ", sjswjgdm:'" + sjswjgdm + '\'' + + '}'; + } +} diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmWebServiceResponseDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmWebServiceResponseDTO.java new file mode 100644 index 0000000..a55240e --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmWebServiceResponseDTO.java @@ -0,0 +1,12 @@ +package com.kakarote.crm.entity.DTO; + + +import lombok.Data; + +@Data +public class CrmWebServiceResponseDTO { + + private int code; + private String msg; + private T data; +} 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 763068f..5077c78 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 @@ -1,12 +1,15 @@ 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 com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @@ -29,55 +32,72 @@ public class CrmNsrzg implements Serializable { /** * 认定凭证UUID */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String rdpzuuid; /** * 登记序号 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djxh; /** * 流程实例ID */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String lcslid; /** * 纳税人资格类型代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nsrzglxDm; /** * 有效期起 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yxqq; /** * 有效期止 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yxqz; /** * 数据终止日期 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String sjzzrq; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createBy; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; + + @TableField(exist = false) + private String zfbz1; + + @TableField(exist = false) + private String qxbz; } 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 d15bb7e..c4acc2a 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 @@ -1,12 +1,15 @@ 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 com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @@ -29,35 +32,42 @@ public class CrmQycbrs implements Serializable { /** * 月份 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yf; /** * 参保人数 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cbrs; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createUp; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; /** * 登记序号 */ + @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 13a8c56..f417cc4 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 @@ -2,12 +2,15 @@ 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 com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @@ -30,41 +33,61 @@ public class CrmQyfxmx implements Serializable { /** * 月份 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yf; /** * 风险指标代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String fxzbDm; /** * 风险描述 */ - private String fxmx; + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) + private String fxms; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createBy; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; /** * 登记序号 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djxh; + /** + * 纳税人名称 + */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) + private String nsrmc; + + /** + * 纳税人识别号 + */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) + private String nsrsbh; + } diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxx.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxx.java index 199c774..aec075c 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxx.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxx.java @@ -1,12 +1,15 @@ 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 com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @@ -34,406 +37,487 @@ public class CrmQyjbxx implements Serializable { /** * 企业登记序号 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djxh; /** * 纳税人识别号 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nsrsbh; /** * 纳税人名称 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nsrmc; /** * 课征主体登记类型代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String kzztdjlxDm; /** * 登记注册类型代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djzclxDm; /** * 生产经营地址 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String scjydz; /** * 生产经营地址行政区划数字代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String scjydzxzqhszDm; /** * 纳税人状态代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nsrztDm; /** * 行业代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String hyDm; /** * 注册地址 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zcdz; /** * 注册地址行政区划数字代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zcdzxzqhszDm; /** * 街道乡镇代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jdxzDm; /** * 单位隶属关系代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String dwlsgxDm; /** * 登记日期 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String djrq; /** * 跨区财产税主体登记标志 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String kqccsztdjbz; /** * 主管税务局代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zgswjDm; /** * 主管税务所（科、分局）代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zgswskfjDm; /** * shxydm */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String shxydm; /** * 税收管理员代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String ssglyDm; /** * 非居民企业标志 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String fjmqybz; /** * 有效标志 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yxbz; /** * 工商注销日期 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String gszxrq; /** * 企业划型类别 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String qyhxlbDm; /** * 企业划型来源 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String qyhxly; /** * 经营范围 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jyfw; /** * 注册地联系电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zcdlxdh; /** * 注册地邮政编码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zcdyzbm; /** * 生产经营地联系电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String scjydlxdh; /** * 生产经营地邮政编码生产经营地邮政编码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String scjydyzbm; /** * 核算方式代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String hsfsDm; /** * 从业人数 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cyrs; /** * 外籍从业人数 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String wjcyrs; /** * 合伙人数 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String hhrs; /** * 雇工人数 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String ggrs; /** * 固定工人数 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String gdgrs; /** * 组织机构类型代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zzjglxDm; /** * 会计制度（准则）代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String kjzdzzDm; /** * 税务代理人联系电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String swdlrlxdh; /** * 税务代理人电子信箱 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String swdlrdzxx; /** * 注册资本 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zczb; /** * 投资总额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String tzze; /** * 自然人投资比例 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zrrtzbl; /** * 外资投资比例 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String wztzbl; /** * 国有投资比例 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String gytzbl; /** * 国有控股类型代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String gykglxDm; /** * 总分机构类型代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zfjglxDm; /** * 法定代表人姓名 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String fddbrxm; /** * 法定代表人身份证件类型代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String fddbrsfzjlxDm; /** * 法定代表人身份证号码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String fddbrsfzjhm; /** * 法定代表人固定电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String fddbrgddh; /** * 法定代表人移动电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String fddbryddh; /** * 法定代表人电子信箱 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String fddbrdzxx; /** * 财务负责人姓名 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cwfzrxm; /** * 财务负责人身份证件种类代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cwfzrsfzjzlDm; /** * 财务负责人身份证件号码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cwfzrsfzjhm; /** * 财务负责人固定电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cwfzrgddh; /** * 财务负责人移动电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cwfzryddh; /** * 财务负责人电子信箱 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cwfzrdzxx; /** * 办税人姓名 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bsrxm; /** * 办税人身份证件种类代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bsrsfzjzlDm; /** * 办税人身份证件号码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bsrsfzjhm; /** * 办税人固定电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bsrgddh; /** * 办税人移动电话 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bsryddh; /** * 办税人电子信箱 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bsrdzxx; /** * 临时税务登记有效期起 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String lsswdjyxqq; /** * 临时税务登记有效期止 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String lsswdjyxqz; /** * 税务代理人纳税人识别号 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String swdlrnsrsbh; /** * 税务代理人名称 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String swdlrmc; /** * 文化事业建设费缴费信息登记标志 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String whsyjsfjfxxdjbz; /** * 增值税经营类别 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zzsjylb; /** * 印花税缴纳方式代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yhsjnfsDm; /** * 征收项目城乡标志代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zsxmcxbzDm; /** * 增值税企业类型代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zzsqylxDm; /** * 国家或地区数字代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String gjhdqszDm; /** * 企业管理层级编号 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String qyglcjbh; /** * 企业所属集团代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String qyssjtDm; /** * 受托方社会信用代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String stfshxydm; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createBy; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; } \ No newline at end of file diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxxDjrqDetail.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxxDjrqDetail.java new file mode 100644 index 0000000..d025ab3 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmQyjbxxDjrqDetail.java @@ -0,0 +1,57 @@ +package com.kakarote.crm.entity.PO; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + +import java.io.Serializable; + + +@EqualsAndHashCode(callSuper = true) +@Data +@ToString(callSuper = true) +public class CrmQyjbxxDjrqDetail extends CrmQyjbxx implements Serializable { + + private static final long serialVersionUID = 1L; + + @JsonProperty("djrq") + @TableField(exist = false) + private DjrqDetail djrqDetail; + + @Data + public static class DjrqDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + // 年 + private String year; + + // 月 + private String month; + + // 星期 + private String day; + + // 日期 + private String date; + + // 时 + private String hours; + + // 分 + private String minutes; + + // 秒 + private String seconds; + + // + private String nanos; + + // 时间戳 + private String time; + + // 时区 + private String timezoneOffset; + + } +} 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 c0ef427..0afc564 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 @@ -1,12 +1,16 @@ 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 com.fasterxml.jackson.annotation.JsonProperty; +import com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @@ -30,46 +34,58 @@ public class CrmQyjxfp implements Serializable { /** * 年度 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nd; /** * 不含税金额 */ + @JsonProperty("jxbhsje") + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jxBhsje; /** * 进税金额 */ + @JsonProperty("jxse") + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jxSe; /** * 进项价税合计 */ + @JsonProperty("jxjshj") + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jxJshj; /** * 社会信用代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String shxydm; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createBy; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; 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 fca26d4..55cd1b1 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 @@ -1,12 +1,15 @@ 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 com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @@ -29,35 +32,42 @@ 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; /** * 评价等级 */ - private String pjjb; + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) + private String pjjg; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createBy; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; } 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 ab93e5a..0798b2b 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 @@ -1,19 +1,21 @@ 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 com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @Data -@Builder @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("wk_crm_qysdsndsb") @@ -31,245 +33,294 @@ 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; /** * UUID */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String uuid; /** * 申报UUID */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String sbuuid; /** * 税款所属期起 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String skssqq; /** * 税款所属期止 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String skssqz; /** * 凭证序号 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String pzxh; /** * 营业收入 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yysr; /** * 营业成本 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yycb; /** * 营业税金及附加 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yysjFj; /** * 销售费用 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String xsfy; /** * 管理费用 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String glfy; /** * 财务费用 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String cwfy; /** * 资产减值损失 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zcjzss; /** * 公允价值变动收益 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String gyjzbdsy; /** * 投资收益 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String tzsy; /** * 营业利润 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yylr; /** * 营业外收入 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yywsr; /** * 营业外支出 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yywzc; /** * 利润总额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String lrze; /** * 境外所得金额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jwsdje; /** * 纳税调整增加额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nstzzje; /** * 纳税调整减少额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nstzjse; /** * 减:免税、减计收入以及加计扣除 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String msjjsrjjjkc; /** * 加:境外应税所得抵减境内亏损 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jwyssddjjnks; /** * 纳税调整后所得 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nstzhsd; /** * 减:所得减免 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String sdjm; /** * 抵扣应纳税所得额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String dkynssde; /** * 弥补以前年度亏损 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String mbyqndks; /** * 应纳税所得额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String ynssde; /** * 税率 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String sl1; /** * 应纳所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String ynsdse; /** * 减、免所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jmsdse; /** * 抵免所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String dmsdse; /** * 应纳税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String ynse; /** * 境外所得应纳所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jwsdynsdse; /** * 减:境外所得抵免所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jwsddmsdse; /** * 实际应纳所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String sjynsdse; /** * 本年累计实际已预缴的所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bnljsjyyjSdse; /** * 本年应补退的所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bnybtSdse; /** * 总机构分摊本年应补（退）所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zjgftbnybtsdse; /** * 财政集中分配本年应补（退）所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String czjzfpbnybtsdse; /** * 总机构主体生产经营部门分摊本年应补（退）所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String zjgztscjybmftbnybtsdse; /** * 以前年度多缴的所得税额在本年抵减额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yqnddjSdseBndje; /** * 以前年度应缴未缴在本年入库所得税额 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yqndYjwjzbnrksdse; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createBy; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; } 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 4230ca7..16c4619 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 @@ -1,12 +1,16 @@ 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 com.fasterxml.jackson.annotation.JsonProperty; +import com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @@ -29,55 +33,71 @@ public class CrmQyxxfp implements Serializable { /** * 年度 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nd; /** * 销项不含税金额 */ + @JsonProperty("xxbhsje") + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String xxBhsje; /** * 销项税额 */ + @JsonProperty("xxse") + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String xxSe; /** * 销项价税合计 */ + @JsonProperty("xxjshj") + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String xxJshj; /** * 销项年开票数量 */ + @JsonProperty("xxkpsl") + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String xxKpsl; /** * 销项年最大开票额 */ + @JsonProperty("xxzdkpe") + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String xxZdkpe; /** * 社会信用代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String shxydm; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createBy; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; } 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 bbdc711..eb37dde 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 @@ -1,12 +1,15 @@ 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 com.kakarote.core.security.converter.SensitiveDataConverter; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.util.Date; @@ -29,70 +32,84 @@ public class CrmSwjg implements Serializable { /** * 税务机关名称 */ - private String wjgmc; + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) + private String swjgmc; /** * 税务机关代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String swjgDm; /** * 税务机关简称 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String swjgjc; /** * 上级税务机关代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String sjswjgDm; /** * 机构级次代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jgjcDm; /** * 行政区划数字代码 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String xzqhszDm; /** * 选用标志 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String xybz; /** * 有效标志 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String yxbz; /** * 办税服务厅标志 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String bsfwtbz; /** * 客户标志 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String ghbz; /** * 创建时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date createTime; /** * 创建人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String createBy; /** * 更新时间 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private Date updateTime; /** * 更新人 */ + @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String updateBy; } 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 fecc5b9..6be7734 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 @@ -1,5 +1,6 @@ package com.kakarote.crm.entity.VO; +import com.fasterxml.jackson.annotation.JsonProperty; import com.kakarote.crm.entity.PO.CrmQyjxfp; import com.kakarote.crm.entity.PO.CrmQyxxfp; import lombok.Data; @@ -10,8 +11,8 @@ import java.util.List; public class CrmMergeListVO { //企业进项发票集合 - private List qyjxfpList; + private List jxfpList; //企业销项发票集合 - private List qyxxfpList; + private List xxfpList; } 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 5699842..164c910 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 @@ -5,10 +5,13 @@ - + + + + diff --git a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQynsrdjMapper.xml b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQynsrdjMapper.xml index b0e8e39..112a71a 100644 --- a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQynsrdjMapper.xml +++ b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmQynsrdjMapper.xml @@ -5,7 +5,7 @@ - + diff --git a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmSwjgMapper.xml b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmSwjgMapper.xml index bfb313b..074ce93 100644 --- a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmSwjgMapper.xml +++ b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmSwjgMapper.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 650e160..41fa46c 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmNsrzgService.java @@ -1,5 +1,6 @@ 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 java.util.List; @@ -50,4 +51,11 @@ public interface ICrmNsrzgService extends BaseService { * @return */ CrmNsrzg getNsrzgByDjxh(String djxh); + + /** + * 根据登记序号查询纳税人资格信息(WebService) + * @param crmSyncNsrzgDTO + * @return + */ + List syncDataByDjxh(CrmSyncNsrzgDTO crmSyncNsrzgDTO) throws Exception; } 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 bc235d8..40d5754 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQycbrsService.java @@ -1,6 +1,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; @@ -53,4 +54,11 @@ public interface ICrmQycbrsService extends BaseService { * @return */ List getQycbrsListByDjxhAndTime(CrmParamAndTimeVO vo); + + /** + * 根据登记序号和月份(选填)查询企业参保人数信息列表(WebService) + * @param crmSyncQycbrsDTO + * @return + */ + List syncDataByDjxhAndYf(CrmSyncQycbrsDTO crmSyncQycbrsDTO) throws Exception; } 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 823888c..13bed51 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyfxmxService.java @@ -1,6 +1,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; @@ -54,4 +55,12 @@ public interface ICrmQyfxmxService extends BaseService { * @return */ List getQyfxmxListByDjxhAndTime(CrmParamAndTimeVO vo); + + + /** + * 通过登记序号和评价年度查询企业风险明细信息列表 + * @param crmSyncQyfxmxDTO + * @return + */ + List syncDataByDjxhAndPjnd(CrmSyncQyfxmxDTO crmSyncQyfxmxDTO) throws Exception; } diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjbxxService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjbxxService.java index c28cfe5..4c1f598 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjbxxService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjbxxService.java @@ -3,6 +3,7 @@ package com.kakarote.crm.service; //借鉴 import com.kakarote.core.servlet.BaseService; import com.kakarote.crm.entity.BO.QyjbxxBo; +import com.kakarote.crm.entity.DTO.CrmSyncQyjbxxDTO; import com.kakarote.crm.entity.PO.CrmQyjbxx; import java.util.List; @@ -53,4 +54,12 @@ public interface ICrmQyjbxxService extends BaseService { * @return */ List getQyjbxxList(CrmQyjbxx crmQyjbxx); + + /** + * 根据税务机关代码和起止时间查询企业基本信息列表 + * @param crmSyncQyjbxxDTO + * @return + */ + List syncDataBySwjgdmAndTime(CrmSyncQyjbxxDTO crmSyncQyjbxxDTO) 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 fa2d824..4129d8b 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQyjxfpService.java @@ -1,6 +1,7 @@ package com.kakarote.crm.service; 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; @@ -55,4 +56,12 @@ public interface ICrmQyjxfpService extends BaseService { * @return */ CrmMergeListVO getMergeListByShxydmAndTime(CrmParamAndTimeVO vo); + + /** + * 通过社会信用代码,查询企业进项发票和企业销项发票信息列表(WebService) + * @param dto + * @return + */ + CrmMergeListVO syncDataByShxydm(CrmSyncQyjxfpAndQyxxfpDTO dto) 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 8ee38ca..7eab4c5 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQynsrdjService.java @@ -1,6 +1,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; @@ -54,4 +55,11 @@ public interface ICrmQynsrdjService extends BaseService { * @return */ List getQynsrdjListByDjxhAndTime(CrmParamAndTimeVO vo); + + /** + * 根据登记序号和评价年度查询 + * @param crmSyncDataQynsrdjDTO + * @return + */ + CrmQynsrdj syncDataByDjxhAndPjnd(CrmSyncDataQynsrdjDTO crmSyncDataQynsrdjDTO) 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 a14b979..9baf438 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmQysdsndsbService.java @@ -2,6 +2,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; @@ -56,4 +57,12 @@ public interface ICrmQysdsndsbService extends BaseService { * @return */ List getQysdsndsbListByDjxhAndTime(CrmParamAndTimeVO vo); + + + /** + * 根据登记序号以及年度，同步WebService数据至数据库 + * @param crmSyncQysdsndsbDTO + * @return + */ + List syncDataByDjxhAndNd(CrmSyncQysdsndsbDTO crmSyncQysdsndsbDTO) throws Exception; } 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 4240c5c..3814258 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmSwjgService.java @@ -1,6 +1,7 @@ package com.kakarote.crm.service; import com.kakarote.core.servlet.BaseService; +import com.kakarote.crm.entity.DTO.CrmSyncSwjgDTO; import com.kakarote.crm.entity.PO.CrmSwjg; import java.util.List; @@ -47,4 +48,11 @@ public interface ICrmSwjgService extends BaseService { * @return */ CrmSwjg getSwjgBySwjgDm(String swjgDm); + + /** + * 根据税务机构代码同步WebService数据至数据库 + * @param crmSyncSwjgDTO + * @return 同步结果报告 + */ + List syncDataBySwjgDmAndSjswjgDm(CrmSyncSwjgDTO crmSyncSwjgDTO) throws Exception; } 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 29fd5e4..dff3e02 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 @@ -1,25 +1,39 @@ 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.servlet.BaseServiceImpl; +import com.kakarote.crm.entity.DTO.CrmSyncNsrzgDTO; +import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.entity.PO.CrmNsrzg; import com.kakarote.crm.entity.PO.CrmQyjbxx; import com.kakarote.crm.mapper.CrmNsrzgMapper; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmNsrzgService; +import com.kakarote.crm.util.AecUtils; +import com.kakarote.crm.util.JsonUtil; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; @Service public class CrmNsrzgServiceImpl extends BaseServiceImpl implements ICrmNsrzgService { + @Autowired private CrmNsrzgMapper crmNsrzgMapper; @Autowired private CrmQyjbxxMapper crmQyjbxxMapper; + @Autowired + private TaxWebServiceConfig config; + @Override public CrmNsrzg getNsrzg(Integer nsrdjzgId) { return crmNsrzgMapper.selectById(nsrdjzgId); @@ -70,4 +84,39 @@ public class CrmNsrzgServiceImpl extends BaseServiceImpl syncDataByDjxh(CrmSyncNsrzgDTO crmSyncNsrzgDTO) throws Exception { + + Body object = new Body(); + object.setSid("JXSW.DZSWJ.CSXT.NSRZGRDXXCX"); + object.setParams(crmSyncNsrzgDTO.toString()); + + String sid = object.getSid (); + System.out.println("config:"+config.getEtaxServiceUrl()); + System.out.println("config:"+config.getAecEncryptKey()); + String requestXml = WebServiceUtil.createRequestXml (sid, object.getParams (), config); + + System.out.println ("requestXml = " + requestXml); + + String response = WebServiceUtil.getEtaxService (config).doService (sid, requestXml); + + System.out.println ("response = " + response); + + XmlService service = WebServiceUtil.getResponse (response); + + String respJson = AecUtils.decrypt (service.getBody (), config.getAecEncryptKey ()); + + System.out.println ("respJson = " + respJson); + + CrmWebServiceResponseDTO> dto = JsonUtil.toObject(respJson, new TypeReference>>() {}); + + List crmNsrzgList = dto.getData(); + + crmNsrzgList.forEach(crmNsrzg -> { + crmNsrzgMapper.insert(crmNsrzg); + }); + + return crmNsrzgList; + } } 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 f586cdf..9416ddc 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,13 +1,22 @@ 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.servlet.BaseServiceImpl; +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.mapper.CrmQycbrsMapper; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmQycbrsService; +import com.kakarote.crm.util.AecUtils; +import com.kakarote.crm.util.JsonUtil; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +32,9 @@ public class CrmQycbrsServiceImpl extends BaseServiceImpl syncDataByDjxhAndYf(CrmSyncQycbrsDTO crmSyncQycbrsDTO) throws Exception { + + Body object = new Body(); + object.setSid("JXSW.DZSWJ.CSXT.QYCBRSCX"); + object.setParams(crmSyncQycbrsDTO.toString()); + + String sid = object.getSid (); + System.out.println("config:"+config.getEtaxServiceUrl()); + System.out.println("config:"+config.getAecEncryptKey()); + String requestXml = WebServiceUtil.createRequestXml (sid, object.getParams (), config); + + System.out.println ("requestXml = " + requestXml); + + String response = WebServiceUtil.getEtaxService (config).doService (sid, requestXml); + + System.out.println ("response = " + response); + + XmlService service = WebServiceUtil.getResponse (response); + + String respJson = AecUtils.decrypt (service.getBody (), config.getAecEncryptKey ()); + + System.out.println ("respJson = " + respJson); + + CrmWebServiceResponseDTO> dto = JsonUtil.toObject(respJson, new TypeReference>>() {}); + + List qycbrsList = dto.getData(); + + qycbrsList.forEach(qycbrs -> { + crmQycbrsMapper.insert(qycbrs); + }); + + return qycbrsList; + } } 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 9379087..864cc55 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 @@ -1,13 +1,25 @@ package com.kakarote.crm.service.impl; +import cn.hutool.core.date.DateTime; +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.BO.CrmQueryQyfxmxBO; +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.mapper.CrmQyfxmxMapper; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmQyfxmxService; +import com.kakarote.crm.util.AecUtils; +import com.kakarote.crm.util.JsonUtil; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +35,9 @@ public class CrmQyfxmxServiceImpl extends BaseServiceImpl syncDataByDjxhAndPjnd(CrmSyncQyfxmxDTO crmSyncQyfxmxDTO) throws Exception { + + Body object = new Body(); + object.setSid("JXSW.DZSWJ.CSXT.QYTSFXMXCX"); + + String year = crmSyncQyfxmxDTO.getPjnd(); + + DateTime fxscsjq = DateUtil.beginOfYear(DateUtil.parse(year + "-01-01")); + String fxscsjqStr = fxscsjq.toString("yyyy-MM-dd"); + DateTime fxscsjz = DateUtil.endOfYear(DateUtil.parse(year + "-01-01")); + String fxscsjzStr = fxscsjz.toString("yyyy-MM-dd"); + + String djxh = crmSyncQyfxmxDTO.getDjxh(); + + CrmQueryQyfxmxBO bo = new CrmQueryQyfxmxBO(djxh,fxscsjqStr,fxscsjzStr); + + object.setParams(bo.toString()); + + String sid = object.getSid (); + System.out.println("config:"+config.getEtaxServiceUrl()); + System.out.println("config:"+config.getAecEncryptKey()); + String requestXml = WebServiceUtil.createRequestXml (sid, object.getParams (), config); + + System.out.println ("requestXml = " + requestXml); + + String response = WebServiceUtil.getEtaxService (config).doService (sid, requestXml); + + System.out.println ("response = " + response); + + XmlService service = WebServiceUtil.getResponse (response); + + String respJson = AecUtils.decrypt (service.getBody (), config.getAecEncryptKey ()); + + System.out.println ("respJson = " + respJson); + + CrmWebServiceResponseDTO> dto = JsonUtil.toObject(respJson, new TypeReference>>() {}); + + List qyfxmxLsit = dto.getData(); + + qyfxmxLsit.forEach(qyfxmx -> { + crmQyfxmxMapper.insert(qyfxmx); + }); + + return qyfxmxLsit; + } + @Override public List getQyfxmxListByNsrsbhAndTime(CrmParamAndTimeVO vo) { diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjbxxServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjbxxServiceImpl.java index 70404fd..b9e3b2a 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjbxxServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmQyjbxxServiceImpl.java @@ -1,27 +1,33 @@ package com.kakarote.crm.service.impl; import cn.hutool.core.util.StrUtil; -import com.aliyun.oss.ServiceException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import com.kakarote.core.exception.CrmException; -import com.kakarote.core.feign.crm.service.CrmService; +import com.fasterxml.jackson.core.type.TypeReference; import com.kakarote.core.redis.RedisImpl; import com.kakarote.core.servlet.BaseServiceImpl; import com.kakarote.crm.common.CrmModel; import com.kakarote.crm.entity.BO.QyjbxxBo; +import com.kakarote.crm.entity.DTO.CrmSyncQyjbxxDTO; +import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.entity.PO.CrmQyjbxx; +import com.kakarote.crm.entity.PO.CrmQyjbxxDjrqDetail; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.service.ICrmCustomerService; import com.kakarote.crm.service.ICrmQyjbxxService; +import com.kakarote.crm.util.AecUtils; +import com.kakarote.crm.util.JsonUtil; +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 lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; -import static com.kakarote.core.common.SystemCodeEnum.SYSTEM_NO_VALID; - @Slf4j @Service public class CrmQyjbxxServiceImpl extends BaseServiceImpl implements ICrmQyjbxxService { @@ -31,6 +37,9 @@ public class CrmQyjbxxServiceImpl extends BaseServiceImpl crmQyjbxxQueryWrapper = new QueryWrapper<>(); return crmQyjbxxMapper.selectList(crmQyjbxxQueryWrapper); } + + + @Override + public List syncDataBySwjgdmAndTime(CrmSyncQyjbxxDTO crmSyncQyjbxxDTO) throws Exception { + + Body object = new Body(); + object.setSid("JXSW.DZSWJ.CSXT.QYJBXXCX"); + object.setParams(crmSyncQyjbxxDTO.toString()); + + String sid = object.getSid (); + System.out.println("config:"+config.getEtaxServiceUrl()); + System.out.println("config:"+config.getAecEncryptKey()); + String requestXml = WebServiceUtil.createRequestXml (sid, object.getParams (), config); + + System.out.println ("requestXml = " + requestXml); + + String response = WebServiceUtil.getEtaxService (config).doService (sid, requestXml); + + System.out.println ("response = " + response); + + XmlService service = WebServiceUtil.getResponse (response); + + String respJson = AecUtils.decrypt (service.getBody (), config.getAecEncryptKey ()); + + System.out.println ("respJson = " + respJson); + + CrmWebServiceResponseDTO> dto = JsonUtil.toObject(respJson, new TypeReference>>() {}); + + List crmQyjbxxDjrqDetailList = dto.getData(); + + List crmQyjbxxList = new ArrayList<>(); + + crmQyjbxxDjrqDetailList.forEach(crmQyjbxxDjrqDetail -> { + // 1.将crmQyjbxxDjrqDetail中的djrqDetail转成字符串 + String djrq = phraseDjrq(crmQyjbxxDjrqDetail); + // 2.设置父类djrq属性 + crmQyjbxxDjrqDetail.setDjrq(djrq); + // 3.插入数据表 + crmQyjbxxMapper.insert(crmQyjbxxDjrqDetail); + // 4.加入crmQyjbxxList集合 + crmQyjbxxList.add(crmQyjbxxDjrqDetail); + }); + + return crmQyjbxxList; + } + + // 将crmQyjbxxDjrqDetail中的djrqDetail转成字符串 + private String phraseDjrq(CrmQyjbxxDjrqDetail crmQyjbxxDjrqDetail){ + + int year = Integer.parseInt(crmQyjbxxDjrqDetail.getDjrqDetail().getYear()) + 1900; + int month = Integer.parseInt(crmQyjbxxDjrqDetail.getDjrqDetail().getMonth()) + 1; + int date = Integer.parseInt(crmQyjbxxDjrqDetail.getDjrqDetail().getDate()); + int hours = Integer.parseInt(crmQyjbxxDjrqDetail.getDjrqDetail().getHours()); + int minutes = Integer.parseInt(crmQyjbxxDjrqDetail.getDjrqDetail().getMinutes()); + int seconds = Integer.parseInt(crmQyjbxxDjrqDetail.getDjrqDetail().getSeconds()); + + String formattedDate = String.format( + "%04d-%02d-%02d %02d:%02d:%02d", + year, month, date, hours, minutes, seconds + ); + + return formattedDate; + } } 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 7e9fb86..49772ed 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,7 +1,11 @@ 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.servlet.BaseServiceImpl; +import com.kakarote.crm.entity.BO.CrmAddMergeListBO; +import com.kakarote.crm.entity.DTO.CrmSyncQyjxfpAndQyxxfpDTO; +import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.entity.PO.CrmQyjbxx; import com.kakarote.crm.entity.PO.CrmQyjxfp; import com.kakarote.crm.entity.PO.CrmQyxxfp; @@ -11,6 +15,12 @@ import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.mapper.CrmQyjxfpMapper; import com.kakarote.crm.service.ICrmQyjxfpService; import com.kakarote.crm.service.ICrmQyxxfpService; +import com.kakarote.crm.util.AecUtils; +import com.kakarote.crm.util.JsonUtil; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collections; @@ -28,6 +38,9 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl qyxxfpList = crmQyxxfpService.getQyxxfpListByShxydmAndTime(vo); - mergeListVO.setQyxxfpList(qyxxfpList); + mergeListVO.setXxfpList(qyxxfpList); return mergeListVO; } @@ -145,17 +158,63 @@ public class CrmQyjxfpServiceImpl extends BaseServiceImpl qyxxfpList = crmQyxxfpService.getQyxxfpListByNsrsbhAndTime(vo); - mergeListVO.setQyxxfpList(qyxxfpList); + mergeListVO.setXxfpList(qyxxfpList); + + return mergeListVO; + } + + @Override + public CrmMergeListVO syncDataByShxydm(CrmSyncQyjxfpAndQyxxfpDTO dto) throws Exception { + + Body object = new Body(); + object.setSid("JXSW.DZSWJ.CSXT.CXFPHZXX"); + object.setParams(dto.toString()); + + String sid = object.getSid (); + System.out.println("config:"+config.getEtaxServiceUrl()); + System.out.println("config:"+config.getAecEncryptKey()); + String requestXml = WebServiceUtil.createRequestXml (sid, object.getParams (), config); + + System.out.println ("requestXml = " + requestXml); + + String response = WebServiceUtil.getEtaxService (config).doService (sid, requestXml); + + System.out.println ("response = " + response); + + XmlService service = WebServiceUtil.getResponse (response); + + String respJson = AecUtils.decrypt (service.getBody (), config.getAecEncryptKey ()); + + System.out.println ("respJson = " + respJson); + + CrmWebServiceResponseDTO responseDTO = JsonUtil.toObject(respJson, new TypeReference>() {}); + + CrmAddMergeListBO mergeListBO = responseDTO.getData(); + + List jxhzList = mergeListBO.getJxhzList(); + List xxhzList = mergeListBO.getXxhzList(); + + jxhzList.forEach(qyjxfp -> { + crmQyjxfpMapper.insert(qyjxfp); + }); + + xxhzList.forEach(qyxxfp -> { + crmQyxxfpService.insertQyxxfp(qyxxfp); + }); + + CrmMergeListVO mergeListVO = new CrmMergeListVO(); + mergeListVO.setJxfpList(jxhzList); + mergeListVO.setXxfpList(xxhzList); 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 77365c5..c1f22e0 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,13 +1,22 @@ 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.servlet.BaseServiceImpl; +import com.kakarote.crm.entity.DTO.CrmSyncDataQynsrdjDTO; import com.kakarote.crm.entity.PO.CrmQyjbxx; import com.kakarote.crm.entity.PO.CrmQynsrdj; import com.kakarote.crm.entity.VO.CrmParamAndTimeVO; +import com.kakarote.crm.entity.DTO.CrmWebServiceResponseDTO; import com.kakarote.crm.mapper.CrmQyjbxxMapper; import com.kakarote.crm.mapper.CrmQynsrdjMapper; import com.kakarote.crm.service.ICrmQynsrdjService; +import com.kakarote.crm.util.AecUtils; +import com.kakarote.crm.util.JsonUtil; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +32,9 @@ public class CrmQynsrdjServiceImpl extends BaseServiceImpl