|
|
|
|
@ -63,6 +63,8 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
|
|
|
|
|
|
|
|
|
|
private final NegativeBlameService blameService; |
|
|
|
|
|
|
|
|
|
private final ConfinementService confinementService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Page<NegativeTask> page(NegativeTaskQueryParam param) { |
|
|
|
|
LambdaQueryWrapper<NegativeTask> queryWrapper = new LambdaQueryWrapper<NegativeTask>() |
|
|
|
|
@ -203,7 +205,9 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
|
|
|
|
|
if(AccountabilityTargetEnum.PERSONAL_AND_DEPARTMENT.getLabel().equals(blameVo.getAccountabilityTarget())){ |
|
|
|
|
blameVo.setAccountabilityTarget(BlameType.personal.name().equals(negativeBlame.getType())?"涉及个人": "涉及单位"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
String confinementId = negativeBlame.getConfinementId(); |
|
|
|
|
Confinement confinement = confinementService.getById(confinementId); |
|
|
|
|
blameVo.setConfinementTime(confinement.getConfinementTime()); |
|
|
|
|
blameVoList.add(blameVo); |
|
|
|
|
} |
|
|
|
|
vo.setFirstApproveTime(TimeUtil.getTimeoutStatus(NumberUtil.nullToZero(item.getFirstApproveTime()))); |
|
|
|
|
|