fix
This commit is contained in:
parent
c920b25a89
commit
1781c3fdcb
@ -186,14 +186,21 @@ public class AssessManagerServiceImpl implements AssessManagerService {
|
|||||||
staffs.retainAll(change);
|
staffs.retainAll(change);
|
||||||
List<Long> collect = staffs.stream().map(s -> Long.valueOf(s)).collect(toList());
|
List<Long> collect = staffs.stream().map(s -> Long.valueOf(s)).collect(toList());
|
||||||
collect.removeAll(longs);
|
collect.removeAll(longs);
|
||||||
groupStaffs.setStaffIds(collect);
|
if(CollectionUtils.isNotEmpty(collect)){
|
||||||
groupS.add(groupStaffs);
|
groupStaffs.setStaffIds(collect);
|
||||||
|
groupS.add(groupStaffs);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StartGroups startGroups = new StartGroups();
|
StartGroups startGroups = new StartGroups();
|
||||||
startGroups.setStartId(req.getStartId());
|
startGroups.setStartId(req.getStartId());
|
||||||
startGroups.setGroups(groupS);
|
startGroups.setGroups(groupS);
|
||||||
flowStartService.startStaffs(startGroups);
|
try {
|
||||||
|
flowStartService.startStaffs(startGroups);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("调用初始化失败");
|
||||||
|
return R.error("初始化失败");
|
||||||
|
}
|
||||||
return R.ok();
|
return R.ok();
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -451,7 +451,8 @@
|
|||||||
|
|
||||||
|
|
||||||
<update id="batchDeleteByStartIdAndStaffId">
|
<update id="batchDeleteByStartIdAndStaffId">
|
||||||
update lz_result_record set is_delete = 1 where
|
update lz_result_record set is_delete = 1,gmt_modified = now()
|
||||||
|
where
|
||||||
is_delete = 0
|
is_delete = 0
|
||||||
and start_id = #{startId}
|
and start_id = #{startId}
|
||||||
and staff_id in (
|
and staff_id in (
|
||||||
|
|||||||
@ -143,7 +143,7 @@
|
|||||||
lz_evaluation_start_staff
|
lz_evaluation_start_staff
|
||||||
set
|
set
|
||||||
score = 1,
|
score = 1,
|
||||||
,gmt_modified = now()
|
gmt_modified = now()
|
||||||
where is_delete = 0 and score = 0 and type = 0
|
where is_delete = 0 and score = 0 and type = 0
|
||||||
and evaluation_id = #{evaluationId} and start_id = #{startId}
|
and evaluation_id = #{evaluationId} and start_id = #{startId}
|
||||||
</update>
|
</update>
|
||||||
@ -154,7 +154,7 @@
|
|||||||
lz_evaluation_start_staff
|
lz_evaluation_start_staff
|
||||||
set
|
set
|
||||||
is_delete = 1,
|
is_delete = 1,
|
||||||
,gmt_modified = now()
|
gmt_modified = now()
|
||||||
where is_delete = 0 and type = 0
|
where is_delete = 0 and type = 0
|
||||||
and start_id = #{startId}
|
and start_id = #{startId}
|
||||||
and staff_id in (
|
and staff_id in (
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user