修改bug

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

@@ -4,6 +4,7 @@ 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.feign.privilege.model.AgencyUserModel;
@@ -125,9 +126,9 @@ public class FailureDetailsController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,@RequestParam Integer type) {
-	    Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
+	public ResponseModel<IPage<FailureDetails>> 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();
@@ -156,7 +157,7 @@ public class FailureDetailsController extends BaseController {
 	@GetMapping(value = "/list/{currentStatus}")
 	public ResponseModel<List<FailureDetails>> selectStatusForList(@PathVariable Long currentStatus) {
 
-		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsList(currentStatus));
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureStatus(currentStatus));
 	}
 
 	/**
@@ -171,22 +172,6 @@ public class FailureDetailsController extends BaseController {
 		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(type));
 	}
 
-/*	*//**c
-	 * 待处理Test
-	 *
-	 * @return
-/*	 *//**/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "待处理",   notes = "待处理")
-	@GetMapping(value = "/list/daichuli")
-	public ResponseModel<Page<FailureDetailsDto>> selectISubmit(@RequestParam(value = "current") int current,@RequestParam
-			(value = "size") int size,@RequestParam Long currentStatus) {
-		Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
-		page.setCurrent(current);
-		page.setSize(size);
-		String userId = getUserInfo().getUserId();
-		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForMe(page,userId,currentStatus));
-	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "流程信息",   notes = "流程信息")

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

@@ -123,7 +123,7 @@ public class FailureRepairlogController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "查询报修日志",   notes = "查询报修日志")
 	@GetMapping(value = "/list/{faultId}")
-	public ResponseModel<List<FailureRepairlog>> findByFaultIdLog(@RequestParam Long faultId) {
+	public ResponseModel<List<FailureRepairlog>> findByFaultIdLog(@PathVariable Long faultId) {
 		return ResponseHelper.buildResponse(failureRepairlogServiceImpl.findByfaultIdLog(faultId));
 	}
 }

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

@@ -56,20 +56,20 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Transactional
     public FailureAuditDto savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
 
-        if (model.getAuditResult().equals(5)) {
+      /*  if (model.getAuditResult().equals(5)) {
             model.setAuditTime(new Date());
             model.setIsDelete(false);
             this.createWithModel(model);
             return model;
-        }
+        }*/
         Integer auditResult = model.getAuditResult();
         //根据审核的结果进行业务操作
         if (auditResult.equals(AuditResultEnum.AGREE.getCode())) {
-            updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN.getCode(), userInfo);
+            updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo);
         } else if (auditResult.equals(AuditResultEnum.REFUSE.getCode())) {
-            updateStatus(model, FailureStatuEnum.REFUSE.getCode(), userInfo);
+            updateStatus(model, FailureStatuEnum.REFUSE, userInfo);
         } else if (auditResult.equals(AuditResultEnum.SEND_BACK.getCode())) {
-            updateStatus(model, FailureStatuEnum.WAITING_SUBMIT.getCode(), userInfo);
+            updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo);
         }
         return model;
     }
@@ -78,12 +78,13 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 修改故障保修单任务状态
      */
     @Transactional
