修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireStationDto.java

@@ -51,7 +51,9 @@ public class FireStationDto extends BaseDto {
     @ApiModelProperty(value = "负责人名称id")
     private String personChargeId;
 
-    @ExcelProperty(value = "负责人名称", index = 4)
+
+    @ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getFireStationContactUser")
+    @ExcelProperty(value = "负责人", index = 4)
     @ApiModelProperty(value = "负责人名称")
     private String personChargeName;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -181,6 +181,9 @@ public class DataSourcesImpl implements DataSources {
                 case "getFireTeamContactUser":
                     str = getFireTeamContactUser();
                     break;
+                case "getFireStationContactUser":
+                    str = getFireStationContactUser();
+                    break;
             }
         }
         return str;
@@ -214,6 +217,23 @@ public class DataSourcesImpl implements DataSources {
         return str;
     }
 
+    private String[] getFireStationContactUser() {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule("fire_station_info");
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("bizOrgCode",reginParams.getPersonIdentity().getBizOrgCode());
+        IPage<Map<String, Object>> mapIPage = iOrgUsrService.pagePerson(null, null, map);
+        List<Map<String, Object>> records = mapIPage.getRecords();
+        List<String> carNameList = Lists.newArrayList();
+        records.forEach(result -> {
+            carNameList.add(result.get("bizOrgName") + "@" + result.get("sequenceNbr"));
+        });
+        String[] str = carNameList.toArray(new String[carNameList.size()]);
+        return str;
+    }
+
     private String[] getFireTeamContactUser() {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 权限处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -800,12 +800,19 @@ public class ExcelServiceImpl {
 			if (fireStation.getBizCompany() != null) {
 				String[] bizCompany = fireStation.getBizCompany().split("@");
 				fireStation.setBizCompany(bizCompany[0]);
+				fireStation.setBizOrgName(bizCompany[0]);
 				fireStation.setBizCompanyId(Long.valueOf(bizCompany[1]));
 				OrgUsr byId = orgUsrService.getById(Long.valueOf(bizCompany[1]));
 				if (byId != null && byId.getBizOrgCode() != null){
 					fireStation.setBizCompanyCode(byId.getBizOrgCode());
+					fireStation.setBizOrgCode(byId.getBizOrgCode());
 				}
 			}
+			if (fireStation.getPersonChargeName() != null){
+				String[] personChargeName = fireStation.getPersonChargeName().split("@");
+				fireStation.setPersonChargeName(personChargeName[0]);
+				fireStation.setPersonChargeId(personChargeName[1]);
+			}
 			excelEntityList.add(fireStation);
 		});
 		fireStationService.saveBatch(excelEntityList);