Merge remote-tracking branch 'refs/remotes/origin/dev_20201208_hiring' into dev_20201208_hiring

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

@@ -198,9 +198,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         List<MdPractitionerHiringApproveSteps> hiringApproveStepsList = systemConfigService.findHiringApproveStepsAll();
         //保存审批结果
         saveRecords(practitionerId, mobileNo, hiringApproveStepsList, requestVO, responseVO);
-        if (responseVO.getCommonResult().isSuccess()){
-            return;
-        }
+
         //保存完毕,判断是否为最后一步
         AclPractitionerHiringBasicInfo basicInfo2 = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
         if (basicInfo2.getApproveStatus().equals(String.valueOf(hiringApproveStepsList.size()))) {
@@ -375,7 +373,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         practitioner.setPractitionerBirthdate(basicInfo.getPractitionerBirthdate());
         practitioner.setPractitionerRegNo(" ");
         practitioner.setPractitionerRegCompany(" ");
-        practitioner.setCustomerId(customer.getId());
+        practitioner.setCustomerId(customer != null ? customer.getId() : null);
         practitioner.setIsActive(1);
         practitioner.setCreatedAt(new Date());
         practitioner.setCreatedBy(operater);

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

@@ -11,7 +11,7 @@ public class PractitionerHiringListRequestVO {
     private Long branchId;
     private Long deptId;
     private Long subsystemId;
-    private Long name;
+    private String name;
     private String status;
     private PageInfo<PractitionerHiringListInfo> pageInfo;
 
@@ -54,11 +54,11 @@ public class PractitionerHiringListRequestVO {
         this.subsystemId = subsystemId;
     }
 
-    public Long getName() {
+    public String getName() {
         return name;
     }
 
-    public void setName(Long name) {
+    public void setName(String name) {
         this.name = name;
     }
 

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

@@ -657,6 +657,11 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
         SavePayrollPictureResponseVO resp = new SavePayrollPictureResponseVO();
         try {
             String mediaId = requestVO.getVxUrl();
+            if (StringUtils.isEmpty(mediaId)) {
+                resp.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("800000")));
+                return resp;
+            }
+
             Long basicInfoId = requestVO.getHiringBasicInfoId();
             String imgUrl = this.uploadImageToOss(mediaId, basicInfoId, 2);
 

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

@@ -62,12 +62,12 @@ public interface AgmsHiringMapper {
      */
     Page<PractitionerHiringListInfo> practitionerHiringList(PractitionerHiringListRequestVO requestVO);
 
-    Page<PractitionerHiringListInfo> queryHandledList(@Param("practitionerId")Long practitionerId,
+    List<PractitionerHiringListInfo> queryHandledList(@Param("practitionerId")Long practitionerId,
                                                       @Param("status")String status,
                                                       @Param("branchId")Long branchId,
                                                       @Param("deptId")Long deptId,
                                                       @Param("subsystemId")Long subsystemId,
-                                                      @Param("name")Long name
+                                                      @Param("name")String name
                                                       );
 
     Page<PractitionerHiringListInfo> queryUnhandledList(@Param("approveStatus")String approveStatus,
@@ -75,7 +75,7 @@ public interface AgmsHiringMapper {
                                                         @Param("branchId")Long branchId,
                                                         @Param("deptId")Long deptId,
                                                         @Param("subsystemId")Long subsystemId,
-                                                        @Param("name")Long name
+                                                        @Param("name")String name
                                                         );
 
     List<PractitionerHiringListInfo> queryS2List();

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

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.yd.api.agms.vo.hiring.PractitionerHiringListRequestVO;
 import com.yd.dal.entity.agms.hiring.*;
 import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
+import com.yd.dal.entity.practitioner.hiring.HiringListInfo;
 import com.yd.dal.entity.user.AclUser;
 import com.yd.dal.mapper.agms.AgmsHiringMapper;
 import com.yd.dal.service.agms.AgmsHiringDALService;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author xxy
@@ -88,16 +90,25 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
     @Override
     public PageInfo<PractitionerHiringListInfo> queryHandledList(Long loginPractitionerId, String status, PractitionerHiringListRequestVO requestVO) {
 
-        PageInfo<PractitionerHiringListInfo> pageInfo = requestVO.getPageInfo();
-
-        PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-        Page<PractitionerHiringListInfo> destList =
+        List<PractitionerHiringListInfo> destList =
                 agmsHiringMapper.queryHandledList(loginPractitionerId, status, requestVO.getBranchId(),
                         requestVO.getDeptId(),
                         requestVO.getSubsystemId(),
                         requestVO.getName());
 
-        return new PageInfo<>(destList);
+        // list去重
+        List<PractitionerHiringListInfo> uniqueList = destList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
+                // 利用 TreeSet 的排序去重构造函数来达到去重元素的目的
+                // 根据hiringBasicInfoId去重
+                () -> new TreeSet<>(Comparator.comparingLong(PractitionerHiringListInfo::getHiringBasicInfoId))), ArrayList::new));
+
+        // 去重后的list分页
+        PageInfo<PractitionerHiringListInfo> pageInfo = requestVO.getPageInfo();
+        int pageNum = pageInfo.getPageNum();
+        int pageSize = pageInfo.getPageSize();
+        PageInfo<PractitionerHiringListInfo> page = PageInfoUtils.list2PageInfo(uniqueList, pageNum, pageSize);
+
+        return page;
     }
 
     @Override
@@ -137,12 +148,18 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
                 dataList.addAll(resultList);
             }
 
-            if ("公司老板".equals(stepName)) {
+            if (canAprroveGrades.contains("30")) {
                 List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List();
                 dataList.addAll(s2List);
             }
 
         }
-        return dataList;
+        // 每个审核步骤可能查询出重复数据， 需去重
+        List<PractitionerHiringListInfo> uniqueList = dataList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
+                // 利用 TreeSet 的排序去重构造函数来达到去重元素的目的
+                // 根据hiringBasicInfoId去重
+                () -> new TreeSet<>(Comparator.comparingLong(PractitionerHiringListInfo::getHiringBasicInfoId))), ArrayList::new));
+
+        return uniqueList;
     }
 }

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

@@ -223,7 +223,7 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
                 dataList.addAll(resultList);
             }
 
-            if ("公司老板".equals(stepName)) {
+            if (canAprroveGrades.contains("30")) {
                 List<PractitionerHiringListInfo> s2List = agmsHiringMapper.queryS2List();
                 dataList.addAll(s2List);
             }

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

@@ -265,7 +265,7 @@
         left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
         left join ag_acl_practitioner_subordinate_system sys on sys.id = m.subsystem_id
 
-        where 1=1
+        where b.approve_status is not null
         <if test="approveStatus != null">
             and b.approve_status = #{approveStatus}
         </if>
@@ -306,6 +306,7 @@
         from ag_acl_practitioner_hiring_basic_info b
         left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
         where 1=1
+        and b.approve_status is not null
         and m.md_drop_option_id = 30
 
     </select>