修改代码

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+@Data
+public class CurrentStatusDto {
+    private String cutrentStatusName;
+    private Integer cutrentStatusCount;
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+@Data
+public class StatusDto {
+    private Integer currentStatus;
+    private Integer currentStatusCount;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.StatusDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *  Mapper 接口
  *
@@ -38,5 +42,5 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
      */
     IPage<FailureDetails> selectInProcessing(Page page);
 
-
+    List<StatusDto> selectStatusCount();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml

@@ -5,7 +5,6 @@
         SELECT
             sequence_nbr,
             current_status,
-            current_status,
             failure_equipment_id,
             failure_equipment,
             fault_time,
@@ -46,7 +45,6 @@
         SELECT
             sequence_nbr,
             current_status,
-            current_status,
             failure_equipment_id,
             failure_equipment,
             fault_time,
@@ -62,4 +60,15 @@
         WHERE
             is_delete = 0
     </select>
+
+    <select id="selectStatusCount" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            cb_failure_details.current_status  ,
+            count(cb_failure_details.current_status)
+         AS currentStatusCount
+        FROM
+            cb_failure_details
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
 </mapper>

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

@@ -181,8 +181,8 @@ public class FailureDetailsController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "查询当前状态任务数量",   notes = "查询当前状态任务数量")
 	@GetMapping(value = "/list/count")
-	public ResponseModel<List<FailureStatusCountDto>> selectStatusCount(@RequestParam Integer type) {
-		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(type));
+	public ResponseModel<Object> selectStatusCount() {
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount());
 	}
 
 

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

@@ -2,15 +2,14 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import org.apache.commons.lang3.ObjectUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -25,9 +24,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
 import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
@@ -70,13 +66,12 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     IFailureRepairlogService failureRepairlog;
 
 
-
     public static String EMERGENCY_COMMAND = "应急指挥科";
     public static String[] PROCESS_NAME = {"提交报修单", "审核", "维修", "验收", "维修中"};
     public static Integer SELECY_ALL = 6;
     public static Integer SELECY_STATUS = 7;
     public static Integer SELECY_ISUBMIT = 8;
-    public String[] roleName = {"",""} ;
+    public String[] roleName = {"", ""};
 
     /**
      * 分页查询
@@ -95,7 +90,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
             return this.baseMapper.selectAllPage(page);
         }
         if (type.equals(SELECY_ISUBMIT)) {
-            return baseMapper.selectISubPage(page,userInfo.getUserModel().getUserId());
+            return baseMapper.selectISubPage(page, userInfo.getUserModel().getUserId());
         }
         return this.queryForWaitManage(page, userInfo);
     }
@@ -118,7 +113,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
      * 待处理分页查询
      */
     public IPage<FailureDetails> queryForWaitManage(Page<FailureDetails> page, ReginParams userInfo) {
-       /* if (userInfo.getRole().getRoleName().equals())*/
+        /* if (userInfo.getRole().getRoleName().equals())*/
     /*    if (submissionPid == null) {
             return null;
         }
@@ -127,7 +122,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         ).orderByDesc(FailureDetails::getSubmissionTime);
         IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
         return baseMapper.selectPage(failureDetailsPage, lambdaQueryWrapper);*/
-      return   baseMapper.selectInProcessing(page);
+        return baseMapper.selectInProcessing(page);
     }
 
 
@@ -176,60 +171,16 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     /**
      * 查询任务状态数量
      */
-    public List<FailureStatusCountDto> queryStatusCount(Integer type) {
-        List<FailureDetailsDto> failureDetailsDtos = new ArrayList<>();
-        if (type.equals(SELECY_ALL)) {
-            failureDetailsDtos = this.queryForFailureDetailsList();
-        }
-        if (type.equals(SELECY_ISUBMIT)) {
-            failureDetailsDtos = this.queryForFailureDetailsList();
-        }
-        int auditStatus = 0;
-        int submitStatus = 0;
-        int maintainStatus = 0;
-        int acceptanceStatus = 0;
-        int refuseStatus = 0;
-        int finishStatus = 0;
-        int inMaintenance = 0;
-
-        List<FailureStatusCountDto> list = new ArrayList<>();
-        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(),
-                FailureStatuEnum.FINISH.getName(), FailureStatuEnum.IN_MAINTENANCE.getName());
-        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++;
-            }
-            if (failureDetailsDtos.get(i).getCurrentStatus().equals(FailureStatuEnum.IN_MAINTENANCE.getCode())) {
-                inMaintenance++;
-            }
-        }
-        int[] statusCount = {auditStatus, submitStatus, maintainStatus, acceptanceStatus, refuseStatus, finishStatus,
-                inMaintenance};
-        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;
+    public List<CurrentStatusDto> queryStatusCount() {
+        List<StatusDto> statusDtos = baseMapper.selectStatusCount();
+        List<CurrentStatusDto> currentStatusDtoList = new ArrayList<>();
+        statusDtos.forEach(e->{
+            CurrentStatusDto currentStatusDto = new CurrentStatusDto();
+            currentStatusDto.setCutrentStatusCount(e.getCurrentStatusCount());
+            currentStatusDto.setCutrentStatusName(Constants.currentStatusNameMap.get(e.getCurrentStatus()));
+            currentStatusDtoList.add(currentStatusDto);
+        });
+        return currentStatusDtoList;
     }
 
     /**
@@ -239,8 +190,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
      */
     @Transactional
     public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) throws Exception {
-        if (null != failureDetailsDto.getSequenceNbr()){
-          return  updatetoModel(failureDetailsDto,  userInfo);
+        if (null != failureDetailsDto.getSequenceNbr()) {
+            return updatetoModel(failureDetailsDto, userInfo);
         }
 
         String businessKey = buildOrderNo();
@@ -296,7 +247,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     public Object updatetoModel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) throws Exception {
 
 
-
         // 发起主表流程 并添加至报修日志
         failureDetailsDto.setSubmissionTime(new Date());
         FailureDetailsDto model = this.updateWithModel(failureDetailsDto);

amos-boot-system-jcs/src/main/resources/application.properties

-spring.application.name=JCS_chenhao
-server.servlet.context-path=/jcs
+spring.application.name=JCS_cz
 server.port=11100
 spring.profiles.active=dev