新增审核记录接口
This commit is contained in:
parent
3f340d3c38
commit
1019a0e6d7
|
|
@ -129,6 +129,11 @@ public class BusinessController {
|
||||||
public AjaxResult approvalHistory(@RequestBody RequestEntity entity) {
|
public AjaxResult approvalHistory(@RequestBody RequestEntity entity) {
|
||||||
return flowTaskUtils.approvalHistory(entity);
|
return flowTaskUtils.approvalHistory(entity);
|
||||||
}
|
}
|
||||||
|
@ApiOperation(value = "审核记录")
|
||||||
|
@PostMapping(value = "/checkHistory")
|
||||||
|
public AjaxResult checkHistory(@RequestBody RequestEntity entity) {
|
||||||
|
return flowTaskUtils.checkHistory(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation(value = "审批列表树")
|
@ApiOperation(value = "审批列表树")
|
||||||
|
|
|
||||||
|
|
@ -874,6 +874,12 @@ public class BusinessServiceImpl implements BusinessService {
|
||||||
}
|
}
|
||||||
finalList.get(0).setIsActive("10");
|
finalList.get(0).setIsActive("10");
|
||||||
}
|
}
|
||||||
|
for (ConfigurationVo configurationVo : finalList) {
|
||||||
|
if (configurationVo.getAuditStatus() == null){
|
||||||
|
configurationVo.setAuditStatus(4);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
return finalList;
|
return finalList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -817,7 +817,32 @@
|
||||||
and user_id=#{userId}
|
and user_id=#{userId}
|
||||||
</select>
|
</select>
|
||||||
<select id="checkHistory" resultType="com.bonus.flowable.entity.CheckComment">
|
<select id="checkHistory" resultType="com.bonus.flowable.entity.CheckComment">
|
||||||
|
SELECT
|
||||||
|
sd.dept_name as section,
|
||||||
|
su.nick_name as name,
|
||||||
|
pcpr.audit_time as time,
|
||||||
|
CASE
|
||||||
|
|
||||||
|
WHEN pcpr.audit_status = '1' THEN
|
||||||
|
'审核通过'
|
||||||
|
WHEN pcpr.audit_status = '2' THEN
|
||||||
|
'审核驳回'
|
||||||
|
WHEN pcpr.audit_status = '3' THEN
|
||||||
|
'终审通过' ELSE '待审核'
|
||||||
|
END AS STATUS,
|
||||||
|
pcpr.remark as turnDownReason,
|
||||||
|
pcpr.audit_remark as reason
|
||||||
|
FROM
|
||||||
|
pt_check_person pcp
|
||||||
|
LEFT JOIN pt_check_person_remark pcpr ON pcp.task_id = pcpr.task_id
|
||||||
|
AND pcp.user_id = pcpr.user_id
|
||||||
|
AND pcp.version = pcpr.version
|
||||||
|
LEFT JOIN sys_user su ON pcp.user_id = su.user_id
|
||||||
|
LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
|
||||||
|
WHERE
|
||||||
|
pcp.task_id = #{taskId}
|
||||||
|
AND pcp.type = 1
|
||||||
|
AND pcpr.type = 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue