代码提交

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -663,6 +663,7 @@ public class ContingencyAction implements CustomerAction {
         if(planOperationRecord!=null){
             planOperationRecord.setStatus(PlanRecordStatusEnum.COMPLETE.getCode());
             planOperationRecord.setEndTime(new Date());
+            planOperationRecordDao.save(planOperationRecord);
             Optional<PlanDetail>  optionalPlanDetail = planDetailDao.findById(planOperationRecord.getPlanId());
             if(optionalPlanDetail.get()!=null){
                 PlanDetail planDetail = optionalPlanDetail.get();

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java

@@ -165,7 +165,7 @@ public class ContingencyPlanController extends BaseController {
         toke.setToke(getToken());
         AgencyUserModel user = getUserInfo();
         vo.setUserId(user.getUserId());
-        vo.setUserName(user.getUserName());
+        vo.setUserName(user.getRealName());
         ContingencyPlanResponseVo result = contingencyPlanService.planStart(vo,toke);
         return CommonResponseUtil2.success(result);
     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -144,7 +144,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                  planOperationRecord.setStartUserName(vo.getUserName());
                  planOperationRecord.setEquipmentCode(equipmentSpecific.getCode());
                  planOperationRecord.setEquipmentName(equipmentSpecific.getName());
-                 if(ContingencyPlanStatusEnum.SIMULATION_START.getCode().equals(vo.getStatus())){
+                 if(ContingencyPlanStatusEnum.SIMULATION_START.getCode()==vo.getStatus()){
                      planOperationRecord.setExecutionType(ExecutionTypeEnum.PLANCHECK.getCode());
                  }else{
                      planOperationRecord.setExecutionType(ExecutionTypeEnum.FIREMANAGEMENT.getCode());
@@ -199,7 +199,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 map.put("startType","自动");
             }
             map.put("executionType",planOperationRecord.getExecutionType());
-            map.put("equipmentName",equipment.getName());
+            map.put("equipmentName",planOperationRecord.getEquipmentName());
             map.put("PlanName",planDetail.getPlanName());
         }
         return map;