diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java index be85805..8bb4d4e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java @@ -35,6 +35,13 @@ public class R implements Serializable { private T data; + /* + * 为了兼容旧的客户端,加上3个兼容字段 + * */ + private boolean success; + private String message = ""; + private Integer errorCode; + public static R ok() { return restResult(null, SUCCESS, "操作成功"); } @@ -97,6 +104,8 @@ public class R implements Serializable { r.setCode(code); r.setData(data); r.setMsg(msg); + r.setMessage(msg); + r.setSuccess(code == SUCCESS); return r; } diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java index 7a5d82c..756a824 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java @@ -115,6 +115,7 @@ public class GlobalExceptionHandler { /** * 找不到路由 */ + @ResponseStatus(org.springframework.http.HttpStatus.NOT_FOUND) @ExceptionHandler(NoHandlerFoundException.class) public R handleNoHandlerFoundException(NoHandlerFoundException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppDictController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppDictController.java new file mode 100644 index 0000000..56a7a32 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppDictController.java @@ -0,0 +1,35 @@ +package com.zdxt.enforcementcode.appcontroller.enterprise; + +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.system.domain.vo.SysDictDataVo; +import org.dromara.system.service.ISysDictDataService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * App端-字典数据查询 + */ +@RequiredArgsConstructor +@RestController +@RequestMapping("/app") +public class AppDictController { + + private final ISysDictDataService dictDataService; + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据列表 + */ + @GetMapping("/queryDict") + public R> queryDict(@RequestParam String dictType) { + List list = dictDataService.selectDictDataByType(dictType); + return R.ok(list); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppEnterpriseMerchantAuthorizationController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppEnterpriseMerchantAuthorizationController.java new file mode 100644 index 0000000..f4d451c --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppEnterpriseMerchantAuthorizationController.java @@ -0,0 +1,27 @@ +package com.zdxt.enforcementcode.appcontroller.enterprise; + +import com.zdxt.enforcementcode.domain.bo.EnterpriseMerchantAuthorizationBo; +import com.zdxt.enforcementcode.service.IEnterpriseMerchantAuthorizationService; +import jakarta.annotation.Resource; +import org.dromara.common.core.domain.R; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +@Controller +@RequestMapping("/app/code/authorization") +public class AppEnterpriseMerchantAuthorizationController { + @Resource + IEnterpriseMerchantAuthorizationService enterpriseMerchantAuthorizationService; + + @GetMapping("/queryList") + @ResponseBody + public R queryList(EnterpriseMerchantAuthorizationBo bo) + { + List list = enterpriseMerchantAuthorizationService.queryEnterpriseMerchantAuthorizationList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/LoginController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppLoginController.java similarity index 98% rename from ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/LoginController.java rename to ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppLoginController.java index 3837636..294a958 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/LoginController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppLoginController.java @@ -31,7 +31,7 @@ import java.util.Map; @RequiredArgsConstructor @RestController @RequestMapping("/app/enterprise") -public class LoginController { +public class AppLoginController { private final IEnterpriseUserService enterpriseUserService; @@ -95,8 +95,10 @@ public class LoginController { SaLoginParameter model = new SaLoginParameter(); model.setDeviceType("enterprise_app"); + model.setExtra("clientid", "enterprise"); LoginHelper.login(loginUser, model); + // 6. 构造返回数据 Map data = new HashMap<>(); data.put("token", StpUtil.getTokenValue()); diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppThirdLogin.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppThirdLogin.java new file mode 100644 index 0000000..7389dce --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppThirdLogin.java @@ -0,0 +1,31 @@ +package com.zdxt.enforcementcode.appcontroller.enterprise; + + +import org.dromara.common.core.domain.R; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +@Controller +@RequestMapping("/app/thirdLogin") +public class AppThirdLogin { + /** + * 获取深i企包裹的code + */ + @GetMapping("/getSiqCode") + @ResponseBody + public R> getSiqCode(){ + String accessKey = "6374106c5eb449a4ad6c2430f30796e6"; + String accessSecret = "434fec85aa5846e88bbeb8fac6cf6d7f"; + Map result = new HashMap<>(); + result.put("accessKey", accessKey); + result.put("accessSecret", accessSecret); + return R.ok("获取成功", result); + } + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseComplaintController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseComplaintController.java new file mode 100644 index 0000000..8170468 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseComplaintController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller; + +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.EnterpriseComplaintVo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseComplaintBo; +import com.zdxt.enforcementcode.service.IEnterpriseComplaintService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 企业执法-在线投诉 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/enforcementcode/complaint") +public class EnterpriseComplaintController extends BaseController { + + private final IEnterpriseComplaintService enterpriseComplaintService; + + /** + * 查询企业执法-在线投诉列表 + */ + @SaCheckPermission("enforcementcode:complaint:list") + @GetMapping("/list") + public TableDataInfo list(EnterpriseComplaintBo bo, PageQuery pageQuery) { + return enterpriseComplaintService.queryPageList(bo, pageQuery); + } + + /** + * 导出企业执法-在线投诉列表 + */ + @SaCheckPermission("enforcementcode:complaint:export") + @Log(title = "企业执法-在线投诉", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EnterpriseComplaintBo bo, HttpServletResponse response) { + List list = enterpriseComplaintService.queryList(bo); + ExcelUtil.exportExcel(list, "企业执法-在线投诉", EnterpriseComplaintVo.class, response); + } + + /** + * 获取企业执法-在线投诉详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:complaint:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(enterpriseComplaintService.queryById(id)); + } + + /** + * 新增企业执法-在线投诉 + */ + @SaCheckPermission("enforcementcode:complaint:add") + @Log(title = "企业执法-在线投诉", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EnterpriseComplaintBo bo) { + return toAjax(enterpriseComplaintService.insertByBo(bo)); + } + + /** + * 修改企业执法-在线投诉 + */ + @SaCheckPermission("enforcementcode:complaint:edit") + @Log(title = "企业执法-在线投诉", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EnterpriseComplaintBo bo) { + return toAjax(enterpriseComplaintService.updateByBo(bo)); + } + + /** + * 删除企业执法-在线投诉 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:complaint:remove") + @Log(title = "企业执法-在线投诉", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(enterpriseComplaintService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseEvaluateController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseEvaluateController.java new file mode 100644 index 0000000..5978858 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseEvaluateController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller; + +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.EnterpriseEvaluateVo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseEvaluateBo; +import com.zdxt.enforcementcode.service.IEnterpriseEvaluateService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 企业端-执法评价 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/enforcementcode/evaluate") +public class EnterpriseEvaluateController extends BaseController { + + private final IEnterpriseEvaluateService enterpriseEvaluateService; + + /** + * 查询企业端-执法评价列表 + */ + @SaCheckPermission("enforcementcode:evaluate:list") + @GetMapping("/list") + public TableDataInfo list(EnterpriseEvaluateBo bo, PageQuery pageQuery) { + return enterpriseEvaluateService.queryPageList(bo, pageQuery); + } + + /** + * 导出企业端-执法评价列表 + */ + @SaCheckPermission("enforcementcode:evaluate:export") + @Log(title = "企业端-执法评价", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EnterpriseEvaluateBo bo, HttpServletResponse response) { + List list = enterpriseEvaluateService.queryList(bo); + ExcelUtil.exportExcel(list, "企业端-执法评价", EnterpriseEvaluateVo.class, response); + } + + /** + * 获取企业端-执法评价详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:evaluate:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(enterpriseEvaluateService.queryById(id)); + } + + /** + * 新增企业端-执法评价 + */ + @SaCheckPermission("enforcementcode:evaluate:add") + @Log(title = "企业端-执法评价", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EnterpriseEvaluateBo bo) { + return toAjax(enterpriseEvaluateService.insertByBo(bo)); + } + + /** + * 修改企业端-执法评价 + */ + @SaCheckPermission("enforcementcode:evaluate:edit") + @Log(title = "企业端-执法评价", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EnterpriseEvaluateBo bo) { + return toAjax(enterpriseEvaluateService.updateByBo(bo)); + } + + /** + * 删除企业端-执法评价 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:evaluate:remove") + @Log(title = "企业端-执法评价", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(enterpriseEvaluateService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseLawEnforcementController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseLawEnforcementController.java new file mode 100644 index 0000000..73557ff --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseLawEnforcementController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller; + +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.EnterpriseLawEnforcementVo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseLawEnforcementBo; +import com.zdxt.enforcementcode.service.IEnterpriseLawEnforcementService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 企业端-执法部门预约记录 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/enforcementcode/lawEnforcement") +public class EnterpriseLawEnforcementController extends BaseController { + + private final IEnterpriseLawEnforcementService enterpriseLawEnforcementService; + + /** + * 查询企业端-执法部门预约记录列表 + */ + @SaCheckPermission("enforcementcode:lawEnforcement:list") + @GetMapping("/list") + public TableDataInfo list(EnterpriseLawEnforcementBo bo, PageQuery pageQuery) { + return enterpriseLawEnforcementService.queryPageList(bo, pageQuery); + } + + /** + * 导出企业端-执法部门预约记录列表 + */ + @SaCheckPermission("enforcementcode:lawEnforcement:export") + @Log(title = "企业端-执法部门预约记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EnterpriseLawEnforcementBo bo, HttpServletResponse response) { + List list = enterpriseLawEnforcementService.queryList(bo); + ExcelUtil.exportExcel(list, "企业端-执法部门预约记录", EnterpriseLawEnforcementVo.class, response); + } + + /** + * 获取企业端-执法部门预约记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:lawEnforcement:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(enterpriseLawEnforcementService.queryById(id)); + } + + /** + * 新增企业端-执法部门预约记录 + */ + @SaCheckPermission("enforcementcode:lawEnforcement:add") + @Log(title = "企业端-执法部门预约记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EnterpriseLawEnforcementBo bo) { + return toAjax(enterpriseLawEnforcementService.insertByBo(bo)); + } + + /** + * 修改企业端-执法部门预约记录 + */ + @SaCheckPermission("enforcementcode:lawEnforcement:edit") + @Log(title = "企业端-执法部门预约记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EnterpriseLawEnforcementBo bo) { + return toAjax(enterpriseLawEnforcementService.updateByBo(bo)); + } + + /** + * 删除企业端-执法部门预约记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:lawEnforcement:remove") + @Log(title = "企业端-执法部门预约记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(enterpriseLawEnforcementService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseMerchantAuthorizationController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseMerchantAuthorizationController.java new file mode 100644 index 0000000..1946558 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseMerchantAuthorizationController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller; + +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.EnterpriseMerchantAuthorizationVo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseMerchantAuthorizationBo; +import com.zdxt.enforcementcode.service.IEnterpriseMerchantAuthorizationService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 商户授权企业信息 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/enforcementcode/merchantAuthorization") +public class EnterpriseMerchantAuthorizationController extends BaseController { + + private final IEnterpriseMerchantAuthorizationService enterpriseMerchantAuthorizationService; + + /** + * 查询商户授权企业信息列表 + */ + @SaCheckPermission("enforcementcode:merchantAuthorization:list") + @GetMapping("/list") + public TableDataInfo list(EnterpriseMerchantAuthorizationBo bo, PageQuery pageQuery) { + return enterpriseMerchantAuthorizationService.queryPageList(bo, pageQuery); + } + + /** + * 导出商户授权企业信息列表 + */ + @SaCheckPermission("enforcementcode:merchantAuthorization:export") + @Log(title = "商户授权企业信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(EnterpriseMerchantAuthorizationBo bo, HttpServletResponse response) { + List list = enterpriseMerchantAuthorizationService.queryList(bo); + ExcelUtil.exportExcel(list, "商户授权企业信息", EnterpriseMerchantAuthorizationVo.class, response); + } + + /** + * 获取商户授权企业信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:merchantAuthorization:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(enterpriseMerchantAuthorizationService.queryById(id)); + } + + /** + * 新增商户授权企业信息 + */ + @SaCheckPermission("enforcementcode:merchantAuthorization:add") + @Log(title = "商户授权企业信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody EnterpriseMerchantAuthorizationBo bo) { + return toAjax(enterpriseMerchantAuthorizationService.insertByBo(bo)); + } + + /** + * 修改商户授权企业信息 + */ + @SaCheckPermission("enforcementcode:merchantAuthorization:edit") + @Log(title = "商户授权企业信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody EnterpriseMerchantAuthorizationBo bo) { + return toAjax(enterpriseMerchantAuthorizationService.updateByBo(bo)); + } + + /** + * 删除商户授权企业信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:merchantAuthorization:remove") + @Log(title = "商户授权企业信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(enterpriseMerchantAuthorizationService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/LawEnforcementEnterpriseController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/LawEnforcementEnterpriseController.java new file mode 100644 index 0000000..01d235a --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/LawEnforcementEnterpriseController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller; + +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.LawEnforcementEnterpriseVo; +import com.zdxt.enforcementcode.domain.bo.LawEnforcementEnterpriseBo; +import com.zdxt.enforcementcode.service.ILawEnforcementEnterpriseService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 行政检查计划-执法企业 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/enforcementcode/enforcementEnterprise") +public class LawEnforcementEnterpriseController extends BaseController { + + private final ILawEnforcementEnterpriseService lawEnforcementEnterpriseService; + + /** + * 查询行政检查计划-执法企业列表 + */ + @SaCheckPermission("enforcementcode:enforcementEnterprise:list") + @GetMapping("/list") + public TableDataInfo list(LawEnforcementEnterpriseBo bo, PageQuery pageQuery) { + return lawEnforcementEnterpriseService.queryPageList(bo, pageQuery); + } + + /** + * 导出行政检查计划-执法企业列表 + */ + @SaCheckPermission("enforcementcode:enforcementEnterprise:export") + @Log(title = "行政检查计划-执法企业", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(LawEnforcementEnterpriseBo bo, HttpServletResponse response) { + List list = lawEnforcementEnterpriseService.queryList(bo); + ExcelUtil.exportExcel(list, "行政检查计划-执法企业", LawEnforcementEnterpriseVo.class, response); + } + + /** + * 获取行政检查计划-执法企业详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:enforcementEnterprise:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(lawEnforcementEnterpriseService.queryById(id)); + } + + /** + * 新增行政检查计划-执法企业 + */ + @SaCheckPermission("enforcementcode:enforcementEnterprise:add") + @Log(title = "行政检查计划-执法企业", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody LawEnforcementEnterpriseBo bo) { + return toAjax(lawEnforcementEnterpriseService.insertByBo(bo)); + } + + /** + * 修改行政检查计划-执法企业 + */ + @SaCheckPermission("enforcementcode:enforcementEnterprise:edit") + @Log(title = "行政检查计划-执法企业", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody LawEnforcementEnterpriseBo bo) { + return toAjax(lawEnforcementEnterpriseService.updateByBo(bo)); + } + + /** + * 删除行政检查计划-执法企业 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:enforcementEnterprise:remove") + @Log(title = "行政检查计划-执法企业", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(lawEnforcementEnterpriseService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeGenerateHistoryController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeGenerateHistoryController.java new file mode 100644 index 0000000..cf2a7f1 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeGenerateHistoryController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller; + +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.QrCodeGenerateHistoryVo; +import com.zdxt.enforcementcode.domain.bo.QrCodeGenerateHistoryBo; +import com.zdxt.enforcementcode.service.IQrCodeGenerateHistoryService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 二维码生成记录 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/enforcementcode/codeGenerateHistory") +public class QrCodeGenerateHistoryController extends BaseController { + + private final IQrCodeGenerateHistoryService qrCodeGenerateHistoryService; + + /** + * 查询二维码生成记录列表 + */ + @SaCheckPermission("enforcementcode:codeGenerateHistory:list") + @GetMapping("/list") + public TableDataInfo list(QrCodeGenerateHistoryBo bo, PageQuery pageQuery) { + return qrCodeGenerateHistoryService.queryPageList(bo, pageQuery); + } + + /** + * 导出二维码生成记录列表 + */ + @SaCheckPermission("enforcementcode:codeGenerateHistory:export") + @Log(title = "二维码生成记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QrCodeGenerateHistoryBo bo, HttpServletResponse response) { + List list = qrCodeGenerateHistoryService.queryList(bo); + ExcelUtil.exportExcel(list, "二维码生成记录", QrCodeGenerateHistoryVo.class, response); + } + + /** + * 获取二维码生成记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("enforcementcode:codeGenerateHistory:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(qrCodeGenerateHistoryService.queryById(id)); + } + + /** + * 新增二维码生成记录 + */ + @SaCheckPermission("enforcementcode:codeGenerateHistory:add") + @Log(title = "二维码生成记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QrCodeGenerateHistoryBo bo) { + return toAjax(qrCodeGenerateHistoryService.insertByBo(bo)); + } + + /** + * 修改二维码生成记录 + */ + @SaCheckPermission("enforcementcode:codeGenerateHistory:edit") + @Log(title = "二维码生成记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QrCodeGenerateHistoryBo bo) { + return toAjax(qrCodeGenerateHistoryService.updateByBo(bo)); + } + + /** + * 删除二维码生成记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("enforcementcode:codeGenerateHistory:remove") + @Log(title = "二维码生成记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(qrCodeGenerateHistoryService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseComplaint.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseComplaint.java new file mode 100644 index 0000000..c075319 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseComplaint.java @@ -0,0 +1,153 @@ +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; + +/** + * 企业执法-在线投诉对象 enterprise_complaint + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("enterprise_complaint") +public class EnterpriseComplaint extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 关联执法记录ID + */ + private String relId; + + /** + * 执法类型 + */ + private Long enforceType; + + /** + * 问题描述 + */ + private String problemDescription; + + /** + * 联系人 + */ + private String linkman; + + /** + * 联系方式 + */ + private String linkmanTel; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + /** + * 投诉对接12345案件类型 + */ + private String caseType; + + /** + * + */ + private Long authorization; + + /** + * + */ + private Long comOrOpi; + + /** + * + */ + private String enterpriseAddress; + + /** + * + */ + private String proWoCode; + + /** + * + */ + private Long status; + + /** + * + */ + private Date evaluateTime; + + /** + * + */ + private String enterpriseNumber; + + /** + * + */ + private String enterpriseName; + + /** + * 执法部门多个-逗号隔开 + */ + private String complaintDepartments; + + /** + * 执法部门id多个-逗号隔开 + */ + private String complaintDepartmentIds; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 投诉类型 0 系默认 1 联合检查 + */ + private Long complaintType; + + /** + * 投诉事项编码，多个逗号隔开 + */ + private String complaintItemCodes; + + /** + * 投诉事项名称，多个逗号隔开 + */ + private String complaintItemNames; + + /** + * 同步过来的处理时间 + */ + private String handleTime; + + /** + * 投诉事项（对应记录表执法/入企事项） + */ + private String complaintRecordItem; + + /** + * 数据类型 0行政 1 非行政 + */ + private Long recordType; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseEvaluate.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseEvaluate.java new file mode 100644 index 0000000..645f78c --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseEvaluate.java @@ -0,0 +1,136 @@ +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; + +/** + * 企业端-执法评价对象 enterprise_evaluate + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("enterprise_evaluate") +public class EnterpriseEvaluate extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 案件名称 + */ + private String enforcementName; + + /** + * 案件ID + */ + private String enforcementId; + + /** + * 评价｜意见建议 + */ + private String evaluateDescription; + + /** + * 联系人 + */ + private String linkman; + + /** + * 联系电话 + */ + private String linkmanTel; + + /** + * 是否授权 0 否 1是 + */ + private Long authorization; + + /** + * + */ + private Long inspectionEfficiency; + + /** + * + */ + private Long checkEffect; + + /** + * + */ + private Long serviceExperience; + + /** + * + */ + private Long checkQuality; + + /** + * + */ + private String batchId; + + /** + * 检查效果（启用） + */ + private Long checkEffectiveness; + + /** + * 执法态度（启用） + */ + private Long checkAttitude; + + /** + * 程序合法（启用） + */ + private Long proceduralLegality; + + /** + * 满意程度：不满意：1，较满意：2，非常满意：3 + */ + private Long satisfactionLevel; + + /** + * 其他问题开关：打开：1；关闭：2 + */ + private Long otherProblemSwitch; + + /** + * 1是0否存在逐利检查，接受被检查企业的馈赠、报酬、福利等； + */ + private Long problem1; + + /** + * 1是0否存在要求被检查企业提供宴请、娱乐、旅游等活动； + */ + private Long problem2; + + /** + * 是否存在干扰企业正常生产经营，刻意要求法定代表人到场行为； + */ + private Long problem3; + + /** + * 是否存在任性处罚企业，乱查封、乱扣押、乱冻结、动辄责令停产停业的行为； + */ + private Long problem4; + + /** + * 是否存在变相检查，以观摩、督导、考察等名义行检查之实. + */ + private Long problem5; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseLawEnforcement.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseLawEnforcement.java new file mode 100644 index 0000000..aa1eff6 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseLawEnforcement.java @@ -0,0 +1,198 @@ +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; + +/** + * 企业端-执法部门预约记录对象 enterprise_law_enforcement + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("enterprise_law_enforcement") +public class EnterpriseLawEnforcement 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 Date checkTime; + + /** + * 执法人员姓名 + */ + private String lawEnforcer; + + /** + * 执法人员ID + */ + private String lawEnforcerId; + + /** + * 备注 + */ + private String remark; + + /** + * + */ + private String userId; + + /** + * + */ + private String deptId; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + /** + * 数据状态 0 正常 1 取消 + */ + private Long status; + + /** + * 登记编号 + */ + private String lawEnforcementCode; + + /** + * 企业联系人 + */ + private String linkMan; + + /** + * 联系人电话 + */ + private String linkTel; + + /** + * 检查事项 + */ + private String checkItem; + + /** + * 检查要求 + */ + private String checkRequire; + + /** + * 企业信用代码 + */ + private String enterpriseNumber; + + /** + * 执法人员2姓名 + */ + private String lawEnforcerTwo; + + /** + * 执法人员2ID + */ + private String lawEnforcerTwoId; + + /** + * 保存状态(0:临时保存; 1:保存) + */ + private Long isSubmit; + + /** + * + */ + private String uniteCheck; + + /** + * + */ + private Long isUnite; + + /** + * + */ + private Long isReg; + + /** + * + */ + private Long mainDeputyOrder; + + /** + * + */ + private String tmpDeptJson; + + /** + * + */ + private String checkItemText; + + /** + * + */ + private String checkRequireText; + + /** + * + */ + private String bureauDeptId; + + /** + * + */ + private String bureauDeptName; + + /** + * + */ + private Long checkTimeOrder; + + /** + * 执法时间 开始时段 + */ + private String checkHourStart; + + /** + * 执法时间 结束时段 + */ + private String checkHourEnd; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseMerchantAuthorization.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseMerchantAuthorization.java new file mode 100644 index 0000000..d5d805e --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseMerchantAuthorization.java @@ -0,0 +1,66 @@ +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; + +/** + * 商户授权企业信息对象 enterprise_merchant_authorization + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("enterprise_merchant_authorization") +public class EnterpriseMerchantAuthorization extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 商户手机号码 + */ + private String merchantTel; + + /** + * 商户所属人姓名 + */ + private String merchantName; + + /** + * 设备唯一码，用作安全认证 + */ + private String deviceCode; + + /** + * 企业信用代码 + */ + private String enterpriseNumber; + + /** + * 微信号 + */ + private String wxNumber; + + /** + * 是否有效 0 有效 1 失效 + */ + private Long status; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/LawEnforcementEnterprise.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/LawEnforcementEnterprise.java new file mode 100644 index 0000000..cbff734 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/LawEnforcementEnterprise.java @@ -0,0 +1,71 @@ +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; + +/** + * 行政检查计划-执法企业对象 law_enforcement_enterprise + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("law_enforcement_enterprise") +public class LawEnforcementEnterprise extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private String id; + + /** + * 企业名称 + */ + private String enterpriseName; + + /** + * 企业纳税识别号 + */ + private String enterpriseNumber; + + /** + * 执法部门 + */ + private String lawEnforcement; + + /** + * 执法部门ID + */ + private String lawEnforcementId; + + /** + * 部门ID + */ + private String deptId; + + /** + * 用户ID + */ + private String userId; + + /** + * 是否已完成 0 否 1 是 + */ + private Long status; + + /** + * 关联检查计划ID + */ + private String relId; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/QrCodeGenerateHistory.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/QrCodeGenerateHistory.java new file mode 100644 index 0000000..c7fcba5 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/QrCodeGenerateHistory.java @@ -0,0 +1,58 @@ +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; + +/** + * 二维码生成记录对象 qr_code_generate_history + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qr_code_generate_history") +public class QrCodeGenerateHistory extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 生成时间 + */ + private Date generateTime; + + /** + * 二维码地址 + */ + private String qrCodeUrl; + + /** + * 企业纳税识别号 + */ + private String enterpriseNumber; + + /** + * 是否有效 0有效 1失效 + */ + private Long status; + + /** + * 变更原因 + */ + private String reasonsChange; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseComplaintBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseComplaintBo.java new file mode 100644 index 0000000..53a6943 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseComplaintBo.java @@ -0,0 +1,152 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.EnterpriseComplaint; +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; + +/** + * 企业执法-在线投诉业务对象 enterprise_complaint + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EnterpriseComplaint.class, reverseConvertGenerate = false) +public class EnterpriseComplaintBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 关联执法记录ID + */ + private String relId; + + /** + * 执法类型 + */ + private Long enforceType; + + /** + * 问题描述 + */ + private String problemDescription; + + /** + * 联系人 + */ + private String linkman; + + /** + * 联系方式 + */ + private String linkmanTel; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + /** + * 投诉对接12345案件类型 + */ + private String caseType; + + /** + * + */ + private Long authorization; + + /** + * + */ + private Long comOrOpi; + + /** + * + */ + private String enterpriseAddress; + + /** + * + */ + private String proWoCode; + + /** + * + */ + private Long status; + + /** + * + */ + private Date evaluateTime; + + /** + * + */ + private String enterpriseNumber; + + /** + * + */ + private String enterpriseName; + + /** + * 执法部门多个-逗号隔开 + */ + private String complaintDepartments; + + /** + * 执法部门id多个-逗号隔开 + */ + private String complaintDepartmentIds; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 投诉类型 0 系默认 1 联合检查 + */ + private Long complaintType; + + /** + * 投诉事项编码，多个逗号隔开 + */ + private String complaintItemCodes; + + /** + * 投诉事项名称，多个逗号隔开 + */ + private String complaintItemNames; + + /** + * 同步过来的处理时间 + */ + private String handleTime; + + /** + * 投诉事项（对应记录表执法/入企事项） + */ + private String complaintRecordItem; + + /** + * 数据类型 0行政 1 非行政 + */ + private Long recordType; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseEvaluateBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseEvaluateBo.java new file mode 100644 index 0000000..ea77966 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseEvaluateBo.java @@ -0,0 +1,135 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.EnterpriseEvaluate; +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.*; + +/** + * 企业端-执法评价业务对象 enterprise_evaluate + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EnterpriseEvaluate.class, reverseConvertGenerate = false) +public class EnterpriseEvaluateBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 案件名称 + */ + private String enforcementName; + + /** + * 案件ID + */ + private String enforcementId; + + /** + * 评价｜意见建议 + */ + private String evaluateDescription; + + /** + * 联系人 + */ + private String linkman; + + /** + * 联系电话 + */ + private String linkmanTel; + + /** + * 是否授权 0 否 1是 + */ + private Long authorization; + + /** + * + */ + private Long inspectionEfficiency; + + /** + * + */ + private Long checkEffect; + + /** + * + */ + private Long serviceExperience; + + /** + * + */ + private Long checkQuality; + + /** + * + */ + private String batchId; + + /** + * 检查效果（启用） + */ + private Long checkEffectiveness; + + /** + * 执法态度（启用） + */ + private Long checkAttitude; + + /** + * 程序合法（启用） + */ + private Long proceduralLegality; + + /** + * 满意程度：不满意：1，较满意：2，非常满意：3 + */ + private Long satisfactionLevel; + + /** + * 其他问题开关：打开：1；关闭：2 + */ + private Long otherProblemSwitch; + + /** + * 1是0否存在逐利检查，接受被检查企业的馈赠、报酬、福利等； + */ + private Long problem1; + + /** + * 1是0否存在要求被检查企业提供宴请、娱乐、旅游等活动； + */ + private Long problem2; + + /** + * 是否存在干扰企业正常生产经营，刻意要求法定代表人到场行为； + */ + private Long problem3; + + /** + * 是否存在任性处罚企业，乱查封、乱扣押、乱冻结、动辄责令停产停业的行为； + */ + private Long problem4; + + /** + * 是否存在变相检查，以观摩、督导、考察等名义行检查之实. + */ + private Long problem5; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java new file mode 100644 index 0000000..9ff9e79 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseLawEnforcementBo.java @@ -0,0 +1,198 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.EnterpriseLawEnforcement; +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; + +/** + * 企业端-执法部门预约记录业务对象 enterprise_law_enforcement + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EnterpriseLawEnforcement.class, reverseConvertGenerate = false) +public class EnterpriseLawEnforcementBo 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 Date checkTime; + + /** + * 执法人员姓名 + */ + private String lawEnforcer; + + /** + * 执法人员ID + */ + private String lawEnforcerId; + + /** + * 备注 + */ + private String remark; + + /** + * + */ + private String userId; + + /** + * + */ + private String deptId; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + /** + * 数据状态 0 正常 1 取消 + */ + private Long status; + + /** + * 登记编号 + */ + private String lawEnforcementCode; + + /** + * 企业联系人 + */ + private String linkMan; + + /** + * 联系人电话 + */ + private String linkTel; + + /** + * 检查事项 + */ + private String checkItem; + + /** + * 检查要求 + */ + private String checkRequire; + + /** + * 企业信用代码 + */ + private String enterpriseNumber; + + /** + * 执法人员2姓名 + */ + private String lawEnforcerTwo; + + /** + * 执法人员2ID + */ + private String lawEnforcerTwoId; + + /** + * 保存状态(0:临时保存; 1:保存) + */ + @NotNull(message = "保存状态(0:临时保存; 1:保存)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long isSubmit; + + /** + * + */ + private String uniteCheck; + + /** + * + */ + private Long isUnite; + + /** + * + */ + private Long isReg; + + /** + * + */ + private Long mainDeputyOrder; + + /** + * + */ + private String tmpDeptJson; + + /** + * + */ + private String checkItemText; + + /** + * + */ + private String checkRequireText; + + /** + * + */ + private String bureauDeptId; + + /** + * + */ + private String bureauDeptName; + + /** + * + */ + private Long checkTimeOrder; + + /** + * 执法时间 开始时段 + */ + private String checkHourStart; + + /** + * 执法时间 结束时段 + */ + private String checkHourEnd; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseMerchantAuthorizationBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseMerchantAuthorizationBo.java new file mode 100644 index 0000000..6adc843 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnterpriseMerchantAuthorizationBo.java @@ -0,0 +1,65 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.EnterpriseMerchantAuthorization; +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.*; + +/** + * 商户授权企业信息业务对象 enterprise_merchant_authorization + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = EnterpriseMerchantAuthorization.class, reverseConvertGenerate = false) +public class EnterpriseMerchantAuthorizationBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 商户手机号码 + */ + private String merchantTel; + + /** + * 商户所属人姓名 + */ + private String merchantName; + + /** + * 设备唯一码，用作安全认证 + */ + private String deviceCode; + + /** + * 企业信用代码 + */ + private String enterpriseNumber; + + /** + * 微信号 + */ + private String wxNumber; + + /** + * 是否有效 0 有效 1 失效 + */ + private Long status; + + /** + * 是否删除 0 否 1 是 + */ + private Long isDelete; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/LawEnforcementEnterpriseBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/LawEnforcementEnterpriseBo.java new file mode 100644 index 0000000..e09f169 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/LawEnforcementEnterpriseBo.java @@ -0,0 +1,70 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.LawEnforcementEnterprise; +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.*; + +/** + * 行政检查计划-执法企业业务对象 law_enforcement_enterprise + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = LawEnforcementEnterprise.class, reverseConvertGenerate = false) +public class LawEnforcementEnterpriseBo extends BaseEntity { + + /** + * 主键 + */ + @NotBlank(message = "主键不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 企业名称 + */ + private String enterpriseName; + + /** + * 企业纳税识别号 + */ + private String enterpriseNumber; + + /** + * 执法部门 + */ + private String lawEnforcement; + + /** + * 执法部门ID + */ + private String lawEnforcementId; + + /** + * 部门ID + */ + private String deptId; + + /** + * 用户ID + */ + private String userId; + + /** + * 是否已完成 0 否 1 是 + */ + private Long status; + + /** + * 关联检查计划ID + */ + private String relId; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/QrCodeGenerateHistoryBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/QrCodeGenerateHistoryBo.java new file mode 100644 index 0000000..d4fdf70 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/QrCodeGenerateHistoryBo.java @@ -0,0 +1,58 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.QrCodeGenerateHistory; +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; + +/** + * 二维码生成记录业务对象 qr_code_generate_history + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = QrCodeGenerateHistory.class, reverseConvertGenerate = false) +public class QrCodeGenerateHistoryBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 生成时间 + */ + @NotNull(message = "生成时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date generateTime; + + /** + * 二维码地址 + */ + private String qrCodeUrl; + + /** + * 企业纳税识别号 + */ + private String enterpriseNumber; + + /** + * 是否有效 0有效 1失效 + */ + private Long status; + + /** + * 变更原因 + */ + private String reasonsChange; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseComplaintVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseComplaintVo.java new file mode 100644 index 0000000..31c711a --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseComplaintVo.java @@ -0,0 +1,185 @@ +package com.zdxt.enforcementcode.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zdxt.enforcementcode.domain.EnterpriseComplaint; +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; + + + +/** + * 企业执法-在线投诉视图对象 enterprise_complaint + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EnterpriseComplaint.class) +public class EnterpriseComplaintVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 关联执法记录ID + */ + @ExcelProperty(value = "关联执法记录ID") + private String relId; + + /** + * 执法类型 + */ + @ExcelProperty(value = "执法类型") + private Long enforceType; + + /** + * 问题描述 + */ + @ExcelProperty(value = "问题描述") + private String problemDescription; + + /** + * 联系人 + */ + @ExcelProperty(value = "联系人") + private String linkman; + + /** + * 联系方式 + */ + @ExcelProperty(value = "联系方式") + private String linkmanTel; + + /** + * 是否删除 0 否 1 是 + */ + @ExcelProperty(value = "是否删除 0 否 1 是") + private Long isDelete; + + /** + * 投诉对接12345案件类型 + */ + @ExcelProperty(value = "投诉对接12345案件类型") + private String caseType; + + /** + * + */ + @ExcelProperty(value = "") + private Long authorization; + + /** + * + */ + @ExcelProperty(value = "") + private Long comOrOpi; + + /** + * + */ + @ExcelProperty(value = "") + private String enterpriseAddress; + + /** + * + */ + @ExcelProperty(value = "") + private String proWoCode; + + /** + * + */ + @ExcelProperty(value = "") + private Long status; + + /** + * + */ + @ExcelProperty(value = "") + private Date evaluateTime; + + /** + * + */ + @ExcelProperty(value = "") + private String enterpriseNumber; + + /** + * + */ + @ExcelProperty(value = "") + private String enterpriseName; + + /** + * 执法部门多个-逗号隔开 + */ + @ExcelProperty(value = "执法部门多个-逗号隔开") + private String complaintDepartments; + + /** + * 执法部门id多个-逗号隔开 + */ + @ExcelProperty(value = "执法部门id多个-逗号隔开") + private String complaintDepartmentIds; + + /** + * 执法时间 + */ + @ExcelProperty(value = "执法时间") + private Date enforcementTime; + + /** + * 投诉类型 0 系默认 1 联合检查 + */ + @ExcelProperty(value = "投诉类型 0 系默认 1 联合检查") + private Long complaintType; + + /** + * 投诉事项编码，多个逗号隔开 + */ + @ExcelProperty(value = "投诉事项编码，多个逗号隔开") + private String complaintItemCodes; + + /** + * 投诉事项名称，多个逗号隔开 + */ + @ExcelProperty(value = "投诉事项名称，多个逗号隔开") + private String complaintItemNames; + + /** + * 同步过来的处理时间 + */ + @ExcelProperty(value = "同步过来的处理时间") + private String handleTime; + + /** + * 投诉事项（对应记录表执法/入企事项） + */ + @ExcelProperty(value = "投诉事项", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "对=应记录表执法/入企事项") + private String complaintRecordItem; + + /** + * 数据类型 0行政 1 非行政 + */ + @ExcelProperty(value = "数据类型 0行政 1 非行政") + private Long recordType; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseEvaluateVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseEvaluateVo.java new file mode 100644 index 0000000..65215fa --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseEvaluateVo.java @@ -0,0 +1,167 @@ +package com.zdxt.enforcementcode.domain.vo; + +import com.zdxt.enforcementcode.domain.EnterpriseEvaluate; +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; + + + +/** + * 企业端-执法评价视图对象 enterprise_evaluate + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EnterpriseEvaluate.class) +public class EnterpriseEvaluateVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 案件名称 + */ + @ExcelProperty(value = "案件名称") + private String enforcementName; + + /** + * 案件ID + */ + @ExcelProperty(value = "案件ID") + private String enforcementId; + + /** + * 评价｜意见建议 + */ + @ExcelProperty(value = "评价｜意见建议") + private String evaluateDescription; + + /** + * 联系人 + */ + @ExcelProperty(value = "联系人") + private String linkman; + + /** + * 联系电话 + */ + @ExcelProperty(value = "联系电话") + private String linkmanTel; + + /** + * 是否授权 0 否 1是 + */ + @ExcelProperty(value = "是否授权 0 否 1是") + private Long authorization; + + /** + * + */ + @ExcelProperty(value = "") + private Long inspectionEfficiency; + + /** + * + */ + @ExcelProperty(value = "") + private Long checkEffect; + + /** + * + */ + @ExcelProperty(value = "") + private Long serviceExperience; + + /** + * + */ + @ExcelProperty(value = "") + private Long checkQuality; + + /** + * + */ + @ExcelProperty(value = "") + private String batchId; + + /** + * 检查效果（启用） + */ + @ExcelProperty(value = "检查效果", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "启=用") + private Long checkEffectiveness; + + /** + * 执法态度（启用） + */ + @ExcelProperty(value = "执法态度", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "启=用") + private Long checkAttitude; + + /** + * 程序合法（启用） + */ + @ExcelProperty(value = "程序合法", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "启=用") + private Long proceduralLegality; + + /** + * 满意程度：不满意：1，较满意：2，非常满意：3 + */ + @ExcelProperty(value = "满意程度：不满意：1，较满意：2，非常满意：3") + private Long satisfactionLevel; + + /** + * 其他问题开关：打开：1；关闭：2 + */ + @ExcelProperty(value = "其他问题开关：打开：1；关闭：2") + private Long otherProblemSwitch; + + /** + * 1是0否存在逐利检查，接受被检查企业的馈赠、报酬、福利等； + */ + @ExcelProperty(value = "1是0否存在逐利检查，接受被检查企业的馈赠、报酬、福利等；") + private Long problem1; + + /** + * 1是0否存在要求被检查企业提供宴请、娱乐、旅游等活动； + */ + @ExcelProperty(value = "1是0否存在要求被检查企业提供宴请、娱乐、旅游等活动；") + private Long problem2; + + /** + * 是否存在干扰企业正常生产经营，刻意要求法定代表人到场行为； + */ + @ExcelProperty(value = "是否存在干扰企业正常生产经营，刻意要求法定代表人到场行为；") + private Long problem3; + + /** + * 是否存在任性处罚企业，乱查封、乱扣押、乱冻结、动辄责令停产停业的行为； + */ + @ExcelProperty(value = "是否存在任性处罚企业，乱查封、乱扣押、乱冻结、动辄责令停产停业的行为；") + private Long problem4; + + /** + * 是否存在变相检查，以观摩、督导、考察等名义行检查之实. + */ + @ExcelProperty(value = "是否存在变相检查，以观摩、督导、考察等名义行检查之实.") + private Long problem5; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseLawEnforcementVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseLawEnforcementVo.java new file mode 100644 index 0000000..14eafc4 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseLawEnforcementVo.java @@ -0,0 +1,238 @@ +package com.zdxt.enforcementcode.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zdxt.enforcementcode.domain.EnterpriseLawEnforcement; +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; + + + +/** + * 企业端-执法部门预约记录视图对象 enterprise_law_enforcement + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EnterpriseLawEnforcement.class) +public class EnterpriseLawEnforcementVo 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 Date checkTime; + + /** + * 执法人员姓名 + */ + @ExcelProperty(value = "执法人员姓名") + private String lawEnforcer; + + /** + * 执法人员ID + */ + @ExcelProperty(value = "执法人员ID") + private String lawEnforcerId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * + */ + @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; + + /** + * 企业联系人 + */ + @ExcelProperty(value = "企业联系人") + private String linkMan; + + /** + * 联系人电话 + */ + @ExcelProperty(value = "联系人电话") + private String linkTel; + + /** + * 检查事项 + */ + @ExcelProperty(value = "检查事项") + private String checkItem; + + /** + * 检查要求 + */ + @ExcelProperty(value = "检查要求") + private String checkRequire; + + /** + * 企业信用代码 + */ + @ExcelProperty(value = "企业信用代码") + private String enterpriseNumber; + + /** + * 执法人员2姓名 + */ + @ExcelProperty(value = "执法人员2姓名") + private String lawEnforcerTwo; + + /** + * 执法人员2ID + */ + @ExcelProperty(value = "执法人员2ID") + private String lawEnforcerTwoId; + + /** + * 保存状态(0:临时保存; 1:保存) + */ + @ExcelProperty(value = "保存状态(0:临时保存; 1:保存)") + private Long isSubmit; + + /** + * + */ + @ExcelProperty(value = "") + private String uniteCheck; + + /** + * + */ + @ExcelProperty(value = "") + private Long isUnite; + + /** + * + */ + @ExcelProperty(value = "") + private Long isReg; + + /** + * + */ + @ExcelProperty(value = "") + private Long mainDeputyOrder; + + /** + * + */ + @ExcelProperty(value = "") + private String tmpDeptJson; + + /** + * + */ + @ExcelProperty(value = "") + private String checkItemText; + + /** + * + */ + @ExcelProperty(value = "") + private String checkRequireText; + + /** + * + */ + @ExcelProperty(value = "") + private String bureauDeptId; + + /** + * + */ + @ExcelProperty(value = "") + private String bureauDeptName; + + /** + * + */ + @ExcelProperty(value = "") + private Long checkTimeOrder; + + /** + * 执法时间 开始时段 + */ + @ExcelProperty(value = "执法时间 开始时段") + private String checkHourStart; + + /** + * 执法时间 结束时段 + */ + @ExcelProperty(value = "执法时间 结束时段") + private String checkHourEnd; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseMerchantAuthorizationVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseMerchantAuthorizationVo.java new file mode 100644 index 0000000..686ff30 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnterpriseMerchantAuthorizationVo.java @@ -0,0 +1,84 @@ +package com.zdxt.enforcementcode.domain.vo; + +import com.zdxt.enforcementcode.domain.EnterpriseMerchantAuthorization; +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; + + + +/** + * 商户授权企业信息视图对象 enterprise_merchant_authorization + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EnterpriseMerchantAuthorization.class) +public class EnterpriseMerchantAuthorizationVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 商户手机号码 + */ + @ExcelProperty(value = "商户手机号码") + private String merchantTel; + + /** + * 商户所属人姓名 + */ + @ExcelProperty(value = "商户所属人姓名") + private String merchantName; + + /** + * 设备唯一码，用作安全认证 + */ + @ExcelProperty(value = "设备唯一码，用作安全认证") + private String deviceCode; + + /** + * 企业信用代码 + */ + @ExcelProperty(value = "企业信用代码") + private String enterpriseNumber; + + /** + * 微信号 + */ + @ExcelProperty(value = "微信号") + private String wxNumber; + + /** + * 是否有效 0 有效 1 失效 + */ + @ExcelProperty(value = "是否有效 0 有效 1 失效") + private Long status; + + /** + * 是否删除 0 否 1 是 + */ + @ExcelProperty(value = "是否删除 0 否 1 是") + private Long isDelete; + + /** + * 企业名称（关联查询，非数据库字段） + */ + private String enterpriseName; + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/LawEnforcementEnterpriseVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/LawEnforcementEnterpriseVo.java new file mode 100644 index 0000000..1da2027 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/LawEnforcementEnterpriseVo.java @@ -0,0 +1,86 @@ +package com.zdxt.enforcementcode.domain.vo; + +import com.zdxt.enforcementcode.domain.LawEnforcementEnterprise; +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; + + + +/** + * 行政检查计划-执法企业视图对象 law_enforcement_enterprise + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = LawEnforcementEnterprise.class) +public class LawEnforcementEnterpriseVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private String id; + + /** + * 企业名称 + */ + @ExcelProperty(value = "企业名称") + private String enterpriseName; + + /** + * 企业纳税识别号 + */ + @ExcelProperty(value = "企业纳税识别号") + private String enterpriseNumber; + + /** + * 执法部门 + */ + @ExcelProperty(value = "执法部门") + private String lawEnforcement; + + /** + * 执法部门ID + */ + @ExcelProperty(value = "执法部门ID") + private String lawEnforcementId; + + /** + * 部门ID + */ + @ExcelProperty(value = "部门ID") + private String deptId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private String userId; + + /** + * 是否已完成 0 否 1 是 + */ + @ExcelProperty(value = "是否已完成 0 否 1 是") + private Long status; + + /** + * 关联检查计划ID + */ + @ExcelProperty(value = "关联检查计划ID") + private String relId; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/QrCodeGenerateHistoryVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/QrCodeGenerateHistoryVo.java new file mode 100644 index 0000000..68d82ff --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/QrCodeGenerateHistoryVo.java @@ -0,0 +1,70 @@ +package com.zdxt.enforcementcode.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zdxt.enforcementcode.domain.QrCodeGenerateHistory; +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; + + + +/** + * 二维码生成记录视图对象 qr_code_generate_history + * + * @author Lion Li + * @date 2026-04-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = QrCodeGenerateHistory.class) +public class QrCodeGenerateHistoryVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 生成时间 + */ + @ExcelProperty(value = "生成时间") + private Date generateTime; + + /** + * 二维码地址 + */ + @ExcelProperty(value = "二维码地址") + private String qrCodeUrl; + + /** + * 企业纳税识别号 + */ + @ExcelProperty(value = "企业纳税识别号") + private String enterpriseNumber; + + /** + * 是否有效 0有效 1失效 + */ + @ExcelProperty(value = "是否有效 0有效 1失效") + private Long status; + + /** + * 变更原因 + */ + @ExcelProperty(value = "变更原因") + private String reasonsChange; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseComplaintMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseComplaintMapper.java new file mode 100644 index 0000000..2070437 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseComplaintMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.EnterpriseComplaint; +import com.zdxt.enforcementcode.domain.vo.EnterpriseComplaintVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 企业执法-在线投诉Mapper接口 + * + * @author Lion Li + * @date 2026-04-13 + */ +public interface EnterpriseComplaintMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseEvaluateMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseEvaluateMapper.java new file mode 100644 index 0000000..f6d9bee --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseEvaluateMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.EnterpriseEvaluate; +import com.zdxt.enforcementcode.domain.vo.EnterpriseEvaluateVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 企业端-执法评价Mapper接口 + * + * @author Lion Li + * @date 2026-04-13 + */ +public interface EnterpriseEvaluateMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseLawEnforcementMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseLawEnforcementMapper.java new file mode 100644 index 0000000..1b23fbe --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseLawEnforcementMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.EnterpriseLawEnforcement; +import com.zdxt.enforcementcode.domain.vo.EnterpriseLawEnforcementVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 企业端-执法部门预约记录Mapper接口 + * + * @author Lion Li + * @date 2026-04-13 + */ +public interface EnterpriseLawEnforcementMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseMerchantAuthorizationMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseMerchantAuthorizationMapper.java new file mode 100644 index 0000000..d81709e --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseMerchantAuthorizationMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.EnterpriseMerchantAuthorization; +import com.zdxt.enforcementcode.domain.vo.EnterpriseMerchantAuthorizationVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 商户授权企业信息Mapper接口 + * + * @author Lion Li + * @date 2026-04-13 + */ +public interface EnterpriseMerchantAuthorizationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/LawEnforcementEnterpriseMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/LawEnforcementEnterpriseMapper.java new file mode 100644 index 0000000..2852bba --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/LawEnforcementEnterpriseMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.LawEnforcementEnterprise; +import com.zdxt.enforcementcode.domain.vo.LawEnforcementEnterpriseVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 行政检查计划-执法企业Mapper接口 + * + * @author Lion Li + * @date 2026-04-13 + */ +public interface LawEnforcementEnterpriseMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/QrCodeGenerateHistoryMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/QrCodeGenerateHistoryMapper.java new file mode 100644 index 0000000..414e99b --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/QrCodeGenerateHistoryMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.QrCodeGenerateHistory; +import com.zdxt.enforcementcode.domain.vo.QrCodeGenerateHistoryVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 二维码生成记录Mapper接口 + * + * @author Lion Li + * @date 2026-04-13 + */ +public interface QrCodeGenerateHistoryMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseComplaintService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseComplaintService.java new file mode 100644 index 0000000..c63a878 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseComplaintService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.EnterpriseComplaintVo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseComplaintBo; +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-13 + */ +public interface IEnterpriseComplaintService { + + /** + * 查询企业执法-在线投诉 + * + * @param id 主键 + * @return 企业执法-在线投诉 + */ + EnterpriseComplaintVo queryById(String id); + + /** + * 分页查询企业执法-在线投诉列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 企业执法-在线投诉分页列表 + */ + TableDataInfo queryPageList(EnterpriseComplaintBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的企业执法-在线投诉列表 + * + * @param bo 查询条件 + * @return 企业执法-在线投诉列表 + */ + List queryList(EnterpriseComplaintBo bo); + + /** + * 新增企业执法-在线投诉 + * + * @param bo 企业执法-在线投诉 + * @return 是否新增成功 + */ + Boolean insertByBo(EnterpriseComplaintBo bo); + + /** + * 修改企业执法-在线投诉 + * + * @param bo 企业执法-在线投诉 + * @return 是否修改成功 + */ + Boolean updateByBo(EnterpriseComplaintBo 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/IEnterpriseEvaluateService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseEvaluateService.java new file mode 100644 index 0000000..19f8d39 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseEvaluateService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.EnterpriseEvaluateVo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseEvaluateBo; +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-13 + */ +public interface IEnterpriseEvaluateService { + + /** + * 查询企业端-执法评价 + * + * @param id 主键 + * @return 企业端-执法评价 + */ + EnterpriseEvaluateVo queryById(String id); + + /** + * 分页查询企业端-执法评价列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 企业端-执法评价分页列表 + */ + TableDataInfo queryPageList(EnterpriseEvaluateBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的企业端-执法评价列表 + * + * @param bo 查询条件 + * @return 企业端-执法评价列表 + */ + List queryList(EnterpriseEvaluateBo bo); + + /** + * 新增企业端-执法评价 + * + * @param bo 企业端-执法评价 + * @return 是否新增成功 + */ + Boolean insertByBo(EnterpriseEvaluateBo bo); + + /** + * 修改企业端-执法评价 + * + * @param bo 企业端-执法评价 + * @return 是否修改成功 + */ + Boolean updateByBo(EnterpriseEvaluateBo 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/IEnterpriseLawEnforcementService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseLawEnforcementService.java new file mode 100644 index 0000000..ed4683f --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseLawEnforcementService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.EnterpriseLawEnforcementVo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseLawEnforcementBo; +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-13 + */ +public interface IEnterpriseLawEnforcementService { + + /** + * 查询企业端-执法部门预约记录 + * + * @param id 主键 + * @return 企业端-执法部门预约记录 + */ + EnterpriseLawEnforcementVo queryById(String id); + + /** + * 分页查询企业端-执法部门预约记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 企业端-执法部门预约记录分页列表 + */ + TableDataInfo queryPageList(EnterpriseLawEnforcementBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的企业端-执法部门预约记录列表 + * + * @param bo 查询条件 + * @return 企业端-执法部门预约记录列表 + */ + List queryList(EnterpriseLawEnforcementBo bo); + + /** + * 新增企业端-执法部门预约记录 + * + * @param bo 企业端-执法部门预约记录 + * @return 是否新增成功 + */ + Boolean insertByBo(EnterpriseLawEnforcementBo bo); + + /** + * 修改企业端-执法部门预约记录 + * + * @param bo 企业端-执法部门预约记录 + * @return 是否修改成功 + */ + Boolean updateByBo(EnterpriseLawEnforcementBo 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/IEnterpriseMerchantAuthorizationService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseMerchantAuthorizationService.java new file mode 100644 index 0000000..574c1aa --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseMerchantAuthorizationService.java @@ -0,0 +1,76 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.EnterpriseMerchantAuthorizationVo; +import com.zdxt.enforcementcode.domain.bo.EnterpriseMerchantAuthorizationBo; +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-13 + */ +public interface IEnterpriseMerchantAuthorizationService { + + /** + * 查询商户授权企业信息 + * + * @param id 主键 + * @return 商户授权企业信息 + */ + EnterpriseMerchantAuthorizationVo queryById(String id); + + /** + * 分页查询商户授权企业信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商户授权企业信息分页列表 + */ + TableDataInfo queryPageList(EnterpriseMerchantAuthorizationBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的商户授权企业信息列表 + * + * @param bo 查询条件 + * @return 商户授权企业信息列表 + */ + List queryList(EnterpriseMerchantAuthorizationBo bo); + + /** + * 新增商户授权企业信息 + * + * @param bo 商户授权企业信息 + * @return 是否新增成功 + */ + Boolean insertByBo(EnterpriseMerchantAuthorizationBo bo); + + /** + * 修改商户授权企业信息 + * + * @param bo 商户授权企业信息 + * @return 是否修改成功 + */ + Boolean updateByBo(EnterpriseMerchantAuthorizationBo bo); + + /** + * 校验并批量删除商户授权企业信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 查询商户授权企业信息列表（关联企业名称） + * + * @param bo 查询条件 + * @return 商户授权企业信息列表 + */ + List queryEnterpriseMerchantAuthorizationList(EnterpriseMerchantAuthorizationBo bo); +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ILawEnforcementEnterpriseService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ILawEnforcementEnterpriseService.java new file mode 100644 index 0000000..16e8665 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ILawEnforcementEnterpriseService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.LawEnforcementEnterpriseVo; +import com.zdxt.enforcementcode.domain.bo.LawEnforcementEnterpriseBo; +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-13 + */ +public interface ILawEnforcementEnterpriseService { + + /** + * 查询行政检查计划-执法企业 + * + * @param id 主键 + * @return 行政检查计划-执法企业 + */ + LawEnforcementEnterpriseVo queryById(String id); + + /** + * 分页查询行政检查计划-执法企业列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 行政检查计划-执法企业分页列表 + */ + TableDataInfo queryPageList(LawEnforcementEnterpriseBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的行政检查计划-执法企业列表 + * + * @param bo 查询条件 + * @return 行政检查计划-执法企业列表 + */ + List queryList(LawEnforcementEnterpriseBo bo); + + /** + * 新增行政检查计划-执法企业 + * + * @param bo 行政检查计划-执法企业 + * @return 是否新增成功 + */ + Boolean insertByBo(LawEnforcementEnterpriseBo bo); + + /** + * 修改行政检查计划-执法企业 + * + * @param bo 行政检查计划-执法企业 + * @return 是否修改成功 + */ + Boolean updateByBo(LawEnforcementEnterpriseBo 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/IQrCodeGenerateHistoryService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IQrCodeGenerateHistoryService.java new file mode 100644 index 0000000..d712eba --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IQrCodeGenerateHistoryService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.QrCodeGenerateHistoryVo; +import com.zdxt.enforcementcode.domain.bo.QrCodeGenerateHistoryBo; +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-13 + */ +public interface IQrCodeGenerateHistoryService { + + /** + * 查询二维码生成记录 + * + * @param id 主键 + * @return 二维码生成记录 + */ + QrCodeGenerateHistoryVo queryById(String id); + + /** + * 分页查询二维码生成记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 二维码生成记录分页列表 + */ + TableDataInfo queryPageList(QrCodeGenerateHistoryBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的二维码生成记录列表 + * + * @param bo 查询条件 + * @return 二维码生成记录列表 + */ + List queryList(QrCodeGenerateHistoryBo bo); + + /** + * 新增二维码生成记录 + * + * @param bo 二维码生成记录 + * @return 是否新增成功 + */ + Boolean insertByBo(QrCodeGenerateHistoryBo bo); + + /** + * 修改二维码生成记录 + * + * @param bo 二维码生成记录 + * @return 是否修改成功 + */ + Boolean updateByBo(QrCodeGenerateHistoryBo 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/EnterpriseComplaintServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseComplaintServiceImpl.java new file mode 100644 index 0000000..c5fd277 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseComplaintServiceImpl.java @@ -0,0 +1,155 @@ +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.EnterpriseComplaintBo; +import com.zdxt.enforcementcode.domain.vo.EnterpriseComplaintVo; +import com.zdxt.enforcementcode.domain.EnterpriseComplaint; +import com.zdxt.enforcementcode.mapper.EnterpriseComplaintMapper; +import com.zdxt.enforcementcode.service.IEnterpriseComplaintService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 企业执法-在线投诉Service业务层处理 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintService { + + private final EnterpriseComplaintMapper baseMapper; + + /** + * 查询企业执法-在线投诉 + * + * @param id 主键 + * @return 企业执法-在线投诉 + */ + @Override + public EnterpriseComplaintVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询企业执法-在线投诉列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 企业执法-在线投诉分页列表 + */ + @Override + public TableDataInfo queryPageList(EnterpriseComplaintBo 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(EnterpriseComplaintBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EnterpriseComplaintBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(EnterpriseComplaint::getId); + lqw.eq(StringUtils.isNotBlank(bo.getRelId()), EnterpriseComplaint::getRelId, bo.getRelId()); + lqw.eq(bo.getEnforceType() != null, EnterpriseComplaint::getEnforceType, bo.getEnforceType()); + lqw.eq(StringUtils.isNotBlank(bo.getProblemDescription()), EnterpriseComplaint::getProblemDescription, bo.getProblemDescription()); + lqw.eq(StringUtils.isNotBlank(bo.getLinkman()), EnterpriseComplaint::getLinkman, bo.getLinkman()); + lqw.eq(StringUtils.isNotBlank(bo.getLinkmanTel()), EnterpriseComplaint::getLinkmanTel, bo.getLinkmanTel()); + lqw.eq(bo.getIsDelete() != null, EnterpriseComplaint::getIsDelete, bo.getIsDelete()); + lqw.eq(StringUtils.isNotBlank(bo.getCaseType()), EnterpriseComplaint::getCaseType, bo.getCaseType()); + lqw.eq(bo.getAuthorization() != null, EnterpriseComplaint::getAuthorization, bo.getAuthorization()); + lqw.eq(bo.getComOrOpi() != null, EnterpriseComplaint::getComOrOpi, bo.getComOrOpi()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseAddress()), EnterpriseComplaint::getEnterpriseAddress, bo.getEnterpriseAddress()); + lqw.eq(StringUtils.isNotBlank(bo.getProWoCode()), EnterpriseComplaint::getProWoCode, bo.getProWoCode()); + lqw.eq(bo.getStatus() != null, EnterpriseComplaint::getStatus, bo.getStatus()); + lqw.eq(bo.getEvaluateTime() != null, EnterpriseComplaint::getEvaluateTime, bo.getEvaluateTime()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), EnterpriseComplaint::getEnterpriseNumber, bo.getEnterpriseNumber()); + lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), EnterpriseComplaint::getEnterpriseName, bo.getEnterpriseName()); + lqw.eq(StringUtils.isNotBlank(bo.getComplaintDepartments()), EnterpriseComplaint::getComplaintDepartments, bo.getComplaintDepartments()); + lqw.eq(StringUtils.isNotBlank(bo.getComplaintDepartmentIds()), EnterpriseComplaint::getComplaintDepartmentIds, bo.getComplaintDepartmentIds()); + lqw.eq(bo.getEnforcementTime() != null, EnterpriseComplaint::getEnforcementTime, bo.getEnforcementTime()); + lqw.eq(bo.getComplaintType() != null, EnterpriseComplaint::getComplaintType, bo.getComplaintType()); + lqw.eq(StringUtils.isNotBlank(bo.getComplaintItemCodes()), EnterpriseComplaint::getComplaintItemCodes, bo.getComplaintItemCodes()); + lqw.eq(StringUtils.isNotBlank(bo.getComplaintItemNames()), EnterpriseComplaint::getComplaintItemNames, bo.getComplaintItemNames()); + lqw.eq(StringUtils.isNotBlank(bo.getHandleTime()), EnterpriseComplaint::getHandleTime, bo.getHandleTime()); + lqw.eq(StringUtils.isNotBlank(bo.getComplaintRecordItem()), EnterpriseComplaint::getComplaintRecordItem, bo.getComplaintRecordItem()); + lqw.eq(bo.getRecordType() != null, EnterpriseComplaint::getRecordType, bo.getRecordType()); + return lqw; + } + + /** + * 新增企业执法-在线投诉 + * + * @param bo 企业执法-在线投诉 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EnterpriseComplaintBo bo) { + EnterpriseComplaint add = MapstructUtils.convert(bo, EnterpriseComplaint.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改企业执法-在线投诉 + * + * @param bo 企业执法-在线投诉 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EnterpriseComplaintBo bo) { + EnterpriseComplaint update = MapstructUtils.convert(bo, EnterpriseComplaint.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EnterpriseComplaint 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/EnterpriseEvaluateServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseEvaluateServiceImpl.java new file mode 100644 index 0000000..bbe37ea --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseEvaluateServiceImpl.java @@ -0,0 +1,152 @@ +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.EnterpriseEvaluateBo; +import com.zdxt.enforcementcode.domain.vo.EnterpriseEvaluateVo; +import com.zdxt.enforcementcode.domain.EnterpriseEvaluate; +import com.zdxt.enforcementcode.mapper.EnterpriseEvaluateMapper; +import com.zdxt.enforcementcode.service.IEnterpriseEvaluateService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 企业端-执法评价Service业务层处理 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService { + + private final EnterpriseEvaluateMapper baseMapper; + + /** + * 查询企业端-执法评价 + * + * @param id 主键 + * @return 企业端-执法评价 + */ + @Override + public EnterpriseEvaluateVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询企业端-执法评价列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 企业端-执法评价分页列表 + */ + @Override + public TableDataInfo queryPageList(EnterpriseEvaluateBo 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(EnterpriseEvaluateBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EnterpriseEvaluateBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(EnterpriseEvaluate::getId); + lqw.like(StringUtils.isNotBlank(bo.getEnforcementName()), EnterpriseEvaluate::getEnforcementName, bo.getEnforcementName()); + lqw.eq(StringUtils.isNotBlank(bo.getEnforcementId()), EnterpriseEvaluate::getEnforcementId, bo.getEnforcementId()); + lqw.eq(StringUtils.isNotBlank(bo.getEvaluateDescription()), EnterpriseEvaluate::getEvaluateDescription, bo.getEvaluateDescription()); + lqw.eq(StringUtils.isNotBlank(bo.getLinkman()), EnterpriseEvaluate::getLinkman, bo.getLinkman()); + lqw.eq(StringUtils.isNotBlank(bo.getLinkmanTel()), EnterpriseEvaluate::getLinkmanTel, bo.getLinkmanTel()); + lqw.eq(bo.getAuthorization() != null, EnterpriseEvaluate::getAuthorization, bo.getAuthorization()); + lqw.eq(bo.getInspectionEfficiency() != null, EnterpriseEvaluate::getInspectionEfficiency, bo.getInspectionEfficiency()); + lqw.eq(bo.getCheckEffect() != null, EnterpriseEvaluate::getCheckEffect, bo.getCheckEffect()); + lqw.eq(bo.getServiceExperience() != null, EnterpriseEvaluate::getServiceExperience, bo.getServiceExperience()); + lqw.eq(bo.getCheckQuality() != null, EnterpriseEvaluate::getCheckQuality, bo.getCheckQuality()); + lqw.eq(StringUtils.isNotBlank(bo.getBatchId()), EnterpriseEvaluate::getBatchId, bo.getBatchId()); + lqw.eq(bo.getCheckEffectiveness() != null, EnterpriseEvaluate::getCheckEffectiveness, bo.getCheckEffectiveness()); + lqw.eq(bo.getCheckAttitude() != null, EnterpriseEvaluate::getCheckAttitude, bo.getCheckAttitude()); + lqw.eq(bo.getProceduralLegality() != null, EnterpriseEvaluate::getProceduralLegality, bo.getProceduralLegality()); + lqw.eq(bo.getSatisfactionLevel() != null, EnterpriseEvaluate::getSatisfactionLevel, bo.getSatisfactionLevel()); + lqw.eq(bo.getOtherProblemSwitch() != null, EnterpriseEvaluate::getOtherProblemSwitch, bo.getOtherProblemSwitch()); + lqw.eq(bo.getProblem1() != null, EnterpriseEvaluate::getProblem1, bo.getProblem1()); + lqw.eq(bo.getProblem2() != null, EnterpriseEvaluate::getProblem2, bo.getProblem2()); + lqw.eq(bo.getProblem3() != null, EnterpriseEvaluate::getProblem3, bo.getProblem3()); + lqw.eq(bo.getProblem4() != null, EnterpriseEvaluate::getProblem4, bo.getProblem4()); + lqw.eq(bo.getProblem5() != null, EnterpriseEvaluate::getProblem5, bo.getProblem5()); + return lqw; + } + + /** + * 新增企业端-执法评价 + * + * @param bo 企业端-执法评价 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EnterpriseEvaluateBo bo) { + EnterpriseEvaluate add = MapstructUtils.convert(bo, EnterpriseEvaluate.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改企业端-执法评价 + * + * @param bo 企业端-执法评价 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EnterpriseEvaluateBo bo) { + EnterpriseEvaluate update = MapstructUtils.convert(bo, EnterpriseEvaluate.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EnterpriseEvaluate 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/EnterpriseLawEnforcementServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java new file mode 100644 index 0000000..a401baa --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -0,0 +1,163 @@ +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.EnterpriseLawEnforcementBo; +import com.zdxt.enforcementcode.domain.vo.EnterpriseLawEnforcementVo; +import com.zdxt.enforcementcode.domain.EnterpriseLawEnforcement; +import com.zdxt.enforcementcode.mapper.EnterpriseLawEnforcementMapper; +import com.zdxt.enforcementcode.service.IEnterpriseLawEnforcementService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 企业端-执法部门预约记录Service业务层处理 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforcementService { + + private final EnterpriseLawEnforcementMapper baseMapper; + + /** + * 查询企业端-执法部门预约记录 + * + * @param id 主键 + * @return 企业端-执法部门预约记录 + */ + @Override + public EnterpriseLawEnforcementVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询企业端-执法部门预约记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 企业端-执法部门预约记录分页列表 + */ + @Override + public TableDataInfo queryPageList(EnterpriseLawEnforcementBo 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(EnterpriseLawEnforcementBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EnterpriseLawEnforcementBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(EnterpriseLawEnforcement::getId); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcement()), EnterpriseLawEnforcement::getLawEnforcement, bo.getLawEnforcement()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementId()), EnterpriseLawEnforcement::getLawEnforcementId, bo.getLawEnforcementId()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseId()), EnterpriseLawEnforcement::getEnterpriseId, bo.getEnterpriseId()); + lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), EnterpriseLawEnforcement::getEnterpriseName, bo.getEnterpriseName()); + lqw.eq(bo.getCheckTime() != null, EnterpriseLawEnforcement::getCheckTime, bo.getCheckTime()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcer()), EnterpriseLawEnforcement::getLawEnforcer, bo.getLawEnforcer()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerId()), EnterpriseLawEnforcement::getLawEnforcerId, bo.getLawEnforcerId()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), EnterpriseLawEnforcement::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), EnterpriseLawEnforcement::getDeptId, bo.getDeptId()); + lqw.eq(bo.getIsDelete() != null, EnterpriseLawEnforcement::getIsDelete, bo.getIsDelete()); + lqw.eq(bo.getStatus() != null, EnterpriseLawEnforcement::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementCode()), EnterpriseLawEnforcement::getLawEnforcementCode, bo.getLawEnforcementCode()); + lqw.eq(StringUtils.isNotBlank(bo.getLinkMan()), EnterpriseLawEnforcement::getLinkMan, bo.getLinkMan()); + lqw.eq(StringUtils.isNotBlank(bo.getLinkTel()), EnterpriseLawEnforcement::getLinkTel, bo.getLinkTel()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckItem()), EnterpriseLawEnforcement::getCheckItem, bo.getCheckItem()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckRequire()), EnterpriseLawEnforcement::getCheckRequire, bo.getCheckRequire()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), EnterpriseLawEnforcement::getEnterpriseNumber, bo.getEnterpriseNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerTwo()), EnterpriseLawEnforcement::getLawEnforcerTwo, bo.getLawEnforcerTwo()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcerTwoId()), EnterpriseLawEnforcement::getLawEnforcerTwoId, bo.getLawEnforcerTwoId()); + lqw.eq(bo.getIsSubmit() != null, EnterpriseLawEnforcement::getIsSubmit, bo.getIsSubmit()); + lqw.eq(StringUtils.isNotBlank(bo.getUniteCheck()), EnterpriseLawEnforcement::getUniteCheck, bo.getUniteCheck()); + lqw.eq(bo.getIsUnite() != null, EnterpriseLawEnforcement::getIsUnite, bo.getIsUnite()); + lqw.eq(bo.getIsReg() != null, EnterpriseLawEnforcement::getIsReg, bo.getIsReg()); + lqw.eq(bo.getMainDeputyOrder() != null, EnterpriseLawEnforcement::getMainDeputyOrder, bo.getMainDeputyOrder()); + lqw.eq(StringUtils.isNotBlank(bo.getTmpDeptJson()), EnterpriseLawEnforcement::getTmpDeptJson, bo.getTmpDeptJson()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckItemText()), EnterpriseLawEnforcement::getCheckItemText, bo.getCheckItemText()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckRequireText()), EnterpriseLawEnforcement::getCheckRequireText, bo.getCheckRequireText()); + lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), EnterpriseLawEnforcement::getBureauDeptId, bo.getBureauDeptId()); + lqw.like(StringUtils.isNotBlank(bo.getBureauDeptName()), EnterpriseLawEnforcement::getBureauDeptName, bo.getBureauDeptName()); + lqw.eq(bo.getCheckTimeOrder() != null, EnterpriseLawEnforcement::getCheckTimeOrder, bo.getCheckTimeOrder()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckHourStart()), EnterpriseLawEnforcement::getCheckHourStart, bo.getCheckHourStart()); + lqw.eq(StringUtils.isNotBlank(bo.getCheckHourEnd()), EnterpriseLawEnforcement::getCheckHourEnd, bo.getCheckHourEnd()); + return lqw; + } + + /** + * 新增企业端-执法部门预约记录 + * + * @param bo 企业端-执法部门预约记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EnterpriseLawEnforcementBo bo) { + EnterpriseLawEnforcement add = MapstructUtils.convert(bo, EnterpriseLawEnforcement.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改企业端-执法部门预约记录 + * + * @param bo 企业端-执法部门预约记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EnterpriseLawEnforcementBo bo) { + EnterpriseLawEnforcement update = MapstructUtils.convert(bo, EnterpriseLawEnforcement.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EnterpriseLawEnforcement 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/EnterpriseMerchantAuthorizationServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseMerchantAuthorizationServiceImpl.java new file mode 100644 index 0000000..92260f6 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseMerchantAuthorizationServiceImpl.java @@ -0,0 +1,183 @@ +package com.zdxt.enforcementcode.service.impl; + +import com.zdxt.enforcementcode.domain.EnterpriseInformation; +import com.zdxt.enforcementcode.domain.vo.EnterpriseInformationVo; +import com.zdxt.enforcementcode.mapper.EnterpriseInformationMapper; +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.EnterpriseMerchantAuthorizationBo; +import com.zdxt.enforcementcode.domain.vo.EnterpriseMerchantAuthorizationVo; +import com.zdxt.enforcementcode.domain.EnterpriseMerchantAuthorization; +import com.zdxt.enforcementcode.mapper.EnterpriseMerchantAuthorizationMapper; +import com.zdxt.enforcementcode.service.IEnterpriseMerchantAuthorizationService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; +import java.util.HashMap; +import java.util.stream.Collectors; + +/** + * 商户授权企业信息Service业务层处理 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class EnterpriseMerchantAuthorizationServiceImpl implements IEnterpriseMerchantAuthorizationService { + + private final EnterpriseMerchantAuthorizationMapper baseMapper; + private final EnterpriseInformationMapper enterpriseInformationMapper; + + /** + * 查询商户授权企业信息 + * + * @param id 主键 + * @return 商户授权企业信息 + */ + @Override + public EnterpriseMerchantAuthorizationVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询商户授权企业信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商户授权企业信息分页列表 + */ + @Override + public TableDataInfo queryPageList(EnterpriseMerchantAuthorizationBo 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(EnterpriseMerchantAuthorizationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(EnterpriseMerchantAuthorizationBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(EnterpriseMerchantAuthorization::getId); + lqw.eq(StringUtils.isNotBlank(bo.getMerchantTel()), EnterpriseMerchantAuthorization::getMerchantTel, bo.getMerchantTel()); + lqw.like(StringUtils.isNotBlank(bo.getMerchantName()), EnterpriseMerchantAuthorization::getMerchantName, bo.getMerchantName()); + lqw.eq(StringUtils.isNotBlank(bo.getDeviceCode()), EnterpriseMerchantAuthorization::getDeviceCode, bo.getDeviceCode()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), EnterpriseMerchantAuthorization::getEnterpriseNumber, bo.getEnterpriseNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getWxNumber()), EnterpriseMerchantAuthorization::getWxNumber, bo.getWxNumber()); + lqw.eq(bo.getStatus() != null, EnterpriseMerchantAuthorization::getStatus, bo.getStatus()); + lqw.eq(bo.getIsDelete() != null, EnterpriseMerchantAuthorization::getIsDelete, bo.getIsDelete()); + return lqw; + } + + /** + * 新增商户授权企业信息 + * + * @param bo 商户授权企业信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(EnterpriseMerchantAuthorizationBo bo) { + EnterpriseMerchantAuthorization add = MapstructUtils.convert(bo, EnterpriseMerchantAuthorization.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改商户授权企业信息 + * + * @param bo 商户授权企业信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(EnterpriseMerchantAuthorizationBo bo) { + EnterpriseMerchantAuthorization update = MapstructUtils.convert(bo, EnterpriseMerchantAuthorization.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(EnterpriseMerchantAuthorization entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除商户授权企业信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public List queryEnterpriseMerchantAuthorizationList(EnterpriseMerchantAuthorizationBo bo) { + // 1. 查询商户授权列表 + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List authorizationList = baseMapper.selectVoList(lqw); + if (authorizationList.isEmpty()) { + return authorizationList; + } + // 2. 收集所有企业信用代码 + List enterpriseNumbers = authorizationList.stream() + .map(EnterpriseMerchantAuthorizationVo::getEnterpriseNumber) + .filter(StringUtils::isNotBlank) + .distinct() + .collect(Collectors.toList()); + if (enterpriseNumbers.isEmpty()) { + return authorizationList; + } + // 3. 批量查询企业信息 + LambdaQueryWrapper eiLqw = Wrappers.lambdaQuery(); + eiLqw.in(EnterpriseInformation::getEnterpriseNumber, enterpriseNumbers); + eiLqw.select(EnterpriseInformation::getEnterpriseNumber, EnterpriseInformation::getEnterpriseName); + List enterpriseInfoList = enterpriseInformationMapper.selectVoList(eiLqw); + // 4. 构建企业编号 -> 企业名称的Map + Map enterpriseNameMap = new HashMap<>(); + for (EnterpriseInformationVo info : enterpriseInfoList) { + if (info.getEnterpriseNumber() != null) { + enterpriseNameMap.put(info.getEnterpriseNumber(), info.getEnterpriseName()); + } + } + // 5. 关联赋值企业名称 + authorizationList.forEach(auth -> { + String name = enterpriseNameMap.get(auth.getEnterpriseNumber()); + if (name != null) { + auth.setEnterpriseName(name); + } + }); + return authorizationList; + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/LawEnforcementEnterpriseServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/LawEnforcementEnterpriseServiceImpl.java new file mode 100644 index 0000000..448397f --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/LawEnforcementEnterpriseServiceImpl.java @@ -0,0 +1,139 @@ +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.LawEnforcementEnterpriseBo; +import com.zdxt.enforcementcode.domain.vo.LawEnforcementEnterpriseVo; +import com.zdxt.enforcementcode.domain.LawEnforcementEnterprise; +import com.zdxt.enforcementcode.mapper.LawEnforcementEnterpriseMapper; +import com.zdxt.enforcementcode.service.ILawEnforcementEnterpriseService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 行政检查计划-执法企业Service业务层处理 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class LawEnforcementEnterpriseServiceImpl implements ILawEnforcementEnterpriseService { + + private final LawEnforcementEnterpriseMapper baseMapper; + + /** + * 查询行政检查计划-执法企业 + * + * @param id 主键 + * @return 行政检查计划-执法企业 + */ + @Override + public LawEnforcementEnterpriseVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询行政检查计划-执法企业列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 行政检查计划-执法企业分页列表 + */ + @Override + public TableDataInfo queryPageList(LawEnforcementEnterpriseBo 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(LawEnforcementEnterpriseBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(LawEnforcementEnterpriseBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(LawEnforcementEnterprise::getId); + lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), LawEnforcementEnterprise::getEnterpriseName, bo.getEnterpriseName()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), LawEnforcementEnterprise::getEnterpriseNumber, bo.getEnterpriseNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcement()), LawEnforcementEnterprise::getLawEnforcement, bo.getLawEnforcement()); + lqw.eq(StringUtils.isNotBlank(bo.getLawEnforcementId()), LawEnforcementEnterprise::getLawEnforcementId, bo.getLawEnforcementId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), LawEnforcementEnterprise::getDeptId, bo.getDeptId()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), LawEnforcementEnterprise::getUserId, bo.getUserId()); + lqw.eq(bo.getStatus() != null, LawEnforcementEnterprise::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getRelId()), LawEnforcementEnterprise::getRelId, bo.getRelId()); + return lqw; + } + + /** + * 新增行政检查计划-执法企业 + * + * @param bo 行政检查计划-执法企业 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(LawEnforcementEnterpriseBo bo) { + LawEnforcementEnterprise add = MapstructUtils.convert(bo, LawEnforcementEnterprise.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改行政检查计划-执法企业 + * + * @param bo 行政检查计划-执法企业 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(LawEnforcementEnterpriseBo bo) { + LawEnforcementEnterprise update = MapstructUtils.convert(bo, LawEnforcementEnterprise.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(LawEnforcementEnterprise 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/QrCodeGenerateHistoryServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/QrCodeGenerateHistoryServiceImpl.java new file mode 100644 index 0000000..6953ce8 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/QrCodeGenerateHistoryServiceImpl.java @@ -0,0 +1,136 @@ +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.QrCodeGenerateHistoryBo; +import com.zdxt.enforcementcode.domain.vo.QrCodeGenerateHistoryVo; +import com.zdxt.enforcementcode.domain.QrCodeGenerateHistory; +import com.zdxt.enforcementcode.mapper.QrCodeGenerateHistoryMapper; +import com.zdxt.enforcementcode.service.IQrCodeGenerateHistoryService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 二维码生成记录Service业务层处理 + * + * @author Lion Li + * @date 2026-04-13 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class QrCodeGenerateHistoryServiceImpl implements IQrCodeGenerateHistoryService { + + private final QrCodeGenerateHistoryMapper baseMapper; + + /** + * 查询二维码生成记录 + * + * @param id 主键 + * @return 二维码生成记录 + */ + @Override + public QrCodeGenerateHistoryVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询二维码生成记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 二维码生成记录分页列表 + */ + @Override + public TableDataInfo queryPageList(QrCodeGenerateHistoryBo 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(QrCodeGenerateHistoryBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(QrCodeGenerateHistoryBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(QrCodeGenerateHistory::getId); + lqw.eq(bo.getGenerateTime() != null, QrCodeGenerateHistory::getGenerateTime, bo.getGenerateTime()); + lqw.eq(StringUtils.isNotBlank(bo.getQrCodeUrl()), QrCodeGenerateHistory::getQrCodeUrl, bo.getQrCodeUrl()); + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), QrCodeGenerateHistory::getEnterpriseNumber, bo.getEnterpriseNumber()); + lqw.eq(bo.getStatus() != null, QrCodeGenerateHistory::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getReasonsChange()), QrCodeGenerateHistory::getReasonsChange, bo.getReasonsChange()); + return lqw; + } + + /** + * 新增二维码生成记录 + * + * @param bo 二维码生成记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(QrCodeGenerateHistoryBo bo) { + QrCodeGenerateHistory add = MapstructUtils.convert(bo, QrCodeGenerateHistory.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改二维码生成记录 + * + * @param bo 二维码生成记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(QrCodeGenerateHistoryBo bo) { + QrCodeGenerateHistory update = MapstructUtils.convert(bo, QrCodeGenerateHistory.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QrCodeGenerateHistory 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/EnterpriseComplaintMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseComplaintMapper.xml new file mode 100644 index 0000000..0c71e9c --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseComplaintMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseEvaluateMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseEvaluateMapper.xml new file mode 100644 index 0000000..1d0ebf2 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseEvaluateMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseLawEnforcementMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseLawEnforcementMapper.xml new file mode 100644 index 0000000..8252273 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseLawEnforcementMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseMerchantAuthorizationMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseMerchantAuthorizationMapper.xml new file mode 100644 index 0000000..fdc0f82 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseMerchantAuthorizationMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnforcementEnterpriseMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnforcementEnterpriseMapper.xml new file mode 100644 index 0000000..e547a29 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LawEnforcementEnterpriseMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/QrCodeGenerateHistoryMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/QrCodeGenerateHistoryMapper.xml new file mode 100644 index 0000000..dde3902 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/QrCodeGenerateHistoryMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql b/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql new file mode 100644 index 0000000..4587bd8 --- /dev/null +++ b/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql @@ -0,0 +1,8 @@ +alter table enterprise_complaint + change `case type` case_type varchar(50) null comment '投诉对接12345案件类型'; + +ALTER TABLE enterprise_merchant_authorization + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门' AFTER create_time, + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者' AFTER create_dept, + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者' AFTER create_by, + ADD COLUMN update_time datetime NULL COMMENT '更新时间' AFTER update_by; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/vite.config.ts b/zdxt-web-client/zdxt-admin-plus-ui/vite.config.ts index cc453f4..2eb9023 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/vite.config.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/vite.config.ts @@ -24,7 +24,7 @@ export default defineConfig(({ mode, command }) => { open: true, proxy: { [env.VITE_APP_BASE_API]: { - target: 'http://localhost:8181/supervision', + target: 'http://localhost:17000/supervision', changeOrigin: true, ws: true, rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalInitialize.js b/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalInitialize.js index 04edf36..542c180 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalInitialize.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalInitialize.js @@ -39,7 +39,7 @@ const $globalReady = { app.use($globalHttp()); // 实例化pinia - const pinia = createPinia() + const pinia = createPinia() pinia.use(piniaPluginPersistedstate) // 持久化 app.use(pinia); app.use($globalRegisterStore); @@ -51,8 +51,8 @@ const $globalReady = { app.use($globalLang); // 依赖注入 - app.provide('$provideGoodsnum', getGoodsnum); - app.provide('$provideLang', getLang); + //app.provide('$provideGoodsnum', getGoodsnum); + //app.provide('$provideLang', getLang); app.provide('$provideLoadUrl', handleLoadUrl); // 导入插件 diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/http/http.js b/zdxt-web-client/zdxt-enforcement-code-app/src/http/http.js index f4fc7dd..3f1361b 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/http/http.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/http/http.js @@ -16,9 +16,11 @@ http.interceptors.request.use( if(!config.headers['Content-Type']){ config.headers['Content-Type'] = 'application/json' } - config.headers['token'] = $globalStore.useCommon.token; - // config.headers['dataScopeId'] = $globalStore.useCommon.userId; - + const token = $globalStore.useCommon.token; + if (token) { + config.headers['Authorization'] = 'Bearer ' + token; + } + config.headers['clientid'] = 'enterprise'; return config }, err => { @@ -78,4 +80,4 @@ http.interceptors.response.use( } ) -export default http \ No newline at end of file +export default http diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js b/zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js index 9a32a72..f2451e4 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js @@ -110,4 +110,8 @@ export default defineStore('useCommon', { } }, }, + persist: { + storage: sessionStorage, + pick: ['token', 'userId', 'enterpriseNumber', 'enterpriseName', 'phonenumber', 'orgId', 'hasLaw'], + }, }); diff --git a/zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enterprise-dev b/zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enterprise-dev index 82543c2..d219ce9 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enterprise-dev +++ b/zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enterprise-dev @@ -1,4 +1,4 @@ # 企业端开发环境 VITE_PORT = 12001 -VITE_BASE_URL = 'http://localhost:8181/supervision' +VITE_BASE_URL = 'http://localhost:17000/enterprise' VITE_DEFAULT_LOGIN = '/enterprise/login' diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enforcement.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enforcement.yml new file mode 100644 index 0000000..720ff9c --- /dev/null +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enforcement.yml @@ -0,0 +1,7 @@ +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 18002 + servlet: + # 应用的访问路径 + context-path: /enforcement diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enterprise.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enterprise.yml new file mode 100644 index 0000000..9225471 --- /dev/null +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enterprise.yml @@ -0,0 +1,7 @@ +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 18000 + servlet: + # 应用的访问路径 + context-path: /enterprise diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-supervision.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-supervision.yml new file mode 100644 index 0000000..a984f00 --- /dev/null +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-supervision.yml @@ -0,0 +1,7 @@ +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 18001 + servlet: + # 应用的访问路径 + context-path: /supervision diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index 0251b53..18f58ae 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -1,14 +1,3 @@ -qr_code_url: /usr/local/uploads/zfjd_logo.png -sjView: http://10.132.108.3/sjWeb - -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 8080 - servlet: - # 应用的访问路径 - context-path: /supervision - --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 diff --git a/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml b/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml index 8747cfc..6c56a0a 100644 --- a/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml +++ b/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8181 + port: 17000 spring: application: @@ -22,10 +22,24 @@ spring: maxAge: 3600 # 路由配置 routes: - - id: admin-service - uri: http://localhost:8080 + - id: enterprise-service + uri: http://localhost:18000 predicates: - - Path=/** + - Path=/enterprise/** + filters: + - StripPrefix=0 + - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE + - id: supervision-service + uri: http://localhost:18001 + predicates: + - Path=/supervision/** + filters: + - StripPrefix=0 + - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE + - id: enforcement-service + uri: http://localhost:18002 + predicates: + - Path=/enforcement/** filters: - StripPrefix=0 - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE