Merge remote-tracking branch 'origin/dev_question_naire' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java

@@ -62,6 +62,11 @@ public class CustomerStaffInfoCacheResult implements Serializable {
      */
     private String headPhoto;
 
+    /**
+     * 工作人员是从哪中组织添加的 组织Id
+     */
+    private String fromOrgId;
+
     /**
      * 工作人员是从哪中组织类型添加的 3个值：agency，grid，dept
      * @see com.epmet.commons.tools.enums.OrgTypeEnum

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java

@@ -79,6 +79,13 @@ public class TDuckListResultDTO implements Serializable {
      */
     private Integer recycled;
 
+    /**
+     * 组织名
+     */
+    private String orgName;
+
+    private String createdBy;
+
     public TDuckListResultDTO() {
         this.customerId = "";
         this.key = "";
@@ -92,5 +99,6 @@ public class TDuckListResultDTO implements Serializable {
         this.client = "";
         this.createdTime = "";
         this.fillStatus = false;
+        this.orgName = "";
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@@ -217,6 +217,30 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 }
             }
         }
+        result.forEach(r -> {
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), r.getCreatedBy());
+            String orgName = "";
+            if (null != staffInfo){
+                if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_AGENCY)){
+                    orgName = staffInfo.getAgencyName();
+                }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_GRID)){
+                    for (IdAndNameDTO g : staffInfo.getGridList()) {
+                        if (g.getId().equals(staffInfo.getFromOrgId())){
+                            orgName = g.getName();
+                            continue;
+                        }
+                    }
+                }else if (staffInfo.getFromOrgType().equals(TDuckConstant.ORG_TYPE_DEPT)){
+                    for (IdAndNameDTO d : staffInfo.getDeptList()) {
+                        if (d.getId().equals(staffInfo.getFromOrgId())){
+                            orgName = d.getName();
+                            continue;
+                        }
+                    }
+                }
+            }
+            r.setOrgName(orgName);
+        });
         return result;
     }
 

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

@@ -297,6 +297,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result deleteGrid(TokenDto tokenDto,DeleteGridFormDTO deleteGridFormDTO) {
+        redisUtils.delete(RedisKeys.getGridInfoKey(deleteGridFormDTO.getGridId()))
         List<UserIdDTO> userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId());
         deleteGridFormDTO.setUserId(tokenDto.getUserId());
         if (userIdDTOS.size()==0){