mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审核通过和不通过不显示当前审核人

master
Harry Yang 2023-01-04 15:42:29 +08:00
parent d1bae8fbf9
commit 05d2baaf2d
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/cn/palmte/work/service/ProjectProcessService.java
View File

@ -133,20 +133,30 @@ public class ProjectProcessService {
* 更新流程 审批人，和状态 * 更新流程 审批人，和状态
* *
* @param processId 流程Id * @param processId 流程Id
* @param auditId 审批人ID * @param auditId 审批人ID 可以为空
* @param status 流程状态 可以为空，为空的时候不修改 * @param status 流程状态 可以为空，为空的时候不修改
*/ */
public void updateAudit(int processId, ProcessStatus status, List<Integer> auditId) { public void updateAudit(int processId, ProcessStatus status, List<Integer> auditId) {
String currentAudit = getCurrentAudit(auditId); if (CollectionUtils.isEmpty(auditId)) {
String currentAuditId = auditId.stream().map(String::valueOf).collect(Collectors.joining(",")); if (status != null) {
if (status != null) { jdbcTemplate.update("update project_process set current_audit=?,current_audit_id=?,status=? where id=?",
if (!CollectionUtils.isEmpty(auditId)) { null, null, status.getValue(), processId);
jdbcTemplate.update( }
"update project_process set current_audit=?,current_audit_id=?,status=? where id=?", currentAudit, currentAuditId, status.getValue(), processId); else {
jdbcTemplate.update("update project_process set current_audit=?,current_audit_id=? where id=?",
null, null, processId);
} }
} }
else { else {
jdbcTemplate.update("update project_process set current_audit=?,current_audit_id=? where id=?", currentAudit, currentAuditId, processId); String currentAudit = getCurrentAudit(auditId);
String currentAuditId = auditId.stream().map(String::valueOf).collect(Collectors.joining(","));
if (status != null) {
jdbcTemplate.update("update project_process set current_audit=?,current_audit_id=?,status=? where id=?",
currentAudit, currentAuditId, status.getValue(), processId);
}
else {
jdbcTemplate.update("update project_process set current_audit=?,current_audit_id=? where id=?", currentAudit, currentAuditId, processId);
}
} }
} }

4
src/main/resources/templates/admin/business/process-completed.ftl
View File

@ -115,7 +115,9 @@
<span>{{scope.row.status | processStatus}}</span> <span>{{scope.row.status | processStatus}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="currentAudit" label="当前审核人" width="100"></el-table-column> <el-table-column prop="currentAudit" label="当前审核人" width="100">
<span v-if="scope.row.status!=='audit_passed' || scope.row.status==='audit_not_passed'">{{cope.row.currentAudit}}</span>
</el-table-column>
<el-table-column prop="lastUpdateAt" label="最后更新时间" width="170"></el-table-column> <el-table-column prop="lastUpdateAt" label="最后更新时间" width="170"></el-table-column>
<el-table-column label="操作" fixed="right" width="230"> <el-table-column label="操作" fixed="right" width="230">