From c632b4c7043e04df3bf8b29703463405d9ef537f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?= <10549902+zhuangruibo@user.noreply.gitee.com> Date: Sat, 18 Apr 2026 00:00:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/ComplaintItemController.java | 105 ++++++ ...nforcementInspectionProgramController.java | 105 ++++++ .../EnforcementRegistrationController.java | 105 ++++++ .../enforcementcode/domain/ComplaintItem.java | 46 +++ .../domain/EnforcementInspectionProgram.java | 108 ++++++ .../domain/EnforcementRegistration.java | 283 +++++++++++++++ .../domain/bo/ComplaintItemBo.java | 45 +++ .../bo/EnforcementInspectionProgramBo.java | 107 ++++++ .../domain/bo/EnforcementRegistrationBo.java | 284 +++++++++++++++ .../domain/vo/ComplaintItemVo.java | 56 +++ .../vo/EnforcementInspectionProgramVo.java | 130 +++++++ .../domain/vo/EnforcementRegistrationVo.java | 341 ++++++++++++++++++ .../mapper/ComplaintItemMapper.java | 15 + .../EnforcementInspectionProgramMapper.java | 15 + .../mapper/EnforcementRegistrationMapper.java | 15 + .../service/IComplaintItemService.java | 68 ++++ .../IEnforcementInspectionProgramService.java | 68 ++++ .../IEnforcementRegistrationService.java | 68 ++++ .../impl/ComplaintItemServiceImpl.java | 134 +++++++ ...forcementInspectionProgramServiceImpl.java | 146 ++++++++ .../EnforcementRegistrationServiceImpl.java | 180 +++++++++ .../enforcementcode/ComplaintItemMapper.xml | 6 + .../EnforcementInspectionProgramMapper.xml | 6 + .../EnforcementRegistrationMapper.xml | 6 + .../src/api/enterprise/index.js | 3 + 25 files changed, 2445 insertions(+) create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/ComplaintItemController.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementInspectionProgramController.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementRegistrationController.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/ComplaintItem.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementInspectionProgram.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/ComplaintItemBo.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementInspectionProgramBo.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/ComplaintItemVo.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementInspectionProgramVo.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/ComplaintItemMapper.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementInspectionProgramMapper.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintItemService.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementInspectionProgramService.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintItemServiceImpl.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementInspectionProgramServiceImpl.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComplaintItemMapper.xml create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml create mode 100644 ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/ComplaintItemController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/ComplaintItemController.java new file mode 100644 index 00000000..dda2f70d --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/ComplaintItemController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller.web.supervision; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import com.zdxt.enforcementcode.domain.vo.ComplaintItemVo; +import com.zdxt.enforcementcode.domain.bo.ComplaintItemBo; +import com.zdxt.enforcementcode.service.IComplaintItemService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 投诉事项 + * + * @author Lion Li + * @date 2026-04-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/web/supervision/complaintitem") +public class ComplaintItemController extends BaseController { + + private final IComplaintItemService complaintItemService; + + /** + * 查询投诉事项列表 + */ + @SaCheckPermission("enforcementcode:item:list") + @GetMapping("/list") + public TableDataInfo list(ComplaintItemBo bo, PageQuery pageQuery) { + return complaintItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出投诉事项列表 + */ + @SaCheckPermission("enforcementcode:item:export") + @Log(title = "投诉事项", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ComplaintItemBo bo, HttpServletResponse response) { + List list = complaintItemService.queryList(bo); + ExcelUtil.exportExcel(list, "投诉事项", ComplaintItemVo.class, response); + } + + /** + * 获取投诉事项详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:item:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(complaintItemService.queryById(id)); + } + + /** + * 新增投诉事项 + */ + @SaCheckPermission("enforcementcode:item:add") + @Log(title = "投诉事项", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ComplaintItemBo bo) { + return toAjax(complaintItemService.insertByBo(bo)); + } + + /** + * 修改投诉事项 + */ + @SaCheckPermission("enforcementcode:item:edit") + @Log(title = "投诉事项", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ComplaintItemBo bo) { + return toAjax(complaintItemService.updateByBo(bo)); + } + + /** + * 删除投诉事项 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:item:remove") + @Log(title = "投诉事项", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(complaintItemService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementInspectionProgramController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementInspectionProgramController.java new file mode 100644 index 00000000..4a0f342d --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementInspectionProgramController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller.web.supervision; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import com.zdxt.enforcementcode.domain.vo.EnforcementInspectionProgramVo; +import com.zdxt.enforcementcode.domain.bo.EnforcementInspectionProgramBo; +import com.zdxt.enforcementcode.service.IEnforcementInspectionProgramService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 执法检查计划 + * + * @author Lion Li + * @date 2026-04-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/web/supervision/inspectionProgram") +public class EnforcementInspectionProgramController extends BaseController { + + private final IEnforcementInspectionProgramService enforcementInspectionProgramService; + + /** + * 查询执法检查计划列表 + */ + @SaCheckPermission("enforcementcode:inspectionProgram:list") + @GetMapping("/list") + public TableDataInfo list(EnforcementInspectionProgramBo bo, PageQuery pageQuery) { + return enforcementInspectionProgramService.queryPageList(bo, pageQuery); + } + + /** + * 导出执法检查计划列表 + */ + @SaCheckPermission("enforcementcode:inspectionProgram:export") + @Log(title = "执法检查计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EnforcementInspectionProgramBo bo, HttpServletResponse response) { + List list = enforcementInspectionProgramService.queryList(bo); + ExcelUtil.exportExcel(list, "执法检查计划", EnforcementInspectionProgramVo.class, response); + } + + /** + * 获取执法检查计划详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:inspectionProgram:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(enforcementInspectionProgramService.queryById(id)); + } + + /** + * 新增执法检查计划 + */ + @SaCheckPermission("enforcementcode:inspectionProgram:add") + @Log(title = "执法检查计划", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EnforcementInspectionProgramBo bo) { + return toAjax(enforcementInspectionProgramService.insertByBo(bo)); + } + + /** + * 修改执法检查计划 + */ + @SaCheckPermission("enforcementcode:inspectionProgram:edit") + @Log(title = "执法检查计划", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EnforcementInspectionProgramBo bo) { + return toAjax(enforcementInspectionProgramService.updateByBo(bo)); + } + + /** + * 删除执法检查计划 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:inspectionProgram:remove") + @Log(title = "执法检查计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(enforcementInspectionProgramService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementRegistrationController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementRegistrationController.java new file mode 100644 index 00000000..fae197dc --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnforcementRegistrationController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller.web.supervision; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.service.IEnforcementRegistrationService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 企业端-执法登记记录 + * + * @author Lion Li + * @date 2026-04-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/web/supervision/registration") +public class EnforcementRegistrationController extends BaseController { + + private final IEnforcementRegistrationService enforcementRegistrationService; + + /** + * 查询企业端-执法登记记录列表 + */ + @SaCheckPermission("enforcementcode:registration:list") + @GetMapping("/list") + public TableDataInfo list(EnforcementRegistrationBo bo, PageQuery pageQuery) { + return enforcementRegistrationService.queryPageList(bo, pageQuery); + } + + /** + * 导出企业端-执法登记记录列表 + */ + @SaCheckPermission("enforcementcode:registration:export") + @Log(title = "企业端-执法登记记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EnforcementRegistrationBo bo, HttpServletResponse response) { + List list = enforcementRegistrationService.queryList(bo); + ExcelUtil.exportExcel(list, "企业端-执法登记记录", EnforcementRegistrationVo.class, response); + } + + /** + * 获取企业端-执法登记记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:registration:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(enforcementRegistrationService.queryById(id)); + } + + /** + * 新增企业端-执法登记记录 + */ + @SaCheckPermission("enforcementcode:registration:add") + @Log(title = "企业端-执法登记记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EnforcementRegistrationBo bo) { + return toAjax(enforcementRegistrationService.insertByBo(bo)); + } + + /** + * 修改企业端-执法登记记录 + */ + @SaCheckPermission("enforcementcode:registration:edit") + @Log(title = "企业端-执法登记记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EnforcementRegistrationBo bo) { + return toAjax(enforcementRegistrationService.updateByBo(bo)); + } + + /** + * 删除企业端-执法登记记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:registration:remove") + @Log(title = "企业端-执法登记记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(enforcementRegistrationService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/ComplaintItem.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/ComplaintItem.java new file mode 100644 index 00000000..088af838 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/ComplaintItem.java @@ -0,0 +1,46 @@ +package com.zdxt.enforcementcode.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 投诉事项对象 complaint_item + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("complaint_item") +public class ComplaintItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 投诉事项编码 + */ + private String complaintItemCode; + + /** + * 投诉事项名称 + */ + private String complaintItemName; + + /** + * 执法主体名称 + */ + private String subName; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementInspectionProgram.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementInspectionProgram.java new file mode 100644 index 00000000..91028e38 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementInspectionProgram.java @@ -0,0 +1,108 @@ +package com.zdxt.enforcementcode.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 执法检查计划对象 enforcement_inspection_program + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("enforcement_inspection_program") +public class EnforcementInspectionProgram extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 计划年度 + */ + private String planYear; + + /** + * 计划名称 + */ + private String planName; + + /** + * 执法部门 + */ + private String enforcementDepartment; + + /** + * 执法部门ID + */ + private String enforcementDepartmentId; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 执法区域 + */ + private String enforcementArea; + + /** + * 用户ID + */ + private String userId; + + /** + * 部门ID + */ + private String deptId; + + /** + * 是否删除 0 否 1是 + */ + private Long isDelete; + + /** + * 是否发布 0否1是 + */ + private Long isPublish; + + /** + * + */ + private String bureauDeptId; + + /** + * + */ + private String bureauDeptName; + + /** + * 日期类型， year 年度 quarter 季度 mouth 月度 + */ + private String timeType; + + /** + * 月份 1 - 12 + */ + private Long mouth; + + /** + * 季度 + */ + private Long quarter; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java new file mode 100644 index 00000000..c401ad9b --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnforcementRegistration.java @@ -0,0 +1,283 @@ +package com.zdxt.enforcementcode.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 企业端-执法登记记录对象 enforcement_registration + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("enforcement_registration") +public class EnforcementRegistration extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 执法部门 + */ + private String lawEnforcement; + + /** + * 执法部门ID + */ + private String lawEnforcementId; + + /** + * 被执法企业ID + */ + private String enterpriseId; + + /** + * 被执法企业 + */ + private String enterpriseName; + + /** + * 被执法企业税号 + */ + private String enterpriseNumber; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 执法人员姓名 + */ + private String lawEnforcer; + + /** + * 执法人员ID + */ + private String lawEnforcerId; + + /** + * 执法人员联系方式 + */ + private String lawEnforcerTel; + + /** + * 其他执法人员 + */ + private String lawEnforcerTwo; + + /** + * 其他执法人员ID + */ + private String lawEnforcerIdTwo; + + /** + * 执法人员联系方式 + */ + private String lawEnforcerTelTwo; + + /** + * 辅助人员姓名 + */ + private String subsidiaryer; + + /** + * 辅助人员id + */ + private String subsidiaryerId; + + /** + * 辅助人员联系方式 + */ + private String subsidiaryerTel; + + /** + * 执法事项 + */ + private String lawEnforcementItem; + + /** + * 执法依据 + */ + private String lawEnforcementBasis; + + /** + * 备注 + */ + private String remark; + + /** + * 执法结果 0 合格 1 不合格 + */ + private Long reslut; + + /** + * + */ + private String userId; + + /** + * + */ + private String deptId; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + /** + * 数据状态 0 正常 1 取消 + */ + private Long status; + + /** + * 登记编号 + */ + private String lawEnforcementCode; + + /** + * 是否投诉 0 否 1 是 + */ + private Long isComplaint; + + /** + * 数据保存或提交 0 保存 1提交 + */ + private Long isSubmit; + + /** + * + */ + private String enforce; + + /** + * + */ + private String uniteCheck; + + /** + * + */ + private String lawEnforcementItemText; + + /** + * + */ + private String lawField; + + /** + * + */ + private String checkCategory; + + /** + * + */ + private String checkCss; + + /** + * + */ + private String enforceReason; + + /** + * + */ + private String bureauDeptId; + + /** + * + */ + private String bureauDeptName; + + /** + * + */ + private String lawEnforcementBasisText; + + /** + * + */ + private Long isEvaluate; + + /** + * + */ + private String lawId; + + /** + * + */ + private String lawText; + + /** + * 是否是联合检查 需要=1 and union_no不为空才是联合检查 + */ + private Long hasUnion; + + /** + * 是否委托执法 + */ + private Long hasAuto; + + /** + * 联合执法的分组编号 + */ + private String unionNo; + + /** + * 执法类别（新） + */ + private String lawEnforceCategory; + + /** + * 委托执法部门id + */ + private String entrustDeptId; + + /** + * 委托执法部门名称 + */ + private String entrustDeptName; + + /** + * 企业注册地址 + */ + private String enterpriseAddress; + + /** + * 企业注册区 + */ + private String district; + + /** + * 企业注册街道 + */ + private String street; + + /** + * 1:市直登记, 3:区直登记 + */ + private Long zone; + + /** + * 是否真联合执法(0:未联合; 1:已经联合) + */ + private Long isRealUnion; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/ComplaintItemBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/ComplaintItemBo.java new file mode 100644 index 00000000..ff578af6 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/ComplaintItemBo.java @@ -0,0 +1,45 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.ComplaintItem; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 投诉事项业务对象 complaint_item + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ComplaintItem.class, reverseConvertGenerate = false) +public class ComplaintItemBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 投诉事项编码 + */ + private String complaintItemCode; + + /** + * 投诉事项名称 + */ + private String complaintItemName; + + /** + * 执法主体名称 + */ + private String subName; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementInspectionProgramBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementInspectionProgramBo.java new file mode 100644 index 00000000..e69cbc5c --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementInspectionProgramBo.java @@ -0,0 +1,107 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.EnforcementInspectionProgram; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 执法检查计划业务对象 enforcement_inspection_program + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EnforcementInspectionProgram.class, reverseConvertGenerate = false) +public class EnforcementInspectionProgramBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 计划年度 + */ + private String planYear; + + /** + * 计划名称 + */ + private String planName; + + /** + * 执法部门 + */ + private String enforcementDepartment; + + /** + * 执法部门ID + */ + private String enforcementDepartmentId; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 执法区域 + */ + private String enforcementArea; + + /** + * 用户ID + */ + private String userId; + + /** + * 部门ID + */ + private String deptId; + + /** + * 是否删除 0 否 1是 + */ + private Long isDelete; + + /** + * 是否发布 0否1是 + */ + private Long isPublish; + + /** + * + */ + private String bureauDeptId; + + /** + * + */ + private String bureauDeptName; + + /** + * 日期类型， year 年度 quarter 季度 mouth 月度 + */ + private String timeType; + + /** + * 月份 1 - 12 + */ + private Long mouth; + + /** + * 季度 + */ + private Long quarter; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java new file mode 100644 index 00000000..410084f6 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java @@ -0,0 +1,284 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.EnforcementRegistration; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 企业端-执法登记记录业务对象 enforcement_registration + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EnforcementRegistration.class, reverseConvertGenerate = false) +public class EnforcementRegistrationBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 执法部门 + */ + private String lawEnforcement; + + /** + * 执法部门ID + */ + private String lawEnforcementId; + + /** + * 被执法企业ID + */ + private String enterpriseId; + + /** + * 被执法企业 + */ + private String enterpriseName; + + /** + * 被执法企业税号 + */ + private String enterpriseNumber; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 执法人员姓名 + */ + private String lawEnforcer; + + /** + * 执法人员ID + */ + private String lawEnforcerId; + + /** + * 执法人员联系方式 + */ + private String lawEnforcerTel; + + /** + * 其他执法人员 + */ + private String lawEnforcerTwo; + + /** + * 其他执法人员ID + */ + private String lawEnforcerIdTwo; + + /** + * 执法人员联系方式 + */ + private String lawEnforcerTelTwo; + + /** + * 辅助人员姓名 + */ + private String subsidiaryer; + + /** + * 辅助人员id + */ + private String subsidiaryerId; + + /** + * 辅助人员联系方式 + */ + private String subsidiaryerTel; + + /** + * 执法事项 + */ + private String lawEnforcementItem; + + /** + * 执法依据 + */ + private String lawEnforcementBasis; + + /** + * 备注 + */ + private String remark; + + /** + * 执法结果 0 合格 1 不合格 + */ + private Long reslut; + + /** + * + */ + private String userId; + + /** + * + */ + private String deptId; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + /** + * 数据状态 0 正常 1 取消 + */ + private Long status; + + /** + * 登记编号 + */ + private String lawEnforcementCode; + + /** + * 是否投诉 0 否 1 是 + */ + private Long isComplaint; + + /** + * 数据保存或提交 0 保存 1提交 + */ + private Long isSubmit; + + /** + * + */ + private String enforce; + + /** + * + */ + private String uniteCheck; + + /** + * + */ + private String lawEnforcementItemText; + + /** + * + */ + private String lawField; + + /** + * + */ + private String checkCategory; + + /** + * + */ + private String checkCss; + + /** + * + */ + private String enforceReason; + + /** + * + */ + private String bureauDeptId; + + /** + * + */ + private String bureauDeptName; + + /** + * + */ + private String lawEnforcementBasisText; + + /** + * + */ + private Long isEvaluate; + + /** + * + */ + private String lawId; + + /** + * + */ + private String lawText; + + /** + * 是否是联合检查 需要=1 and union_no不为空才是联合检查 + */ + @NotNull(message = "是否是联合检查 需要=1 and union_no不为空才是联合检查不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long hasUnion; + + /** + * 是否委托执法 + */ + @NotNull(message = "是否委托执法不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long hasAuto; + + /** + * 联合执法的分组编号 + */ + private String unionNo; + + /** + * 执法类别（新） + */ + private String lawEnforceCategory; + + /** + * 委托执法部门id + */ + private String entrustDeptId; + + /** + * 委托执法部门名称 + */ + private String entrustDeptName; + + /** + * 企业注册地址 + */ + private String enterpriseAddress; + + /** + * 企业注册区 + */ + private String district; + + /** + * 企业注册街道 + */ + private String street; + + /** + * 1:市直登记, 3:区直登记 + */ + private Long zone; + + /** + * 是否真联合执法(0:未联合; 1:已经联合) + */ + private Long isRealUnion; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/ComplaintItemVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/ComplaintItemVo.java new file mode 100644 index 00000000..afec8319 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/ComplaintItemVo.java @@ -0,0 +1,56 @@ +package com.zdxt.enforcementcode.domain.vo; + +import com.zdxt.enforcementcode.domain.ComplaintItem; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 投诉事项视图对象 complaint_item + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ComplaintItem.class) +public class ComplaintItemVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 投诉事项编码 + */ + @ExcelProperty(value = "投诉事项编码") + private String complaintItemCode; + + /** + * 投诉事项名称 + */ + @ExcelProperty(value = "投诉事项名称") + private String complaintItemName; + + /** + * 执法主体名称 + */ + @ExcelProperty(value = "执法主体名称") + private String subName; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementInspectionProgramVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementInspectionProgramVo.java new file mode 100644 index 00000000..220ca81f --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementInspectionProgramVo.java @@ -0,0 +1,130 @@ +package com.zdxt.enforcementcode.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zdxt.enforcementcode.domain.EnforcementInspectionProgram; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 执法检查计划视图对象 enforcement_inspection_program + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EnforcementInspectionProgram.class) +public class EnforcementInspectionProgramVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 计划年度 + */ + @ExcelProperty(value = "计划年度") + private String planYear; + + /** + * 计划名称 + */ + @ExcelProperty(value = "计划名称") + private String planName; + + /** + * 执法部门 + */ + @ExcelProperty(value = "执法部门") + private String enforcementDepartment; + + /** + * 执法部门ID + */ + @ExcelProperty(value = "执法部门ID") + private String enforcementDepartmentId; + + /** + * 执法时间 + */ + @ExcelProperty(value = "执法时间") + private Date enforcementTime; + + /** + * 执法区域 + */ + @ExcelProperty(value = "执法区域") + private String enforcementArea; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private String userId; + + /** + * 部门ID + */ + @ExcelProperty(value = "部门ID") + private String deptId; + + /** + * 是否删除 0 否 1是 + */ + @ExcelProperty(value = "是否删除 0 否 1是") + private Long isDelete; + + /** + * 是否发布 0否1是 + */ + @ExcelProperty(value = "是否发布 0否1是") + private Long isPublish; + + /** + * + */ + @ExcelProperty(value = "") + private String bureauDeptId; + + /** + * + */ + @ExcelProperty(value = "") + private String bureauDeptName; + + /** + * 日期类型， year 年度 quarter 季度 mouth 月度 + */ + @ExcelProperty(value = "日期类型， year 年度 quarter 季度 mouth 月度") + private String timeType; + + /** + * 月份 1 - 12 + */ + @ExcelProperty(value = "月份 1 - 12") + private Long mouth; + + /** + * 季度 + */ + @ExcelProperty(value = "季度") + private Long quarter; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java new file mode 100644 index 00000000..4f6732c1 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java @@ -0,0 +1,341 @@ +package com.zdxt.enforcementcode.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zdxt.enforcementcode.domain.EnforcementRegistration; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 企业端-执法登记记录视图对象 enforcement_registration + * + * @author Lion Li + * @date 2026-04-17 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EnforcementRegistration.class) +public class EnforcementRegistrationVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 执法部门 + */ + @ExcelProperty(value = "执法部门") + private String lawEnforcement; + + /** + * 执法部门ID + */ + @ExcelProperty(value = "执法部门ID") + private String lawEnforcementId; + + /** + * 被执法企业ID + */ + @ExcelProperty(value = "被执法企业ID") + private String enterpriseId; + + /** + * 被执法企业 + */ + @ExcelProperty(value = "被执法企业") + private String enterpriseName; + + /** + * 被执法企业税号 + */ + @ExcelProperty(value = "被执法企业税号") + private String enterpriseNumber; + + /** + * 执法时间 + */ + @ExcelProperty(value = "执法时间") + private Date enforcementTime; + + /** + * 执法人员姓名 + */ + @ExcelProperty(value = "执法人员姓名") + private String lawEnforcer; + + /** + * 执法人员ID + */ + @ExcelProperty(value = "执法人员ID") + private String lawEnforcerId; + + /** + * 执法人员联系方式 + */ + @ExcelProperty(value = "执法人员联系方式") + private String lawEnforcerTel; + + /** + * 其他执法人员 + */ + @ExcelProperty(value = "其他执法人员") + private String lawEnforcerTwo; + + /** + * 其他执法人员ID + */ + @ExcelProperty(value = "其他执法人员ID") + private String lawEnforcerIdTwo; + + /** + * 执法人员联系方式 + */ + @ExcelProperty(value = "执法人员联系方式") + private String lawEnforcerTelTwo; + + /** + * 辅助人员姓名 + */ + @ExcelProperty(value = "辅助人员姓名") + private String subsidiaryer; + + /** + * 辅助人员id + */ + @ExcelProperty(value = "辅助人员id") + private String subsidiaryerId; + + /** + * 辅助人员联系方式 + */ + @ExcelProperty(value = "辅助人员联系方式") + private String subsidiaryerTel; + + /** + * 执法事项 + */ + @ExcelProperty(value = "执法事项") + private String lawEnforcementItem; + + /** + * 执法依据 + */ + @ExcelProperty(value = "执法依据") + private String lawEnforcementBasis; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 执法结果 0 合格 1 不合格 + */ + @ExcelProperty(value = "执法结果 0 合格 1 不合格") + private Long reslut; + + /** + * + */ + @ExcelProperty(value = "") + private String userId; + + /** + * + */ + @ExcelProperty(value = "") + private String deptId; + + /** + * 是否删除 0 否 1 是 + */ + @ExcelProperty(value = "是否删除 0 否 1 是") + private Long isDelete; + + /** + * 数据状态 0 正常 1 取消 + */ + @ExcelProperty(value = "数据状态 0 正常 1 取消") + private Long status; + + /** + * 登记编号 + */ + @ExcelProperty(value = "登记编号") + private String lawEnforcementCode; + + /** + * 是否投诉 0 否 1 是 + */ + @ExcelProperty(value = "是否投诉 0 否 1 是") + private Long isComplaint; + + /** + * 数据保存或提交 0 保存 1提交 + */ + @ExcelProperty(value = "数据保存或提交 0 保存 1提交") + private Long isSubmit; + + /** + * + */ + @ExcelProperty(value = "") + private String enforce; + + /** + * + */ + @ExcelProperty(value = "") + private String uniteCheck; + + /** + * + */ + @ExcelProperty(value = "") + private String lawEnforcementItemText; + + /** + * + */ + @ExcelProperty(value = "") + private String lawField; + + /** + * + */ + @ExcelProperty(value = "") + private String checkCategory; + + /** + * + */ + @ExcelProperty(value = "") + private String checkCss; + + /** + * + */ + @ExcelProperty(value = "") + private String enforceReason; + + /** + * + */ + @ExcelProperty(value = "") + private String bureauDeptId; + + /** + * + */ + @ExcelProperty(value = "") + private String bureauDeptName; + + /** + * + */ + @ExcelProperty(value = "") + private String lawEnforcementBasisText; + + /** + * + */ + @ExcelProperty(value = "") + private Long isEvaluate; + + /** + * + */ + @ExcelProperty(value = "") + private String lawId; + + /** + * + */ + @ExcelProperty(value = "") + private String lawText; + + /** + * 是否是联合检查 需要=1 and union_no不为空才是联合检查 + */ + @ExcelProperty(value = "是否是联合检查 需要=1 and union_no不为空才是联合检查") + private Long hasUnion; + + /** + * 是否委托执法 + */ + @ExcelProperty(value = "是否委托执法") + private Long hasAuto; + + /** + * 联合执法的分组编号 + */ + @ExcelProperty(value = "联合执法的分组编号") + private String unionNo; + + /** + * 执法类别（新） + */ + @ExcelProperty(value = "执法类别", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "新=") + private String lawEnforceCategory; + + /** + * 委托执法部门id + */ + @ExcelProperty(value = "委托执法部门id") + private String entrustDeptId; + + /** + * 委托执法部门名称 + */ + @ExcelProperty(value = "委托执法部门名称") + private String entrustDeptName; + + /** + * 企业注册地址 + */ + @ExcelProperty(value = "企业注册地址") + private String enterpriseAddress; + + /** + * 企业注册区 + */ + @ExcelProperty(value = "企业注册区") + private String district; + + /** + * 企业注册街道 + */ + @ExcelProperty(value = "企业注册街道") + private String street; + + /** + * 1:市直登记, 3:区直登记 + */ + @ExcelProperty(value = "1:市直登记, 3:区直登记") + private Long zone; + + /** + * 是否真联合执法(0:未联合; 1:已经联合) + */ + @ExcelProperty(value = "是否真联合执法(0:未联合; 1:已经联合)") + private Long isRealUnion; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/ComplaintItemMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/ComplaintItemMapper.java new file mode 100644 index 00000000..2bdb6968 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/ComplaintItemMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.ComplaintItem; +import com.zdxt.enforcementcode.domain.vo.ComplaintItemVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 投诉事项Mapper接口 + * + * @author Lion Li + * @date 2026-04-17 + */ +public interface ComplaintItemMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementInspectionProgramMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementInspectionProgramMapper.java new file mode 100644 index 00000000..edb1b4ce --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementInspectionProgramMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.EnforcementInspectionProgram; +import com.zdxt.enforcementcode.domain.vo.EnforcementInspectionProgramVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 执法检查计划Mapper接口 + * + * @author Lion Li + * @date 2026-04-17 + */ +public interface EnforcementInspectionProgramMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java new file mode 100644 index 00000000..fc3f54d9 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.EnforcementRegistration; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 企业端-执法登记记录Mapper接口 + * + * @author Lion Li + * @date 2026-04-17 + */ +public interface EnforcementRegistrationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintItemService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintItemService.java new file mode 100644 index 00000000..05e234bd --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintItemService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.ComplaintItemVo; +import com.zdxt.enforcementcode.domain.bo.ComplaintItemBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 投诉事项Service接口 + * + * @author Lion Li + * @date 2026-04-17 + */ +public interface IComplaintItemService { + + /** + * 查询投诉事项 + * + * @param id 主键 + * @return 投诉事项 + */ + ComplaintItemVo queryById(String id); + + /** + * 分页查询投诉事项列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 投诉事项分页列表 + */ + TableDataInfo queryPageList(ComplaintItemBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的投诉事项列表 + * + * @param bo 查询条件 + * @return 投诉事项列表 + */ + List queryList(ComplaintItemBo bo); + + /** + * 新增投诉事项 + * + * @param bo 投诉事项 + * @return 是否新增成功 + */ + Boolean insertByBo(ComplaintItemBo bo); + + /** + * 修改投诉事项 + * + * @param bo 投诉事项 + * @return 是否修改成功 + */ + Boolean updateByBo(ComplaintItemBo bo); + + /** + * 校验并批量删除投诉事项信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementInspectionProgramService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementInspectionProgramService.java new file mode 100644 index 00000000..83421084 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementInspectionProgramService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.EnforcementInspectionProgramVo; +import com.zdxt.enforcementcode.domain.bo.EnforcementInspectionProgramBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 执法检查计划Service接口 + * + * @author Lion Li + * @date 2026-04-17 + */ +public interface IEnforcementInspectionProgramService { + + /** + * 查询执法检查计划 + * + * @param id 主键 + * @return 执法检查计划 + */ + EnforcementInspectionProgramVo queryById(String id); + + /** + * 分页查询执法检查计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 执法检查计划分页列表 + */ + TableDataInfo queryPageList(EnforcementInspectionProgramBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的执法检查计划列表 + * + * @param bo 查询条件 + * @return 执法检查计划列表 + */ + List queryList(EnforcementInspectionProgramBo bo); + + /** + * 新增执法检查计划 + * + * @param bo 执法检查计划 + * @return 是否新增成功 + */ + Boolean insertByBo(EnforcementInspectionProgramBo bo); + + /** + * 修改执法检查计划 + * + * @param bo 执法检查计划 + * @return 是否修改成功 + */ + Boolean updateByBo(EnforcementInspectionProgramBo bo); + + /** + * 校验并批量删除执法检查计划信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java new file mode 100644 index 00000000..073c8f1a --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 企业端-执法登记记录Service接口 + * + * @author Lion Li + * @date 2026-04-17 + */ +public interface IEnforcementRegistrationService { + + /** + * 查询企业端-执法登记记录 + * + * @param id 主键 + * @return 企业端-执法登记记录 + */ + EnforcementRegistrationVo queryById(String id); + + /** + * 分页查询企业端-执法登记记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 企业端-执法登记记录分页列表 + */ + TableDataInfo queryPageList(EnforcementRegistrationBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的企业端-执法登记记录列表 + * + * @param bo 查询条件 + * @return 企业端-执法登记记录列表 + */ + List queryList(EnforcementRegistrationBo bo); + + /** + * 新增企业端-执法登记记录 + * + * @param bo 企业端-执法登记记录 + * @return 是否新增成功 + */ + Boolean insertByBo(EnforcementRegistrationBo bo); + + /** + * 修改企业端-执法登记记录 + * + * @param bo 企业端-执法登记记录 + * @return 是否修改成功 + */ + Boolean updateByBo(EnforcementRegistrationBo bo); + + /** + * 校验并批量删除企业端-执法登记记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintItemServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintItemServiceImpl.java new file mode 100644 index 00000000..7dca4894 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintItemServiceImpl.java @@ -0,0 +1,134 @@ +package com.zdxt.enforcementcode.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.zdxt.enforcementcode.domain.bo.ComplaintItemBo; +import com.zdxt.enforcementcode.domain.vo.ComplaintItemVo; +import com.zdxt.enforcementcode.domain.ComplaintItem; +import com.zdxt.enforcementcode.mapper.ComplaintItemMapper; +import com.zdxt.enforcementcode.service.IComplaintItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 投诉事项Service业务层处理 + * + * @author Lion Li + * @date 2026-04-17 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class ComplaintItemServiceImpl implements IComplaintItemService { + + private final ComplaintItemMapper baseMapper; + + /** + * 查询投诉事项 + * + * @param id 主键 + * @return 投诉事项 + */ + @Override + public ComplaintItemVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询投诉事项列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 投诉事项分页列表 + */ + @Override + public TableDataInfo queryPageList(ComplaintItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的投诉事项列表 + * + * @param bo 查询条件 + * @return 投诉事项列表 + */ + @Override + public List queryList(ComplaintItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ComplaintItemBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(ComplaintItem::getId); + lqw.eq(StringUtils.isNotBlank(bo.getComplaintItemCode()), ComplaintItem::getComplaintItemCode, bo.getComplaintItemCode()); + lqw.like(StringUtils.isNotBlank(bo.getComplaintItemName()), ComplaintItem::getComplaintItemName, bo.getComplaintItemName()); + lqw.like(StringUtils.isNotBlank(bo.getSubName()), ComplaintItem::getSubName, bo.getSubName()); + return lqw; + } + + /** + * 新增投诉事项 + * + * @param bo 投诉事项 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ComplaintItemBo bo) { + ComplaintItem add = MapstructUtils.convert(bo, ComplaintItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改投诉事项 + * + * @param bo 投诉事项 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ComplaintItemBo bo) { + ComplaintItem update = MapstructUtils.convert(bo, ComplaintItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ComplaintItem entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除投诉事项信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementInspectionProgramServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementInspectionProgramServiceImpl.java new file mode 100644 index 00000000..569c911c --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementInspectionProgramServiceImpl.java @@ -0,0 +1,146 @@ +package com.zdxt.enforcementcode.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.zdxt.enforcementcode.domain.bo.EnforcementInspectionProgramBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementInspectionProgramVo; +import com.zdxt.enforcementcode.domain.EnforcementInspectionProgram; +import com.zdxt.enforcementcode.mapper.EnforcementInspectionProgramMapper; +import com.zdxt.enforcementcode.service.IEnforcementInspectionProgramService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 执法检查计划Service业务层处理 + * + * @author Lion Li + * @date 2026-04-17 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class EnforcementInspectionProgramServiceImpl implements IEnforcementInspectionProgramService { + + private final EnforcementInspectionProgramMapper baseMapper; + + /** + * 查询执法检查计划 + * + * @param id 主键 + * @return 执法检查计划 + */ + @Override + public EnforcementInspectionProgramVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询执法检查计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 执法检查计划分页列表 + */ + @Override + public TableDataInfo queryPageList(EnforcementInspectionProgramBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的执法检查计划列表 + * + * @param bo 查询条件 + * @return 执法检查计划列表 + */ + @Override + public List queryList(EnforcementInspectionProgramBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EnforcementInspectionProgramBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(EnforcementInspectionProgram::getId); + lqw.eq(StringUtils.isNotBlank(bo.getPlanYear()), EnforcementInspectionProgram::getPlanYear, bo.getPlanYear()); + lqw.like(StringUtils.isNotBlank(bo.getPlanName()), EnforcementInspectionProgram::getPlanName, bo.getPlanName()); + lqw.eq(StringUtils.isNotBlank(bo.getEnforcementDepartment()), EnforcementInspectionProgram::getEnforcementDepartment, bo.getEnforcementDepartment()); + lqw.eq(StringUtils.isNotBlank(bo.getEnforcementDepartmentId()), EnforcementInspectionProgram::getEnforcementDepartmentId, bo.getEnforcementDepartmentId()); + lqw.eq(bo.getEnforcementTime() != null, EnforcementInspectionProgram::getEnforcementTime, bo.getEnforcementTime()); + lqw.eq(StringUtils.isNotBlank(bo.getEnforcementArea()), EnforcementInspectionProgram::getEnforcementArea, bo.getEnforcementArea()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), EnforcementInspectionProgram::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), EnforcementInspectionProgram::getDeptId, bo.getDeptId()); + lqw.eq(bo.getIsDelete() != null, EnforcementInspectionProgram::getIsDelete, bo.getIsDelete()); + lqw.eq(bo.getIsPublish() != null, EnforcementInspectionProgram::getIsPublish, bo.getIsPublish()); + lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), EnforcementInspectionProgram::getBureauDeptId, bo.getBureauDeptId()); + lqw.like(StringUtils.isNotBlank(bo.getBureauDeptName()), EnforcementInspectionProgram::getBureauDeptName, bo.getBureauDeptName()); + lqw.eq(StringUtils.isNotBlank(bo.getTimeType()), EnforcementInspectionProgram::getTimeType, bo.getTimeType()); + lqw.eq(bo.getMouth() != null, EnforcementInspectionProgram::getMouth, bo.getMouth()); + lqw.eq(bo.getQuarter() != null, EnforcementInspectionProgram::getQuarter, bo.getQuarter()); + return lqw; + } + + /** + * 新增执法检查计划 + * + * @param bo 执法检查计划 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EnforcementInspectionProgramBo bo) { + EnforcementInspectionProgram add = MapstructUtils.convert(bo, EnforcementInspectionProgram.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改执法检查计划 + * + * @param bo 执法检查计划 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EnforcementInspectionProgramBo bo) { + EnforcementInspectionProgram update = MapstructUtils.convert(bo, EnforcementInspectionProgram.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EnforcementInspectionProgram entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除执法检查计划信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java new file mode 100644 index 00000000..7e88da8a --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -0,0 +1,180 @@ +package com.zdxt.enforcementcode.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import com.zdxt.enforcementcode.domain.EnforcementRegistration; +import com.zdxt.enforcementcode.mapper.EnforcementRegistrationMapper; +import com.zdxt.enforcementcode.service.IEnforcementRegistrationService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 企业端-执法登记记录Service业务层处理 + * + * @author Lion Li + * @date 2026-04-17 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrationService { + + private final EnforcementRegistrationMapper baseMapper; + + /** + * 查询企业端-执法登记记录 + * + * @param id 主键 + * @return 企业端-执法登记记录 + */ + @Override + public EnforcementRegistrationVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询企业端-执法登记记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 企业端-执法登记记录分页列表 + */ + @Override + public TableDataInfo queryPageList(EnforcementRegistrationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的企业端-执法登记记录列表 + * + * @param bo 查询条件 + * @return 企业端-执法登记记录列表 + */ + @Override + public List queryList(EnforcementRegistrationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EnforcementRegistrationBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(EnforcementRegistration::getId); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcement()), EnforcementRegistration::getLawEnforcement, bo.getLawEnforcement()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementId()), EnforcementRegistration::getLawEnforcementId, bo.getLawEnforcementId()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseId()), EnforcementRegistration::getEnterpriseId, bo.getEnterpriseId()); + lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), EnforcementRegistration::getEnterpriseName, bo.getEnterpriseName()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), EnforcementRegistration::getEnterpriseNumber, bo.getEnterpriseNumber()); + lqw.eq(bo.getEnforcementTime() != null, EnforcementRegistration::getEnforcementTime, bo.getEnforcementTime()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcer()), EnforcementRegistration::getLawEnforcer, bo.getLawEnforcer()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerId()), EnforcementRegistration::getLawEnforcerId, bo.getLawEnforcerId()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerTel()), EnforcementRegistration::getLawEnforcerTel, bo.getLawEnforcerTel()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerTwo()), EnforcementRegistration::getLawEnforcerTwo, bo.getLawEnforcerTwo()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerIdTwo()), EnforcementRegistration::getLawEnforcerIdTwo, bo.getLawEnforcerIdTwo()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerTelTwo()), EnforcementRegistration::getLawEnforcerTelTwo, bo.getLawEnforcerTelTwo()); + lqw.eq(StringUtils.isNotBlank(bo.getSubsidiaryer()), EnforcementRegistration::getSubsidiaryer, bo.getSubsidiaryer()); + lqw.eq(StringUtils.isNotBlank(bo.getSubsidiaryerId()), EnforcementRegistration::getSubsidiaryerId, bo.getSubsidiaryerId()); + lqw.eq(StringUtils.isNotBlank(bo.getSubsidiaryerTel()), EnforcementRegistration::getSubsidiaryerTel, bo.getSubsidiaryerTel()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementItem()), EnforcementRegistration::getLawEnforcementItem, bo.getLawEnforcementItem()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementBasis()), EnforcementRegistration::getLawEnforcementBasis, bo.getLawEnforcementBasis()); + lqw.eq(bo.getReslut() != null, EnforcementRegistration::getReslut, bo.getReslut()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), EnforcementRegistration::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), EnforcementRegistration::getDeptId, bo.getDeptId()); + lqw.eq(bo.getIsDelete() != null, EnforcementRegistration::getIsDelete, bo.getIsDelete()); + lqw.eq(bo.getStatus() != null, EnforcementRegistration::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementCode()), EnforcementRegistration::getLawEnforcementCode, bo.getLawEnforcementCode()); + lqw.eq(bo.getIsComplaint() != null, EnforcementRegistration::getIsComplaint, bo.getIsComplaint()); + lqw.eq(bo.getIsSubmit() != null, EnforcementRegistration::getIsSubmit, bo.getIsSubmit()); + lqw.eq(StringUtils.isNotBlank(bo.getEnforce()), EnforcementRegistration::getEnforce, bo.getEnforce()); + lqw.eq(StringUtils.isNotBlank(bo.getUniteCheck()), EnforcementRegistration::getUniteCheck, bo.getUniteCheck()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementItemText()), EnforcementRegistration::getLawEnforcementItemText, bo.getLawEnforcementItemText()); + lqw.eq(StringUtils.isNotBlank(bo.getLawField()), EnforcementRegistration::getLawField, bo.getLawField()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckCategory()), EnforcementRegistration::getCheckCategory, bo.getCheckCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckCss()), EnforcementRegistration::getCheckCss, bo.getCheckCss()); + lqw.eq(StringUtils.isNotBlank(bo.getEnforceReason()), EnforcementRegistration::getEnforceReason, bo.getEnforceReason()); + lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), EnforcementRegistration::getBureauDeptId, bo.getBureauDeptId()); + lqw.like(StringUtils.isNotBlank(bo.getBureauDeptName()), EnforcementRegistration::getBureauDeptName, bo.getBureauDeptName()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementBasisText()), EnforcementRegistration::getLawEnforcementBasisText, bo.getLawEnforcementBasisText()); + lqw.eq(bo.getIsEvaluate() != null, EnforcementRegistration::getIsEvaluate, bo.getIsEvaluate()); + lqw.eq(StringUtils.isNotBlank(bo.getLawId()), EnforcementRegistration::getLawId, bo.getLawId()); + lqw.eq(StringUtils.isNotBlank(bo.getLawText()), EnforcementRegistration::getLawText, bo.getLawText()); + lqw.eq(bo.getHasUnion() != null, EnforcementRegistration::getHasUnion, bo.getHasUnion()); + lqw.eq(bo.getHasAuto() != null, EnforcementRegistration::getHasAuto, bo.getHasAuto()); + lqw.eq(StringUtils.isNotBlank(bo.getUnionNo()), EnforcementRegistration::getUnionNo, bo.getUnionNo()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforceCategory()), EnforcementRegistration::getLawEnforceCategory, bo.getLawEnforceCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getEntrustDeptId()), EnforcementRegistration::getEntrustDeptId, bo.getEntrustDeptId()); + lqw.like(StringUtils.isNotBlank(bo.getEntrustDeptName()), EnforcementRegistration::getEntrustDeptName, bo.getEntrustDeptName()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseAddress()), EnforcementRegistration::getEnterpriseAddress, bo.getEnterpriseAddress()); + lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), EnforcementRegistration::getDistrict, bo.getDistrict()); + lqw.eq(StringUtils.isNotBlank(bo.getStreet()), EnforcementRegistration::getStreet, bo.getStreet()); + lqw.eq(bo.getZone() != null, EnforcementRegistration::getZone, bo.getZone()); + lqw.eq(bo.getIsRealUnion() != null, EnforcementRegistration::getIsRealUnion, bo.getIsRealUnion()); + return lqw; + } + + /** + * 新增企业端-执法登记记录 + * + * @param bo 企业端-执法登记记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EnforcementRegistrationBo bo) { + EnforcementRegistration add = MapstructUtils.convert(bo, EnforcementRegistration.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改企业端-执法登记记录 + * + * @param bo 企业端-执法登记记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EnforcementRegistrationBo bo) { + EnforcementRegistration update = MapstructUtils.convert(bo, EnforcementRegistration.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EnforcementRegistration entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除企业端-执法登记记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComplaintItemMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComplaintItemMapper.xml new file mode 100644 index 00000000..58df58bf --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComplaintItemMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml new file mode 100644 index 00000000..3a94aa60 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml new file mode 100644 index 00000000..490074b7 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js b/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js index ac3fc3c6..3449bb37 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js @@ -18,6 +18,9 @@ export const getEnterpriseMerchantAuthorization = (params, success, error) => _g //查询企业二维码 export const queryEnterpriseInformationQrCode = (enterpriseNumber, success, error) => _get(enterpriseAppBaseUrl+"/enterpriseInfo/getQrCode/"+enterpriseNumber,null,success,error) +//查询企业执法登记列表-企业端修改联合检查查询语句 +export const queryEnterpriseList = (params, success, error) => _get(enterpriseAppBaseUrl+"/registration/queryEnterpriseList",params,success,error) + //深i企登录-暂时没有环境调通 export const getSiqLoginAuth = (params, success, error) => _post(enterpriseAppBaseUrl +"/thirdLogin/siqLogin",params,success,error);