Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenPublicServicePlaceListByCateRstDTO.java

@@ -44,6 +44,11 @@ public class LingShanScreenPublicServicePlaceListByCateRstDTO {
      */
     private String policePhone;
 
+    /**
+     * 网格员id
+     */
+    private String gridUserId;
+
     /**
      * 网格员姓名
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java

@@ -388,7 +388,7 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
 
             return new LingShanScreenPublicServicePlaceListByCateRstDTO(
                     e.getName(), categoryAndObj.get(e.getCategory()).getLabel(), e.getLongitude(), e.getLatitude(), e.getAddress(),
-                    e.getPrincipal(), e.getMobile(), e.getPoliceName(), e.getPolicePhone(), griderName, griderPhone);
+                    e.getPrincipal(), e.getMobile(), e.getPoliceName(), e.getPolicePhone(), e.getGriderId(), griderName, griderPhone);
         }).collect(Collectors.toList());
     }
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java

@@ -56,11 +56,11 @@ public class IcEventProcessListResultDTO implements Serializable {
      */
     private List<SubProcessDTO> subProcess;
     /**
-     *  公开答复附件
+     * 公开答复附件
      */
     private List<PublicAndInternalFileResultDTO> publicFile;
     /**
-     *  内部备注附件
+     * 内部备注附件
      */
     private List<PublicAndInternalFileResultDTO> internalFile;
     /**
@@ -108,6 +108,12 @@ public class IcEventProcessListResultDTO implements Serializable {
      */
     private String manageResi;
 
+    /**
+     * 办理人ID
+     */
+
+    private String userId;
+
     /**
      * 办理人电话
      */

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventReplyDao.xml

@@ -14,7 +14,8 @@
             manage_status,
             manage_time,
             manage_resi,
-            manage_resi_tel
+            manage_resi_tel,
+            FROM_USER_ID as userId
         FROM
             ic_event_reply
         WHERE

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/LingshanHelpCrowdCanjiCallbackProcessor.java

@@ -1,12 +1,14 @@
 package com.epmet.processor;
 
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.entity.LingshanHelpCrowdCanjiEntity;
 import com.epmet.enums.IcResiUserTableEnum;
+import com.epmet.service.impl.IcResiUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 @Component
 public class LingshanHelpCrowdCanjiCallbackProcessor extends AbstractLingshanHelpCrowdCallbackProcessor<LingshanHelpCrowdCanjiEntity> {
@@ -22,11 +24,16 @@ public class LingshanHelpCrowdCanjiCallbackProcessor extends AbstractLingshanHel
     @Override
     public void onSaveSpecialCrowdDetail(LingshanHelpCrowdCanjiEntity entity) {
         //     更新残疾信息
-        HashMap<String, String> map = new HashMap<>();
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
         map.put("IS_CJ", "1");
         map.put("CJLB", entity.getCjlb());
         map.put("CJZK", entity.getCjzk());
         map.put("CJZH", entity.getCjzh());
+
+        // 居民变更记录(一定要在更新主表之前执行，否则检测不出类别变更)
+        IcResiUserServiceImpl resiService = SpringContextUtils.getBean(IcResiUserServiceImpl.class);
+        resiService.icUserChangeRecord(icResiUserDao.selectById(entity.getResiId()), map);
+
         icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), entity.getResiId(), map);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/LingshanHelpCrowdDabingCallbackProcessor.java

@@ -1,13 +1,16 @@
 package com.epmet.processor;
 
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.entity.LingshanHelpCrowdDabingEntity;
 import com.epmet.enums.IcResiUserTableEnum;
+import com.epmet.service.impl.IcResiUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 @Component
 public class LingshanHelpCrowdDabingCallbackProcessor extends AbstractLingshanHelpCrowdCallbackProcessor<LingshanHelpCrowdDabingEntity> {
@@ -22,7 +25,7 @@ public class LingshanHelpCrowdDabingCallbackProcessor extends AbstractLingshanHe
 
     @Override
     public void onSaveSpecialCrowdDetail(LingshanHelpCrowdDabingEntity entity) {
-        HashMap<String, String> map = new HashMap<>();
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
         map.put("IS_DB", "1");
         // map.put("SHDB", entity.getShbz()); // 因为excel模板里，用的不是字典，是手动输入，所以不能对应的居民信息的所患病种
 
@@ -30,6 +33,11 @@ public class LingshanHelpCrowdDabingCallbackProcessor extends AbstractLingshanHe
         if (hbsj != null) {
             map.put("DBSJ", hbsj);
         }
+
+        // 居民变更记录(一定要在更新主表之前执行，否则检测不出类别变更)
+        IcResiUserServiceImpl resiService = SpringContextUtils.getBean(IcResiUserServiceImpl.class);
+        resiService.icUserChangeRecord(icResiUserDao.selectById(entity.getResiId()), map);
+
         icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), entity.getResiId(), map);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/LingshanHelpCrowdDibaoCallbackProcessor.java

@@ -1,12 +1,15 @@
 package com.epmet.processor;
 
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.entity.LingshanHelpCrowdDibaoEntity;
 import com.epmet.enums.IcResiUserTableEnum;
+import com.epmet.service.impl.IcResiUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 @Component
 public class LingshanHelpCrowdDibaoCallbackProcessor extends AbstractLingshanHelpCrowdCallbackProcessor<LingshanHelpCrowdDibaoEntity> {
@@ -21,8 +24,12 @@ public class LingshanHelpCrowdDibaoCallbackProcessor extends AbstractLingshanHel
 
     @Override
     public void onSaveSpecialCrowdDetail(LingshanHelpCrowdDibaoEntity form) {
-        HashMap<String, String> map = new HashMap<>();
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
-        map.put("IS_DB", "1");
+        map.put("IS_DBH", "1");
+
+        IcResiUserServiceImpl resiService = SpringContextUtils.getBean(IcResiUserServiceImpl.class);
+        resiService.icUserChangeRecord(icResiUserDao.selectById(form.getResiId()), map);
+
         icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), form.getResiId(), map);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/LingshanHelpCrowdKongchaoCallbackProcessor.java

@@ -1,12 +1,15 @@
 package com.epmet.processor;
 
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.entity.LingshanHelpCrowdKongchaoEntity;
 import com.epmet.enums.IcResiUserTableEnum;
+import com.epmet.service.impl.IcResiUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 @Component
 public class LingshanHelpCrowdKongchaoCallbackProcessor extends AbstractLingshanHelpCrowdCallbackProcessor<LingshanHelpCrowdKongchaoEntity> {
@@ -21,8 +24,12 @@ public class LingshanHelpCrowdKongchaoCallbackProcessor extends AbstractLingshan
 
     @Override
     public void onSaveSpecialCrowdDetail(LingshanHelpCrowdKongchaoEntity form) {
-        HashMap<String, String> map = new HashMap<>();
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
         map.put("IS_KC", "1");
+
+        IcResiUserServiceImpl resiService = SpringContextUtils.getBean(IcResiUserServiceImpl.class);
+        resiService.icUserChangeRecord(icResiUserDao.selectById(form.getResiId()), map);
+
         icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), form.getResiId(), map);
     }
 }