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

直转审核状态字符判断

This commit is contained in:
hongchao 2025-09-27 15:59:53 +08:00
parent ba3470bc26
commit e526346a24
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
View File

@ -349,7 +349,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bu.unit_id = #{unitId} AND bu.unit_id = #{unitId}
</if> </if>
<if test="deptId != null"> <if test="deptId != null">
AND bu.dept_id = #{deptId} AND sd.dept_id = #{deptId}
</if> </if>
UNION UNION
SELECT DISTINCT SELECT DISTINCT
@ -372,7 +372,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND bu.unit_id = #{unitId} AND bu.unit_id = #{unitId}
</if> </if>
<if test="deptId != null"> <if test="deptId != null">
AND bu.dept_id = #{deptId} AND sd.dept_id = #{deptId}
</if> </if>
) a ) a
ORDER BY ORDER BY

1
bonus-modules/bonus-material/src/main/resources/mapper/material/work/DirectAuditMapper.xml
View File

@ -25,6 +25,7 @@
dai.lease_man as leaseMan , dai.lease_man as leaseMan ,
swr.workflow_status as flowStatus, swr.workflow_status as flowStatus,
swr.task_id as flowId, swr.task_id as flowId,
swr.task_code as code,
swrs.node_id AS nodeId, swrs.node_id AS nodeId,
swrs.next_node_id AS nextNodeId, swrs.next_node_id AS nextNodeId,
swrs.record_id AS recordId, swrs.record_id AS recordId,

7
bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordMapper.xml
View File

@ -80,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_workflow_record a from sys_workflow_record a
where task_id = #{taskId} where task_id = #{taskId}
<if test="taskTypeId != null">
and a.task_type = #{taskTypeId}
</if>
LIMIT 1 LIMIT 1
</select> </select>
@ -95,7 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_workflow_record swr on swr.id = si.business_id LEFT JOIN sys_workflow_record swr on swr.id = si.business_id
LEFT JOIN uni_org.sys_information_people sp on si.id = sp.information_id LEFT JOIN uni_org.sys_information_people sp on si.id = sp.information_id
WHERE swr.task_id=#{taskId} and si.web_app_id ="9fa73f046ef520b09e94bbffc3b07702" WHERE swr.task_id=#{taskId} and si.web_app_id ="9fa73f046ef520b09e94bbffc3b07702"
<if test="taskTypeId != null">
and swr.task_type = #{taskTypeId}
</if>
</select> </select>
<select id="getAuditUserByRecordId" resultType="com.bonus.material.work.domain.SysWorkflowRecordHistory"> <select id="getAuditUserByRecordId" resultType="com.bonus.material.work.domain.SysWorkflowRecordHistory">