增加属性 当前状态名称 修改代码细节

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FailureDetailsDto.java

@@ -21,6 +21,8 @@ public class FailureDetailsDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "当前状态名")
+    private String currentStatusName;
 
     @ApiModelProperty(value = "当前状态")
     private Integer currentStatus;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/constats/Constants.java

+package com.yeejoin.amos.boot.module.common.biz.constats;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Constants {
+
+    public static final Map<Integer,String> currentStatusNameMap = new HashMap<>();
+
+    static {
+        currentStatusNameMap.put(0,"待审核");
+        currentStatusNameMap.put(1,"待提交");
+        currentStatusNameMap.put(2,"待维修");
+        currentStatusNameMap.put(3,"待验收");
+        currentStatusNameMap.put(4,"已拒绝");
+        currentStatusNameMap.put(5,"已完结");
+    }
+}

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
+import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,21 +22,15 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl;
-
-/*import com.yeejoin.amos.patrol.business.util.CommonResponse;
-import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;*/
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -70,8 +66,9 @@ public class FailureDetailsController extends BaseController {
 			result = failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo());
 			 return ResponseHelper.buildResponse(result);
 		} catch (Exception e) {
+			e.printStackTrace();
 			// TODO Auto-generated catch block
-			 return ResponseHelper.buildResponse("erro");
+			 return ResponseHelper.buildResponse("error");
 		}
 	}
 
@@ -113,7 +110,8 @@ public class FailureDetailsController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
 	public ResponseModel<FailureDetailsDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryBySeq(sequenceNbr));
+
+	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForOne(sequenceNbr));
 	}
 
 	/**
@@ -126,13 +124,28 @@ public class FailureDetailsController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<IPage<FailureDetails>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+	public ResponseModel<IPage<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
                     (value = "size") int size, @RequestParam Integer type) {
 	    Page<FailureDetails> page = new Page<FailureDetails>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 		final AgencyUserModel userInfo = getUserInfo();
-		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page,userInfo,type));
+		IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
+		IPage<FailureDetails> failureDetailsIPage = failureDetailsServiceImpl.queryForFailureDetailsPage(page, userInfo, type);
+		BeanUtils.copyProperties(failureDetailsIPage,FailureDetailsDto.class);
+		List<FailureDetails> records = failureDetailsIPage.getRecords();
+		List<FailureDetailsDto> failureDetailsDtoList = new ArrayList<>();
+		records.forEach(failureDetails -> {
+			FailureDetailsDto failureDetailsDto = new FailureDetailsDto();
+			BeanUtils.copyProperties(failureDetails,failureDetailsDto);
+
+			failureDetailsDto.setCurrentStatusName(
+					Constants.currentStatusNameMap.get(failureDetails.getCurrentStatus()));
+			failureDetailsDtoList.add(failureDetailsDto);
+		});
+		failureDetailDTOsIPage.setRecords(failureDetailsDtoList);
+
+		return ResponseHelper.buildResponse(failureDetailDTOsIPage);
 	}
 
 	/**

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

@@ -62,6 +62,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             this.createWithModel(model);
             return model;
         }*/
+
         Integer auditResult = model.getAuditResult();
         //根据审核的结果进行业务操作
         if (auditResult.equals(AuditResultEnum.AGREE.getCode())) {
@@ -97,6 +98,10 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             condition = AuditResultEnum.AGREE.getName();
             repairlog(faultId,processAuditor,processTime,processDepartment,condition);
         }
+        if (status.equals(AuditResultEnum.SEND_BACK)) {
+            condition = AuditResultEnum.SEND_BACK.getName();
+            repairlog(faultId,processAuditor,processTime,processDepartment,condition);
+        }
         condition = AuditResultEnum.REFUSE.getName();
 
         failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition);

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.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 
 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;
@@ -71,6 +68,7 @@ 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);
 
@@ -130,6 +128,8 @@ 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);
@@ -146,6 +146,19 @@ 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<>();
@@ -189,12 +202,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		List<FailureStatusCountDto> list = new ArrayList<>();
 	//	String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
 		List<String> statusName = new ArrayList<>();
-		statusName.add("待审核");
-		statusName.add("待提交");
-		statusName.add("待维修");
-		statusName.add("待验收");
-		statusName.add("已拒绝");
-		statusName.add("已完结");
+		Collections.addAll(statusName, FailureStatuEnum.WAITING_AUDIT.getName(),
+				FailureStatuEnum.WAITING_SUBMIT.getName(),
+				FailureStatuEnum.WAITING_MAINTAIN.getName(),
+				FailureStatuEnum.WAITING_ACCEPTANCE.getName(),
+				FailureStatuEnum.REFUSE.getName());
 
 		for (int i = 0; i < failureDetailsDtos.size(); i++) {
 			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_AUDIT.getCode())){
@@ -273,26 +285,21 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			repairlog(faultId, processAuditor, processTime, processDepartment, processResult);
 
 
-/*			FailureAuditDto failureAuditDto = new FailureAuditDto();
-			failureAuditDto.setAuditor(model.getRecUserName());
-			failureAuditDto.setFaultId(model.getSequenceNbr());
-			failureAuditDto.setAuditOpinion("已发起");
-			failureAuditDto.setAuditTime(new Date());
-			failureAuditDto.setIsDelete(true);
-			failureAuditDto.setAuditResult(5);
-
-			if (ObjectUtils.isNotEmpty(failureAuditDto)) {
-				failureAuditServiceImpl.savemodel(failureAuditDto, userInfo);
-			}*/
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.info("添加故障维修信息到数据库失败");
 			return false;
 			// return CommonResponseUtil.failure("添加失败");
 		}
-		if (ObjectUtils.isNotEmpty(model)) {
-			excuteTask(instance.getString("id"), userInfo, null);
+		try{
+			if (ObjectUtils.isNotEmpty(model)) {
+				excuteTask(instance.getString("id"), userInfo, null);
+			}
+		}catch (Exception e){
+			e.printStackTrace();
+			return false;
 		}
+
 		return true;
 	}
 
@@ -500,13 +507,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("提交保修单")) {
+			if(buttonValueString.contains(PROCESS_NAME[1])) { //提交维修单
 				flag=1;
-			}else if(buttonValueString.contains("审核")) {
+			}else if(buttonValueString.contains(PROCESS_NAME[2])) {  //审核
 				flag=2;
-			}else if(buttonValueString.contains("维修")) {
+			}else if(buttonValueString.contains(PROCESS_NAME[3])) {//维修
 				flag=3;
-			}else if(buttonValueString.contains("验收")) {
+			}else if(buttonValueString.contains(PROCESS_NAME[4])) {//验收
 				flag=4;
 			}
 		 }