修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -368,7 +368,7 @@ public interface IOrgUsrService {
      * @param id
      * @return
      */
-    String deleteFirefighterPeopleById(Long id);
+    String deleteFirefighterPeopleById(Long id,String type);
     
      OrgUsr selectParentOrgUsr(OrgUsr orgUsr);
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -435,14 +435,10 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
         max(case field_code when 'politicalOutlook' then field_value end)                     politicalOutlook,
         max(case field_code when 'residenceDetailsCode' then field_value_label end)                     residenceDetails,
         max(case field_code when 'residenceDetailVal' then field_value end)                     residenceDetailVal,
-
         max(case field_code when 'holdingTime' then field_value end)                     holdingTime,
         max(case field_code when 'peopleType' then field_value_label end)                     peopleTypecode,
-
-
         max(case field_code when 'airportAccommodation' then field_value end)                     airportAccommodation
         FROM cb_dynamic_form_instance GROUP BY instance_id) b
-
         on b.instance_id=a.sequence_nbr
         LEFT JOIN cb_firefighters_contacts fc ON a.sequence_nbr = fc.org_usr_id
         LEFT JOIN cb_firefighters_workexperience fw ON a.sequence_nbr = fw.org_usr_id

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -428,10 +428,10 @@ public class OrgPersonController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/people/firefighter/{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/people/firefighter/{id}/{type}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel<String> deleteFirefighterPeopleById(@PathVariable Long id) {
-        return ResponseHelper.buildResponse(iOrgUsrService.deleteFirefighterPeopleById(id));
+    public ResponseModel<String> deleteFirefighterPeopleById(@PathVariable Long id,@PathVariable String type) {
+        return ResponseHelper.buildResponse(iOrgUsrService.deleteFirefighterPeopleById(id,type));
     }
 /**
  *
@@ -457,6 +457,9 @@ public class OrgPersonController extends BaseController {
     @RequestMapping(value = "/listCompany/{bizOrgCode}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "查询当前单位或部门自己的人员列表 非父子级", notes = "根据bizOrgCode查询")
     public List<OrgUsr>  listCompany(@PathVariable String bizOrgCode) {
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            return null;
+        }
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BaseEntity::getIsDelete,false);
         wrapper.likeRight(OrgUsr::getBizOrgCode,bizOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -99,6 +99,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		return iPage;
 	}
 
+
+
+
 	//120系统迁移接口 sql固定查询急救科下值班人员
 	@Override
 	public List<Map<String, Object>> listOnDutyPersonByAid() {
@@ -664,6 +667,8 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 				RequestContext.getAppKey(), groupCode, params);
 	}
 
+
+
 	@Override
 	public List<Map<String, Object>> listOnDutyPerson() {
 		String groupCode = this.getGroupCode();
@@ -685,14 +690,45 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 			List<Map<String, Object>> orgUsrList = orgUsrService.selectForShowByListId(ids);
 			maps.forEach(item -> {
 				String userId = String.valueOf(item.get("userId"));
+				//此处是用来给119日常值班首页值班岗位排序用
+				String sort = "";
+				switch (item.get("postType").toString()) {
+					case "826":
+						sort = "4";
+						break;
+					case "824":
+						sort = "3";
+						break;
+					case "825":
+						sort = "2";
+						break;
+					case "827":
+						sort = "1";
+						break;
+				}
+				item.put("postSort", sort);
 				for (Map<String, Object> usr : orgUsrList) {
 					if (userId.equals(String.valueOf(usr.get("sequenceNbr")))) {
 						item.put("personImg", usr.get("personImg"));
 						item.put("telephone", usr.get("telephone"));
+						item.put("companyId", usr.get("companyId"));
+						item.put("bizOrgType", usr.get("bizOrgType"));
+						item.put("parentId", usr.get("parentId"));
 						break;
 					}
 				}
 			});
+			maps = maps.stream().sorted((map1, map2) -> {
+				if (map1.get("companyId").toString().equals(map2.get("companyId").toString())) {
+					if (map1.get("deptId").toString().equals(map2.get("deptId").toString())) {
+						return map2.get("postSort").toString().compareTo(map1.get("postSort").toString());
+					} else {
+						return map1.get("deptId").toString().compareTo(map2.get("deptId").toString());
+					}
+				} else {
+					return map2.get("companyId").toString().compareTo(map1.get("companyId").toString());
+				}
+			}).collect(Collectors.toList());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -90,7 +90,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		}
 		if (ObjectUtils.isNotEmpty(firefighter.getNativePlace())) {
 			FeignClientResult<RegionModel> nativePlace = Systemctl.regionClient
-					.getRegion(Long.parseLong(firefighter.getNativePlace()));
+					.getRegion(Long.parseLong(firefighter.getNativePlaceCode()));
 			firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
 		}
 		save(firefighter);
@@ -236,10 +236,10 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 			peopleInfoDto.getFirefighters().setAmosName(null);
 		}
 		OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
-
+		ifirefightersContactsService.updateById(peopleInfoDto.getFirefightersContacts());
 		OrgPersonDto orgPersonDto = new OrgPersonDto();
 		BeanUtils.copyProperties(orgUsr, orgPersonDto);
-		List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto.getFirefighters(), false);
+		List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto, false);
 		orgPersonDto.setDynamicFormValue(dynamicFormInstances);
 		try {
 			orgUsrService.updateByIdOrgPerson(orgPersonDto, id);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -10,6 +10,11 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.component.robot.BadRequest;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +55,8 @@ import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
+import javax.annotation.Resource;
+
 /**
  * 重点部位服务实现类
  *
@@ -83,6 +90,10 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	@Autowired
 	private RedisUtils redisUtils;
 
+
+	@Resource
+	DataDictionaryMapper dataDictionaryMapper;
+
 	/**
 	 * 分页查询
 	 */
@@ -279,6 +290,19 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		return keySiteMapper.getSequenceNbr(sequenceNbr);
 	}
 
+
+	private String[] getDataDictionary(String type) {
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+		List<DataDictionary> list = dataDictionaryMapper.selectList(queryWrapper);
+		List<String> names = list.stream().map(dataDictionary -> {
+			return dataDictionary.getName() + "@" + dataDictionary.getCode();
+		}).collect(Collectors.toList());
+		String[] str = names.toArray(new String[names.size()]);
+		return str;
+	}
+
 	@Override
 	public boolean saveExcel(List<KeySiteExcleDto> excelDtoList) {
 		Map<String, String> maps = getAllBuildingIdForParentBuilingIds(excelDtoList);
@@ -291,6 +315,11 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		List<OrgUsr> comDeptList = orgUsrMapper.companyTreeByUserAndType(param);
 		Map<Long, OrgUsr> comDeptMap = comDeptList.stream()
 				.collect(Collectors.toMap(BaseEntity::getSequenceNbr, Function.identity()));
+		//耐火等级
+		String[] nhdjs = getDataDictionary("NHDJ");
+		//使用性质
+		String[] jzwsyxzs = getDataDictionary("JZWSYXZ");
+
 		for (KeySiteExcleDto keySiteExcleDto : excelDtoList) {
 			KeySite keySiteDto = new KeySite();
 			Bean.copyExistPropertis(keySiteExcleDto, keySiteDto);
@@ -315,6 +344,9 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			}
 			if (StringUtils.isNotBlank(keySiteExcleDto.getFireEnduranceRate())
 					&& keySiteExcleDto.getFireEnduranceRate().contains("@")) {
+				if (!ArrayUtils.contains(nhdjs, keySiteExcleDto.getFireEnduranceRate())) {
+					throw new BadRequest("请检查耐火等级选择是否正确");
+				}
 				String[] fireEnduranceRateArray = keySiteExcleDto.getFireEnduranceRate().split("@");
 				if (fireEnduranceRateArray.length > 1) {
 					keySiteDto.setFireEnduranceRate(fireEnduranceRateArray[1]);
@@ -323,6 +355,9 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			}
 			if (StringUtils.isNotBlank(keySiteExcleDto.getUseNature())
 					&& keySiteExcleDto.getUseNature().contains("@")) {
+				if (!ArrayUtils.contains(jzwsyxzs, keySiteExcleDto.getUseNature())) {
+					throw new BadRequest("请检查使用性质选择是否正确");
+				}
 				String[] useNatureArray = keySiteExcleDto.getUseNature().split("@");
 				if (useNatureArray.length > 1) {
 					keySiteDto.setUseNature(useNatureArray[1]);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -36,6 +36,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.codehaus.jettison.json.JSONString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -1075,11 +1076,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		} else {
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
-
-		if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
+		//已在前面对此字段赋值 废弃
+	/*	if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
 			AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
 			OrgPersonVo.setAmosOrgCode(user.getRealName());
-		}
+		}*/
 
 		return saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
 	}
@@ -2993,7 +2994,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsr orgUsr = peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
 
 		// 2.保存cb_dynamic_form_instance表 人员基本信息
-		OrgUsrDto orgUsrDto = saveDynamicformInstance(orgUsr, peopleInfoDto.getFirefighters());
+		OrgUsrDto orgUsrDto = saveDynamicformInstance(orgUsr, peopleInfoDto);
 
 		if (!ObjectUtils.isEmpty(orgUsrDto.getSequenceNbr())) {
 			peopleInfoDto.getFirefightersContacts().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
@@ -3035,21 +3036,21 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsr;
 	}
 
-	private OrgUsrDto saveDynamicformInstance(OrgUsr orgUsr, PeopleBasicInfoDto peopleBasicInfoDto) {
-		List<DynamicFormInstance> dynamicFormInstancelist = dynamicFormColumn(peopleBasicInfoDto, true);
+	private OrgUsrDto saveDynamicformInstance(OrgUsr orgUsr,PeopleInfoDto peopleInfoDto) {
+		List<DynamicFormInstance> dynamicFormInstancelist = dynamicFormColumn(peopleInfoDto, true);
 		return  saveOrgUsrDynamicFormInstance(orgUsr, dynamicFormInstancelist);
 	}
 
-	public List<DynamicFormInstance> dynamicFormColumn(PeopleBasicInfoDto peopleBasicInfoDto, boolean flag){
+	public List<DynamicFormInstance> dynamicFormColumn(PeopleInfoDto peopleInfoDto, boolean flag){
 		// 动态字段填充
 		List<DynamicFormInitDto> dynamicFormColumn = dynamicFormColumnServiceImpl.getFormlist("246");
 		Map<String, Object> map = new HashMap<>();
 		// 获取对象属性和值
-		Field[] fields = peopleBasicInfoDto.getClass().getDeclaredFields();
+		Field[] fields = peopleInfoDto.getFirefighters().getClass().getDeclaredFields();
 		for (Field field : fields) {
 			try{
 				field.setAccessible(true);
-				Object value = field.get(peopleBasicInfoDto);
+				Object value = field.get(peopleInfoDto.getFirefighters());
 				String name = field.getName();
 				map.put(name, value);
 			}	catch (Exception ex){
@@ -3063,6 +3064,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr());
 		});
 
+		FirefightersPost firefightersPost = peopleInfoDto.getPostEduDtoObj().getFirefightersPost();
+		String s = JSONObject.toJSONString(firefightersPost);
+		Map map1 = JSONObject.parseObject(s, Map.class);
+
 		dynamicFormValue.forEach(dynamicFormInstanceDto -> {
 			String key = dynamicFormInstanceDto.getFieldCode();
 			Object value = map.get(key);
@@ -3084,7 +3089,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 						}
 					}
 				}
-
 				if ("birthdayTime".equals(key)) {
 					SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 					try {
@@ -3096,10 +3100,22 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				}
 			}
 			DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
+			BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
 			if ("gender".equals(dynamicFormInstance.getFieldCode())){
 				dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
 			}
-			BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
+			if ("peopleType".equals(dynamicFormInstance.getFieldCode())){
+				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
+			}
+
+			String fieldCode = dynamicFormInstance.getFieldCode();
+			if (map1.containsKey(fieldCode) && fieldCode.contains("Code") ){
+				dynamicFormInstance.setFieldValue(map1.get(fieldCode).toString());
+			}
+
+			if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
+				dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
+			}
 			dynamicFormInstancelist.add(dynamicFormInstance);
 		});
 
@@ -3267,7 +3283,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Transactional(rollbackFor = Exception.class)
 	public String deletePeopleById(Long id, String type, AgencyUserModel user) {
 
-		if ("2".equals(type)) {
+		if ("1601".equals(type)) {
 			QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
 			Firefighters firefighters = iFirefightersService.getOne(firefightersQueryWrapper.eq("org_usr_id", id).eq("is_delete", 0));
 			Long firefightersSequenceNbr = firefighters.getSequenceNbr();
@@ -3393,13 +3409,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public String deleteFirefighterPeopleById(Long id) {
+	public String deleteFirefighterPeopleById(Long id,String type) {
 		String flag = deleteFirefighters(id);
 		// 基础信息人员类型修改为非消防
 		UpdateWrapper<DynamicFormInstance> updateWrapper = new UpdateWrapper<>();
 		updateWrapper.eq("instance_id", id);
 		updateWrapper.eq("field_code", "peopleType");
-		updateWrapper.set("field_value", "1");
+		updateWrapper.set("field_value", type);
 		if ("0".equals(flag)) {
 			dynamicFormInstanceService.update(updateWrapper);
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -443,7 +443,7 @@ public class FirefightersController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "获取人员详情", notes = "获取人员详情")
     public ResponseModel<PeopleInfoDto> updatePeopleById(@RequestBody PeopleInfoDto firefighters, @PathVariable Long id) {
         try {
-            if ("2".equals(firefighters.getFirefighters().getPeopleType())){
+            if ("1601".equals(firefighters.getFirefighters().getPeopleType())){
                 PeopleBasicInfoDto peopleBasicInfoDto = firefighters.getFirefighters();
                 Firefighters firefighter = new Firefighters();
                 BeanUtils.copyProperties(peopleBasicInfoDto, firefighter);

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

@@ -202,14 +202,14 @@ public class ExcelServiceImpl {
 			//查询已经关联的所有 用户
             Set<String> set=new HashSet();
 			List<OrgUsr> listD=orgUsrMapper.selectAmosorgCode();
-			if(listD.isEmpty()){
+			if(!listD.isEmpty()){
 				for (OrgUsr orgUsr : listD) {
 					set.add(orgUsr.getAmosOrgId());
 				}
 			}
 			userList.stream().forEach(u -> {
 
-				if(set.isEmpty()&& set.contains(u.getUserId())){
+				if(!set.isEmpty()&& set.contains(u.getUserId())){
 					//暂时不处理
 				}else{
 					OrgUsrExcelDto dd=new OrgUsrExcelDto();
@@ -341,12 +341,12 @@ public class ExcelServiceImpl {
 						null, FirefightersExcelDto.class, null, false);
 				break;
 			}
-//			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false, par);
-			List<OrgUsrFireExcelDto> firefightersExcelDtoList = firefightersService.exportToExcelNew(false, par);
-			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
-					firefightersExcelDtoList, OrgUsrFireExcelDto.class, null, false);
+			List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false, par);
+		//	List<OrgUsrFireExcelDto> firefightersExcelDtoList = firefightersService.exportToExcelNew(false, par);
 //			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
-//					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
+//					firefightersExcelDtoList, OrgUsrFireExcelDto.class, null, false);
+			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+					firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
 			break;
 		case "WBRY":
 			List<MaintenancePersonExcleDto> maintenancePersonExcelDtoList = maintenanceCompanyService
@@ -821,6 +821,8 @@ public class ExcelServiceImpl {
 					}
 				}
 
+				String s = JSONObject.toJSONString(orgUsrExcelDto);
+				Map map1 = JSONObject.parseObject(s, Map.class);
 				List<DynamicFormInstanceDto> dynamicFormValue = new ArrayList<>();
 				List<DynamicFormInstance> dynamicFormInstancelist = new ArrayList<>();
 
@@ -856,6 +858,19 @@ public class ExcelServiceImpl {
 
 					DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
 					BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
+					if ("gender".equals(dynamicFormInstance.getFieldCode())){
+						dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
+					}
+					String fieldCode = dynamicFormInstance.getFieldCode();
+					if (map1.containsKey(fieldCode) && fieldCode.contains("Code") ){
+						String[] split = map1.get(fieldCode).toString().split("@");
+						dynamicFormInstance.setFieldValue(split[0]);
+					}
+
+					if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
+						dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
+					}
+
 					dynamicFormInstancelist.add(dynamicFormInstance);
 				});
 
@@ -880,6 +895,7 @@ public class ExcelServiceImpl {
 						savePeopleItem(orgUsrExcelDto);
 					}
 				} catch (Exception e) {
+					e.printStackTrace();
 					throw new RuntimeException("导入失败!");
 				}
 			});
@@ -1458,13 +1474,11 @@ public class ExcelServiceImpl {
 	private void excelImportFireExperts(MultipartFile multipartFile) throws Exception {
 		ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 		String companyId = reginParams.getPersonIdentity().getCompanyId();
-		String bizOrgCode = "1";
-		String bizOrgName = "1";
-		if (org.apache.commons.lang3.StringUtils.isNotEmpty(companyId)) {
-			OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
-			bizOrgCode = orgUsr.getBizOrgCode();
-			bizOrgName = orgUsr.getBizOrgName();
-		}
+	//	String bizOrgCode = "1";
+	//	String bizOrgName = "1"; 此处代码无意义 且容易造成数据问题 暂时先赋值 当前登录人所在部门或公司
+		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+		String bizOrgName = reginParams.getPersonIdentity().getCompanyName();
+
 		List<FireExpertsDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireExpertsDto.class, 1);
 		List<FireExperts> excelEntityList = new ArrayList<>();
 		String finalBizOrgCode = bizOrgCode;
@@ -1478,6 +1492,12 @@ public class ExcelServiceImpl {
 				fireExperts.setCertificatesType(certificates[0]);
 				fireExperts.setCertificatesTypeCode(certificates[1]);
 			}
+			if (StringUtils.isEmpty(fireExperts.getCertificatesNum())) {
+				throw new BadRequest("导入身份证号码不可为空");
+			}
+			if (StringUtils.isEmpty(fireExperts.getMobilePhone())) {
+				throw new BadRequest("导入移动号码不可为空");
+			}
 			if (fireExperts.getJobs() != null) {
 				String[] jobs = fireExperts.getJobs().split("@");
 				fireExperts.setJobs(jobs[0]);
@@ -1487,6 +1507,8 @@ public class ExcelServiceImpl {
 				String[] expert = fireExperts.getExpert().split("@");
 				fireExperts.setExpert(expert[0]);
 				fireExperts.setExpertCode(expert[1]);
+			}else {
+				throw new BadRequest("消防专家领域不可为空");
 			}
 			if (fireExperts.getHighestEducation() != null) {
 				String[] highestEducation = fireExperts.getHighestEducation().split("@");

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java

 package com.yeejoin.amos.patrol.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
@@ -22,6 +23,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.persistence.Column;
 import java.util.*;
@@ -139,6 +141,12 @@ public class PlanController extends AbstractBaseController {
     @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
         try {
+
+
+            if ( param.getDayBegin().getTime()> param.getDayEnd().getTime()){
+                throw new BadRequest("开始时间不能大于结束时间");
+            }
+
             String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);
@@ -173,8 +181,7 @@ public class PlanController extends AbstractBaseController {
                 }
             }
             map.put("param", param);
-            planService.addPlan(map);
-            return CommonResponseUtil.success();
+            return CommonResponseUtil.success(planService.addPlan(map));
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             return CommonResponseUtil.failure("巡检计划新增失败");

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -340,6 +340,10 @@ public class PointController extends AbstractBaseController {
 				if(pointClassify.getId()!=null){
 					newPointClassify.setId(pointClassify.getId());
 				}
+				List<PointClassify> pointClassifies = iPointClassifyDao.queryByPointIdAndEquipmentId(pointClassify.getPointId(), pointClassify.getEquipmentId());
+				if (pointClassifies.size() > 0) {
+					return CommonResponseUtil.failure("该巡查对象已存在，不可再添加！");
+				}
 				iPointService.addPointClassifyByPointId(newPointClassify);
 
 				List<PointInputItemVo> customInputList = pointClassify.getEquipIputDetailData();//巡检项
@@ -881,29 +885,36 @@ public class PointController extends AbstractBaseController {
 			downData.add(new String[0]);
 		}
 		//责任人
-		Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode());
-		List<Map<String,String>> personlist = (List<Map<String,String>>)o;
-		String[] person = new String[personlist.size()];
-		if (CollectionUtils.isNotEmpty(personlist)){
-			for (int i = 0; i < personlist.size(); i++) {
-				person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("sequenceNbr")+"@"+personlist.get(i).get("parentName");
+		if (!StringUtils.isEmpty(reginParams.getPersonIdentity().getBizOrgCode())) {
+			Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode());
+			List<Map<String,String>> personlist = (List<Map<String,String>>)o;
+			String[] person = new String[personlist.size()];
+			if (CollectionUtils.isNotEmpty(personlist)){
+				for (int i = 0; i < personlist.size(); i++) {
+					person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("sequenceNbr")+"@"+personlist.get(i).get("parentName");
+				}
+				downData.add(person);
+			}else {
+				downData.add(new String[0]);
 			}
-			downData.add(person);
-		}else {
+		} else {
 			downData.add(new String[0]);
 		}
-
-		//所在建筑
-		FeignClientResult result = equipFeign.myTreeList();
-		Object obj = result.getResult();
-		List<Map<String,Object>> treeMap = (List<Map<String,Object>>)obj;
-		String[] build = new String[treeMap.size()];
-		if (CollectionUtils.isNotEmpty(treeMap)){
-			for (int i = 0; i < treeMap.size(); i++) {
-				build[i] = treeMap.get(i).get("instanceName")+"@"+treeMap.get(i).get("instanceId");
+		if (!StringUtils.isEmpty(reginParams.getPersonIdentity().getBizOrgCode())) {
+			//所在建筑
+			FeignClientResult result = equipFeign.myTreeList();
+			Object obj = result.getResult();
+			List<Map<String, Object>> treeMap = (List<Map<String, Object>>) obj;
+			String[] build = new String[treeMap.size()];
+			if (CollectionUtils.isNotEmpty(treeMap)) {
+				for (int i = 0; i < treeMap.size(); i++) {
+					build[i] = treeMap.get(i).get("instanceName") + "@" + treeMap.get(i).get("instanceId");
+				}
 			}
+			downData.add(build);
+		} else {
+			downData.add(new String[0]);
 		}
-		downData.add(build);
 		String [] downRows = {"2","3","4", "8","11","12","13","14"}; //下拉的列序号数组(序号从0开始)
 
 		try {
@@ -1557,7 +1568,7 @@ public class PointController extends AbstractBaseController {
 	@ApiOperation(value = "查询巡检点信息", notes = "查询巡检点信息")
 	@PostMapping(value = "/listNew", produces = "application/json;charset=UTF-8")
 	public CommonResponse listPointNew(
-			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false)  Point point,
+			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false)  PointQueryVo point,
 			@RequestParam(value = "pageNumber", defaultValue = "1") int current,
 			@RequestParam(value = "pageSize", defaultValue = "10") int size) {
 		ReginParams reginParams = getSelectedOrgInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.dao.mapper.RouteMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.RoutePointItemMapper;
+import com.yeejoin.amos.patrol.business.dao.repository.IRouteDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.service.impl.RouteServiceImpl;
@@ -91,6 +92,9 @@ public class RouteController extends AbstractBaseController {
 	private IRoutePointDao iRoutePointDao;
 	@Autowired
 	private RouteServiceImpl routeServiceImpl;
+
+	@Autowired
+	private IRouteDao iRouteDao;
 	/**
 	 *
 	 * 新增接口
@@ -104,15 +108,16 @@ public class RouteController extends AbstractBaseController {
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) RoutePageParam queryRequests,
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 		try {
-			ReginParams reginParams = getSelectedOrgInfo();
-			//获取所在公司code
-			String bizOrgCode=reginParams.getPersonIdentity().getBizOrgCode();
-			queryRequests.setBizOrgCode(bizOrgCode);
-			if(commonPageable !=null){
-				queryRequests.setPageNumber(commonPageable.getPageNumber()-1);
+			if (StringUtils.isEmpty(queryRequests.getBizOrgCode())) {
+				ReginParams reginParams = getSelectedOrgInfo();
+				//获取所在公司code
+				String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+				queryRequests.setBizOrgCode(bizOrgCode);
+			}
+			if (commonPageable != null) {
+				queryRequests.setPageNumber(commonPageable.getPageNumber() - 1);
 				queryRequests.setPageSize(commonPageable.getPageSize());
 			}
-
 			Page<HashMap<String, Object>> routeList = routeService.getRouteInfo(null,null,null,queryRequests);
 
 			return CommonResponseUtil.success(routeList);
@@ -179,9 +184,7 @@ public class RouteController extends AbstractBaseController {
 			route.setOrgCode(loginOrgCode);
 
 			if(!StringUtils.isEmpty(route.getName())){
-				LambdaQueryWrapper<Route> wrapper = new LambdaQueryWrapper<>();
-				wrapper.eq(Route::getName,route.getName());
-				List<Route> list = routeServiceImpl.list(wrapper);
+				List<Route> list = iRouteDao.getListByName(route.getName());
 				if (!ObjectUtils.isEmpty(list) || list.size()>0){
 					throw new BadRequest("该名称路线已存在");
 				}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PointMapper.java

@@ -6,7 +6,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemNewVo;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.dao.entity.Point;
 import org.apache.ibatis.annotations.Param;
@@ -14,9 +14,6 @@ import org.apache.ibatis.annotations.Param;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.patrol.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.patrol.business.param.PointImportQueryParam;
-import com.yeejoin.amos.patrol.business.vo.LeavelMovePointVo;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
 import com.yeejoin.amos.patrol.core.common.response.PointResponse;
 import com.yeejoin.amos.patrol.dao.entity.PointConfig;
 import com.yeejoin.amos.patrol.dao.entity.PointPhoto;
@@ -53,9 +50,9 @@ public interface PointMapper extends BaseMapper {
 	List<PointInputItemVo> getPointClassInputItemById(@Param(value = "pointId") Long pointId);
 
 
-	List<Point> listByParams(Point pointParams, Page page);
+	List<Point> listByParams(PointQueryVo pointParams, Page page);
 
-	int listByParamsCount(Point pointParams);
+	int listByParamsCount(PointQueryVo pointParams);
 
 	/**
 	 * 根据点ID获取点图片信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IRouteDao.java

@@ -22,4 +22,7 @@ public interface IRouteDao extends BaseDao<Route, Long> {
 
     @Query(value = "select * from p_route where original_id in ?1 and is_delete =0", nativeQuery = true)
     List<Route> listByOriginalIds(List<String> originalIds);
+
+    @Query(value = "select * from p_route where `name` = ?1 and is_delete =0", nativeQuery = true)
+    List<Route> getListByName(String name);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanServiceImpl.java

@@ -45,7 +45,7 @@ public class PlanServiceImpl implements IPlanService {
 	}
 
 	@Override
-	public void addPlan(HashMap<String, Object> map) {
+	public Plan addPlan(HashMap<String, Object> map) {
 		Plan param =  (Plan) map.get("param");
 
 		String userDept = param.getUserDept();
@@ -84,7 +84,7 @@ public class PlanServiceImpl implements IPlanService {
 			param.setDayBegin(DateUtil.formatStrToTime("00:00:00"));
 			param.setDayEnd(DateUtil.formatStrToTime("23:59:59"));
 		}
-		planDao.save(param);
+		return planDao.save(param);
 	}
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -1964,7 +1964,7 @@ public class PointServiceImpl implements IPointService {
     }
 
 /*13迭代新增列表方法*/
-    public IPage<PointVo> queryPointInfoNew(Point pointParams, int current ,int size, String loginOrgCode) {
+    public IPage<PointVo> queryPointInfoNew(PointQueryVo pointParams, int current ,int size, String loginOrgCode) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(current, size);
         List<Point> pointPage = pointMapper.listByParams(pointParams,page);
         int num = pointMapper.listByParamsCount(pointParams);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanService.java

@@ -21,7 +21,7 @@ public interface IPlanService {
 	 * 巡检计划新增及维护
 	 * @param map
 	 */
-	void addPlan(HashMap<String, Object> map);
+	Plan addPlan(HashMap<String, Object> map);
 	
 	/**
 	 * 巡检计划删除

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPointService.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
-import com.yeejoin.amos.patrol.business.vo.LeavelMovePointVo;
-import com.yeejoin.amos.patrol.business.vo.PointClassifyVo;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.response.PointResponse;
 import com.yeejoin.amos.patrol.dao.entity.Point;
@@ -36,7 +33,7 @@ public interface IPointService {
  *
  */
 
-    IPage<PointVo> queryPointInfoNew(Point pointParams,int current,int size, String loginOrgCode);
+    IPage<PointVo> queryPointInfoNew(PointQueryVo pointParams, int current, int size, String loginOrgCode);
 
     /**
      * 添加巡检点

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/vo/PointQueryVo.java

+package com.yeejoin.amos.patrol.business.vo;
+
+
+import com.yeejoin.amos.patrol.dao.entity.BasicEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class PointQueryVo extends BasicEntity {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 参考地址
+     */
+    private String address;
+
+    /**
+     * 分类编号
+     */
+    private long catalogId;
+
+    /**
+     * 3维坐标(x,y,z)
+     */
+    private String coordinates;
+
+    /**
+     * 创建用户id
+     */
+    private String creatorId;
+
+    /**
+     * 有效巡检距离
+     */
+    private int distance;
+
+    /**
+     * 扩展字段
+     */
+    private String extendJson;
+
+    /**
+     * 定点拍照数
+     */
+    private int fixedShot;
+
+    /**
+     * 是否为固定点(1:固定点，0：移动点)
+     */
+    private String isFixed;
+
+    /**
+     * 无计划巡检是否评分(is_score = 1评分,0不评分)
+     */
+    private String isScore;
+
+    /**
+     * 最新更新时间
+     */
+    private Date lastUpdateTime;
+
+    /**
+     * 经度
+     */
+    private String latitude;
+
+    /**
+     * 风险等级(1:一级，2：二级，3：三级，4：四级，5：五级)
+     */
+    private String level;
+
+    /**
+     * 纬度
+     */
+    private String longitude;
+
+    /**
+     * 点名称
+     */
+    private String name;
+
+    /**
+     * 是否允许离线巡检
+     */
+    private Boolean offline;
+
+    /**
+     * 权限系统org code
+     */
+    private String orgCode;
+
+    /**
+     * 点编号
+     */
+    private String pointNo;
+
+    /**
+     * 备注说明
+     */
+    private String remark;
+
+    /**
+     * 路线id
+     */
+    private String routeId;
+
+    /**
+     * 路线名称
+     */
+    private String routeName;
+
+    /**
+     * 是否保存地理信(1:记录，0：不记录)
+     */
+    private String saveGps;
+
+    /**
+     * 最大拍照数
+     */
+    private int shotMaxNumber;
+
+    /**
+     * 最小拍照数
+     */
+    private int shotMinNumber;
+
+    /**
+     * 是否允许普通拍照(1：允许，0：不允许)
+     */
+    private String usuallyShot;
+
+    /**
+     * 是否删除：0表示未删除，1表示已删除
+     */
+    private boolean isDelete;
+
+    /**
+     * 归属区域/部门id
+     */
+    private String chargeDeptId ;
+
+    /**
+     * 负责人id
+     */
+    private String chargePersonId ;
+
+    /**
+     * 负责人id
+     */
+    private String chargePersonName ;
+
+
+    /**
+     * 状态：0 未纳入巡检，1 合格；2 不合格；3 漏检
+     */
+    private String status;
+
+    /**
+     * 3维模型楼层
+     */
+    private Integer floor;
+
+    /**
+     * 是否室内
+     */
+    private Boolean isIndoor;
+
+    /**
+     * 原始字段
+     */
+    private String originalId;
+
+    /**
+     * 风险源id
+     */
+    private String riskSourceId;
+
+    /**
+     * ue4位置
+     */
+
+    private String ue4Location;
+
+    /**
+     * ue4旋转
+     */
+
+    private String ue4Rotation;
+
+    private String bizOrgCode;
+
+    private String bizOrgName;
+
+    /**
+     * 物理区域id（数据来源于装备wl_area）
+     */
+    private Long areaId;
+    /**
+     * 物理区域名称（数据来源于装备wl_area）
+     */
+    private String areaName;
+}
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -26,11 +26,13 @@
 	        sys.design_org,
 	        sys.lead_designer,
 	        sys.design_org_telephone,
+            wec.code as categoryCode,
 	        (select count(1) from `wl_equipment_specific` es where find_in_set(sys.id,es.system_id) and es.single = true ) equipCount,
 	        wws.full_name as fullName
 	        from
 	        f_fire_fighting_system as sys
 	        left join wl_warehouse_structure wws on wws.id = sys.contro_box_build
+            LEFT JOIN wl_equipment_category wec ON wec.id = sys.system_type
             <where>
 	            <if test="equimentName != null and  equimentName !='' and equimentCode !='null' ">
 	                AND sys.name like  CONCAT('%',#{equimentName},'%')

amos-boot-system-patrol/src/main/resources/application.properties

@@ -28,8 +28,8 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 equip.fegin.name=AMOS-EQUIPMANAGE
 equip.fegin.prefix=/equip
-input.custom.prefix = QYZD
-input.statute.prefix = FG
+input.custom.prefix =
+input.statute.prefix =
 
 
 Security.fegin.name=AMOS-API-PRIVILEGE

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -25,8 +25,8 @@
 			<if test="inputClassify != null ">input_classify=#{inputClassify},</if>
 			<if test="unit != null ">unit=#{unit},</if>
 			<if test="facilitiesType != null ">facilities_type=#{facilitiesType},</if>
-			<if test="keyPartsType != null ">key_parts_type=#{keyPartsType},</if>
-			<if test="customType != null ">custom_type=#{customType},</if>
+			<if test="1 == 1">key_parts_type=#{keyPartsType},</if>
+			<if test="1 == 1">custom_type=#{customType},</if>
 			<if test="equipmentType != null ">equipment_type=#{equipmentType},</if>
  		</trim>
  		WHERE id=#{id}

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckReportImpl.java

@@ -61,5 +61,6 @@ public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport>
         return map;
 
     }
-
+return null;
 }
+}
\ No newline at end of file