审批问题2

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

@@ -160,7 +160,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         if (basicInfo != null && StringUtils.isNotEmpty(basicInfo.getApproveStatus())) {
         if (basicInfo != null && StringUtils.isNotEmpty(basicInfo.getApproveStatus())) {
             List<AclPractitionerHiringApproveRecords> recordsList = aclPractitionerHiringApproveRecordsDalService.queryListByBasicInfoId(hiringBasicInfoId);
             List<AclPractitionerHiringApproveRecords> recordsList = aclPractitionerHiringApproveRecordsDalService.queryListByBasicInfoId(hiringBasicInfoId);
             for (AclPractitionerHiringApproveRecords record : recordsList) {
             for (AclPractitionerHiringApproveRecords record : recordsList) {
-                if (record.getStepSeq().equals(hiringApproveStepsSeq)) {
+                if (record.getStepSeq().equals(String.valueOf(hiringApproveStepsSeq))) {
                     responseVO.setCommonResult(new CommonResult(true, "当前流程已审批，请勿重复提交"));
                     responseVO.setCommonResult(new CommonResult(true, "当前流程已审批，请勿重复提交"));
                     return responseVO;
                     return responseVO;
                 }
                 }
@@ -251,23 +251,8 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
                              PractitionerHiringApproveResponseVO responseVO) {
                              PractitionerHiringApproveResponseVO responseVO) {
 
 
         Long basicInfoId = requestVO.getHiringBasicInfoId();
         Long basicInfoId = requestVO.getHiringBasicInfoId();
-        // 先查出当前审批流程
-        AclPractitionerHiringBasicInfo basicInfo = basicInfoMapper.selectByPrimaryKey(basicInfoId);
-        Integer hiringApproveStepsSeq;
-        if (basicInfo == null) {
-            responseVO.setHiringBasicInfoId(requestVO.getHiringBasicInfoId());
-            responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("830025")));
-            return;
-        } else {
-            // 获取下一步的序号
-            hiringApproveStepsSeq = practitionerHiringDalService.getNextStepSeqByApproveStatus(basicInfo.getApproveStatus());
-            if (hiringApproveStepsSeq == null) {
-                responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
-                return;
-            }
-        }
 
 
-        BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("stepSeq", hiringApproveStepsSeq);
+        BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("stepSeq", requestVO.getHiringApproveStepsSeq());
         List<MdPractitionerHiringApproveSteps> steps = (List<MdPractitionerHiringApproveSteps>) CollectionUtils.select(hiringApproveStepsList, predicate);
         List<MdPractitionerHiringApproveSteps> steps = (List<MdPractitionerHiringApproveSteps>) CollectionUtils.select(hiringApproveStepsList, predicate);
 
 
         if (steps.size() != 1) {
         if (steps.size() != 1) {