报聘辅导人可以不填-修改审批流程

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -852,19 +852,12 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             AclPractitionerHiringMembership hiringMemberShip = membershipMapper.selectByHiringBasicInfoId(basicInfoId);
             AclPractitionerHiringMembership hiringMemberShip = membershipMapper.selectByHiringBasicInfoId(basicInfoId);
 
 
             if (basicInfoId == null || hiringMemberShip == null) {
             if (basicInfoId == null || hiringMemberShip == null) {
-                System.out.println("------------hiringMemberShip-----------------");
-                System.out.println(hiringMemberShip);
-                System.out.println("------------basicInfoId-----------------");
-                System.out.println(basicInfoId);
                 resp.setCommonResult(new CommonResult(false, "保存失败"));
                 resp.setCommonResult(new CommonResult(false, "保存失败"));
                 return resp;
                 return resp;
             }
             }
+            // 计算审批流程
+            basicInfo.setApproveStatus(this.handleApproveStatus(hiringMemberShip));
 
 
-            if (Long.valueOf("30").equals(hiringMemberShip.getMdDropOptionId())) {
-                basicInfo.setApproveStatus("2");
-            } else {
-                basicInfo.setApproveStatus("-2");
-            }
             basicInfoMapper.updateByPrimaryKeySelective(basicInfo);
             basicInfoMapper.updateByPrimaryKeySelective(basicInfo);
 
 
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
@@ -876,6 +869,16 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         return resp;
         return resp;
     }
     }
 
 
+    private String handleApproveStatus(AclPractitionerHiringMembership hiringMemberShip) {
+        if (Long.valueOf("30").equals(hiringMemberShip.getMdDropOptionId())) {
+            return "2";
+        }
+        if (hiringMemberShip.getMentor() == null || hiringMemberShip.getMentorPractitionerId() == null) {
+            return "2";
+        }
+        return "-2";
+    }
+
     @SuppressWarnings("unchecked")
     @SuppressWarnings("unchecked")
     private boolean addStepToList(HiringApproveRequestVO requestVO,
     private boolean addStepToList(HiringApproveRequestVO requestVO,
                                   int stepSeq,
                                   int stepSeq,