更新代码

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
-import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
-import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +70,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	IFailureRepairlogService failureRepairlog;
 
 	public static String EMERGENCY_COMMAND = "应急指挥科";
-	public static String[] PROCESS_NAME = {"提交维修单","审核","维修","验收"};
 
 	private final Logger logger = LoggerFactory.getLogger(FailureDetailsServiceImpl.class);
 
@@ -129,8 +129,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
 		wrapper.eq("submission_pid",submissionPid);
 		wrapper.lt("current_status",FailureStatuEnum.REFUSE.getCode());
-		wrapper.lt("current_status",FailureStatuEnum.FINISH.getCode());
-		wrapper.lt("current_status",FailureStatuEnum.WAITING_AUDIT.getCode());
 		wrapper.orderByDesc("submission_time");
 		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
 		return  baseMapper.selectPage(failureDetailsPage, wrapper);
@@ -147,19 +145,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 根据状态查询
 	 */
-
-	public FailureDetailsDto queryForOne(Long sequenceNbr){
-		FailureDetailsDto failureDetailsDto = this.queryBySeq(sequenceNbr);
-		failureDetailsDto.setCurrentStatusName(
-				Constants.currentStatusNameMap.get(failureDetailsDto.getCurrentStatus()));
-		List<SourceFile> sourceFiles = sourceFileServiceImpl.findBySourceId(sequenceNbr);
-		failureDetailsDto.setAttachment(sourceFiles);
-		return failureDetailsDto ;
-	}
-
-	/**
-	 * 根据状态查询
-	 */
 	public List<FailureDetails> queryForFailureStatus(Long currentStatus) {
 		String status = new String();
 		List<FailureStatuEnum> list = new ArrayList<>();
@@ -203,11 +188,12 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		List<FailureStatusCountDto> list = new ArrayList<>();
 	//	String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
 		List<String> statusName = new ArrayList<>();
-		Collections.addAll(statusName, FailureStatuEnum.WAITING_AUDIT.getName(),
-				FailureStatuEnum.WAITING_SUBMIT.getName(),
-				FailureStatuEnum.WAITING_MAINTAIN.getName(),
-				FailureStatuEnum.WAITING_ACCEPTANCE.getName(),
-				FailureStatuEnum.REFUSE.getName());
+		statusName.add("待审核");
+		statusName.add("待提交");
+		statusName.add("待维修");
+		statusName.add("待验收");
+		statusName.add("已拒绝");
+		statusName.add("已完结");
 
 		for (int i = 0; i < failureDetailsDtos.size(); i++) {
 			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_AUDIT.getCode())){
@@ -303,15 +289,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			return false;
 			// return CommonResponseUtil.failure("添加失败");
 		}
-		try{
-			if (ObjectUtils.isNotEmpty(model)) {
-				excuteTask(instance.getString("id"), userInfo, null);
-			}
-		}catch (Exception e){
-			e.printStackTrace();
-			return false;
+		if (ObjectUtils.isNotEmpty(model)) {
+			excuteTask(instance.getString("id"), userInfo, null);
 		}
-
 		return true;
 	}
 
@@ -519,13 +499,13 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		Map<String, Object> map = this.checkExcuteTaskAuthMap(sequenceNbr, userInfo);
 		 if(Boolean.parseBoolean(map.get("checkFlag").toString())) {
 			String  buttonValueString = map.get("name").toString();
-			if(buttonValueString.contains(PROCESS_NAME[1])) { //提交维修单
+			if(buttonValueString.contains("提交保修单")) {
 				flag=1;
-			}else if(buttonValueString.contains(PROCESS_NAME[2])) {  //审核
+			}else if(buttonValueString.contains("审核") ) {
 				flag=2;
-			}else if(buttonValueString.contains(PROCESS_NAME[3])) {//维修
+			}else if(buttonValueString.contains("维修")) {
 				flag=3;
-			}else if(buttonValueString.contains(PROCESS_NAME[4])) {//验收
+			}else if(buttonValueString.contains("验收")) {
 				flag=4;
 			}
 		 }