修改bug

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

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -413,7 +414,14 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 				param.put("id", plan.getId());
 				param.put("status", PlanStatusEnum.OUT_TIME.getValue());
 				planMapper.updPlanStatusOrGenDate(param);
-				updateTaskStatus(plan);
+
+				try {
+					updateTaskStatus(plan);
+				}catch (InnerInvokException e) {
+					log.error(e.getMessage(), e);
+					e.printStackTrace();
+				}
+
 			}
 		}
 
@@ -461,7 +469,14 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 				if (plan.getIsFixedDate().equals("2")){
 					paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
 					planMapper.updPlanStatusOrGenDate(paramMap);
-					updateTaskStatus(plan);
+
+					try {
+						updateTaskStatus(plan);
+					}catch (InnerInvokException e) {
+						log.error(e.getMessage(), e);
+						e.printStackTrace();
+					}
+
 					// 计划超时，修改计划下任务状态
 					planTaskMapper.updateTaskStatusByPlanId(plan.getId());
 					// 计划超时，修改计划下任务详情状态
@@ -485,7 +500,14 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 				}else {
 					paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
 					planMapper.updPlanStatusOrGenDate(paramMap);
-					updateTaskStatus(plan);
+
+					try {
+						updateTaskStatus(plan);
+					}catch (InnerInvokException e) {
+						log.error(e.getMessage(), e);
+						e.printStackTrace();
+					}
+
 					continue;
 				}
 
@@ -496,7 +518,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 					planTaskMapper.updateTaskStatusByPlanId(plan.getId());
 					// 计划超时，修改计划下任务详情状态
 					planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
-					updateTaskStatus(plan);
+
+					try {
+						updateTaskStatus(plan);
+					}catch (InnerInvokException e) {
+						log.error(e.getMessage(), e);
+						e.printStackTrace();
+					}
 				}
 				continue;
 			}

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

@@ -1187,7 +1187,7 @@
             IFNULL( fs.`name`, '其他' ) AS fireFightSysName,
             'equip' AS fireFacilityType,
             ws.source_id AS buildingId,
-            ws.`name` AS buildingName,
+            ws.`full_name` AS buildingName,
             ed.maintenance_cycle,
             ed.area AS location
         FROM