薪资单-业绩列表的查询时间

yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java

@@ -646,18 +646,5 @@ public class PractitionerController {
         result.setData(responseVO);
         return result;
     }
-    /**
-     * test
-     * @return
-     */
-    @RequestMapping("/test")
-    public Object test(@RequestBody PractitionerRankRequestVO requestVO){
-        JsonResult result = new JsonResult();
-        PractitionerRankResponseVO responseVO = practitionerService.practitionerRank(requestVO);
-        result.addResult(responseVO);
-        result.setData(responseVO);
-        return result;
-    }
-
 
 }

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

@@ -423,8 +423,11 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         salaryDetailsSearchRequestBody.setLoginName(staff.getAgent_id());
         salaryDetailsSearchRequestBody.setSearchType("1");
         if ("0".equals(isHistory)) {
-            salaryDetailsSearchRequestBody.setStartDate(CommonUtil.getBeginDayOfYear());
-            salaryDetailsSearchRequestBody.setEndDate(CommonUtil.getEndDayOfYear());
+            String beginDayOfYear = this.calculateDate(CommonUtil.getBeginDayOfYear());
+            String endDayOfYear = this.calculateDate(CommonUtil.getEndDayOfYear());
+
+            salaryDetailsSearchRequestBody.setStartDate(beginDayOfYear);
+            salaryDetailsSearchRequestBody.setEndDate(endDayOfYear);
         }
         SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody);
 
@@ -477,6 +480,18 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return resultList;
     }
 
+    private String calculateDate(String dateStr) {
+
+        Date date = CommonUtil.stringParseDate(CommonUtil.getBeginDayOfYear(), "yyyy-MM-dd");
+        Date result = CommonUtil.dateOperation(date, "SUB", "Mon", 2);
+        String s = CommonUtil.dateParseString(result, "yyyy-MM-dd");
+
+        System.out.println("看看业绩列表的查询时间");
+        System.out.println();
+
+        return s;
+    }
+
     private List<PayScaleInfo> historyEG(PayScaleQueryRequestVO requestVO) {
         String practitionerIdEG = requestVO.getPractitionerIdEG();
         Long practitionerId = requestVO.getPractitionerId();
@@ -563,7 +578,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             if (StringUtils.isNotBlank(payScaleInfo.getMonDtlPeriod())) {
                 time = payScaleInfo.getMonDtlPeriod();
                 payScaleInfo.setYears(time.substring(0, 4));
-                payScaleInfo.setMonth(time.substring(-2));
+                payScaleInfo.setMonth(time.substring(4));
             }
 
             resultList.add(payScaleInfo);