修改投诉模块查询

投诉列表中投诉对象多个展示修改

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<String> lawTwoList = new ArrayList<>();
+            List<UserBean> 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();

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<User> selectUserListNoPermission(User user) {
-        return userMapper.selectUserListByDeptId(user);
+        return userMapper.selectUserListByHave(user);
     }
 
 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -215,6 +215,7 @@
         <if test="tenantCode != @com.zdxt.auth.common.constant.Constants@DEFAULT_TENANT_CODE and tenantCode != null and tenantCode != ''">
             AND u.tenant_code = #{tenantCode}
         </if>
+        AND  u.law_certificate_num is not null
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>

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<String> 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<MssqOrderFlow> mssqOrderFlows;
 
+    public List<String> getComplaintDepartmentList() {
+        return complaintDepartmentList;
+    }
+
+    public void setComplaintDepartmentList(List<String> complaintDepartmentList) {
+        this.complaintDepartmentList = complaintDepartmentList;
+    }
+
+    public String getLawEnforcementBasisText() {
+        return lawEnforcementBasisText;
+    }
+
+    public void setLawEnforcementBasisText(String lawEnforcementBasisText) {
+        this.lawEnforcementBasisText = lawEnforcementBasisText;
+    }
+
     public String getEnterpriseAddress() {
         return enterpriseAddress;
     }

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)

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<EnterpriseComplaint> selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint);
+    List<EnterpriseComplaint> selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint);
+
+    /**
+     * 查询投诉列表支持搜索
+     * @param enterpriseComplaint
+     * @return
+     */
+    List<EnterpriseComplaint> selectEnterpriseComplaintNew(EnterpriseComplaint enterpriseComplaint);
 
     /**
      * 查询工单数据
      * @param enterpriseComplaint
      * @return
      */
-    public List<EnterpriseComplaint> selectByStatus(EnterpriseComplaint enterpriseComplaint);
+    List<EnterpriseComplaint> 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);
 }

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<EnterpriseComplaint> selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint)
     {
         List<EnterpriseComplaint> 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 =

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();
+        }
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEnterpriseComplaintList" parameterType="EnterpriseComplaint" resultMap="EnterpriseComplaintResult">
         <include refid="selectEnterpriseComplaintVo"/>
-        <where>  
+        <where>
             <if test="relId != null  and relId != ''"> and rel_id = #{relId}</if>
             <if test="enforceType != null "> and enforce_type = #{enforceType}</if>
             <if test="problemDescription != null  and problemDescription != ''"> and problem_description = #{problemDescription}</if>
@@ -47,6 +47,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ORDER BY create_time DESC
     </select>
+
+    <select id="selectEnterpriseComplaintNew" parameterType="EnterpriseComplaint" resultMap="EnterpriseComplaintResult">
+        select * from enterprise_complaint c left join  enforcement_registration r on c.rel_id = r.id
+        <where>
+            <if test="relId != null  and relId != ''"> and c.rel_id = #{relId}</if>
+            <if test="enforceType != null "> and c.enforce_type = #{enforceType}</if>
+            <if test="problemDescription != null  and problemDescription != ''">
+                and c.problem_description like  concat(concat('%',#{searchValue}),'%')
+             </if>
+            <if test="linkman != null  and linkman != ''"> and c.linkman = #{linkman}</if>
+            <if test="linkmanTel != null  and linkmanTel != ''"> and c.linkman_tel = #{linkmanTel}</if>
+            <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and c.enterprise_number = #{enterpriseNumber}</if>
+            <if test="status != null"> and c.status = #{status}</if>
+            <if test="searchValue != null and searchValue != ''">
+                and (r.law_enforcement_item_text like concat(concat('%',#{searchValue}),'%')
+                or r.law_enforcement_basis_text like concat(concat('%',#{searchValue}),'%')
+                or c.problem_description like  concat(concat('%',#{searchValue}),'%'))
+            </if>
+        </where>
+        ORDER BY c.create_time DESC
+    </select>
+
     <select id="selectByStatus" parameterType="EnterpriseComplaint" resultMap="EnterpriseComplaintResult">
         <include refid="selectEnterpriseComplaintVo"/>
         where status != #{status}  and pro_wo_code is not null

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml

@@ -56,6 +56,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test=" enforcementDepartmentId != null  and enforcementDepartmentId != ''">
                 enforcement_department_id = #{enforcementDepartmentId},
             </if>
+            <if test="dateType != null and dateType == 1">
+                and DATE_FORMAT(warning_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+            </if>
+            <if test="dateType != null and dateType == 2">
+                AND DATE_FORMAT(warning_time, '%Y-%m') &gt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '04'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '07'
+                ELSE '10' END)
+                and DATE_FORMAT(warning_time, '%Y-%m') &lt;= CONCAT(YEAR(CURDATE()), '-',
+                CASE
+                WHEN QUARTER(CURDATE()) IN (1) THEN '03'
+                WHEN QUARTER(CURDATE()) IN (2) THEN '06'
+                WHEN QUARTER(CURDATE()) IN (3) THEN '09'
+                ELSE '12'
+                END)
+            </if>
+            <if test="dateType != null and dateType == 3">
+                and DATE_FORMAT(warning_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
+            </if>
         </where>
         ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000
         ) t GROUP BY t.enterprise_number order by t.create_time desc