|
@@ -130,13 +130,13 @@
|
|
|
content ->> '$.makingPeople' as makingPeople, status
|
|
|
from sy_fabric_loss_report
|
|
|
where 1=1
|
|
|
- <if test="sy.createTime != null and sy.createTime !=''">
|
|
|
+ <if test="sy.createTimeB != null and sy.createTimeB !='' and sy.createTimeE != null and sy.createTimeE !=''">
|
|
|
AND date_format( create_time, '%Y-%m-%d' ) between date_format(#{sy.createTimeB},'%Y-%m-%d') and date_format(#{sy.createTimeE},'%Y-%m-%d')
|
|
|
</if>
|
|
|
<if test="sy.approvalMan != null and sy.approvalMan !=''">
|
|
|
AND first_approve_by LIKE CONCAT('%',#{sy.approvalMan},'%')
|
|
|
</if>
|
|
|
- <if test="sy.approvalDate != null and sy.approvalDate !=''">
|
|
|
+ <if test="sy.approvalDateB != null and sy.approvalDateB !='' and sy.approvalDateE != null and sy.approvalDateE !=''">
|
|
|
AND first_approve_date between #{sy.approvalDateB} and #{sy.approvalDateE}
|
|
|
</if>
|
|
|
<if test="sy.cCode != null and sy.cCode !=''">
|