wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-11-03 17:46:15 +08:00
commit 1e03654f2d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -283,7 +283,8 @@ public class AssessManagerServiceImpl implements AssessManagerService {
List<Long> collect = objects.stream().map(o -> Long.valueOf(String.valueOf(o))).collect(toList()); List<Long> collect = objects.stream().map(o -> Long.valueOf(String.valueOf(o))).collect(toList());
flowRecordMapper.batchUpdateExecution(collect,processId); int updateExecution = flowRecordMapper.batchUpdateExecution(collect, processId);
log.info("更新flowRecord记录,i:" + updateExecution);
} }

4
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -172,7 +172,7 @@
<select id="selectFinishTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto"> <select id="selectFinishTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
SELECT DISTINCT(record_id),flow_process,current_approval_staff_id,staff_id,month_time,r.gmt_modified,f.type from lz_flow_record f SELECT DISTINCT(record_id),f.flow_process,current_approval_staff_id,staff_id,month_time,r.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r LEFT JOIN lz_result_record r
ON f.record_id = r.id ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0 where f.is_delete=0 and r.is_delete=0
@ -182,7 +182,7 @@
</select> </select>
<select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto"> <select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
SELECT DISTINCT(record_id),flow_process,current_approval_staff_id,staff_id,month_time,r.gmt_modified,f.type from lz_flow_record f SELECT DISTINCT(record_id),f.flow_process,current_approval_staff_id,staff_id,month_time,r.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r LEFT JOIN lz_result_record r
ON f.record_id = r.id ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0 where f.is_delete=0 and r.is_delete=0