Merge branch 'yantai_zhengwu_master' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -730,6 +730,14 @@ public class EpmetUserServiceImpl implements EpmetUserService, ResultDataResolve
         formDTO.setPageNo(pageIndex);
         //1.分页查询排好序的工作人员Id列表【原本1/2步可以用一个sql，但涉及2需要按1的顺序排序，sql复杂且效率低，所以拆开】
         LinkedList<String> staffIds = customerStaffDao.selectOrderRole(formDTO);
+        if (staffIds!=null && formDTO.getStaffIds()!=null){
+            formDTO.getStaffIds().forEach(
+                    staffId->{
+                        if (!staffIds.contains(staffId)){
+                            staffIds.add(staffId);
+                        }
+                    });
+        }
         //2.批量查询工作人员信息，按传入顺序排序
         if(CollectionUtils.isEmpty(staffIds)){
             return new ArrayList<>();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java

@@ -29,10 +29,10 @@ public class CustomerStaffImportExcelData {
     private String idCard;
 
     @ExcelProperty("村居委员职务")
-    private Date viliagePosition;
+    private String viliagePosition;
 
     @ExcelProperty("党组织职务")
-    private Date partyPosition;
+    private String partyPosition;
 
     @NotBlank(message = "居住地址为必填项")
     @ExcelProperty("居住地址※")

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

@@ -774,7 +774,7 @@ public class StaffServiceImpl implements StaffService {
 
 			CustomerStaffImportListener listener = new CustomerStaffImportListener(userRemoteService.getLoginUserDetails().getUserId(), userRemoteService.getLoginUserDetails().getCustomerId(), orgType,orgId,this);
 
-			EasyExcel.read(filePath.toFile(), CustomerStaffImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead();
+			EasyExcel.read(filePath.toFile(), CustomerStaffImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead();
 
 			String errorDesFileUrl = null;
 

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

@@ -421,7 +421,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         }
         baseDao.insert(staffEntity);
 
+        CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO();
         //工作人员角色关联表
+        if (fromDTO.getRoles()!=null){
             fromDTO.getRoles().forEach(role -> {
                 StaffRoleEntity staffRoleEntity = new StaffRoleEntity();
                 staffRoleEntity.setStaffId(userEntity.getId());
@@ -430,20 +432,19 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
                 staffRoleEntity.setCustomerId(fromDTO.getCustomerId());
                 staffRoleService.insert(staffRoleEntity);
             });
-
             // 角色放缓存
-        CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO();
             List<RoleKeyValueResultDTO> roleKeyValue = govStaffRoleDao.selectRoleKeyName(fromDTO.getRoles());
-        dto.setCustomerId(fromDTO.getCustomerId());
-        dto.setStaffId(userEntity.getId());
-        dto.setAgencyId(fromDTO.getAgencyId());
             Map m = new HashMap(16);
             roleKeyValue.forEach(r -> {
                 m.put(r.getRoleKey(), r.getRoleName());
             });
             dto.setRoles(m);
-        CustomerStaffRedis.delStaffInfoFormCache(dto.getCustomerId(), dto.getStaffId());
+        }
 
+        dto.setCustomerId(fromDTO.getCustomerId());
+        dto.setStaffId(userEntity.getId());
+        dto.setAgencyId(fromDTO.getAgencyId());
+        CustomerStaffRedis.delStaffInfoFormCache(dto.getCustomerId(), dto.getStaffId());
         return new Result<CustomerStaffDTO>().ok(ConvertUtils.sourceToTarget(staffEntity, CustomerStaffDTO.class));
     }
 

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

@@ -141,6 +141,7 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl<DataSyncReco
                 IcResiUserEntity icResiUserEntity = icResiUserDao.selectOne(queryWrapper);
                 if (null == icResiUserEntity) {
                     existedFlag = false;
+                    entity.setDealStatus(NumConstant.TWO);
                     entity.setIcResiUserId(null);
                     entity.setDealResult("居民信息表不存在此居民");
                 }else{