From 95c8ee6a4f2d85b85964bd9ae06bf820454099d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 11 Apr 2023 11:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmybatis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/report/entity/bo/SalaryStatisticsReportBO.java   | 6 ++----
 .../salary/report/entity/po/SalaryStatisticsReportPO.java   | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
index d4a32742e..b7c9a2ab6 100644
--- a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
+++ b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
@@ -86,8 +86,8 @@ public class SalaryStatisticsReportBO {
      * @param po
      */
     public static void poToQueryParam(SalaryStatisticsReportDataQueryParam param, SalaryStatisticsReportPO po) {
-        param.setSalaryStartMonth(ReportTimeUtil.getFormatYearMonth(po.getSalaryStartMonth()));
-        param.setSalaryEndMonth(ReportTimeUtil.getFormatYearMonth(po.getSalaryEndMonth()));
+//        param.setSalaryStartMonth(ReportTimeUtil.getFormatYearMonth(po.getSalaryStartMonth()));
+//        param.setSalaryEndMonth(ReportTimeUtil.getFormatYearMonth(po.getSalaryEndMonth()));
 
         // todo 待优化
 //        String key = "id";
@@ -822,8 +822,6 @@ public class SalaryStatisticsReportBO {
      *
      * @param dimensionName
      * @param salaryStatisticsItemList
-     * @param employeeId
-     * @param tenantKey
      * @return
      */
     public static List<WeaTableColumn> buildReportColumns(String dimensionName, List<SalaryStatisticsItemPO> salaryStatisticsItemList) {
diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
index 142d18623..8d371dc68 100644
--- a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
+++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Date;
 
@@ -40,10 +39,10 @@ public class SalaryStatisticsReportPO implements Serializable {
     private String dimension;
 
     //薪资所属月-起始")
-    private LocalDate salaryStartMonth;
+    private Date salaryStartMonth;
 
     //薪资所属月-截止")
-    private LocalDate salaryEndMonth;
+    private Date salaryEndMonth;
 
     //个税扣缴义务人配置")
     private String taxAgentSetting;