审批问题11

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

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

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

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

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.api.agms.vo.hiring.PractitionerHiringListRequestVO;
 import com.yd.dal.entity.agms.hiring.*;
 import com.yd.dal.entity.agms.hiring.*;
 import com.yd.dal.entity.meta.MdPractitionerHiringApproveSteps;
 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.entity.user.AclUser;
 import com.yd.dal.mapper.agms.AgmsHiringMapper;
 import com.yd.dal.mapper.agms.AgmsHiringMapper;
 import com.yd.dal.service.agms.AgmsHiringDALService;
 import com.yd.dal.service.agms.AgmsHiringDALService;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.*;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
 /**
  * @author xxy
  * @author xxy
@@ -88,16 +90,25 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
     @Override
     @Override
     public PageInfo<PractitionerHiringListInfo> queryHandledList(Long loginPractitionerId, String status, PractitionerHiringListRequestVO requestVO) {
     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(),
                 agmsHiringMapper.queryHandledList(loginPractitionerId, status, requestVO.getBranchId(),
                         requestVO.getDeptId(),
                         requestVO.getDeptId(),
                         requestVO.getSubsystemId(),
                         requestVO.getSubsystemId(),
                         requestVO.getName());
                         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
     @Override