diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 0adc7dbd..972f430e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -1602,6 +1602,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" clz_slt_agreement_info WHERE status = 0 + AND is_slt = '0' AND type_id = #{typeId} AND ma_id = #{maId} order by start_time asc @@ -1743,6 +1744,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" clz_slt_agreement_info WHERE status = 0 + AND is_slt = '0' AND source = '2' AND type_id = #{typeId} AND agreement_id = #{agreementId} @@ -1925,6 +1927,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE status = 0 AND (source = 1 OR source is NULL) + AND is_slt = '0' AND type_id = #{info.typeId} AND ma_id = #{info.maId} AND agreement_id in diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzDirectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzDirectMapper.xml index d309b189..958e4bb0 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzDirectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzDirectMapper.xml @@ -321,6 +321,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN clz_lease_apply_info lai ON lai.id = sai.lease_id WHERE sai.STATUS = '0' + AND sai.is_slt = '0' and sai.agreement_id in diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml index c941e821..ed472260 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml @@ -622,6 +622,7 @@ clz_slt_agreement_info WHERE status = 0 + AND is_slt = '0' AND agreement_id in @@ -771,6 +772,7 @@ LEFT JOIN clz_lease_apply_info clai ON sai.lease_id = clai.id WHERE sai.STATUS = '0' + AND sai.is_slt = '0' and sai.agreement_id in @@ -806,6 +808,7 @@ LEFT JOIN clz_bm_agreement_info ba ON sai.agreement_id = ba.agreement_id WHERE sai.status = '0' + AND sai.is_slt = '0' AND mt.type_id = #{typeId} AND ba.unit_id = #{teamId} AND ba.project_id = #{proId} @@ -834,6 +837,7 @@ clz_slt_agreement_info WHERE status = '0' + AND is_slt = '0' AND agreement_id = #{agreementId} AND type_id = #{typeId} @@ -849,6 +853,7 @@ clz_slt_agreement_info WHERE status = '0' + AND is_slt = '0' and agreement_id in @@ -894,6 +899,7 @@ AND bu.del_flag = '0' WHERE cs.`status` = '0' + AND cs.is_slt = '0' AND ba.unit_id = #{teamId} AND ba.project_id = #{proId} @@ -963,6 +969,7 @@ clz_slt_agreement_info WHERE status = 0 + AND is_slt = '0' and source = '2' AND agreement_id = #{agreementId} AND type_id = #{typeId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index e55ea447..ea625638 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -760,6 +760,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT DISTINCT csa.ma_id FROM clz_slt_agreement_info csa WHERE csa.status = '0' + AND csa.is_slt = '0' AND csa.ma_id IN #{maId} @@ -1115,6 +1116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ma_id IS NULL AND status = '0' + AND is_slt = '0' AND publish_task = #{publishTask} @@ -1161,6 +1163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" clz_slt_agreement_info WHERE status = '0' + AND is_slt = '0' AND type_id = #{typeId} AND ma_id = #{maId} @@ -1218,6 +1221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN clz_bm_agreement_info ba ON sai.agreement_id = ba.agreement_id WHERE sai.status = '0' + AND sai.is_slt = '0' AND mt.type_id = #{typeId} AND ba.project_id = #{proId} GROUP BY mm.ma_id @@ -1375,6 +1379,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0' where sai.status = '0' + AND sai.is_slt = '0' and mm.qr_code = #{qrCode} and mt.type_id = #{typeId} @@ -1452,6 +1457,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0' where sai.status = '0' + AND sai.is_slt = '0' AND mm.ma_id = #{maId} @@ -1528,6 +1534,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mt1.del_flag = '0' WHERE sai.STATUS = '0' + AND sai.is_slt = '0' AND sai.agreement_id in #{agreement.agreementId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 77786822..c27a0337 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -175,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bu.del_flag = '0' WHERE sai.`status` = '0' + AND sai.is_slt = '0' AND sai.end_time IS NULL AND sai.back_id IS NULL GROUP BY mt.type_id, bp.pro_id @@ -308,6 +309,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE sai.end_time IS NULL AND sai.back_id IS NULL + AND sai.is_slt = '0' AND bt.unit_id = #{teamId} @@ -361,6 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_machine mm ON mm.ma_id = sai.ma_id WHERE sai.status = '0' + AND sai.is_slt = '0' AND sai.end_time IS NULL AND sai.back_id IS NULL AND sai.ma_id IS NOT NULL @@ -485,6 +488,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bu.del_flag = '0' WHERE sai.`status` = '0' + AND sai.is_slt = '0' AND sai.end_time IS NULL AND sai.back_id IS NULL GROUP BY mt.type_id @@ -537,6 +541,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_machine mm ON mm.ma_id = sai.ma_id WHERE sai.status = '0' + AND sai.is_slt = '0' AND sai.end_time IS NULL AND sai.back_id IS NULL @@ -657,6 +662,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status as status FROM clz_slt_agreement_info WHERE status = '0' and ma_id = #{maId} + AND is_slt = '0' @@ -520,6 +521,7 @@ clz_slt_agreement_info WHERE status = 0 + AND is_slt = '0' AND source = '2' AND type_id = #{typeId} AND agreement_id = #{agreementId}