|
@@ -337,16 +337,37 @@
|
|
|
r.role_name roleName
|
|
|
FROM
|
|
|
`jeecg-boot`.`ctop_cwjs_policy_approval_log` l
|
|
|
- LEFT JOIN `jeecg-boot`.sys_user u ON l.create_user_id = u.id
|
|
|
- LEFT JOIN `jeecg-boot`.sys_user_role ur ON ur.user_id = u.id
|
|
|
- LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
|
|
|
- <where>
|
|
|
- <if test="policyId != null and policyId != ''">
|
|
|
- and l.policy_id = #{policyId}
|
|
|
- </if>
|
|
|
- </where>
|
|
|
- ORDER BY
|
|
|
- l.create_time
|
|
|
+ LEFT JOIN `jeecg-boot`.sys_user u ON l.create_user_id = u.id
|
|
|
+ LEFT JOIN `jeecg-boot`.sys_user_role ur ON ur.user_id = u.id
|
|
|
+ LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
|
|
|
+ WHERE
|
|
|
+ l.policy_id = #{policyId}
|
|
|
+ UNION
|
|
|
+ SELECT
|
|
|
+ p.id,
|
|
|
+ p.id policyId,
|
|
|
+ '0' approvalStatus,
|
|
|
+ CASE
|
|
|
+ p.approved_status
|
|
|
+ WHEN 0 THEN '待审核'
|
|
|
+ WHEN 1 THEN '审核中'
|
|
|
+ WHEN 2 THEN '审核通过/拒绝'
|
|
|
+ WHEN 3 THEN '审核完成'
|
|
|
+ WHEN 4 THEN '待提交' ELSE '-'
|
|
|
+ END AS approvalContent,
|
|
|
+ IF
|
|
|
+ ( p.approved_progress = 'legalAffairs', 'legalAffairs', p.approved_progress ) userId,
|
|
|
+ IF
|
|
|
+ ( p.approved_progress = 'legalAffairs', '法务人员', u.realname ) userName,
|
|
|
+ NOW() createTime,
|
|
|
+ r.role_name roleName
|
|
|
+ FROM
|
|
|
+ ctop_cwjs_policy_info p
|
|
|
+ LEFT JOIN `jeecg-boot`.sys_user u ON p.approved_progress = u.id
|
|
|
+ LEFT JOIN `jeecg-boot`.sys_user_role ur ON ur.user_id = u.id
|
|
|
+ LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
|
|
|
+ WHERE
|
|
|
+ p.id = #{policyId}
|
|
|
</select>
|
|
|
|
|
|
|