From 6f42a796c083fc4bbf7c449249a3b647d557fefd Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 31 Jul 2024 11:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E4=BA=BA=E5=91=98=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 11 ++++++++++ .../AppEnterpriseComplaintController.java | 22 +++++++++++++++++++ .../java/com/zdxt/auth/feign/UserApiImpl.java | 13 +++++++++++ .../system/user/mapper/UserMapper.java | 2 +- .../resources/mapper/system/UserMapper.xml | 8 +++++++ .../src/main/resources/application-dev.yml | 10 ++++----- .../code/domain/EnforcementRegistration.java | 15 ++++++++++--- .../EnforcementRegistrationServiceImpl.java | 4 ++-- .../impl/EnterpriseComplaintServiceImpl.java | 1 - .../mapper/EnterpriseComplaintMapper.xml | 1 + .../main/java/com/zdxt/auth/dto/UserBean.java | 2 +- .../java/com/zdxt/auth/feign/UserApi.java | 1 + 12 files changed, 77 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 c1ac1b57..56ea1621 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 @@ -302,6 +302,17 @@ public class AppEnforcementRegistrationController extends BaseController // 前端似乎没保存部门id, 所以弄个userId上来 通过userId获取其部门id UserBean userBean = userApi.getUserByUserId(userId); EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseInformation.getEnterpriseNumber()); + // 执法人员需要展示用户名+执法码 + List userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo()); + String tmpUserShow = ""; + for (UserBean ub : userBeans) { + String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); + tmpUserShow += ub.getUserName() +" - "+ lawCertificateNum + ","; + } + if (tmpUserShow.length() > 0) { + tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); + } + registration.setLawEnforcer2Show(tmpUserShow); if (null!=registration && StringUtils.isNotEmpty(registration.getId())) { Map params = new HashMap<>(); LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); 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 687e9701..0bb5982d 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,11 +1,13 @@ package com.zdxt.app.controller; +import com.alibaba.fastjson.JSONObject; import com.zdxt.code.domain.EnterpriseComplaint; import com.zdxt.code.domain.MssqAddOrder; import com.zdxt.code.service.IEnterpriseComplaintService; import com.zdxt.code.service.MssqApiService; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.TableDataInfo; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +15,9 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 企业执法-在线投诉Controller @@ -105,6 +109,24 @@ public class AppEnterpriseComplaintController extends BaseController { public ZDResponse queryById(String id) { EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id); + if (StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())) { + MssqAddOrder mparams = new MssqAddOrder(); + mparams.setProWoCode(enterpriseComplaint.getProWoCode()); + String resStr = null; + try { + resStr = mssqApiService.mssqQueryEndInfo(mparams); + JSONObject resObj = JSONObject.parseObject(resStr); + Map resMap = new HashMap<>(); + if ("0".equals(resObj.getString("resultCode"))) { + resMap.put("res", resObj.getJSONObject("endData")); + } else { + resMap.put("res", "0"); + } + enterpriseComplaint.setParams(resMap); + } catch (Exception e) { + e.printStackTrace(); + } + } return ZDResponse.success("投诉详情查询",enterpriseComplaint); } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java index 93bf38db..cc62ca35 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java @@ -1,6 +1,7 @@ package com.zdxt.auth.feign; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; import com.zdxt.auth.common.utils.security.ShiroUtils; import com.zdxt.auth.dto.DeptBean; import com.zdxt.auth.dto.RoleBean; @@ -125,6 +126,18 @@ public class UserApiImpl implements UserApi { return userBean; } + @Override + public List getUserByUserIds(String ids) { + List users = userMapper.selectUserByIds(Convert.toStrArray(ids)); + List ubs = new ArrayList<>(); + for (User user : users) { + UserBean userBean = new UserBean(); + BeanUtil.copyProperties(user, userBean); + ubs.add(userBean); + } + return ubs; + } + @Override public UserBean getUserByUserStrId(String userId) { User user = userMapper.selectUserByStrId(userId); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java index cee8966c..61a0a19a 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java @@ -1,7 +1,6 @@ package com.zdxt.auth.project.system.user.mapper; -import com.zdxt.auth.dto.UserBean; import com.zdxt.domain.auth.User; import org.apache.ibatis.annotations.Param; @@ -86,6 +85,7 @@ public interface UserMapper * @return 用户对象信息 */ public User selectUserById(Long userId); + public List selectUserByIds(String[] ids); public User selectUserByStrId(String userId); public List selectUserByDeptId(@Param("deptId") Long deptId, @Param("loginName") String loginName); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index 14039fe9..5223a80a 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -291,6 +291,14 @@ where u.user_id = #{userId} + +