修改 待处理 全部任务 我发起

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

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *  Mapper 接口
+ * Mapper 接口
  *
  * @author system_generator
  * @date 2021-08-04
@@ -21,26 +21,45 @@ import java.util.Map;
 public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
 
     /**
-     *查询全部 分页
+     * 查询全部 分页
+     *
      * @param page
      * @return
      */
     IPage<FailureDetails> selectAllPage(Page page);
 
     /**
-     *查询我发起的 分页
+     * 查询我发起的 分页
      * current 当前页
      * size 条数
+     *
      * @return
      */
     IPage<FailureDetails> selectISubPage(Page page, String submissionPid);
 
     /**
-     *查询待处理 分页
+     * 查询待处理 分页
+     *
      * @param page
      * @return
      */
     IPage<FailureDetails> selectInProcessing(Page page);
 
+
+    IPage<FailureDetails> selectStatusWaitTj(Page page);
+
+    IPage<FailureDetails> selectStatusWaitWx();
+
+
     List<StatusDto> selectStatusCount();
+
+    List<StatusDto> selectStatusWx();
+
+    List<StatusDto> selectStatusFq();
+
+    List<StatusDto> selectStatusFqp(Integer submissionPid);
+
+    List<StatusDto> selectStatusLeader();
+
+
 }

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

@@ -58,7 +58,53 @@
         FROM
             cb_failure_details
         WHERE
-            is_delete = 0
+            cb_failure_details.current_status = 3
+           OR
+            cb_failure_details.current_status = 0
+    </select>
+
+    <select id="selectStatusWaitTj" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
+        WHERE
+            cb_failure_details.current_status = 1
+
+    </select>
+
+    <select id="selectStatusWaitWx" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
+        WHERE
+            cb_failure_details.current_status = 6
+           OR
+            cb_failure_details.current_status = 2
+
     </select>
 
     <select id="selectStatusCount" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
@@ -71,4 +117,64 @@
         GROUP BY
             cb_failure_details.current_status
     </select>
+
+    <select id="selectStatusWx" 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
+        WHERE
+            cb_failure_details.current_status = 6
+        OR
+            cb_failure_details.current_status = 2
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
+
+    <select id="selectStatusFq" 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
+        WHERE
+            cb_failure_details.current_status = 1
+
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
+
+    <select id="selectStatusLeader" 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
+        WHERE
+            cb_failure_details.current_status = 0
+        or
+             cb_failure_details.current_status = 3
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
+
+    <select id="selectStatusFqp" parameterType="integer" 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
+        WHERE
+            submission_pid = #{submissionPid}
+        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

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.dto.CurrentStatusDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -181,8 +182,8 @@ public class FailureDetailsController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "查询当前状态任务数量",   notes = "查询当前状态任务数量")
 	@GetMapping(value = "/list/count")
-	public ResponseModel<Object> selectStatusCount() {
-		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount());
+	public ResponseModel<List<CurrentStatusDto> >selectStatusCount(Integer type ) {
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(getSelectedOrgInfo(),type));
 	}
 
 

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

@@ -71,7 +71,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     public static Integer SELECY_ALL = 6;
     public static Integer SELECY_STATUS = 7;
     public static Integer SELECY_ISUBMIT = 8;
-    public String[] roleName = {"", ""};
+    public String[] roleName = {"maintenance_department_maintenance_personnel", "emergency_command_staff"};
+
 
     /**
      * 分页查询
@@ -113,15 +114,12 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
      * 待处理分页查询
      */
     public IPage<FailureDetails> queryForWaitManage(Page<FailureDetails> page, ReginParams userInfo) {
-        /* if (userInfo.getRole().getRoleName().equals())*/
-    /*    if (submissionPid == null) {
-            return null;
+
+        if (userInfo.getRole().getRoleName().equals(roleName[0])) {
+            return baseMapper.selectStatusWaitWx();
+        } else if (userInfo.getRole().getRoleName().equals(roleName[1])) {
+            return baseMapper.selectStatusWaitTj(page);
         }
-        LambdaQueryWrapper<FailureDetails> lambdaQueryWrapper = new LambdaQueryWrapper();
-        lambdaQueryWrapper.notIn(FailureDetails::getCurrentStatus, FailureStatuEnum.REFUSE.getCode(), FailureStatuEnum.FINISH.getCode()
-        ).orderByDesc(FailureDetails::getSubmissionTime);
-        IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
-        return baseMapper.selectPage(failureDetailsPage, lambdaQueryWrapper);*/
         return baseMapper.selectInProcessing(page);
     }
 
@@ -150,7 +148,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
      * 根据状态查询
      */
     public List<FailureDetails> queryForFailureStatus(Long currentStatus) {
-        String status = new String();
+        String status = "";
         List<FailureStatuEnum> list = new ArrayList<>();
         list.add(FailureStatuEnum.WAITING_AUDIT);
         list.add(FailureStatuEnum.WAITING_SUBMIT);
@@ -171,10 +169,21 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     /**
      * 查询任务状态数量
      */
-    public List<CurrentStatusDto> queryStatusCount() {
-        List<StatusDto> statusDtos = baseMapper.selectStatusCount();
+    public List<CurrentStatusDto> queryStatusCount(ReginParams userInfo, Integer type) {
+        List<StatusDto> statusDtos = null;
+        if (type.equals(SELECY_STATUS) &&userInfo.getRole().getRoleName().equals(roleName[0])) {
+            statusDtos = baseMapper.selectStatusWx();
+        } else if (type.equals(SELECY_STATUS) && userInfo.getRole().getRoleName().equals(roleName[1])) {
+            statusDtos = baseMapper.selectStatusFq();
+        } else if (type.equals(SELECY_ISUBMIT)) {
+            statusDtos = baseMapper.selectStatusFqp(Integer.parseInt(userInfo.getUserModel().getUserId()));
+        } else if (type.equals(SELECY_ALL)){
+            statusDtos = baseMapper.selectStatusCount();
+        }else {
+            statusDtos = baseMapper.selectStatusLeader();
+        }
         List<CurrentStatusDto> currentStatusDtoList = new ArrayList<>();
-        statusDtos.forEach(e->{
+        statusDtos.forEach(e -> {
             CurrentStatusDto currentStatusDto = new CurrentStatusDto();
             currentStatusDto.setCutrentStatusCount(e.getCurrentStatusCount());
             currentStatusDto.setCutrentStatusName(Constants.currentStatusNameMap.get(e.getCurrentStatus()));