qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复mybatis

This commit is contained in:
钱涛 2023-04-11 11:31:20 +08:00
parent bbcaa1a1e8
commit 95c8ee6a4f
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
View File

@ -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) {

5
src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
View File

@ -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;