From b4cec84136177b3e619151e796a1d049765a5502 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 25 Jul 2024 19:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=A1=A5=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 41 ++++++++++++++----- .../code/domain/EnforcementRegistration.java | 19 +++++++++ .../code/domain/EnterpriseInformation.java | 11 +++++ .../IEnforcementRegistrationService.java | 2 +- .../EnforcementRegistrationServiceImpl.java | 21 ++++++++++ .../EnterpriseInformationServiceImpl.java | 7 ++++ .../mapper/EnforcementRegistrationMapper.xml | 10 ++++- .../mapper/EnterpriseInformationMapper.xml | 6 ++- 8 files changed, 104 insertions(+), 13 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index fa123b37..5a37ef45 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -2,6 +2,8 @@ package com.zdxt.app.controller; import cn.hutool.core.util.IdUtil; import com.zdxt.auth.dto.DeptBean; +import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.UserApi; import com.zdxt.code.domain.*; import com.zdxt.code.service.*; import com.zdxt.common.ZDResponse; @@ -38,6 +40,7 @@ public class AppEnforcementRegistrationController extends BaseController @Autowired private ILinkageDictService iLinkageDictService; @Autowired private IEnterpriseComplaintService enterpriseComplaintService; @Autowired private IZqyjjdm137344Service iZqyjjdm137344Service; + @Autowired private UserApi userApi; @RequiresPermissions("code:registration:view") @GetMapping() @@ -276,18 +279,36 @@ public class AppEnforcementRegistrationController extends BaseController /** * 查看预约记录详情 */ - @GetMapping( "/getByUserIdAndZero/{userId}") +// @GetMapping( "/getByUserIdAndZero/{userId}") +// @ResponseBody +// public ZDResponse getByUserIdAndZero(@PathVariable Long userId) +// { +// EnforcementRegistration registration = enforcementRegistrationService.getByUserIdAndZero(userId); +// Map params = new HashMap<>(); +// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); +// params.put("lawEnforcementItemText", null!=tmp?tmp.getTitle():""); +// tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis()); +// params.put("lawEnforcementBasisText", null!=tmp?tmp.getTitle():""); +// registration.setParams(params); +// return ZDResponse.success("查询成功", registration); +// } + @GetMapping( "/getByUserIdAndEnterpriseNumber/{userId}/{enterpriseNumber}") @ResponseBody - public ZDResponse getByUserIdAndZero(@PathVariable Long userId) + public ZDResponse getByUserIdAndEnterpriseNumber(@PathVariable Long userId, @PathVariable String enterpriseNumber) { - EnforcementRegistration registration = enforcementRegistrationService.getByUserIdAndZero(userId); - Map params = new HashMap<>(); - LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); - params.put("lawEnforcementItemText", null!=tmp?tmp.getTitle():""); - tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis()); - params.put("lawEnforcementBasisText", null!=tmp?tmp.getTitle():""); - registration.setParams(params); - return ZDResponse.success("查询成功", registration); + // 前端似乎没保存部门id, 所以弄个userId上来 通过userId获取其部门id + UserBean userBean = userApi.getUserByUserId(userId); + EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseNumber); + if (null!=registration && StringUtils.isNotEmpty(registration.getId())) { + Map params = new HashMap<>(); + LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); + params.put("lawEnforcementItemText", null != tmp ? tmp.getTitle() : ""); + tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis()); + params.put("lawEnforcementBasisText", null != tmp ? tmp.getTitle() : ""); + registration.setParams(params); + return ZDResponse.success("查询成功", registration); + } + return ZDResponse.error("查询失败"); } /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index 007305ee..8ba0614d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java @@ -133,6 +133,9 @@ public class EnforcementRegistration extends BaseDomain */ private String searchText; + private String checkCss; + private String enforceReason; + /** 临时用 */ private String lawCertificateNum; private String lawCertificateNumText; @@ -145,6 +148,22 @@ public class EnforcementRegistration extends BaseDomain /** 超时几天(临时用的, 判断检查时间是否超过5天) */ private long outTimeDayNum; + public String getCheckCss() { + return checkCss; + } + + public void setCheckCss(String checkCss) { + this.checkCss = checkCss; + } + + public String getEnforceReason() { + return enforceReason; + } + + public void setEnforceReason(String enforceReason) { + this.enforceReason = enforceReason; + } + public long getOutTimeDayNum() { return outTimeDayNum; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java index b75c7b92..58da7eeb 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java @@ -90,6 +90,17 @@ public class EnterpriseInformation extends BaseDomain */ private String industry; + // 临时字段 - 补录原因 + private String reason; + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + public String getEnterprise() { return enterprise; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index ae84f68b..875bf39c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -2,7 +2,6 @@ package com.zdxt.code.service; import com.zdxt.code.domain.EnforceRegCount; import com.zdxt.code.domain.EnforcementRegistration; -import com.zdxt.code.domain.EnterpriseLawEnforcement; import com.zdxt.common.zdxtFile.AttFileRespDTO; import java.util.List; @@ -78,5 +77,6 @@ public interface IEnforcementRegistrationService AttFileRespDTO queryFiles(String key); public EnforcementRegistration getByUserIdAndZero(Long userId); + public EnforcementRegistration getByDeptIdAndEnterpriseNumber(String deptId, String enterpriseNumber); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index 263a65e3..f4701f2c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -330,4 +330,25 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } return result; } + + @Override + public EnforcementRegistration getByDeptIdAndEnterpriseNumber(String deptId, String enterpriseNumber) { + EnforcementRegistration registration = new EnforcementRegistration(); + registration.setDeptId(deptId); + registration.setEnterpriseNumber(enterpriseNumber); + registration.setIsSubmit(0); + List es = enforcementRegistrationMapper.selectEnforcementRegistrationList(registration); + + EnforcementRegistration result = new EnforcementRegistration(); + if (null != es && es.size() >0) { + result = es.get(0); + List files = zdxtFileCommonApi.selectZdxtFileById(result.getId()); + List fileUrls = new ArrayList<>(); + for (ZdxtFileCommon file : files) { + fileUrls.add(file.getUploadPath()); + } + result.setFileList(fileUrls); + } + return result; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index fa8a47bb..dd884ec6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java @@ -12,7 +12,9 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.temporal.ChronoUnit; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; @@ -99,6 +101,11 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS @Override public List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation) { + if ("3".equals(enterpriseInformation.getReason())) { + Map tmp = new HashMap<>(); + tmp.put("reason", 3); + enterpriseInformation.setParams(tmp); + } return enterpriseInformationMapper.selectEnterpriseInformationList(enterpriseInformation); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 598c08da..9590ff2a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -37,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -46,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, law_enforcement, law_enforcement_id, enforce, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_item_text, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,is_complaint,is_submit, unite_check from enforcement_registration + select id, law_enforcement, law_enforcement_id, enforce, check_css, enforce_reason, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_item_text, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,is_complaint,is_submit, unite_check from enforcement_registration