-    FailureDetailsDto updateStatus(FailureAuditDto model, Integer status, ReginParams userInfo) throws Exception {
+    FailureDetailsDto updateStatus(FailureAuditDto model, FailureStatuEnum status, ReginParams userInfo) throws Exception {
 
         failureDetailsService.checkExcuteTaskAuthMap(model.getSequenceNbr(),userInfo);
 
+
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
-        failureDetailsDto.setCurrentStatus(status);
+        failureDetailsDto.setCurrentStatus(status.getCode());
         failureDetailsDto.setSequenceNbr(model.getFaultId());
         String 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

@@ -8,6 +8,7 @@ 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 org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
@@ -65,7 +66,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 	@Autowired
 	FailureRepairlogServiceImpl failureRepairlogService;
-	
+
 	@Autowired
 	IFailureRepairlogService failureRepairlog;
 
@@ -80,48 +81,58 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 分页查询
 	 */
-	public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page, Long currentStatus,
-			AgencyUserModel userInfo) {
-		if (currentStatus == null) {
-			return this.queryForPage(page, "submission_time", true);
-		}
-		return this.queryForPage(page, "submission_time", true, currentStatus);
+	public IPage<FailureDetails> queryAllPage(long size,
+			long current) {
+		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
+		wrapper.orderByDesc("submission_time");
+		IPage<FailureDetails> page = new Page<>(current, size);
+		return  baseMapper.selectPage(page, wrapper);
 	}
 
-	public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page,
+
+
+	public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page,
 			AgencyUserModel userInfo, Integer type) {
 
 		if ( type.equals(SELECY_ALL) ) {
-			return this.queryForPage(page, "submission_time", true);
+			return this. queryAllPage(page.getSize(),page.getCurrent());
 		}
+
 		if (type.equals(SELECY_ISUBMIT)) {
-			if (ObjectUtils.isNotEmpty(userInfo)) {
-				String submissionPid = userInfo.getUserId();
-				return	queryForPage(page, submissionPid);
-			}
+
+				return	queryForPage(page, userInfo.getUserId());
 
 		}
-		return this.queryForPage(page, "submission_time", true);
+		return this. queryForWaitManage(page, userInfo.getUserId());
 	}
 
 	/**
 	 * 我发起分页查询
 	 */
-	public Page<FailureDetailsDto> queryForPage(Page<FailureDetailsDto> page, String submissionPid) {
+	public IPage<FailureDetails> queryForPage(Page<FailureDetails> page, String submissionPid) {
 		if (submissionPid == null) {
 			return null;
 		}
-		return this.queryForPage(page, "submission_time", true, submissionPid);
+		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
+		wrapper.eq("submission_pid",submissionPid);
+		wrapper.orderByDesc("submission_time");
+		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
+		return  baseMapper.selectPage(failureDetailsPage, wrapper);
 	}
 
 	/**
 	 * 待处理分页查询
 	 */
-	public Page<FailureDetailsDto> queryForMe(Page<FailureDetailsDto> page, String userId,Long currentStatus) {
-		if (userId == null) {
+	public IPage<FailureDetails> queryForWaitManage(Page<FailureDetails> page, String submissionPid) {
+		if (submissionPid == null) {
 			return null;
 		}
-		return this.queryForPage(page, "submission_time", true, userId,currentStatus);
+		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
+		wrapper.eq("submission_pid",submissionPid);
+		wrapper.lt("current_status",FailureStatuEnum.REFUSE.getCode());
+		wrapper.orderByDesc("submission_time");
+		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
+		return  baseMapper.selectPage(failureDetailsPage, wrapper);
 	}
 
 
@@ -135,9 +146,23 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 根据状态查询
 	 */
-	public List<FailureDetails> queryForFailureDetailsList(Long currentStatus) {
+	public List<FailureDetails> queryForFailureStatus(Long currentStatus) {
+		String status = new String();
+		List<FailureStatuEnum> list = new ArrayList<>();
+		list.add(FailureStatuEnum.WAITING_AUDIT);
+		list.add(FailureStatuEnum.WAITING_SUBMIT);
+		list.add(FailureStatuEnum.WAITING_MAINTAIN);
+		list.add(FailureStatuEnum.WAITING_ACCEPTANCE);
+		list.add(FailureStatuEnum.REFUSE);
+		list.add(FailureStatuEnum.FINISH);
+		for (int i = 0; i < list.size(); i++) {
+			if (currentStatus.equals(list.get(i).getCode())){
+				status = list.get(i).getName();
+			};
+		}
+		/*FailureStatuEnum[] failureStatuEnums = new FailureStatuEnum []{};*/
 		QueryWrapper<FailureDetails> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("current_status", currentStatus).orderByDesc("submission_time");
+		queryWrapper.eq("current_status", status).orderByDesc("submission_time");
 		return baseMapper.selectList(queryWrapper);
 
 	}
@@ -162,8 +187,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		int finishStatus=0;
 
 		List<FailureStatusCountDto> list = new ArrayList<>();
-
-		String[] statusName ={"待审核","待提交","待维修","待验收","已拒绝","已完结"};
+	//	String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
+		List<String> statusName = new ArrayList<>();
+		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())){
@@ -184,20 +215,21 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.FINISH.getCode())){
 				finishStatus++;
 			}
-			int[] statusCount = {auditStatus,submitStatus,maintainStatus,acceptanceStatus,refuseStatus,finishStatus};
-			for (int j = 0; j < 5; j++) {
-				FailureStatusCountDto statusCountDto= new FailureStatusCountDto();
-				statusCountDto.setStatus(statusName[i]);
-				statusCountDto.setCount(statusCount[i]);
-				list.add(statusCountDto);
-			}
+
+		}
+		int[] statusCount = {auditStatus,submitStatus,maintainStatus,acceptanceStatus,refuseStatus,finishStatus};
+		for (int i = 0; i < statusName.size(); i++) {
+			FailureStatusCountDto statusCountDto= new FailureStatusCountDto();
+			statusCountDto.setStatus(statusName.get(i));
+			statusCountDto.setCount(statusCount[i]);
+			list.add(statusCountDto);
 		}
 		return list;
 	}
 
 	/**
 	 * 发起故障保修单
-	 * 
+	 *
 	 * @throws Exception
 	 */
 	@Transactional
