民生诉求同步状态

评价功能修改
投诉限制为本人可见

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -182,6 +182,11 @@ public class EnforcementRegistration extends BaseDomain
      */
     private String checkCategory;
 
+    /**
+     * 行政执法评价
+     */
+    private EnterpriseEvaluate enterpriseEvaluate;
+
 
     public String getCheckCss() {
         return checkCss;
@@ -584,4 +589,12 @@ public class EnforcementRegistration extends BaseDomain
     public void setIsEvaluate(Integer isEvaluate) {
         this.isEvaluate = isEvaluate;
     }
+
+    public EnterpriseEvaluate getEnterpriseEvaluate() {
+        return enterpriseEvaluate;
+    }
+
+    public void setEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate) {
+        this.enterpriseEvaluate = enterpriseEvaluate;
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java

@@ -47,6 +47,16 @@ public class EnterpriseComplaint extends BaseDomain
     /** 关联工单 */
     private String proWoCode;
 
+    /**
+     * 工单状态
+     */
+    private Integer status;
+
+    /**
+     * 可评价 同步时间
+     */
+    private String evaluateTime;
+
     public String getProWoCode() {
         return proWoCode;
     }
@@ -193,6 +203,22 @@ public class EnterpriseComplaint extends BaseDomain
         this.fileList = fileList;
     }
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getEvaluateTime() {
+        return evaluateTime;
+    }
+
+    public void setEvaluateTime(String evaluateTime) {
+        this.evaluateTime = evaluateTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java

@@ -27,6 +27,13 @@ public interface EnterpriseComplaintMapper
      */
     public List<EnterpriseComplaint> selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint);
 
+    /**
+     * 查询工单数据
+     * @param enterpriseComplaint
+     * @return
+     */
+    public List<EnterpriseComplaint> selectByStatus(EnterpriseComplaint enterpriseComplaint);
+
     /**
      * 新增企业执法-在线投诉
      * 
@@ -43,6 +50,13 @@ public interface EnterpriseComplaintMapper
      */
     public int updateEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint);
 
+    /**
+     * 根据工单修改投诉数据
+     * @param enterpriseComplaint
+     * @return
+     */
+    public int updateEnterpriseComplaintByCode(EnterpriseComplaint enterpriseComplaint);
+
     /**
      * 删除企业执法-在线投诉
      * 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java

@@ -20,6 +20,13 @@ public interface EnterpriseEvaluateMapper
      */
     public EnterpriseEvaluate selectEnterpriseEvaluateById(String id);
 
+    /**
+     * 查询执法评价
+     * @param relId
+     * @return
+     */
+    public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId);
+
     /**
      * 查询企业端-执法评价列表
      * 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java

@@ -19,6 +19,13 @@ public interface IEnterpriseEvaluateService
      * @return 企业端-执法评价
      */
     public EnterpriseEvaluate selectEnterpriseEvaluateById(String id);
