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

fix

Browse Source
This commit is contained in:
杜建超 2020-11-13 11:25:13 +08:00
parent c0fdf12869
commit d03e2d998f
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
View File

@ -43,7 +43,7 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
EvaluationGroup selectEvaluationGroupByName(@Param("name") String name); EvaluationGroup selectEvaluationGroupByName(@Param("name") String name);
void deleteByCopyIds(@Param("ids") List<Long> ids); void deleteByCopyIds(@Param("ids") List<Long> ids,@Param("startId")Long startId);
List<Long> selectIdsByCopyIds(@Param("copyIds")String copyIds,@Param("startId")Long startId); List<Long> selectIdsByCopyIds(@Param("copyIds")String copyIds,@Param("startId")Long startId);

2
src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
View File

@ -52,7 +52,7 @@ public interface EvaluationGroupService extends IService<EvaluationGroup> {
//获取考核组里面所有参与的人员信息，去除重复，去除离职 //获取考核组里面所有参与的人员信息，去除重复，去除离职
List<StaffSimpleInfo> selectAllStaffSimpleInfoByGroupId(EvaluationGroup evaluationGroup); List<StaffSimpleInfo> selectAllStaffSimpleInfoByGroupId(EvaluationGroup evaluationGroup);
void deleteByCopyIds(List<Long> ids); void deleteByCopyIds(List<Long> ids,Long startId);
R checkStaff(CheckStaffReq checkStaffReq); R checkStaff(CheckStaffReq checkStaffReq);

4
src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
View File

@ -311,8 +311,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
@Override @Override
public void deleteByCopyIds(List<Long> ids) { public void deleteByCopyIds(List<Long> ids,Long startId) {
evaluationGroupMapper.deleteByCopyIds(ids); evaluationGroupMapper.deleteByCopyIds(ids,startId);
} }

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

@ -174,7 +174,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
List<String> ids = Arrays.asList(split); List<String> ids = Arrays.asList(split);
List<Long> collect = ids.stream().map(s -> Long.valueOf(s)).collect(toList()); List<Long> collect = ids.stream().map(s -> Long.valueOf(s)).collect(toList());
//删除副本组 //删除副本组
evaluationGroupService.deleteByCopyIds(collect); evaluationGroupService.deleteByCopyIds(collect,flowStart.getId());
} }
resultRecordMapper.batchDeleteByStartId(flowStart.getId()); resultRecordMapper.batchDeleteByStartId(flowStart.getId());
return ; return ;
@ -260,6 +260,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
StartGroups startGroups = new StartGroups(); StartGroups startGroups = new StartGroups();
startGroups.setStartId(req.getStartId()); startGroups.setStartId(req.getStartId());
startGroups.setGroups(groupS); startGroups.setGroups(groupS);
log.info("添加人员初始化请求：" + JSON.toJSONString(startGroups));
R r = flowStartService.startStaffs(startGroups); R r = flowStartService.startStaffs(startGroups);
log.info("添加人员初始化返回：" + JSON.toJSONString(r)); log.info("添加人员初始化返回：" + JSON.toJSONString(r));
return r; return r;

1
src/main/resources/mapper/flow/EvaluationGroupMapper.xml
View File

@ -141,6 +141,7 @@
<update id="deleteByCopyIds"> <update id="deleteByCopyIds">
update lz_evaluation_group set is_delete = 1 where is_delete=0 update lz_evaluation_group set is_delete = 1 where is_delete=0
and start_id = #{startId}
and copy_id in ( and copy_id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">
#{id} #{id}