|
@@ -106,15 +106,15 @@
|
|
|
d.remark remark2
|
|
|
FROM
|
|
|
(
|
|
|
- SELECT start_code, end_code,b.prj_id FROM tf_ywpn_check_data_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT start_code, end_code,prj_id FROM tf_ywpn_check_data_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
|
and a.check_flag=1
|
|
|
<if test="checkDataDto !=null ">
|
|
|
<if test="checkDataDto.prjId !=null">
|
|
|
- and b.prj_id=#{checkDataDto.prjId}
|
|
|
+ and prj_id=#{checkDataDto.prjId}
|
|
|
</if>
|
|
|
<if test="checkDataDto.startCode !=null">
|
|
|
and start_code=#{checkDataDto.startCode}
|
|
@@ -124,14 +124,14 @@
|
|
|
</if>
|
|
|
</if>
|
|
|
UNION
|
|
|
- SELECT start_code , end_code,b.prj_id FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT start_code , end_code,prj_id FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
|
<if test="checkDataDto !=null ">
|
|
|
<if test="checkDataDto.prjId !=null">
|
|
|
- and b.prj_id=#{checkDataDto.prjId}
|
|
|
+ and prj_id=#{checkDataDto.prjId}
|
|
|
</if>
|
|
|
<if test="checkDataDto.startCode !=null">
|
|
|
and start_code=#{checkDataDto.startCode}
|
|
@@ -146,8 +146,8 @@
|
|
|
) b
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
- SELECT a.*,b.prj_id FROM tf_ywpn_check_data_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT a.* FROM tf_ywpn_check_data_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
@@ -157,8 +157,8 @@
|
|
|
<if test="checkDataDto ==null ">
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
- SELECT a.*,b.prj_id FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT a.* FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
@@ -170,14 +170,14 @@
|
|
|
<when test="checkDataDto.checkFlag !=null">
|
|
|
RIGHT JOIN
|
|
|
(
|
|
|
- SELECT a.*,b.prj_id FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT a.* FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
|
<if test="checkDataDto !=null ">
|
|
|
<if test="checkDataDto.prjId !=null">
|
|
|
- and b.prj_id=#{checkDataDto.prjId}
|
|
|
+ and prj_id=#{checkDataDto.prjId}
|
|
|
</if>
|
|
|
<if test="checkDataDto.startCode !=null">
|
|
|
and start_code=#{checkDataDto.startCode}
|
|
@@ -195,8 +195,8 @@
|
|
|
<when test="checkDataDto.checkFlag ==null">
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
- SELECT a.*,b.prj_id FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT a.* FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
@@ -280,33 +280,33 @@
|
|
|
d.check_length check_length2
|
|
|
FROM
|
|
|
(
|
|
|
- SELECT start_code, end_code,b.prj_id FROM tf_ywpn_check_data_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT start_code, end_code,prj_id FROM tf_ywpn_check_data_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
|
and a.check_flag=1
|
|
|
<if test="checkDataDto !=null ">
|
|
|
<if test="checkDataDto.prjId !=null">
|
|
|
- and b.prj_id=#{checkDataDto.prjId}
|
|
|
+ and prj_id=#{checkDataDto.prjId}
|
|
|
</if>
|
|
|
</if>
|
|
|
UNION
|
|
|
- SELECT start_code , end_code,b.prj_id FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT start_code , end_code,prj_id FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
|
<if test="checkDataDto !=null ">
|
|
|
<if test="checkDataDto.prjId !=null">
|
|
|
- and b.prj_id=#{checkDataDto.prjId}
|
|
|
+ and prj_id=#{checkDataDto.prjId}
|
|
|
</if>
|
|
|
</if>
|
|
|
) b
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
- SELECT a.*,b.prj_id FROM tf_ywpn_check_data_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT a.* FROM tf_ywpn_check_data_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|
|
@@ -315,8 +315,8 @@
|
|
|
c ON ( c.start_code = b.start_code AND c.end_code = b.end_code AND b.prj_id=c.prj_id )
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
- SELECT a.*,b.prj_id FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
- LEFT JOIN tf_ywpn_batchinfo_w b ON a.info_id = b.id
|
|
|
+ SELECT a.* FROM tf_ywpn_whatinfo_monitorsettle_w a
|
|
|
+
|
|
|
WHERE
|
|
|
a.STATUS = 0
|
|
|
and a.del_flag=0
|