|
|
@ -320,6 +320,8 @@ public class WorkActUserServiceImpl implements WorkActUserService { |
|
|
|
historicalAuditResult.setLatestAuditTime(latestRefused.getCreatedTime()); |
|
|
|
historicalAuditResult.setLatestRefusedReason(latestRefused.getReason()); |
|
|
|
historicalAuditResult.setRefusedCountDesc(String.format("已拒绝%s次",refusedCount)); |
|
|
|
resultDTO.setLatestAuditTime(latestRefused.getCreatedTime()); |
|
|
|
resultDTO.setLatestRefusedReason(latestRefused.getReason()); |
|
|
|
resultDTO.setHistoricalAuditResult(historicalAuditResult); |
|
|
|
} |
|
|
|
}else if(ActConstant.ACT_USER_STATUS_PASSED.equals(resultDTO.getStatus())||ActConstant.ACT_USER_STATUS_REFUSED.equals(resultDTO.getStatus())){ |
|
|
@ -451,7 +453,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { |
|
|
|
actUserLogEntity.setActId(actUserRelationEntity.getActId()); |
|
|
|
actUserLogEntity.setUserId(actUserRelationEntity.getUserId()); |
|
|
|
actUserLogEntity.setOperationType(ActConstant.ACT_USER_LOG_OPER_REFUSED); |
|
|
|
actUserLogEntity.setReason(StrConstant.EPMETY_STR); |
|
|
|
actUserLogEntity.setReason(formDTO.getRejectReason()); |
|
|
|
actUserLogEntity.setCreatedTime(auditTime); |
|
|
|
//插入一条日志
|
|
|
|
actUserLogDao.insert(actUserLogEntity); |
|
|
|