仓库报表

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

@@ -21,6 +21,8 @@ import java.util.List;
 @Component
 public interface CheckJobMapper extends MyMapper<CheckJob> {
 
+    BigDecimal getReceiveOverTimeCount(CheckJobDTO checkJobDTO);
+
     List<CheckJobVO> getCheckJobCount1(CheckJobDTO checkJobDTO);
     /**
      * 分页查询

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

@@ -323,4 +323,10 @@
         </where>
         group by status
     </select>
+
+    <select id="getReceiveOverTimeCount" parameterType="com.platform.dao.dto.check.CheckJobDTO"
+            resultType="BigDecimal">
+        select count(1) from t_check_job
+        where type=2 and receive_overtime=#{receiveOvertime}
+    </select>
 </mapper>

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -174,15 +174,16 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         noticeNumberVO.setUnexectuedMaintenanceNum(new BigDecimal(0));
         noticeNumberVO.setAllBaoYangTaskNum(new BigDecimal(0));
         noticeNumberVO.setExecutedTaskNum(new BigDecimal(0));
-        noticeNumberVO.setTimeOutTaskNum(new BigDecimal(0));
+//        noticeNumberVO.setTimeOutTaskNum(new BigDecimal(0));
         for (CheckJobVO vo:checkJobVOS){
             if(vo.getStatus()==CheckJobStatusEnum.NOT_EXECUTE.getValue()){
                 noticeNumberVO.setUnexectuedMaintenanceNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
-            }else if(vo.getStatus()==CheckJobStatusEnum.FINISHED.getValue()){
+            }else if(vo.getStatus()==CheckJobStatusEnum.EXECUTING.getValue()){
                 noticeNumberVO.setExecutedTaskNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
-            }else if(vo.getReceiveOvertime()!=null&&vo.getReceiveOvertime()){
-                noticeNumberVO.setTimeOutTaskNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
             }
+//            if(vo.getReceiveOvertime()!=null&&vo.getReceiveOvertime()){
+//                noticeNumberVO.setTimeOutTaskNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
+//            }
             int num=vo.getCountNum()==null?0:vo.getCountNum();
             count=new BigDecimal(count.intValue()+num);
         }
@@ -227,6 +228,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             noticeNumberVO.setRoleFlag(0);
             repairApplicationFormVOS= mapper.getRepairCount(null);
             checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
+            checkJobDTO.setReceiveOvertime(true);
+            BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
+            noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?new BigDecimal(0):overTimeCount);
             noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
             noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             noticeNumberVO=addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
@@ -245,6 +249,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 //保养
                 checkJobDTO.setCheckUserId(userInfo.getUserId());
                 checkJobVOS=checkJobMapper.getCheckJobCount(checkJobDTO);
+                checkJobDTO.setReceiveOvertime(true);
+                BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
+                noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?new BigDecimal(0):overTimeCount);
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             } if(sb.toString().contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
                 noticeNumberVO.setRoleFlag(2);
@@ -263,6 +270,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 checkJobDTO.setDeptId(deptId);
                 checkJobMapper.getCheckJobCount1(checkJobDTO);
                 checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
+                checkJobDTO.setReceiveOvertime(true);
+                BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
+                noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?new BigDecimal(0):overTimeCount);
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             }
             if(sb.toString().contains(CommonConstants.WORKPLACE_STORE_MANAGE)){