+    /**
+     * 查询企业端-执法评价
+     *
+     * @param relId 案件ID
+     * @return 企业端-执法评价
+     */
+    public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId);
 
     /**
      * 查询企业端-执法评价列表

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -13,9 +13,7 @@ import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.feign.ZdxtFileCommonApi;
 import com.zdxt.code.domain.*;
 import com.zdxt.code.mapper.LinkageDictMapper;
-import com.zdxt.code.service.ILawEnforcementWarningListService;
-import com.zdxt.code.service.IRuleItemListService;
-import com.zdxt.code.service.IRuleListService;
+import com.zdxt.code.service.*;
 import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.config.RuoYiConfig;
 import com.zdxt.common.util.DateUtils;
@@ -28,7 +26,6 @@ import org.dmg.pmml.association.Item;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;
-import com.zdxt.code.service.IEnforcementRegistrationService;
 
 /**
  * 执法端-执法登记Service业务层处理
@@ -57,6 +54,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     @Autowired
     private LinkageDictMapper linkageDictMapper;
 
+    @Autowired
+    private IEnterpriseEvaluateService enterpriseEvaluateService;
+
 
     @Autowired
     private ILawEnforcementWarningListService lawEnforcementWarningListService;
@@ -98,8 +98,13 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 enforcementRegistration.setLawEnforcementBasisText(linkageDict.getTitle());
             }
         }
+        //查询行政检查评价
+        EnterpriseEvaluate enterpriseEvaluate =
+                enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getId());
+        enforcementRegistration.setEnterpriseEvaluate(enterpriseEvaluate);
         return enforcementRegistration;
     }
+
     @Override
     public EnforcementRegistration getEnforcementRegistrationById(String id)
     {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@@ -89,6 +89,8 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
         System.out.println("========================");
         enterpriseComplaint.setCreateTime(DateUtils.getNowDate());
         enterpriseComplaint.setId(IdUtil.simpleUUID());
+        //默认工单为已受理
+        enterpriseComplaint.setStatus(0);
         int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint);
         /*if (i > 0) {
             try {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java

@@ -42,6 +42,12 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService
         return enterpriseEvaluateMapper.selectEnterpriseEvaluateById(id);
     }
 
+
+    @Override
+    public EnterpriseEvaluate selectEnterpriseEvaluateByRelId(String relId) {
+        return enterpriseEvaluateMapper.selectEnterpriseEvaluateByRelId(relId);
+    }
+
     /**
      * 查询企业端-执法评价列表
      * 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/MssqTask.java

@@ -0,0 +1,90 @@
+package com.zdxt.code.task;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import com.zdxt.code.domain.EnterpriseComplaint;
+import com.zdxt.code.domain.MssqAddOrder;
+import com.zdxt.code.mapper.EnterpriseComplaintMapper;
+import com.zdxt.code.service.IEnterpriseComplaintService;
+import com.zdxt.code.service.MssqApiService;
+import com.zdxt.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 民生诉求接口定时获取工单状态
+ */
+@Component("mssqTask")
+public class MssqTask {
+
+    @Autowired
+    private MssqApiService mssqApiService;
+
+    @Autowired
+    private EnterpriseComplaintMapper enterpriseComplaintMapper;
+
+
+    public void getMssqStatus() throws Exception {
+        EnterpriseComplaint enterpriseComplaint = new EnterpriseComplaint();
+        enterpriseComplaint.setStatus(15);
+        List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintMapper.selectByStatus(enterpriseComplaint);
+        if(enterpriseComplaints.size() == 0 ){
+            return;
+        }
+        //获取列表中所有工单
+        List<String> collect = enterpriseComplaints.stream().map(EnterpriseComplaint::getProWoCode).collect(Collectors.toList());
+
+        //集合数据拆分
+        List<List<String>> partition = Lists.partition(collect, 19);
+
+        for (List<String> stringList : partition) {
+            //查询民生诉求工单状态
+            MssqAddOrder mssqAddOrder = new MssqAddOrder();
+            mssqAddOrder.setProWoCodes(stringList);
+            String jsonStr = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryCurState");
+
+            //存储工单中的状态
+            Map<String,Integer> map = new HashMap<>();
+
+            JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+            JSONArray formList = jsonObject.getJSONArray("formList");
+            for (int i = 0; i < formList.size(); i++) {
+                JSONObject jsonObject1 = formList.getJSONObject(i);
+                //工单编码
+                String proWoCode = jsonObject1.getString("proWoCode");
+                //工单状态
+                Integer state = jsonObject1.getInteger("state");
+                map.put(proWoCode,state);
+            }
+            Set<String> strings = map.keySet();
+
+            //TODO 民生诉求状态
+            //状态为6 待评价
+            //状态为 15 已完成
+            //状态为 20 办理中
+            //TODO 系统投诉工单状态
+            //0 已受理  1 已办结  2 已归档
+            for (String string : strings) {
+                EnterpriseComplaint enterpriseComplaintUpdate = new EnterpriseComplaint();
+                enterpriseComplaintUpdate.setProWoCode(string);
+                if(map.get(string) == 6){
+                    enterpriseComplaintUpdate.setStatus(1);
+                    enterpriseComplaintUpdate.setEvaluateTime(DateUtils.getDate());
+                    enterpriseComplaintMapper.updateEnterpriseComplaintByCode(enterpriseComplaintUpdate);
+                }
+                if(map.get(string) == 15){
+                    enterpriseComplaintUpdate.setStatus(2);
+//                    enterpriseComplaintUpdate.setEvaluateTime(DateUtils.getDate());
+                    enterpriseComplaintMapper.updateEnterpriseComplaintByCode(enterpriseComplaintUpdate);
+                }
+            }
+        }
+    }
+
+}

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

