完善

platform-dao/src/main/java/com/platform/dao/mapper/check/CheckJobMapper.java

@@ -43,4 +43,6 @@ public interface CheckJobMapper extends MyMapper<CheckJob> {
     Integer getNumByDTO(CheckJob checkJob);
 
     CheckJobVO  getScreenCountByTime(CheckJobDTO model);
+
+    int getNotFinishNumByDTO(CheckJobDTO record);
 }

platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckJobVO.java

@@ -79,6 +79,10 @@ public class CheckJobVO implements Serializable{
      * 标准id
      */
     private String standardId;
+    /**
+     * 标准no
+     */
+    private String standardNo;
     /**
      * 计划周期
      */

platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -181,7 +181,7 @@
             resultType="com.platform.dao.vo.query.check.CheckJobVO">
         select checkjob.*, u.real_name as checkUserName,
                sbinfo.name sbName, sbinfo.no sbNo, sbinfo.level sbLevel,
-               partinfo.name partName, standard.name standardName,standard.level standardLevel,
+               partinfo.name partName, standard.no standardNo, standard.name standardName,standard.level standardLevel,
                standard.period period, standard.period_type periodType
         from t_check_job as checkjob
         left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
@@ -219,7 +219,7 @@
     <select id="selectDetail" resultType="com.platform.dao.vo.query.check.CheckJobVO">
         select checkjob.*, u.real_name as checkUserName,
                sbinfo.name sbName, sbinfo.no sbNo,sbinfo.level sbLevel,
-               partinfo.name partName,standard.name standardName,standard.level standardLevel,
+               partinfo.name partName,standard.no standardNo, standard.name standardName,standard.level standardLevel,
                standard.period period, standard.period_type periodType
         from t_check_job as checkjob
         left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
@@ -229,6 +229,18 @@
         where checkjob.id = #{id}
     </select>
 
+    <select id="getNotFinishNumByDTO" resultType="java.lang.Integer">
+        select count(checkjob.id)
+        from t_check_job as checkjob
+                 left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
+                 left join t_part_info partinfo on partinfo.id = checkjob.part_id
+                 left join t_check_standard standard on standard.id = checkjob.standard_id
+                 left join t_sys_user u on checkjob.check_user_id = u.user_id
+        <where>
+            <include refid="List_Condition"/>
+        </where>
+    </select>
+
     <select id="selectLastJob" parameterType="com.platform.dao.dto.check.CheckJobDTO"
             resultType="com.platform.dao.vo.query.check.CheckJobVO">
         select checkjob.*

platform-rest/src/main/java/com/platform/rest/controller/check/CheckJobController.java

@@ -156,7 +156,7 @@ public class CheckJobController {
      */
     @GetMapping("/num")
     public R getNum(CheckJobDTO checkJobDTO) {
-        return new R<>(checkJobService.getCountByDTO(checkJobDTO));
+        return new R<>(checkJobService.getNotFinishNumByDTO(checkJobDTO));
     }
 
     /**

platform-service/src/main/java/com/platform/service/check/CheckJobService.java

@@ -28,6 +28,14 @@ public interface CheckJobService extends IBaseService<CheckJob, CheckJobDTO> {
      */
     int batchDelete(List<String> ids);
 
+    /**
+     * 查询未完成的数量
+     *
+     * @param record ：
+     * @return ：
+     */
+    int getNotFinishNumByDTO(CheckJobDTO record);
+
     /**
      * 分页查询
      *

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -81,6 +81,21 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         return 1;
     }
 
+    @Override
+    public int getNotFinishNumByDTO(CheckJobDTO record) {
+        List<Integer> statusList = new ArrayList<Integer>();
+        statusList.add(CheckJobStatusEnum.NOT_EXECUTE.getValue());
+        statusList.add(CheckJobStatusEnum.EXECUTING.getValue());
+        statusList.add(CheckJobStatusEnum.OUT_OF_DATE.getValue());
+        record.setStatusList(statusList);
+        return mapper.getNotFinishNumByDTO(record);
+    }
+
+    @Override
+    public int getCountByDTO(CheckJobDTO model) {
+        return super.getCountByDTO(model);
+    }
+
     /**
      *
      *
@@ -1187,10 +1202,10 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         searchEndTime = DateUtils.getLastDayOfMonth(month);
 
         // 总数
-        Weekend<CheckJob> weekend = new Weekend<>(CheckJob.class);
-        WeekendCriteria<CheckJob, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andBetween(CheckJob::getStartTime, searchStartTime, searchEndTime);
-        List<CheckJob> list = mapper.selectByExample(weekend);
+        checkJobDTO.setSearchStartTime(searchStartTime);
+        checkJobDTO.setSearchEndTime(searchEndTime);
+        checkJobDTO.setType(CheckStandardTypeEnum.POLLING.getValue());
+        List<CheckJobVO> list = mapper.selectList(checkJobDTO);
 
         List<CheckJobReportVO> result = new ArrayList<CheckJobReportVO>();
         for(Map<String, LocalDateTime> map: monthStartAndEndList){
@@ -1200,7 +1215,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
             int totalFinishNum = 0;
             int totalWaitNum = 0;
             double finishRate = 0;
-            for(CheckJob checkJob: list){
+            for(CheckJobVO checkJob: list){
                 if(checkJob.getStartTime().isAfter(map.get("searchStartTimeMonth").toLocalDate()) && checkJob.getStartTime().isBefore(map.get("searchEndTimeMonth").toLocalDate())){
                     totalNum ++;
                     if(checkJob.getStatus().equals(CheckJobStatusEnum.FINISHED.getValue())){
@@ -1233,9 +1248,6 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         searchEndTime = DateUtils.getLastDayOfWeekOfYear(searchYear);
 
         // 总数
-        Weekend<CheckJob> weekend = new Weekend<>(CheckJob.class);
-        WeekendCriteria<CheckJob, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andBetween(CheckJob::getStartTime, searchStartTime, searchEndTime);
         checkJobDTO.setSearchStartTime(searchStartTime);
         checkJobDTO.setSearchEndTime(searchEndTime);
         checkJobDTO.setType(CheckStandardTypeEnum.POLLING.getValue());