Merge branch 'lingshan_master' into dev

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/ResiMyCreatedAgentServiceResultDTO.java

@@ -42,7 +42,9 @@ public class ResiMyCreatedAgentServiceResultDTO {
 
     private String processStatusName;
 
-    private Integer satisfaction;
+    private Integer satisfication;
+
+    private String satisficationName;
 
     private List<String> attachments;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@@ -122,6 +122,17 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
                 log.error("【红色待办】居民-我创建的列表：未找到服务类别数据:{}", e.getServiceCategory());
             }
 
+            // 满意度中文
+            if (e.getSatisfication() != null) {
+                if (e.getSatisfication().intValue() == -1) {
+                    d.setSatisficationName("不满意");
+                } else if (e.getSatisfication().intValue() == 0) {
+                    d.setSatisficationName("基本满意");
+                } else if (e.getSatisfication().intValue() == 1) {
+                    d.setSatisficationName("非常满意");
+                }
+            }
+
             // 反序列化附件列表
             d.setAttachments(JSON.parseArray(e.getAttachments(), String.class));
 

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java

@@ -9,7 +9,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ValidateException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.PidUtils;
@@ -244,7 +246,7 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener<T extends
      * @date: 2023/4/18 3:42 PM
      */
     protected void saveBatch() {
-        String orgIdPath = PidUtils.convertPid2OrgIdPath(currentStaffInfo.getAgencyId(), currentStaffInfo.getAgencyPIds());
+        // String orgIdPath = PidUtils.convertPid2OrgIdPath(currentStaffInfo.getAgencyId(), currentStaffInfo.getAgencyPIds());
         String customerId = EpmetRequestHolder.getLoginUserCustomerId();
         Date now = new Date();
         Iterator<T> it = getOriginDatas().iterator();
@@ -256,9 +258,15 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener<T extends
                 errorDatas.add(row);
                 it.remove();
             } else {
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(row.getResiGridId());
+
+                if (gridInfo == null) {
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "【灵山街道-特殊人群】导入：未找到网格: " + row.getResiGridId());
+                }
+
                 specialTypes.add(new PersonSpecialTypeBean(row.getResiId(), row.getIdCard(), specialCrowdType.getType()));
 
-                orgIdPath = PidUtils.convertPid2OrgIdPath(row.getResiGridId(), orgIdPath);
+                String orgIdPath = PidUtils.convertPid2OrgIdPath(row.getResiGridId(), gridInfo.getPids());
 
                 E e = ConvertUtils.sourceToTarget(row, entityClass);
                 e.setCustomerId(customerId);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java

@@ -433,10 +433,16 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
 
         String customerId = EpmetRequestHolder.getLoginUserCustomerId();
         String staffId = EpmetRequestHolder.getLoginUserId();
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+        // CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
-        String orgIdPath = PidUtils.convertPid2OrgIdPath(staffInfo.getAgencyId(), staffInfo.getAgencyPIds());
+        // String orgIdPath = PidUtils.convertPid2OrgIdPath(staffInfo.getAgencyId(), staffInfo.getAgencyPIds());
 
-        orgIdPath = PidUtils.convertPid2OrgIdPath(vt.getResiGridId(), orgIdPath);
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(vt.getResiGridId());
+
+        if (gridInfo == null) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "【灵山街道-特殊人群】新增：未找到网格: " + vt.getResiGridId());
+        }
+
+        String orgIdPath = PidUtils.convertPid2OrgIdPath(vt.getResiGridId(), gridInfo.getPids());
 
         Date now = new Date();