审批状态记录修改

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

@@ -7,6 +7,7 @@ import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.agms.hiring.*;
 import com.yd.dal.entity.customer.*;
 import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
+import com.yd.dal.entity.practitioner.hiring.HiringApproveRecords;
 import com.yd.dal.entity.user.AclUser;
 import com.yd.dal.mapper.customer.AclPractitionerHiringBasicInfoMapper;
 import com.yd.dal.mapper.customer.AclPractitionerHiringMembershipMapper;
@@ -115,7 +116,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         PractitionerHiringDetailResponseVO responseVO = new PractitionerHiringDetailResponseVO();
 
         Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
-        Long loginId = requestVO.getLoginId();
+
         //经纪人审批基本信息
         PractitionerHiringBasicInfo practitionerHiringBasicInfo = agmsHiringDalService.findPractitionerHiringBasicInfo(hiringBasicInfoId);
         //审批经纪人关系
@@ -127,17 +128,19 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         //经纪人合同条款是否同意
         List<PractitionerHiringContractTermsConfirms> practitionerHiringContractTermsConfirmsList = agmsHiringDalService.findPractitionerHiringContractTermsConfirmsList(hiringBasicInfoId);
         //已审批结果
-        List<PractitionerHiringApproveRecords> practitionerHiringApproveRecordsList = agmsHiringDalService.findPractitionerHiringApproveRecordsList(hiringBasicInfoId);
-        //查询是否可进行审批操作 0.不可审批(未到)  1.可审批  2.已审批  3.无权审批(默认)  4.已驳回
-        PractitionerHiringApproveSteps practitionerHiringApproveSteps = getHiringApproveStatus(loginId,practitionerHiringMemberShip.getPractitionerLevelId(),practitionerHiringApproveRecordsList);
+        List<HiringApproveRecords> hiringApproveRecordsList = practitionerHiringDalService.findHiringApproveRecordsList(hiringBasicInfoId);
+
+
         responseVO.setHiringBasicInfoId(hiringBasicInfoId);
-        responseVO.setPractitionerHiringApproveSteps(practitionerHiringApproveSteps);
+        // 审批到哪一步
+        Integer nextStepSeq = practitionerHiringDalService.getNextStepSeqByApproveStatus(practitionerHiringBasicInfo.getApproveStatus());
+        responseVO.setHiringApproveStepsSeq(nextStepSeq);
         responseVO.setPractitionerHiringBasicInfo(practitionerHiringBasicInfo);
         responseVO.setPractitionerHiringMemberShip(practitionerHiringMemberShip);
         responseVO.setPractitionerHiringWorkingExperienceList(practitionerHiringWorkingExperienceList);
         responseVO.setPractitionerHiringPersonalStatementsList(practitionerHiringPersonalStatementsList);
         responseVO.setPractitionerHiringContractTermsConfirmsList(practitionerHiringContractTermsConfirmsList);
-        responseVO.setPractitionerHiringApproveRecordsList(practitionerHiringApproveRecordsList);
+        responseVO.setPractitionerHiringApproveRecordsList(hiringApproveRecordsList);
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         return responseVO;
     }

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

