Merge branch 'developer' into developer-latentDanger

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

@@ -763,6 +763,10 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 		List<WaterResourceDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, WaterResourceDto.class, 1);
 
 		excelDtoList.forEach(item -> {
+			/*Bug 2950 消防水源，缺失设施分类、设施定义等必填字段可以上传成功 陈召 2021-10-09 */
+			if (item.getEquipName() == null || item.getEquipName().equals(" ")) {
+				throw new RuntimeException("设备定义名称为必填字段，填写后重新上传");
+			}
 			//BUG 2953  导入模板没有设备编码生成 2021-09-18 陈召开始
 			item.setEquipCode(QRCodeUtil.generateQRCode());
 			//BUG 2953  导入模板没有设备编码生成 2021-09-18 陈召结束

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -269,6 +269,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("pointName", point.getName());
         result.put("bizId", hiddenDangerDto.getCheckInputId());
         result.put("bizName", hiddenDangerDto.getInputItemName());
+        result.put("routeId", plan.getRouteId());
         result.put("accompanyingUserId", plan.getLeadPeopleIds());
         result.put("accompanyingUserName", plan.getLeadPeopleNames());
         result.put("checkUnitId",plan.getCheckUnitId());