@@ -18,12 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="proWoCode"    column="pro_wo_code"    />
         <result property="enterpriseNumber"    column="enterprise_number"    />
         <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="status"    column="status"    />
+        <result property="evaluateTime"    column="evaluate_time"    />
     </resultMap>
 
     <sql id="selectEnterpriseComplaintVo">
         select id, rel_id, enforce_type, problem_description, enterprise_address, linkman,
          linkman_tel, com_or_opi, authorization, create_time, pro_wo_code,enterprise_number,
-         enterprise_name
+         enterprise_name,status,evaluate_time
         from enterprise_complaint
     </sql>
 
@@ -39,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ORDER BY create_time DESC
     </select>
+    <select id="selectByStatus" parameterType="EnterpriseComplaint" resultMap="EnterpriseComplaintResult">
+        <include refid="selectEnterpriseComplaintVo"/>
+        where status != #{status}  and pro_wo_code is not null
+        ORDER BY create_time DESC
+    </select>
     
     <select id="selectEnterpriseComplaintById" parameterType="String" resultMap="EnterpriseComplaintResult">
         <include refid="selectEnterpriseComplaintVo"/>
@@ -95,6 +102,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+    <update id="updateEnterpriseComplaintByCode" parameterType="EnterpriseComplaint">
+        update enterprise_complaint
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="relId != null  and relId != ''">rel_id = #{relId},</if>
+            <if test="enforceType != null ">enforce_type = #{enforceType},</if>
+            <if test="problemDescription != null  and problemDescription != ''">problem_description = #{problemDescription},</if>
+            <if test="enterpriseAddress != null  and enterpriseAddress != ''">enterprise_address = #{enterpriseAddress},</if>
+            <if test="linkman != null  and linkman != ''">linkman = #{linkman},</if>
+            <if test="linkmanTel != null  and linkmanTel != ''">linkman_tel = #{linkmanTel},</if>
+            <if test="comOrOpi != null  and comOrOpi != ''">com_or_opi = #{comOrOpi},</if>
+            <if test="authorization != null  and authorization != ''">authorization = #{authorization},</if>
+            <if test="createTime != null ">create_time = #{createTime},</if>
+            <if test="status != null ">status = #{status},</if>
+            <if test="evaluateTime != null ">evaluate_time = #{evaluateTime},</if>
+        </trim>
+        where pro_wo_code = #{proWoCode}
+    </update>
 
     <delete id="deleteEnterpriseComplaintById" parameterType="String">
         delete from enterprise_complaint where id = #{id}

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

@@ -16,10 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enterpriseNumber"    column="enterprise_number"    />
         <result property="enterpriseName"    column="enterprise_name"    />
     </resultMap>
-
+<!--    ,enterprise_number,enterprise_name-->
     <sql id="selectEnterpriseEvaluateVo">
         select id, enforcement_name, enforcement_id, evaluate_description, linkman, linkman_tel,
-         authorization, create_time,enterprise_number,enterprise_name from enterprise_evaluate
+         authorization, create_time from enterprise_evaluate
     </sql>
 
     <select id="selectEnterpriseEvaluateList" parameterType="EnterpriseEvaluate" resultMap="EnterpriseEvaluateResult">
@@ -39,6 +39,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectEnterpriseEvaluateByRelId" parameterType="String" resultMap="EnterpriseEvaluateResult">
+        <include refid="selectEnterpriseEvaluateVo"/>
+        where enforcement_id = #{id}
+    </select>
+        
     <insert id="insertEnterpriseEvaluate" parameterType="EnterpriseEvaluate">
         insert into enterprise_evaluate
         <trim prefix="(" suffix=")" suffixOverrides=",">