@@ -6,34 +6,11 @@ package com.yd.api.agms.vo.hiring;
 public class PractitionerHiringDetailRequestVO {
 
     /**
-     * AGMS登入者id
-     */
-    private Long loginId;
-
-    /**
      * 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      */
     private Long hiringBasicInfoId;
 
     /**
-     * 获取 AGMS登入者id
-     *
-     * @return loginId AGMS登入者id
-     */
-    public Long getLoginId() {
-        return this.loginId;
-    }
-
-    /**
-     * 设置 AGMS登入者id
-     *
-     * @param loginId AGMS登入者id
-     */
-    public void setLoginId(Long loginId) {
-        this.loginId = loginId;
-    }
-
-    /**
      * 获取 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
      *
      * @return hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
@@ -51,11 +28,4 @@ public class PractitionerHiringDetailRequestVO {
         this.hiringBasicInfoId = hiringBasicInfoId;
     }
 
-    @Override
-    public String toString() {
-        return "PractitionerHiringDetailRequestVO{" +
-                "loginId=" + loginId +
-                ", hiringBasicInfoId=" + hiringBasicInfoId +
-                '}';
-    }
 }

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

@@ -2,6 +2,7 @@ package com.yd.api.agms.vo.hiring;
 
 import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.agms.hiring.*;
+import com.yd.dal.entity.practitioner.hiring.HiringApproveRecords;
 
 import java.util.List;
 
@@ -14,9 +15,9 @@ public class PractitionerHiringDetailResponseVO {
      */
     private Long hiringBasicInfoId;
     /**
-     * 经纪人审批步骤/状态
+     * 审批步骤经行到哪一步了
      */
-    private PractitionerHiringApproveSteps practitionerHiringApproveSteps;
+    private Integer hiringApproveStepsSeq;
     /**
      * 经纪人审批基本信息
      */
@@ -40,7 +41,7 @@ public class PractitionerHiringDetailResponseVO {
     /**
      * 已审批结果
      */
-    private List<PractitionerHiringApproveRecords> practitionerHiringApproveRecordsList;
+    private List<HiringApproveRecords> practitionerHiringApproveRecordsList;
 
     private CommonResult commonResult;
 
@@ -64,24 +65,6 @@ public class PractitionerHiringDetailResponseVO {
     }
 
     /**
-     * 获取 经纪人审批步骤状态
-     *
-     * @return practitionerHiringApproveSteps 经纪人审批步骤状态
-     */
-    public PractitionerHiringApproveSteps getPractitionerHiringApproveSteps() {
-        return this.practitionerHiringApproveSteps;
-    }
-
-    /**
-     * 设置 经纪人审批步骤状态
-     *
-     * @param practitionerHiringApproveSteps 经纪人审批步骤状态
-     */
-    public void setPractitionerHiringApproveSteps(PractitionerHiringApproveSteps practitionerHiringApproveSteps) {
-        this.practitionerHiringApproveSteps = practitionerHiringApproveSteps;
-    }
-
-    /**
      * 获取 经纪人审批基本信息
      *
      * @return practitionerHiringBasicInfo 经纪人审批基本信息
@@ -176,7 +159,7 @@ public class PractitionerHiringDetailResponseVO {
      *
      * @return practitionerHiringApproveRecordsList 已审批结果
      */
-    public List<PractitionerHiringApproveRecords> getPractitionerHiringApproveRecordsList() {
+    public List<HiringApproveRecords> getPractitionerHiringApproveRecordsList() {
         return this.practitionerHiringApproveRecordsList;
     }
 
@@ -185,7 +168,7 @@ public class PractitionerHiringDetailResponseVO {
      *
      * @param practitionerHiringApproveRecordsList 已审批结果
      */
-    public void setPractitionerHiringApproveRecordsList(List<PractitionerHiringApproveRecords> practitionerHiringApproveRecordsList) {
+    public void setPractitionerHiringApproveRecordsList(List<HiringApproveRecords> practitionerHiringApproveRecordsList) {
         this.practitionerHiringApproveRecordsList = practitionerHiringApproveRecordsList;
     }
 
@@ -207,11 +190,19 @@ public class PractitionerHiringDetailResponseVO {
         this.commonResult = commonResult;
     }
 
+    public Integer getHiringApproveStepsSeq() {
+        return hiringApproveStepsSeq;
+    }
+
+    public void setHiringApproveStepsSeq(Integer hiringApproveStepsSeq) {
+        this.hiringApproveStepsSeq = hiringApproveStepsSeq;
+    }
+
     @Override
     public String toString() {
         return "PractitionerHiringDetailResponseVO{" +
                 "hiringBasicInfoId=" + hiringBasicInfoId +
-                ", practitionerHiringApproveSteps=" + practitionerHiringApproveSteps +
+                ", hiringApproveStepsSeq=" + hiringApproveStepsSeq +
                 ", practitionerHiringBasicInfo=" + practitionerHiringBasicInfo +
                 ", practitionerHiringMemberShip=" + practitionerHiringMemberShip +
                 ", practitionerHiringWorkingExperienceList=" + practitionerHiringWorkingExperienceList +

yd-api/src/main/java/com/yd/dal/entity/practitioner/hiring/HiringApproveRecords.java

@@ -31,11 +31,11 @@ public class HiringApproveRecords {
      */
     private String levelName;
     /**
-     * 1：通过，0：驳回
+     * 1：通过，0：驳回 2:未审批
      */
     private Long approvingStatusId;
     /**
-     * 1：通过，0：驳回
+     * 1：通过，0：驳回 2:未审批
      */
     private String approvingStatus;
 

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

@@ -15,6 +15,7 @@ import com.yd.dal.service.customer.AclFileUploadDALService;
 import com.yd.dal.service.customer.AclPractitionerDALService;
 import com.yd.dal.service.meta.MdPractitionerHiringApproveStepsDALService;
 import com.yd.dal.service.practitioner.PractitionerHiringDALService;
+import com.yd.rmi.cache.SystemConfigService;
 import com.yd.util.CommonUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -45,6 +46,8 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
     private AclPractitionerMapper aclPractitionerMapper;
     @Autowired
     private AgmsHiringMapper agmsHiringMapper;
+    @Autowired
+    private SystemConfigService systemConfigService;
 
     @Override
     public List<HiringListInfo> findHiringList(Long practitionerId, Long approvingStatus) {
@@ -83,6 +86,9 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
         CustomerFileUpload fileUpload;
         String imagePath;
         String levelName;
+
+        // 创建一个Map
+        Map<Long, HiringApproveRecords> map = new HashMap<>();
         for (HiringApproveRecords item : records) {
             // 获取职级
             practitionerInfo = aclPractitionerDALService.findPractitionerInfoByPractitionerId(item.getApprovingPractitionerId());
@@ -93,8 +99,29 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
 
             item.setHeadImagePath(imagePath);
             item.setLevelName(levelName);
+
+            map.put(item.getApproveStepId(), item);
         }
-        return records;
+
+        // 声明最终返回的List
+        List<HiringApproveRecords> resultList = new ArrayList<>();
+        // 所有的审批流程
+        List<MdPractitionerHiringApproveSteps> stepsList = systemConfigService.findHiringApproveStepsAll();
+        HiringApproveRecords record;
+        for (MdPractitionerHiringApproveSteps step : stepsList) {
+            record = map.get(step.getId());
+            if (record != null) {
+                resultList.add(record);
+            } else {
+                HiringApproveRecords obj = new HiringApproveRecords();
+                obj.setApproveStepId(step.getId());
+                obj.setApproveStepName(step.getStepName());
+                obj.setApprovingStatusId(Long.valueOf("2"));
+                obj.setApprovingStatus("未审批");
+                resultList.add(obj);
+            }
+        }
+        return resultList;
     }
 
     @Override