|
@@ -1,6 +1,5 @@
|
|
|
package com.qmth.distributed.print.business.activiti;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.google.common.reflect.TypeToken;
|
|
|
import com.google.gson.Gson;
|
|
|
import com.qmth.distributed.print.business.entity.ExamTask;
|
|
@@ -53,8 +52,7 @@ public class DirectorApproveListener implements TaskListener {
|
|
|
List<ApproveUserResult> sysUserList = null;
|
|
|
if (Objects.nonNull(approveUserIds) && approveUserIds.size() > 0) {
|
|
|
List<SysUser> sysUsers = sysUserService.listByIds(approveUserIds);
|
|
|
- Gson gson = new Gson();
|
|
|
- sysUserList = gson.fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {
|
|
|
+ sysUserList = new Gson().fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {
|
|
|
}.getType());
|
|
|
delegateTask.addCandidateUsers(approveUserIds.stream().map(x -> String.valueOf(x)).collect(Collectors.toList()));
|
|
|
} else {
|
|
@@ -73,7 +71,7 @@ public class DirectorApproveListener implements TaskListener {
|
|
|
}
|
|
|
|
|
|
// 驳回短信(驳回给主任)
|
|
|
- if(tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
|
|
|
+ if (tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
|
|
|
&& tfFlowApprove.getSetup().equals(FlowGdykdxApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
|
|
|
basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
|
|
|
}
|