审批问题4

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java

@@ -193,7 +193,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         }
         //保存完毕,判断是否为最后一步
         AclPractitionerHiringBasicInfo basicInfo2 = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
-        if ("5".equals(basicInfo2.getApproveStatus())) {
+        if (basicInfo2.getApproveStatus().equals(String.valueOf(hiringApproveStepsList.size()))) {
             Long approvingStatus = requestVO.getApprovingStatus();
             String basicInfoStatus = null;
             if (approvingStatus == 1) {
@@ -320,13 +320,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
     }
 
     private boolean isHasNextStep(Long loginPractitionerId, String mobileNo, Long basicInfoId, MdPractitionerHiringApproveSteps nextStep) {
-        // 先判断是否是AGMS中审批的人员
-        String appointedApprovePractitioners = nextStep.getAppointedApprovePractitioners();
-        List<String> hiringApproveMobileNos = new ArrayList<>(Arrays.asList(appointedApprovePractitioners.split(",")));
-        if (hiringApproveMobileNos.contains(mobileNo)) {
-            return true;
-        }
-        // 不是AGMS审批人；只有既是辅导人又是团队长才有下一步
+        // 判断是辅导人和团队长
         if (!CommonUtil.isNullOrZero(loginPractitionerId)) {
             String approveRole = nextStep.getApproveRole();
             if (StringUtils.isNotEmpty(approveRole)) {
@@ -340,6 +334,14 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
                 }
             }
         }
+        // 判断是否是AGMS中审批的人员
+        String appointedApprovePractitioners = nextStep.getAppointedApprovePractitioners();
+        if (StringUtils.isNotEmpty(appointedApprovePractitioners)) {
+            List<String> hiringApproveMobileNos = new ArrayList<>(Arrays.asList(appointedApprovePractitioners.split(",")));
+            if (hiringApproveMobileNos.contains(mobileNo)) {
+                return true;
+            }
+        }
         return false;
     }
 

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

@@ -268,6 +268,8 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
                 return "3";
             case 5 :
                 return "4";
+            case 6 :
+                return "5";
         }
         return null;
     }
@@ -285,6 +287,8 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
                 return Integer.valueOf("4");
             case "4" :
                 return Integer.valueOf("5");
+            case "5" :
+                return Integer.valueOf("6");
         }
         return null;
     }