报聘审批补充提交

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

@@ -149,7 +149,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         PractitionerHiringApproveResponseVO responseVO = new PractitionerHiringApproveResponseVO();
         PractitionerHiringApproveResponseVO responseVO = new PractitionerHiringApproveResponseVO();
         Long loginId = requestVO.getLoginId();
         Long loginId = requestVO.getLoginId();
         Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
         Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
-        Integer hiringApproveStepsSeq = requestVO.getHiringApproveStepsSeq();
+
         //通过loginId查询此登入者的经纪人id
         //通过loginId查询此登入者的经纪人id
         Long loginPractitionerId = agmsHiringDalService.findPractitionerIdByLoginId(loginId);
         Long loginPractitionerId = agmsHiringDalService.findPractitionerIdByLoginId(loginId);
         AclUser user = aclUserDalService.selectByPrimaryKey(loginId);
         AclUser user = aclUserDalService.selectByPrimaryKey(loginId);
@@ -162,14 +162,22 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
             return responseVO;
             return responseVO;
         }
         }
         //保存完毕,判断是否为最后一步
         //保存完毕,判断是否为最后一步
-        MdPractitionerHiringApproveSteps listStep = hiringApproveStepsList.get(hiringApproveStepsList.size() - 1);
-        Integer stepSeq = listStep.getStepSeq();
-        if (stepSeq.equals(hiringApproveStepsSeq)) {
+        AclPractitionerHiringBasicInfo basicInfo = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
+        if ("5".equals(basicInfo.getApproveStatus())) {
             Long approvingStatus = requestVO.getApprovingStatus();
             Long approvingStatus = requestVO.getApprovingStatus();
+            String basicInfoStatus = null;
             if (approvingStatus == 1) {
             if (approvingStatus == 1) {
                 //最后一步 并同意 更新经纪人系类表
                 //最后一步 并同意 更新经纪人系类表
                 updatePractitionerInfo(hiringBasicInfoId,loginId);
                 updatePractitionerInfo(hiringBasicInfoId,loginId);
+                basicInfoStatus = "0";
+            } else {
+                basicInfoStatus = "-1";
             }
             }
+            // 更新basicInfo表审批状态
+            AclPractitionerHiringBasicInfo updateObj = new AclPractitionerHiringBasicInfo();
+            updateObj.setId(hiringBasicInfoId);
+            updateObj.setApproveStatus(basicInfoStatus);
+            basicInfoMapper.updateByPrimaryKeySelective(updateObj);
         }
         }
         responseVO.setHiringBasicInfoId(hiringBasicInfoId);
         responseVO.setHiringBasicInfoId(hiringBasicInfoId);
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
@@ -230,16 +238,12 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("stepSeq", hiringApproveStepsSeq);
         BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("stepSeq", hiringApproveStepsSeq);
         List<MdPractitionerHiringApproveSteps> steps = (List<MdPractitionerHiringApproveSteps>) CollectionUtils.select(hiringApproveStepsList, predicate);
         List<MdPractitionerHiringApproveSteps> steps = (List<MdPractitionerHiringApproveSteps>) CollectionUtils.select(hiringApproveStepsList, predicate);
 
 
-        System.out.println("看看审批操作中处理后的步骤是不是每次都只有一个");
-        System.out.println(steps);
-
         if (steps.size() != 1) {
         if (steps.size() != 1) {
             responseVO.setHiringBasicInfoId(requestVO.getHiringBasicInfoId());
             responseVO.setHiringBasicInfoId(requestVO.getHiringBasicInfoId());
             responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("830025")));
             responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("830025")));
             return;
             return;
         }
         }
 
 
-
         AclPractitionerHiringApproveRecords records = new AclPractitionerHiringApproveRecords();
         AclPractitionerHiringApproveRecords records = new AclPractitionerHiringApproveRecords();
         MdPractitionerHiringApproveSteps step = steps.get(0);
         MdPractitionerHiringApproveSteps step = steps.get(0);
         records.setHiringBasicInfoId(basicInfoId);
         records.setHiringBasicInfoId(basicInfoId);

yd-api/src/main/java/com/yd/api/agms/vo/hiring/PractitionerHiringApproveRequestVO.java

@@ -13,6 +13,10 @@ public class PractitionerHiringApproveRequestVO {
      */
      */
     private Long hiringBasicInfoId;
     private Long hiringBasicInfoId;
     /**
     /**
+     * 审批步骤经行到哪一步了
+     */
+    private Integer hiringApproveStepsSeq;
+    /**
      * 1：通过，0：驳回
      * 1：通过，0：驳回
      */
      */
     private Long approvingStatus;
     private Long approvingStatus;
@@ -115,4 +119,12 @@ public class PractitionerHiringApproveRequestVO {
     public void setInterviewAssessment(String interviewAssessment) {
     public void setInterviewAssessment(String interviewAssessment) {
         this.interviewAssessment = interviewAssessment;
         this.interviewAssessment = interviewAssessment;
     }
     }
+
+    public Integer getHiringApproveStepsSeq() {
+        return hiringApproveStepsSeq;
+    }
+
+    public void setHiringApproveStepsSeq(Integer hiringApproveStepsSeq) {
+        this.hiringApproveStepsSeq = hiringApproveStepsSeq;
+    }
 }
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/HiringApproveRequestVO.java

@@ -9,6 +9,14 @@ public class HiringApproveRequestVO {
      */
      */
     private Long practitionerId;
     private Long practitionerId;
     /**
     /**
+     * 审批身份 0.既是辅导人又是团队长  1.辅导人  2.团队长
+     */
+    private Long approvalIdentity;
+    /**
+     * 审批步骤经行到哪一步了
+     */
+    private Long hiringApproveStepsSeq;
+    /**
      * 审批经纪人基本资料id
      * 审批经纪人基本资料id
      */
      */
     private Long hiringBasicInfoId;
     private Long hiringBasicInfoId;
@@ -115,4 +123,20 @@ public class HiringApproveRequestVO {
     public void setInterviewAssessment(String interviewAssessment) {
     public void setInterviewAssessment(String interviewAssessment) {
         this.interviewAssessment = interviewAssessment;
         this.interviewAssessment = interviewAssessment;
     }
     }
+
+    public Long getApprovalIdentity() {
+        return approvalIdentity;
+    }
+
+    public void setApprovalIdentity(Long approvalIdentity) {
+        this.approvalIdentity = approvalIdentity;
+    }
+
+    public Long getHiringApproveStepsSeq() {
+        return hiringApproveStepsSeq;
+    }
+
+    public void setHiringApproveStepsSeq(Long hiringApproveStepsSeq) {
+        this.hiringApproveStepsSeq = hiringApproveStepsSeq;
+    }
 }
 }