审批问题10

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

@@ -170,26 +170,35 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
             }
         }
 
-        Long practitionerId = requestVO.getPractitionerId();
-        Long loginId = requestVO.getLoginId();
-        String mobileNo;
-        AclPractitioner practitioner = aclPractitionerMapper.selectByPrimaryKey(practitionerId);
-        mobileNo = practitioner.getMobileNo();
-
         Integer plateform = requestVO.getPlateform();
         if (Integer.valueOf("2").equals(plateform)) {
             //通过loginId查询此登入者的经纪人id
-            practitionerId = agmsHiringDalService.findPractitionerIdByLoginId(loginId);
+            Long loginId = requestVO.getLoginId();
+            Long practitionerId = agmsHiringDalService.findPractitionerIdByLoginId(loginId);
             AclUser user = aclUserDalService.selectByPrimaryKey(loginId);
-            mobileNo = user.getMobileNo();
+            String mobileNo = user.getMobileNo();
+            this.doApprove(practitionerId, mobileNo, requestVO, responseVO);
+            return responseVO;
+
+        } else {
+            Long practitionerId = requestVO.getPractitionerId();
+            AclPractitioner practitioner = aclPractitionerMapper.selectByPrimaryKey(practitionerId);
+            String mobileNo = practitioner.getMobileNo();
+            this.doApprove(practitionerId, mobileNo, requestVO, responseVO);
+            return responseVO;
+
+        }
+
     }
 
+    private void doApprove(Long practitionerId, String mobileNo, PractitionerHiringApproveRequestVO requestVO, PractitionerHiringApproveResponseVO responseVO) {
+        Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
         //查询审批流程
         List<MdPractitionerHiringApproveSteps> hiringApproveStepsList = systemConfigService.findHiringApproveStepsAll();
         //保存审批结果
         saveRecords(practitionerId, mobileNo, hiringApproveStepsList, requestVO, responseVO);
         if (responseVO.getCommonResult().isSuccess()){
-            return responseVO;
+            return;
         }
         //保存完毕,判断是否为最后一步
         AclPractitionerHiringBasicInfo basicInfo2 = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
@@ -198,8 +207,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
             String basicInfoStatus = null;
             if (approvingStatus == 1) {
                 //最后一步 并同意 更新经纪人系类表
-                Long operater = CommonUtil.isNullOrZero(loginId) ? loginId : practitionerId;
-                updatePractitionerInfo(hiringBasicInfoId, operater);
+                updatePractitionerInfo(hiringBasicInfoId, practitionerId);
                 basicInfoStatus = "0";
             } else {
                 basicInfoStatus = "-1";
@@ -212,7 +220,6 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         }
         responseVO.setHiringBasicInfoId(hiringBasicInfoId);
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
-        return responseVO;
     }
 
     @Override