From db517f0ff356b0da0c65fa178f9f71fd712a789d Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Sun, 18 Aug 2024 17:53:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=AF=89=20=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=92=8C=E8=AF=A6=E6=83=85=E5=A4=84=E7=90=86=E5=85=A5=E4=BC=81?= =?UTF-8?q?=E4=B8=8D=E6=89=AB=E7=A0=81=E5=8C=BA=E5=88=AB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseComplaintController.java | 30 +++++++++++++++++++ .../impl/EnterpriseComplaintServiceImpl.java | 3 ++ 2 files changed, 33 insertions(+) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java index b0073dd2..8d28b084 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java @@ -1,10 +1,16 @@ package com.zdxt.app.controller; import com.alibaba.fastjson.JSONObject; +import com.zdxt.auth.dto.DictDataBean; +import com.zdxt.auth.feign.DictDataApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; +import com.zdxt.code.domain.EnforcementRegistration; import com.zdxt.code.domain.EnterpriseComplaint; +import com.zdxt.code.domain.EnterpriseLawEnforcement; import com.zdxt.code.domain.MssqAddOrder; +import com.zdxt.code.service.IEnforcementRegistrationService; import com.zdxt.code.service.IEnterpriseComplaintService; +import com.zdxt.code.service.IEnterpriseLawEnforcementService; import com.zdxt.code.service.MssqApiService; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; @@ -43,6 +49,8 @@ public class AppEnterpriseComplaintController extends BaseController { private IEnterpriseComplaintService enterpriseComplaintService; @Autowired private ZdxtFileCommonApi zdxtFileCommonApi; + @Autowired private DictDataApi dictDataApi; + @Autowired private IEnforcementRegistrationService enforcementRegistrationService; @Autowired private MssqApiService mssqApiService; @@ -122,6 +130,28 @@ public class AppEnterpriseComplaintController extends BaseController { @ResponseBody public ZDResponse queryById(String id) { EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id); + // 获取投诉类型 + if (null != enterpriseComplaint.getEnforceType()) { + DictDataBean dictParams = new DictDataBean(); + dictParams.setDictType("caseType"); + List dicts = dictDataApi.getDictData(dictParams); + for (DictDataBean d : dicts) { + if (d.getDictValue().equals(enterpriseComplaint.getEnforceType().toString())) { + enterpriseComplaint.setEnforceTypeText(d.getDictLabel()); + break; + } + } + } else { + enterpriseComplaint.setEnforceTypeText("入企不扫码"); + } + + // 获取相关事项 + if (StringUtils.isNotEmpty(enterpriseComplaint.getRelId())) { + EnforcementRegistration registration = enforcementRegistrationService.selectEnforcementRegistrationById(enterpriseComplaint.getRelId()); + enterpriseComplaint.setLawEnforcementIncident(registration.getLawEnforcementItemText()); + } + + Map resMap = new HashMap<>(); if (StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())) { MssqAddOrder mparams = new MssqAddOrder(); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index 8a17c9d6..9467dc75 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -82,6 +82,9 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi @Override public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint) { + if ("入企不扫码".equals(enterpriseComplaint.getEnforceTypeText())) { + enterpriseComplaint.setEnforceType(null); + } UserBean user = userApi.getUserByUserId(enterpriseComplaint.getUserId()); System.out.println("========================"); System.out.println("enterpriseComplaint.getUserId : "+ enterpriseComplaint.getUserId());