薪资单查询本年问题2

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

@@ -29,9 +29,7 @@ import com.yd.dal.entity.order.PolicyDetailInfoE;
 import com.yd.dal.entity.order.PolicyFactorInfoE;
 import com.yd.dal.entity.practitioner.payscale.AgAclLifePractitionerSalary;
 import com.yd.dal.entity.practitioner.payscale.PayScaleBasicInfo;
-import com.yd.dal.entity.product.Product;
 import com.yd.dal.entity.product.ProductE;
-import com.yd.dal.entity.product.ProductPlan;
 import com.yd.dal.entity.salary.AgAclSalary;
 import com.yd.dal.mapper.practitioner.AgAclLifePractitionerSalaryMapper;
 import com.yd.dal.mapper.salary.AgAclSalaryMapper;
@@ -56,14 +54,7 @@ import com.yd.rmi.n22.salary.pojo.SalaryDetails;
 import com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchRequestBody;
 import com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchResponseBody;
 import com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchResponseVO;
-import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.Commission;
-import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.FirstYearPerformanceCommission;
-import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.OtherCommission;
-import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.RecommendSystemCommission;
-import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.RenewalYearPerformanceCommission;
-import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsRequestBody;
-import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseBody;
-import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseVO;
+import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.*;
 import com.yd.rmi.n22.salary.service.N22SalaryService;
 import com.yd.rmi.n22.staff.pojo.GetStaffNewRequestBody;
 import com.yd.rmi.n22.staff.pojo.GetStaffNewResponseVO;
@@ -388,30 +379,32 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     public PayScaleQueryResponseVO payScaleListQuery(PayScaleQueryRequestVO requestVO) {
         PayScaleQueryResponseVO responseVO = new PayScaleQueryResponseVO();
 
+        Long practitionerId = requestVO.getPractitionerId();
+        Integer isActive = requestVO.getIsActive();
         String isHistory = requestVO.getIsHistory();
 
-        List<PayScaleInfo> resultList = new ArrayList<>();
-
         //如果是预览薪资单，则跳过权限校验
-//        if(!"AGMS".equals(requestVO.getPreFlag())){
-//            //等保调整
-//            List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null);
-//            if(null == findByObjSortable ){
-//                responseVO.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
-//                return responseVO;
-//            }
-//        }
+        if(!"AGMS".equals(requestVO.getPreFlag())){
+            //等保调整
+            List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null);
+            if(null == findByObjSortable ){
+                responseVO.setCommonResult(new CommonResult(false,ZHBErrorConfig.getErrorInfo("630028")));
+                return responseVO;
+            }
+        }
+        List<PayScaleInfo> resultList = new ArrayList<>();
+        List<AgAclLifePractitionerSalary> newList = null;
         try {
-            if ("0".equals(isHistory)) {
-                // 查询本年
-                resultList = this.queryNew(requestVO);
-            } else if ("1".equals(isHistory)) {
-                // 查询历史才需要执行
-                resultList = this.historyEG(requestVO);
-            } else {
-                // 查询全部，把本年和历史集合合并到一起
-                resultList = this.queryAll(requestVO);
+            // 查询新表数据
+            newList = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(practitionerId, isActive, isHistory);
+            if (!"0".equals(isHistory)) {
+                // 查询全部和历史，把新表数据和EG历史集合合并到一起
+                resultList = aclPractitionerDALService.queryEGHistorySalaryPDFByPractitionerId(practitionerId);
             }
+            translateObj(newList, resultList, requestVO.getPreFlag());
+            // 排序
+            resultList.sort(Comparator.comparing(PayScaleInfo::getMonDtlPeriod).reversed());
+
             responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             responseVO.setPayScaleInfos(resultList);
 
@@ -428,7 +421,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         String isHistory = requestVO.getIsHistory();
 
         // 1.先查本地新基本法的薪资
-        List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(practitionerId, 1, isActive, isHistory);
+        List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(practitionerId, isActive, isHistory);
         List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list,requestVO.getPreFlag());
 
         // 2.再查N22
@@ -677,20 +670,22 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return result;
     }
 
-    private void translateObj(List<AgAclLifePractitionerSalary> list, List<PayScaleInfo> resultList,String preFlag) {
+    private void translateObj(List<AgAclLifePractitionerSalary> newList, List<PayScaleInfo> resultList, String preFlag) {
         PayScaleInfo payScaleInfo;
         String time;
-        for (AgAclLifePractitionerSalary salary : list) {
-            payScaleInfo = new PayScaleInfo();
-            payScaleInfo.setMonShId(salary.getId());
-            payScaleInfo.setPdfOssPath(salary.getPdfOssPath());
-            payScaleInfo.setMonDtlPeriod(salary.getYearMonth());
-            payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
-            payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
-            payScaleInfo.setIsBasic(salary.getIsBasic());
-            payScaleInfo.setIsActive(salary.getIsActive());
-            payScaleInfo.setPreFlag(preFlag);
-            resultList.add(payScaleInfo);
+        if (newList != null && newList.size() > 0) {
+            for (AgAclLifePractitionerSalary salary : newList) {
+                payScaleInfo = new PayScaleInfo();
+                payScaleInfo.setMonShId(salary.getId());
+                payScaleInfo.setPdfOssPath(salary.getPdfOssPath());
+                payScaleInfo.setMonDtlPeriod(salary.getYearMonth());
+                payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
+                payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
+                payScaleInfo.setIsBasic(salary.getIsBasic());
+                payScaleInfo.setIsActive(salary.getIsActive());
+                payScaleInfo.setPreFlag(preFlag);
+                resultList.add(payScaleInfo);
+            }
         }
 
         for (PayScaleInfo info : resultList) {

yd-api/src/main/java/com/yd/dal/mapper/practitioner/AgAclLifePractitionerSalaryMapper.java

@@ -20,7 +20,7 @@ public interface AgAclLifePractitionerSalaryMapper {
 
     List<AgAclLifePractitionerSalary> queryListByPractitionerId(@Param("practitionerId") Long practitionerId,@Param("isActive") Integer isActive);
 
-    List<AgAclLifePractitionerSalary> queryListByPractitionerIdAndIsbasic(@Param("practitionerId") Long practitionerId, @Param("isBasic") Integer isBasic,
+    List<AgAclLifePractitionerSalary> queryListByPractitionerIdAndIsbasic(@Param("practitionerId") Long practitionerId,
                                                                           @Param("isActive") Integer isActive, @Param("isHistory") String isHistory);
 
     List<AgAclLifePractitionerSalary> queryByRecord(AgAclLifePractitionerSalary lifePractitionerSalary);

yd-api/src/main/resources/mapper/practitioner/AgAclLifePractitionerSalaryMapper.xml

@@ -138,7 +138,6 @@
     <include refid="Base_Column_List"/>
     from ag_acl_life_practitioner_salary
     where practitioner_id = #{practitionerId,jdbcType=BIGINT}
-    and is_basic = #{isBasic,jdbcType=BIGINT}
     <if test="isActive != null ">
       and is_active = #{isActive,jdbcType=BIGINT}
     </if>