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

修复中途插入绩效时，无法生成模板中的指标

Browse Source
This commit is contained in:
wulin 2020-11-12 12:38:25 +08:00
parent 6ae642147f
commit 513ede5708
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ public interface ResultTagetLibMapper extends BaseMapper<ResultTagetLib> {
int deleteResultTagetLibById(@Param("id")Long id);
List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id);
List<ResultTagetLib> selectResultTagetLibByModelId(Long id);
List<ResultTagetLibDto> selectByCondition(@Param("page") IPage page, @Param("req") ResultTagetLibSearchReq req);

19
src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
View File

@ -383,9 +383,21 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
evaluationGroup =
evaluationGroupService.selectEvaluationGroupByCopyId(evaluationGroup.getId(),flowStart.getId());
if(evaluationGroup == null){
log.info("无法assess/manager/detail找到拷贝组信息");
log.info("无法找到拷贝组信息");
return 5;
}
resultModelDtos = resultModelService.selectResultDtoByGroupId(evaluationGroup.getId());
if(resultModelDtos.size() == 0){
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
log.info("拷贝组的维度信息错误");
return 1;
}
for (ResultModelDto modelDto:resultModelDtos
) {
List<ResultTagetLibDto> resultTagetLibDtos = resultTagetLibService.selectResultTagetLibDtoByModelId(modelDto.getId());
modelDto.setTagetLibs(resultTagetLibDtos);
}
//以下代码没必要更新，因为这个拷贝分用不到。正确的对应关系清查看lz_evaluation_start_staff
//evaluationGroup.setStaffIds(evaluationGroup.getStaffIds() + ",");
@ -424,6 +436,8 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
resultRecord.setCurrentApprovalStaffName(staffInfo.getName());
resultRecordService.insertResultRecord(resultRecord);
//下面生成实际的考核流程
resultRecordService.initFlowRecord(resultRecord.getId());
staffInfo.setRecordId(resultRecord.getId());
for (ResultModelDto modelDto:resultModelDtos
@ -454,8 +468,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
}
//下面生成实际的考核流程
resultRecordService.initFlowRecord(resultRecord.getId());
}
evaluationStartStaffService.insertEvaluationStartStaffs(evaluationStartStaffs);
return 0;

2
src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java
View File

@ -37,7 +37,7 @@ public interface ResultTagetLibService extends IService<ResultTagetLib> {
int deleteResultTagetLibById(Long id);
List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id);
List<ResultTagetLib> selectResultTagetLibByModelId(Long id);
PageUtils selectResultTagetLibByReq(ResultTagetLibSearchReq req);

4
src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java
View File

@ -55,7 +55,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl<ResultTagetLibMapper,
if(resultModel == null){
return R.error("找不到相关考核模板");
}
List<ResultTagetLibDto> resultTagetLibDtos = selectResultTagetLibByModelId(resultModel.getId());
List<ResultTagetLibDto> resultTagetLibDtos = selectResultTagetLibDtoByModelId(resultModel.getId());
BigDecimal weight = BigDecimal.ZERO;
for(int i = 0; i < resultTagetLibDtos.size(); i++){
ResultTagetLibDto dto = resultTagetLibDtos.get(i);
@ -92,7 +92,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl<ResultTagetLibMapper,
}
@Override
public List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id){
public List<ResultTagetLib> selectResultTagetLibByModelId(Long id){
return resultTagetLibMapper.selectResultTagetLibByModelId(id);
}

2
src/main/resources/mapper/flow/ResultTagetLibMapper.xml
View File

@ -89,7 +89,7 @@
update lz_result_taget_lib set is_delete = 1 where id=#{id} limit 1
</update>
<select id="selectResultTagetLibByModelId" resultType="com.lz.modules.flow.model.ResultTagetLibDto" >
<select id="selectResultTagetLibByModelId" resultType="com.lz.modules.flow.entity.ResultTagetLib" >
select * from lz_result_taget_lib where model_id=#{id} and is_delete = 0 order by order_by desc
</select>