被拒绝的记录显示在待审批，S2的记录前面的流程未审批就显示，S2的审核状态没有前两步

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

@@ -292,6 +292,12 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         basicInfoMapper.updateByPrimaryKeySelective(updateObj);
         basicInfoMapper.updateByPrimaryKeySelective(updateObj);
 
 
         if (CommonUtil.isNullOrZero(requestVO.getApprovingStatus())) {
         if (CommonUtil.isNullOrZero(requestVO.getApprovingStatus())) {
+            // 审批拒绝更新basicInfo表审批状态为 "-1"
+            AclPractitionerHiringBasicInfo updateObj2 = new AclPractitionerHiringBasicInfo();
+            updateObj2.setId(basicInfoId);
+            updateObj2.setApproveStatus("-1");
+            basicInfoMapper.updateByPrimaryKeySelective(updateObj2);
+
             responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             return;
             return;
         }
         }

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

@@ -640,7 +640,12 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo();
             AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo();
             basicInfo.setId(basicInfoId);
             basicInfo.setId(basicInfoId);
             basicInfo.setPersonalSignOssPath(putFileToOss);
             basicInfo.setPersonalSignOssPath(putFileToOss);
-            basicInfo.setApproveStatus("-2");
+            AclPractitionerHiringMembership hiringMemberShip = membershipMapper.selectByHiringBasicInfoId(basicInfoId);
+            if (Long.valueOf("30").equals(hiringMemberShip.getMdDropOptionId())) {
+                basicInfo.setApproveStatus("2");
+            } else {
+                basicInfo.setApproveStatus("-2");
+            }
             basicInfoMapper.updateByPrimaryKeySelective(basicInfo);
             basicInfoMapper.updateByPrimaryKeySelective(basicInfo);
 
 
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));

yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsHiringMapper.java

@@ -78,5 +78,5 @@ public interface AgmsHiringMapper {
                                                         @Param("name")String name
                                                         @Param("name")String name
                                                         );
                                                         );
 
 
-    List<PractitionerHiringListInfo> queryS2List();
+    List<PractitionerHiringListInfo> queryS2List(String approveStatus);
 }
 }

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

@@ -149,7 +149,7 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
             }
             }
 
 
             if (canAprroveGrades.contains("30")) {
             if (canAprroveGrades.contains("30")) {
-                List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List();
+                List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List(approveStatus);
                 dataList.addAll(s2List);
                 dataList.addAll(s2List);
             }
             }
 
 

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

@@ -3,6 +3,7 @@ package com.yd.dal.service.practitioner.impl;
 import com.yd.api.practitioner.vo.hiring.PractitionerHiringContractTerms;
 import com.yd.api.practitioner.vo.hiring.PractitionerHiringContractTerms;
 import com.yd.dal.entity.agms.hiring.PractitionerHiringListInfo;
 import com.yd.dal.entity.agms.hiring.PractitionerHiringListInfo;
 import com.yd.dal.entity.customer.AclPractitioner;
 import com.yd.dal.entity.customer.AclPractitioner;
+import com.yd.dal.entity.customer.AclPractitionerHiringMembership;
 import com.yd.dal.entity.customer.CustomerFileUpload;
 import com.yd.dal.entity.customer.CustomerFileUpload;
 import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
 import com.yd.dal.entity.customer.practitioner.PractitionerInfo;
 import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
 import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
@@ -107,8 +108,17 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
         List<HiringApproveRecords> resultList = new ArrayList<>();
         List<HiringApproveRecords> resultList = new ArrayList<>();
         // 所有的审批流程
         // 所有的审批流程
         List<MdPractitionerHiringApproveSteps> stepsList = systemConfigService.findHiringApproveStepsAll();
         List<MdPractitionerHiringApproveSteps> stepsList = systemConfigService.findHiringApproveStepsAll();
+        // 当前经纪人的报聘职级
+        AclPractitionerHiringMembership hiringMemberShip = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+
         HiringApproveRecords record;
         HiringApproveRecords record;
         for (MdPractitionerHiringApproveSteps step : stepsList) {
         for (MdPractitionerHiringApproveSteps step : stepsList) {
+            if (Long.valueOf("30").equals(hiringMemberShip.getMdDropOptionId())
+                    && (step.getStepSeq() == 1 || step.getStepSeq() == 2)
+            ) {
+                continue;
+            }
+
             record = map.get(step.getId());
             record = map.get(step.getId());
             if (record != null) {
             if (record != null) {
                 resultList.add(record);
                 resultList.add(record);
@@ -224,7 +234,7 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
             }
             }
 
 
             if (canAprroveGrades.contains("30")) {
             if (canAprroveGrades.contains("30")) {
-                List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List();
+                List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List(approveStatus);
                 dataList.addAll(s2List);
                 dataList.addAll(s2List);
             }
             }
         }
         }

yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml

@@ -307,6 +307,9 @@
         left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
         left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
         where 1=1
         where 1=1
         and b.approve_status is not null
         and b.approve_status is not null
+        <if test="approveStatus != null">
+            and b.approve_status = #{approveStatus}
+        </if>
         and m.md_drop_option_id = 30
         and m.md_drop_option_id = 30
 
 
     </select>
     </select>