From 4e9d1030212f609af6fbbda85be062cbdf89d656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sat, 12 Mar 2022 14:20:39 +0800 Subject: [PATCH] fix bug --- .../AddUpSituationGetDetailListCmd.java | 4 +- .../datacollection/AddUpSituationListCmd.java | 6 +- .../datacollection/dto/AddUpDeductionDTO.java | 2 +- .../dto/AddUpDeductionListDTO.java | 109 ------------------ .../datacollection/dto/AddUpSituationDTO.java | 2 +- .../dto/OtherDeductionListDTO.java | 3 +- .../salary/transmethod/TransMethod.java | 5 + 7 files changed, 13 insertions(+), 118 deletions(-) delete mode 100644 src/com/engine/salary/entity/datacollection/dto/AddUpDeductionListDTO.java diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java index 2646b59a5..479e5d8b1 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java @@ -143,10 +143,10 @@ public class AddUpSituationGetDetailListCmd extends AbstractCommonCommand taxYearMonth = queryParam.getTaxYearMonth(); if (CollectionUtils.isNotEmpty(taxYearMonth)) { if (taxYearMonth.size() == 1) { - sqlWhere += " AND t1.declare_month = '" + taxYearMonth.get(0) + "'"; + sqlWhere += " AND t1.tax_year_month = '" + taxYearMonth.get(0) + "'"; } if (taxYearMonth.size() == 2) { - sqlWhere += " AND (t1.declare_month BETWEEN '" + taxYearMonth.get(0) + "' AND '" + taxYearMonth.get(1) + "')"; + sqlWhere += " AND (t1.tax_year_month BETWEEN '" + taxYearMonth.get(0) + "' AND '" + taxYearMonth.get(1) + "')"; } } //姓名 diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java index 845a5bdff..e587f2db6 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java @@ -33,7 +33,7 @@ public class AddUpSituationListCmd extends AbstractCommonCommand execute(CommandContext commandContext) { String fields = " t1.id," + - " t1.tax_year_month," + + " t1.tax_year_month as taxYearMonth," + " t1.employee_id as employeeId," + " e.lastname as username," + " d.departmentName AS departmentName," + @@ -115,10 +115,10 @@ public class AddUpSituationListCmd extends AbstractCommonCommand taxYearMonth = queryParam.getTaxYearMonth(); if (CollectionUtils.isNotEmpty(taxYearMonth)) { if (taxYearMonth.size() == 1) { - sqlWhere += " AND t1.declare_month = '" + taxYearMonth.get(0) + "'"; + sqlWhere += " AND t1.tax_year_month = '" + taxYearMonth.get(0) + "'"; } if (taxYearMonth.size() == 2) { - sqlWhere += " AND (t1.declare_month BETWEEN '" + taxYearMonth.get(0) + "' AND '" + taxYearMonth.get(1) + "')"; + sqlWhere += " AND (t1.tax_year_month BETWEEN '" + taxYearMonth.get(0) + "' AND '" + taxYearMonth.get(1) + "')"; } } //姓名 diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java index 147bad456..5ee2116f0 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java @@ -89,7 +89,7 @@ public class AddUpDeductionDTO { */ @JsonFormat(pattern = "yyyy-MM-dd") @ExcelProperty(index = 6) - @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate", transmethod = "com.engine.salary.transmethod.TransMethod.timeToDate") + @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate") private Date hiredate; /** diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionListDTO.java deleted file mode 100644 index 65a0a7e99..000000000 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionListDTO.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.engine.salary.entity.datacollection.dto; - -import com.engine.salary.util.excel.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 数据采集-累计专项附加扣除 - *

Copyright: Copyright (c) 2022

- *

Company: 泛微软件

- * - * @author qiantao - * @version 1.0 - **/ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class AddUpDeductionListDTO { - - /** - * 主键id - */ - private Long id; - - /** - * 员工id - */ - private Long employeeId; - - /** - * 姓名 - */ - @ExcelProperty(index = 0) - private String username; - - /** - * 个税扣缴义务人 - */ - @ExcelProperty(index = 1) - private String taxAgentName; - - /** - * 部门 - */ - @ExcelProperty(index = 2) - private String departmentName; - - /** - * 手机号 - */ - @ExcelProperty(index = 3) - private String mobile; - - /** - * 工号 - */ - @ExcelProperty(index = 4) - private String jobNum; - - /** - * 证件号码 - */ - @ExcelProperty(index = 5) - private String idNo; - - /** - * 入职日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ExcelProperty(index = 6) - private Date hiredate; - - /** - * 累计子女教育 - */ - @ExcelProperty(index = 7) - private BigDecimal addUpChildEducation; - - /** - * 累计继续教育 - */ - @ExcelProperty(index = 8) - private BigDecimal addUpContinuingEducation; - - /** - * 累计住房贷款利息 - */ - @ExcelProperty(index = 9) - private BigDecimal addUpHousingLoanInterest; - - /** - * 累计住房租金 - */ - @ExcelProperty(index = 10) - private BigDecimal addUpHousingRent; - - /** - * 累计赡养老人 - */ - @ExcelProperty(index = 11) - private BigDecimal addUpSupportElderly; -} diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java index 188bd2a15..d674f8edf 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java @@ -70,7 +70,7 @@ public class AddUpSituationDTO { private String idNo; //入职日期 - @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate", transmethod = "com.engine.salary.transmethod.TransMethod.timeToDate") + @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate") @ExcelProperty(index = 6) private Date hiredate; diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java index df29ce8f4..362f7200c 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java @@ -38,7 +38,6 @@ public class OtherDeductionListDTO { private Long employeeId; //姓名 - @SalaryTableColumn(text = "姓名", width = "10%", column = "username") @ExcelProperty(index = 0) private String username; @@ -70,7 +69,7 @@ public class OtherDeductionListDTO { //入职日期 @ExcelProperty(index = 6) - @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate", transmethod = "com.engine.salary.transmethod.TransMethod.timeToDate") + @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate") private Date hiredate; //商业健康保险 diff --git a/src/com/engine/salary/transmethod/TransMethod.java b/src/com/engine/salary/transmethod/TransMethod.java index 372803e66..c86b27dd3 100644 --- a/src/com/engine/salary/transmethod/TransMethod.java +++ b/src/com/engine/salary/transmethod/TransMethod.java @@ -31,4 +31,9 @@ public class TransMethod { } return format; } + + + public static String dateToString(String date) { + return date; + } }