diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml index f1439e85..da7b461b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml @@ -92,14 +92,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sai.agreement_id = #{agreementId} - AND start_time <= #{endTime} - AND (end_time >= #{startTime} OR end_time IS NULL) + AND( + DATE_FORMAT(start_time,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startTime},'%Y-%m-%d') AND DATE_FORMAT(#{endTime},'%Y-%m-%d') OR + DATE_FORMAT(start_time,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startTime},'%Y-%m-%d') AND DATE_FORMAT(#{endTime},'%Y-%m-%d') + ) and sai.type_id = #{typeId} + + AND INSTR(mt2.type_name,#{maName}) >0 + + + AND INSTR(mt.type_name,#{typeName}) >0 + ) rs GROUP BY rs.typeId,rs.startTime ORDER BY rs.maName