From 4e888f7a6de59eb1b56d20995882301f29d4a53a Mon Sep 17 00:00:00 2001 From: dengliangliang Date: Thu, 11 Dec 2025 14:29:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=A3=80=E6=8C=87=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E4=B8=BB=E7=AE=A1=E7=A8=8E=E5=8A=A1=E6=9C=BA=E5=85=B3=E5=92=8C?= =?UTF-8?q?=E7=A7=91=E5=88=86=E5=B1=80=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=BE=81?= =?UTF-8?q?=E6=94=B6=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=AD=97=E5=85=B8=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/controller/ZjzbdmVoController.java | 47 ++++++++++++ .../kakarote/crm/entity/DTO/ZjzbSwjgDTO.java | 24 +++++++ .../com/kakarote/crm/entity/VO/ZjzbHyVo.java | 2 +- .../kakarote/crm/entity/VO/ZjzbSwjgVo.java | 72 +++++++++++++++++++ .../kakarote/crm/entity/VO/ZjzbZsxmVo.java | 53 ++++++++++++++ .../com/kakarote/crm/entity/VO/ZjzbdlVo.java | 2 +- .../com/kakarote/crm/entity/VO/ZjzbdmVo.java | 2 +- .../com/kakarote/crm/entity/VO/ZjzbglfVo.java | 2 +- .../com/kakarote/crm/entity/VO/ZjzbxlVo.java | 2 +- .../kakarote/crm/mapper/ZjzbSwjgVoMapper.java | 12 ++++ .../kakarote/crm/mapper/ZjzbZsxmVoMapper.java | 12 ++++ .../crm/service/IZjzbSwjgVoService.java | 12 ++++ .../crm/service/IZjzbZsxmVoService.java | 12 ++++ .../service/impl/ZjzbSwjgVoServiceImpl.java | 16 +++++ .../service/impl/ZjzbZsxmVoServiceImpl.java | 16 +++++ 15 files changed, 281 insertions(+), 5 deletions(-) create mode 100644 crm/src/main/java/com/kakarote/crm/entity/DTO/ZjzbSwjgDTO.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbSwjgVo.java create mode 100644 crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbZsxmVo.java create mode 100644 crm/src/main/java/com/kakarote/crm/mapper/ZjzbSwjgVoMapper.java create mode 100644 crm/src/main/java/com/kakarote/crm/mapper/ZjzbZsxmVoMapper.java create mode 100644 crm/src/main/java/com/kakarote/crm/service/IZjzbSwjgVoService.java create mode 100644 crm/src/main/java/com/kakarote/crm/service/IZjzbZsxmVoService.java create mode 100644 crm/src/main/java/com/kakarote/crm/service/impl/ZjzbSwjgVoServiceImpl.java create mode 100644 crm/src/main/java/com/kakarote/crm/service/impl/ZjzbZsxmVoServiceImpl.java diff --git a/crm/src/main/java/com/kakarote/crm/controller/ZjzbdmVoController.java b/crm/src/main/java/com/kakarote/crm/controller/ZjzbdmVoController.java index 23fd505..c542d47 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/ZjzbdmVoController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/ZjzbdmVoController.java @@ -3,6 +3,7 @@ package com.kakarote.crm.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kakarote.core.common.R; import com.kakarote.core.common.Result; +import com.kakarote.crm.entity.DTO.ZjzbSwjgDTO; import com.kakarote.crm.entity.VO.*; import com.kakarote.crm.service.*; import io.swagger.annotations.Api; @@ -11,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -40,6 +42,12 @@ public class ZjzbdmVoController { @Autowired private IZjzbHyVoService zjzbHyVoService; + @Autowired + private IZjzbZsxmVoService zjzbZsxmVoService; + + @Autowired + private IZjzbSwjgVoService zjzbSwjgVoService; + @GetMapping("/page") @ApiOperation("分页查询") public Result> getZjzbdmVoPage(@RequestParam(defaultValue = "1") int pageNum, @@ -112,4 +120,43 @@ public class ZjzbdmVoController { return R.ok(zjzbHyVos); } + @GetMapping("/getZjzbZsxmVoList") + @ApiOperation("查询自检指标征收项目代码") + public Result> getZjzbZsxmVoList() { + List zjzbZsxmVos = zjzbZsxmVoService.lambdaQuery().eq(ZjzbZsxmVo::getYxbz,"Y").orderByAsc(ZjzbZsxmVo::getZsxmDm).list(); + return R.ok(zjzbZsxmVos); + } + + @GetMapping("/getZjzbSwjgVoList") + @ApiOperation("查询自检指标税务机关代码") + public Result> getZjzbSwjgVoList() { + List zjzbSwjgDTOS = new ArrayList<>(); + + //获取主管税务机关代码 + List zgswjgList = zjzbSwjgVoService.lambdaQuery() + .eq(ZjzbSwjgVo::getYxbz,"Y") + .eq(ZjzbSwjgVo::getJgjcDm,"41") + .eq(ZjzbSwjgVo::getSwjgbz,"0") + .orderByAsc(ZjzbSwjgVo::getSwjgDm) + .list(); + + //获取主管税务机关科分局代码 + for (ZjzbSwjgVo vo:zgswjgList){ + ZjzbSwjgDTO dto = new ZjzbSwjgDTO(); + List zgswjgkfjList = zjzbSwjgVoService.lambdaQuery() + .eq(ZjzbSwjgVo::getYxbz,"Y") + .eq(ZjzbSwjgVo::getBsfwtbz,"N") + .eq(ZjzbSwjgVo::getGhbz,"Y") + .eq(ZjzbSwjgVo::getSjswjgDm,vo.getSwjgDm()) + .orderByAsc(ZjzbSwjgVo::getSwjgDm) + .list(); + + dto.setZjzbSwjgVo(vo); + dto.setZjzbSwjgVos(zgswjgkfjList); + zjzbSwjgDTOS.add(dto); + } + + return R.ok(zjzbSwjgDTOS); + } + } \ No newline at end of file diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/ZjzbSwjgDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/ZjzbSwjgDTO.java new file mode 100644 index 0000000..5030a5f --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/ZjzbSwjgDTO.java @@ -0,0 +1,24 @@ +package com.kakarote.crm.entity.DTO; + +import com.kakarote.crm.entity.VO.ZjzbSwjgVo; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.List; + +/** + * @description: 自检指标税务机关DTO + * @Author: dengLL + * @CreateTime: 2025/12/10 + */ +@Setter +@Getter +public class ZjzbSwjgDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private ZjzbSwjgVo zjzbSwjgVo; + + private List zjzbSwjgVos; + +} \ No newline at end of file diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbHyVo.java b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbHyVo.java index 238a464..19a90f3 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbHyVo.java +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbHyVo.java @@ -17,7 +17,7 @@ import java.io.Serializable; */ @Setter @Getter -@TableName("zj_zb_hy") +@TableName("wk_crm_zjzbhy") public class ZjzbHyVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbSwjgVo.java b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbSwjgVo.java new file mode 100644 index 0000000..a507fc8 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbSwjgVo.java @@ -0,0 +1,72 @@ +package com.kakarote.crm.entity.VO; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +/** + * @description: 自检指标税务机关 + * @Author: dengLL + * @CreateTime: 2025/12/10 + */ +@Setter +@Getter +@TableName("tax_swjg") +public class ZjzbSwjgVo implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "swjg_dm",type = IdType.NONE) + @ApiModelProperty(value = "税务机关代码") + private String swjgDm; + + @TableField(value = "swjgmc") + @ApiModelProperty(value = "税务机关名称") + private String swjgmc; + + @TableField(value = "swjgjc") + @ApiModelProperty(value = "简称") + private String swjgjc; + + @TableField(value = "swjgbz") + @ApiModelProperty(value = "机关标志") + private String swjgbz; + + @TableField(value = "sjswjg_dm") + @ApiModelProperty(value = "上级机关代码") + private String sjswjgDm; + + @TableField(value = "jgjc_dm") + @ApiModelProperty(value = "机构级别代码") + private String jgjcDm; + + @TableField(value = "xzqhsz_dm") + @ApiModelProperty(value = "行政区划代码") + private String xzqhszDm; + + @TableField(value = "xybz") + @ApiModelProperty(value = "选用标志") + private String xybz; + + @TableField(value = "yxbz") + @ApiModelProperty(value = "有效标志") + private String yxbz; + + @TableField(value = "bsfwtbz") + @ApiModelProperty(value = "办税服务厅标志") + private String bsfwtbz; + + @TableField(value = "ghbz") + @ApiModelProperty(value = "管户标志") + private String ghbz; + + @TableField(value = "gdslx_dm") + @ApiModelProperty(value = "国地税类型代码") + private String gdslxDm; + +} \ No newline at end of file diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbZsxmVo.java b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbZsxmVo.java new file mode 100644 index 0000000..c06dc3f --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbZsxmVo.java @@ -0,0 +1,53 @@ +package com.kakarote.crm.entity.VO; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.Date; + +/** + * @description: 自检指标征收项目 + * @Author: dengLL + * @CreateTime: 2025/12/10 + */ +@Setter +@Getter +@TableName("wk_crm_zsxm") +public class ZjzbZsxmVo implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "zsxm_dm",type = IdType.NONE) + @ApiModelProperty(value = "征收项目代码") + private String zsxmDm; + + @TableField(value = "zsxm_mc") + @ApiModelProperty(value = "征收项目名称") + private String zsxmMc; + + @TableField(value = "zsxm_jc") + @ApiModelProperty(value = "简称") + private String zsxmJc; + + @TableField(value = "yxbz") + @ApiModelProperty(value = "有效标志") + private String yxbz; + + @TableField(value = "yxqq") + @ApiModelProperty(value = "有效期起") + private Date yxqq; + + @TableField(value = "yxqz") + @ApiModelProperty(value = "有效期止") + private Date yxqz; + + @TableField(value = "sjzsxm_dm") + @ApiModelProperty(value = "上级征收项目代码") + private String sjzsxmDm; + +} \ No newline at end of file diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbdlVo.java b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbdlVo.java index 1173373..49c8e09 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbdlVo.java +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbdlVo.java @@ -17,7 +17,7 @@ import java.io.Serializable; */ @Setter @Getter -@TableName("zj_zb_dl") +@TableName("wk_crm_zjzbdl") public class ZjzbdlVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbdmVo.java b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbdmVo.java index 331d5d3..5dff65f 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbdmVo.java +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbdmVo.java @@ -17,7 +17,7 @@ import java.io.Serializable; */ @Getter @Setter -@TableName("zj_zb_dm") +@TableName("wk_crm_zjzbdm") public class ZjzbdmVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbglfVo.java b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbglfVo.java index dda0b05..c5c6c77 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbglfVo.java +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbglfVo.java @@ -17,7 +17,7 @@ import java.io.Serializable; */ @Setter @Getter -@TableName("zj_zb_glf") +@TableName("wk_crm_zjzbglf") public class ZjzbglfVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbxlVo.java b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbxlVo.java index 670809c..1b89116 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbxlVo.java +++ b/crm/src/main/java/com/kakarote/crm/entity/VO/ZjzbxlVo.java @@ -17,7 +17,7 @@ import java.io.Serializable; */ @Setter @Getter -@TableName("zj_zb_xl") +@TableName("wk_crm_zjzbxl") public class ZjzbxlVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/crm/src/main/java/com/kakarote/crm/mapper/ZjzbSwjgVoMapper.java b/crm/src/main/java/com/kakarote/crm/mapper/ZjzbSwjgVoMapper.java new file mode 100644 index 0000000..573387e --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/mapper/ZjzbSwjgVoMapper.java @@ -0,0 +1,12 @@ +package com.kakarote.crm.mapper; + +import com.kakarote.core.servlet.BaseMapper; +import com.kakarote.crm.entity.VO.ZjzbSwjgVo; + +/** + * @description: 自检指标税务机关 + * @Author: dengLL + * @CreateTime: 2025/12/11 + */ +public interface ZjzbSwjgVoMapper extends BaseMapper { +} diff --git a/crm/src/main/java/com/kakarote/crm/mapper/ZjzbZsxmVoMapper.java b/crm/src/main/java/com/kakarote/crm/mapper/ZjzbZsxmVoMapper.java new file mode 100644 index 0000000..4c1345a --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/mapper/ZjzbZsxmVoMapper.java @@ -0,0 +1,12 @@ +package com.kakarote.crm.mapper; + +import com.kakarote.core.servlet.BaseMapper; +import com.kakarote.crm.entity.VO.ZjzbZsxmVo; + +/** + * @description: 自检指标征收项目 + * @Author: dengLL + * @CreateTime: 2025/12/11 + */ +public interface ZjzbZsxmVoMapper extends BaseMapper { +} diff --git a/crm/src/main/java/com/kakarote/crm/service/IZjzbSwjgVoService.java b/crm/src/main/java/com/kakarote/crm/service/IZjzbSwjgVoService.java new file mode 100644 index 0000000..a48c095 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/service/IZjzbSwjgVoService.java @@ -0,0 +1,12 @@ +package com.kakarote.crm.service; + +import com.kakarote.core.servlet.BaseService; +import com.kakarote.crm.entity.VO.ZjzbSwjgVo; + +/** + * @description: 自检指标税务机关 + * @Author: dengLL + * @CreateTime: 2025/12/11 + */ +public interface IZjzbSwjgVoService extends BaseService { +} diff --git a/crm/src/main/java/com/kakarote/crm/service/IZjzbZsxmVoService.java b/crm/src/main/java/com/kakarote/crm/service/IZjzbZsxmVoService.java new file mode 100644 index 0000000..dc8d20e --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/service/IZjzbZsxmVoService.java @@ -0,0 +1,12 @@ +package com.kakarote.crm.service; + +import com.kakarote.core.servlet.BaseService; +import com.kakarote.crm.entity.VO.ZjzbZsxmVo; + +/** + * @description: 自检指标征收项目 + * @Author: dengLL + * @CreateTime: 2025/12/11 + */ +public interface IZjzbZsxmVoService extends BaseService { +} diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/ZjzbSwjgVoServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/ZjzbSwjgVoServiceImpl.java new file mode 100644 index 0000000..840e928 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/service/impl/ZjzbSwjgVoServiceImpl.java @@ -0,0 +1,16 @@ +package com.kakarote.crm.service.impl; + +import com.kakarote.core.servlet.BaseServiceImpl; +import com.kakarote.crm.entity.VO.ZjzbSwjgVo; +import com.kakarote.crm.mapper.ZjzbSwjgVoMapper; +import com.kakarote.crm.service.IZjzbSwjgVoService; +import org.springframework.stereotype.Service; + +/** + * @description: 自检指标税务机关 + * @Author: dengLL + * @CreateTime: 2025/12/11 + */ +@Service +public class ZjzbSwjgVoServiceImpl extends BaseServiceImpl implements IZjzbSwjgVoService { +} \ No newline at end of file diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/ZjzbZsxmVoServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/ZjzbZsxmVoServiceImpl.java new file mode 100644 index 0000000..73627b9 --- /dev/null +++ b/crm/src/main/java/com/kakarote/crm/service/impl/ZjzbZsxmVoServiceImpl.java @@ -0,0 +1,16 @@ +package com.kakarote.crm.service.impl; + +import com.kakarote.core.servlet.BaseServiceImpl; +import com.kakarote.crm.entity.VO.ZjzbZsxmVo; +import com.kakarote.crm.mapper.ZjzbZsxmVoMapper; +import com.kakarote.crm.service.IZjzbZsxmVoService; +import org.springframework.stereotype.Service; + +/** + * @description: 自检指标征收项目 + * @Author: dengLL + * @CreateTime: 2025/12/11 + */ +@Service +public class ZjzbZsxmVoServiceImpl extends BaseServiceImpl implements IZjzbZsxmVoService { +} \ No newline at end of file