bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口提交

This commit is contained in:
liang.chao 2025-07-14 13:44:56 +08:00
parent 1747408292
commit cd8d35212f
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
View File

@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[ AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]> and lai.create_time BETWEEN CONCAT(#{startTime},' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if> </if>
<if test="directId != null "> and lai.direct_id = #{directId}</if> <if test="directId != null "> and lai.direct_id = #{directId}</if>
<if test="leaseType != null and leaseType != ''"> and lai.lease_type = #{leaseType}</if> <if test="leaseType != null and leaseType != ''"> and lai.lease_type = #{leaseType}</if>

30
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
View File

@ -311,23 +311,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectRepairQuestList" resultType="com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO"> <select id="selectRepairQuestList" resultType="com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO">
SELECT DISTINCT SELECT DISTINCT
tk.task_id taskId, tk.task_id taskId,
tk.CODE scrapNum,tt.code as repairTaskCode, tk.CODE scrapNum,
tk.task_status taskStatus, tt2.CODE AS repairTaskCode,
bui.unit_name unitName, tk.task_status taskStatus,
bpl.pro_name projectName, bui.unit_name unitName,
su.nick_name createBy, bpl.pro_name projectName,
tk.create_time createTime, su.nick_name createBy,
tk.remark, tk.create_time createTime,
tk.CODE repairNum tk.remark,
tk.CODE repairNum
FROM FROM
tm_task tk tm_task tk
LEFT JOIN tm_task tt on tk.pre_task_id = tt.task_id LEFT JOIN tm_task tt ON tk.pre_task_id = tt.task_id
LEFT JOIN tm_task_agreement tta ON tk.task_id = tta.task_id LEFT JOIN repair_audit_details rad ON tk.task_id = rad.task_id
LEFT JOIN tm_task tt2 on tt2.task_id = rad.repair_id
LEFT JOIN tm_task_agreement tta ON rad.repair_id = tta.task_id
LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
LEFT JOIN bm_project bpl ON bai.project_id = bpl.pro_id LEFT JOIN bm_project bpl ON bai.project_id = bpl.pro_id
LEFT JOIN bm_unit bui ON bai.unit_id = bui.unit_id LEFT JOIN bm_unit bui ON bai.unit_id = bui.unit_id
LEFT JOIN repair_audit_details rad ON tk.task_id = rad.task_id
LEFT JOIN ma_type mt ON rad.type_id = mt.type_id LEFT JOIN ma_type mt ON rad.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN sys_user su ON su.user_id = tk.create_by LEFT JOIN sys_user su ON su.user_id = tk.create_by
@ -350,7 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and locate(#{backCode}, tk.code) > 0 and locate(#{backCode}, tk.code) > 0
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[and DATE_FORMAT( tk.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]> and tk.create_time BETWEEN CONCAT(#{startTime},' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if> </if>
<if test="appTaskStatus != null and appTaskStatus == 10"> <if test="appTaskStatus != null and appTaskStatus == 10">
and tk.task_status = #{appTaskStatus} and tk.task_status = #{appTaskStatus}