@@ -220,13 +252,19 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		failureDetailsDto.setProcessId(instance.getString("id"));
 		FailureDetailsDto model = null;
 		try {
-			if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
-				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
-			}
+
 
 			// 发起主表流程 并添加至报修日志
 			failureDetailsDto.setSubmissionTime(new Date());
+			failureDetailsDto.setFailureCode(buildOrderNo());
+			failureDetailsDto.setBizCode(buildOrderNo());
+			failureDetailsDto.setIsDelete(false);
 			model = this.createWithModel(failureDetailsDto);
+
+			if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
+				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
+			}
+
 			Long faultId = model.getSequenceNbr();
 			String processAuditor = model.getRecUserName();
 			String processResult = "提交报修单";
@@ -234,16 +272,18 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			Date processTime = model.getSubmissionTime();
 			repairlog(faultId, processAuditor, processTime, processDepartment, processResult);
 
-			FailureAuditDto failureAuditDto = new FailureAuditDto();
+
+/*			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("添加故障维修信息到数据库失败");
@@ -280,6 +320,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				workflowFeignService.pickupAndCompleteTask(map.get("taskId").toString(), conditionMap);
 			}
 		} catch (Exception e) {
+			e.printStackTrace();
 			return false;
 		}
 		return true;
@@ -375,7 +416,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 	/**
 	 * 獲取待處理的任務數量
-	 * 
+	 *
 	 * @param userInfo
 	 * @return
 	 */
@@ -447,7 +488,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		}
 		return newDate + result;
 	}
-	
+
 	/**
 	 * 获取当前登录人能够操作的任务执行Button类型
 	 * @param sequenceNbr
@@ -470,8 +511,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			}
 		 }
 		 FailureDetails details = this.baseMapper.selectById(sequenceNbr);
-		JSONObject object= workflowFeignService.queryTasksByProcessInstanceId(details.getProcessId());
-		JSONArray array=	object.getJSONArray("data");
+		JSONObject object = workflowFeignService.queryTasksByProcessInstanceId(details.getProcessId());
+		JSONArray array =	object.getJSONArray("data");
 		for (Object historyDetail : array) {
 			JSONObject historyDetailJson=	JSONObject.parseObject(JSONObject.toJSONString(historyDetail));
 			if("rejected".equals(historyDetailJson.getString("activityId"))) {