成品检验任务手持15天内展示

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml

@@ -54,7 +54,23 @@
                     CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
                 or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)
             )
+		  and qct.check_type != 'checkTypeCP'
 		group by qct.check_type,qc.check_name
+        union all
+        select qct.check_type checkType,
+               qc.check_name checkName,
+               count(0) taskNum,
+               '检验任务' attr1
+        from qc_check_task qct
+                 left join qc_check_type qc on qct.check_type = qc.order_code
+                 left join qc_check_task_user qctu on qctu.belong_to = qct.record_id
+        where qct.check_status = '0' and qctu.check_man_code = #{checkManCode}
+          and (
+                    CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+                or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120)
+            )
+          and qct.check_type = 'checkTypeCP'
+        group by qct.check_type,qc.check_name
         union all
 		select '','',
 		       count(0) taskNum,

op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml

@@ -286,8 +286,11 @@
                  qct.material_code like concat('%', #{materialCode},'%') or qct.material_name like concat('%', #{materialCode},'%')
                 )
             </if>
-            <if test='delFlag == "0"'>
+            <if test='delFlag == "0" and checkType!="checkTypeCP"'>
-            and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+                and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+            </if>
+            <if test='delFlag == "0" and checkType=="checkTypeCP"'>
+                and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120))
             </if>
         </where>
         order by qct.create_time desc