bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购时间筛选修改

This commit is contained in:
hayu 2024-06-14 15:14:34 +08:00
parent 9cd15963dd
commit 1fd3565c51
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectPurchaseCheckInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult"> <select id="selectPurchaseCheckInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseCheckInfo" resultMap="PurchaseCheckInfoResult">
select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time,
pci.update_by, pci.update_by,
pci.update_time, pci.remark, pci.company_id ,dict.id purchasingId,dict.name purchasingStatus,tk.code,su.nick_name pci.update_time, pci.remark, pci.company_id ,dict.id purchasingId,dict.name
purchasingStatus,tk.code,su.nick_name
purchaserName,tk.task_status taskStatus purchaserName,tk.task_status taskStatus
from purchase_check_info pci from purchase_check_info pci
left join tm_task tk on pci.task_id = tk.task_id left join tm_task tk on pci.task_id = tk.task_id
@ -50,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND ((pci.purchase_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')) AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
or (pci.arrival_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59'))) or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
</if> </if>
GROUP BY pcd.task_id GROUP BY pcd.task_id
order by pci.create_time desc order by pci.create_time desc

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml
View File

@ -294,8 +294,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND ((pci.purchase_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')) AND (pci.purchase_time BETWEEN #{startTime} AND #{endTime}
or (pci.arrival_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59'))) or pci.arrival_time BETWEEN #{startTime} AND #{endTime})
</if> </if>
GROUP BY pcd.task_id GROUP BY pcd.task_id
order by pci.id desc order by pci.id desc