流程数据修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/FlowTaskApprovePeopleResult.java

@@ -21,7 +21,7 @@ public class FlowTaskApprovePeopleResult implements Serializable {
     private Integer setup;
 
     @ApiModelProperty(value = "是否审核，true：已审，false：未审")
-    private boolean approve;
+    private Boolean approve;
 
     @ApiModelProperty(value = "流程审批人")
     private List<ApproveUserResult> approveUser;
@@ -30,11 +30,6 @@ public class FlowTaskApprovePeopleResult implements Serializable {
 
     }
 
-    public FlowTaskApprovePeopleResult(Integer setup, List<ApproveUserResult> approveUser) {
-        this.setup = setup;
-        this.approveUser = approveUser;
-    }
-
     public FlowTaskApprovePeopleResult(Integer setup, boolean approve, List<ApproveUserResult> approveUser) {
         this.setup = setup;
         this.approve = approve;
@@ -45,11 +40,11 @@ public class FlowTaskApprovePeopleResult implements Serializable {
         this.approveUser = approveUser;
     }
 
-    public boolean isApprove() {
+    public Boolean isApprove() {
         return approve;
     }
 
-    public void setApprove(boolean approve) {
+    public void setApprove(Boolean approve) {
         this.approve = approve;
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -15,8 +15,6 @@ import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicCourse;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.service.BasicCourseService;
@@ -559,7 +557,7 @@ public class ActivitiServiceImpl implements ActivitiService {
                     if (Objects.nonNull(sysUser.getOrgId())) {
                         //获取院长审批人
                         List<ApproveUserResult> sysUserPresidentList = sysUserService.findByPresidentApprove(Arrays.asList(sysUser.getOrgId()));
-                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.SECOND_APPROVE.getSetup(), sysUserPresidentList));
+                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.SECOND_APPROVE.getSetup(), false, sysUserPresidentList));
                     }
                     break;
                 case 3:
@@ -581,6 +579,7 @@ public class ActivitiServiceImpl implements ActivitiService {
                 throw ExceptionResultEnum.ERROR.exception("课程编码为空");
             }
             flowTaskApprovePeopleResultList = getApproveUserAll(courseCode, flowTaskApprovePeopleResultList);
+            flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
         }
         flowTaskApprovePeopleAllResult.setApproveUserList(flowTaskApprovePeopleResultList);
         return flowTaskApprovePeopleAllResult;
@@ -736,11 +735,11 @@ public class ActivitiServiceImpl implements ActivitiService {
         flowTaskApprovePeopleResultList = Objects.isNull(flowTaskApprovePeopleResultList) ? new LinkedList() : flowTaskApprovePeopleResultList;
         //获取教研室主任审批人
         List<ApproveUserResult> sysUserDirectorList = sysUserService.findByDirectorApprove(courseCode);
-        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.PRIMARY_APPROVE.getSetup(), sysUserDirectorList));
+        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, sysUserDirectorList));
         Set<Long> orgIds = sysUserDirectorList.stream().map(s -> s.getOrgId()).collect(Collectors.toSet());
         //获取院长审批人
         List<ApproveUserResult> sysUserPresidentList = sysUserService.findByPresidentApprove(new ArrayList<>(orgIds));
-        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.SECOND_APPROVE.getSetup(), sysUserPresidentList));
+        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.SECOND_APPROVE.getSetup(), false, sysUserPresidentList));
         return flowTaskApprovePeopleResultList;
     }
 }