统计

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+@Data
+public class FailureStatusCountDto {
+    private String status;
+    private int count;
+}

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

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
 import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
@@ -100,6 +101,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			}
 			return null;
 		}
+
 		return this.queryForPage(page, "submission_time", true, currentStatus);
 	}
 
@@ -114,6 +116,16 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	}
 
 	/**
+	 * 待处理分页查询
+	 */
+	public Page<FailureDetailsDto> queryForMe(Page<FailureDetailsDto> page, String userId) {
+		if (userId == null) {
+			return null;
+		}
+		return this.queryForPage(page, "submission_time", true, userId);
+	}
+
+	/**
 	 * 列表查询 示例
 	 */
 	public List<FailureDetailsDto> queryForFailureDetailsList() {
@@ -129,23 +141,66 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		return baseMapper.selectList(queryWrapper);
 
 	}
-
+	
 	/**
-	 * 流程日志
+	 * 查询任务状态数量
 	 */
-	public List<Map> repairLog(Long currentStatus) {
 
-		return null;
+	public List<FailureStatusCountDto> queryStatusCount() {
+		List<FailureDetailsDto> failureDetailsDtos = this.queryForFailureDetailsList();
+
+		int auditStatus=0;
+		int submitStatus=0;
+		int maintainStatus=0;
+		int acceptanceStatus=0;
+		int refuseStatus=0;
+		int finishStatus=0;
+
+		List<FailureStatusCountDto> list = new ArrayList<>();
+
+		String[] statusName ={"待审核","待提交","待维修","待验收","已拒绝","已完结"};
+
+		for (int i = 0; i < failureDetailsDtos.size(); i++) {
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_AUDIT.getCode())){
+				auditStatus++;
+			}
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_SUBMIT.getCode())){
+				submitStatus++;
+			}
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_MAINTAIN.getCode())){
+				maintainStatus++;
+			}
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.WAITING_ACCEPTANCE.getCode())){
+				acceptanceStatus++;
+			}
+			if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.REFUSE.getCode())){
+				refuseStatus++;
+			}
+			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);
+			}
+
+		}
+
+		return list;
 	}
 
-	/**
+
+/*	*//**
 	 * 查询任务状态数量
-	 */
+	 *//*
 	public Integer queryStatusCount(Long currentStatus) {
 		QueryWrapper<FailureDetails> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("current_status", currentStatus);
 		return baseMapper.selectCount(queryWrapper);
-	}
+	}*/
 
 	/**
 	 * 发起故障保修单
@@ -178,6 +233,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 			// 发起主表流程 并添加至报修日志
 			failureDetailsDto.setSubmissionTime(new Date());
+			failureDetailsDto.setFailureCode(buildOrderNo());
+			failureDetailsDto.setBizCode(buildOrderNo());
+			failureDetailsDto.setIsDelete(false);
 			model = this.createWithModel(failureDetailsDto);
 			Long faultId = model.getSequenceNbr();
 			String processAuditor = model.getRecUserName();