From 00a91c9a03d3a0a13dda45ee36f87399c7c5bf80 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Sat, 14 Sep 2024 16:28:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E8=AF=89=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=9F=A5=E8=AF=A2=20=E6=8A=95=E8=AF=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=8A=95=E8=AF=89=E5=AF=B9=E8=B1=A1=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 16 ++++++++++++ .../system/user/service/UserServiceImpl.java | 2 +- .../resources/mapper/system/UserMapper.xml | 1 + .../zdxt/code/domain/EnterpriseComplaint.java | 26 +++++++++++++++++++ .../domain/LawEnforcementWarningList.java | 12 +++++++++ .../mapper/EnterpriseComplaintMapper.java | 23 ++++++++++------ .../impl/EnterpriseComplaintServiceImpl.java | 9 ++++++- .../EnterpriseLawEnforcementServiceImpl.java | 24 ++++++++++++++--- .../mapper/EnterpriseComplaintMapper.xml | 24 ++++++++++++++++- .../LawEnforcementWarningListMapper.xml | 20 ++++++++++++++ 10 files changed, 143 insertions(+), 14 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 e3007e7f..e1c34e5e 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 @@ -290,6 +290,22 @@ public class AppEnforcementRegistrationController extends BaseController } else { ee.setComOrOpi(0); } + // 执法人员1需要展示用户名+执法码 + UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId()); + String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum(); + ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN); + + // 执法人员2需要展示用户名+执法码 + List lawTwoList = new ArrayList<>(); + List userBeans = new ArrayList<>(); + if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) { + userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo()); + } + for (UserBean ub : userBeans) { + String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); + lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum); + } + ee.setLawEnforcer2List(lawTwoList); // 判断超时多少天 Instant instant = ee.getEnforcementTime().toInstant(); ZoneId zoneId = ZoneId.systemDefault(); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java index a2955f44..325572b5 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java @@ -138,7 +138,7 @@ public class UserServiceImpl implements IUserService { */ @Override public List selectUserListNoPermission(User user) { - return userMapper.selectUserListByDeptId(user); + return userMapper.selectUserListByHave(user); } 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 a9c96ff3..6315c806 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -215,6 +215,7 @@ AND u.tenant_code = #{tenantCode} + AND u.law_certificate_num is not null ${params.dataScope} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java index 7a8df644..900a3871 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java @@ -71,6 +71,11 @@ public class EnterpriseComplaint extends BaseDomain */ private String complaintDepartmentIds; + /** + * 入企不扫码投诉-投诉部门 列表 + */ + private List complaintDepartmentList; + /** * 投诉类型 1 联合执法投诉 */ @@ -113,6 +118,11 @@ public class EnterpriseComplaint extends BaseDomain * 检查事项 */ public String lawEnforcementIncident; + + /** + * 检查依据 + */ + public String lawEnforcementBasisText; /** * 投诉类型 */ @@ -147,6 +157,22 @@ public class EnterpriseComplaint extends BaseDomain */ private List mssqOrderFlows; + public List getComplaintDepartmentList() { + return complaintDepartmentList; + } + + public void setComplaintDepartmentList(List complaintDepartmentList) { + this.complaintDepartmentList = complaintDepartmentList; + } + + public String getLawEnforcementBasisText() { + return lawEnforcementBasisText; + } + + public void setLawEnforcementBasisText(String lawEnforcementBasisText) { + this.lawEnforcementBasisText = lawEnforcementBasisText; + } + public String getEnterpriseAddress() { return enterpriseAddress; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java index e8c5c584..142cd463 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java @@ -70,6 +70,10 @@ public class LawEnforcementWarningList extends BaseDomain * 是否展示 */ private Boolean show = false; + /** + * 快捷搜索 日期类型 + */ + private Integer dateType; public void setId(String id) @@ -196,6 +200,14 @@ public class LawEnforcementWarningList extends BaseDomain this.show = show; } + public Integer getDateType() { + return dateType; + } + + public void setDateType(Integer dateType) { + this.dateType = dateType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java index ddefe151..85963583 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java @@ -17,7 +17,7 @@ public interface EnterpriseComplaintMapper * @param id 企业执法-在线投诉ID * @return 企业执法-在线投诉 */ - public EnterpriseComplaint selectEnterpriseComplaintById(String id); + EnterpriseComplaint selectEnterpriseComplaintById(String id); /** * 查询企业执法-在线投诉列表 @@ -25,14 +25,21 @@ public interface EnterpriseComplaintMapper * @param enterpriseComplaint 企业执法-在线投诉 * @return 企业执法-在线投诉集合 */ - public List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint); + List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint); + + /** + * 查询投诉列表支持搜索 + * @param enterpriseComplaint + * @return + */ + List selectEnterpriseComplaintNew(EnterpriseComplaint enterpriseComplaint); /** * 查询工单数据 * @param enterpriseComplaint * @return */ - public List selectByStatus(EnterpriseComplaint enterpriseComplaint); + List selectByStatus(EnterpriseComplaint enterpriseComplaint); /** * 新增企业执法-在线投诉 @@ -40,7 +47,7 @@ public interface EnterpriseComplaintMapper * @param enterpriseComplaint 企业执法-在线投诉 * @return 结果 */ - public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); + int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); /** * 修改企业执法-在线投诉 @@ -48,14 +55,14 @@ public interface EnterpriseComplaintMapper * @param enterpriseComplaint 企业执法-在线投诉 * @return 结果 */ - public int updateEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); + int updateEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); /** * 根据工单修改投诉数据 * @param enterpriseComplaint * @return */ - public int updateEnterpriseComplaintByCode(EnterpriseComplaint enterpriseComplaint); + int updateEnterpriseComplaintByCode(EnterpriseComplaint enterpriseComplaint); /** * 删除企业执法-在线投诉 @@ -63,7 +70,7 @@ public interface EnterpriseComplaintMapper * @param id 企业执法-在线投诉ID * @return 结果 */ - public int deleteEnterpriseComplaintById(String id); + int deleteEnterpriseComplaintById(String id); /** * 批量删除企业执法-在线投诉 @@ -71,5 +78,5 @@ public interface EnterpriseComplaintMapper * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteEnterpriseComplaintByIds(String[] ids); + int deleteEnterpriseComplaintByIds(String[] ids); } 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 47db0d19..c4625922 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 @@ -4,6 +4,7 @@ import java.util.*; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -135,7 +136,13 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi public List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint) { List enterpriseComplaints = - enterpriseComplaintMapper.selectEnterpriseComplaintList(enterpriseComplaint); + enterpriseComplaintMapper.selectEnterpriseComplaintNew(enterpriseComplaint); + enterpriseComplaints.forEach(res ->{ + if(StringUtils.isNotEmpty(res.getComplaintDepartments())){ + String[] strings = Convert.toStrArray(res.getComplaintDepartments()); + res.setComplaintDepartmentList(Arrays.asList(strings)); + } + }); for (int i = 0; i < enterpriseComplaints.size(); i++) { if(StringUtils.isNotEmpty(enterpriseComplaints.get(i).getRelId())){ EnforcementRegistration enforcementRegistration = diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 26c1b475..ddd8cf54 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -13,6 +13,7 @@ import com.zdxt.code.domain.EnterpriseMerchantAuthorization; import com.zdxt.code.domain.LinkageDict; import com.zdxt.code.service.IEnterpriseMerchantAuthorizationService; import com.zdxt.code.service.ILinkageDictService; +import com.zdxt.code.utils.ZwSmsClient; import com.zdxt.common.annotation.DataScope; import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; @@ -203,10 +204,14 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc //设置状态 enterpriseLawEnforcement.setStatus(1); - //TODO 短信通知，告知商户取消预约 - - + //短信通知，告知商户取消预约 int i = enterpriseLawEnforcementMapper.updateEnterpriseLawEnforcement(enterpriseLawEnforcement); + if(i > 0){ + EnterpriseLawEnforcement enterpriseLawEnforcement1 = + enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(id); + this.sendSms(enterpriseLawEnforcement1); + } + return i; } @@ -238,4 +243,17 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc { return enterpriseLawEnforcementMapper.deleteEnterpriseLawEnforcementById(id); } + // 下发短信 + public void sendSms(EnterpriseLawEnforcement enterpriseLawEnforcement) { + //【xx企业】尊敬的xx，xx活动将定于本月15日上午开赛，请各位参赛者务必提前抵达会场，以免耽误您的比赛！ + try { + String smsStr = "【"+enterpriseLawEnforcement.getEnterpriseName()+"】" + + "尊敬的" + enterpriseLawEnforcement.getLinkMan() + +", 您有一条于: "+ enterpriseLawEnforcement.getCheckTime()+" 的执法预约信息,已取消请查收"; + ZwSmsClient.sendMessage(enterpriseLawEnforcement.getLinkTel(),smsStr); + } catch (Exception e) { + System.out.println("短信下发异常"); + e.printStackTrace(); + } + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml index 5efe7a08..60295779 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + +