From 60ae1ff35b9d4ff9b986bad6a053b77c6beaea65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 27 May 2022 18:07:26 +0800 Subject: [PATCH] =?UTF-8?q?sqlserver=20=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlupgrade/SQLServer/sql202205200203.sql | 10 +++++----- .../datacollection/AddUpDeductionImportCmd.java | 10 +++++----- .../datacollection/dto/AddUpDeductionDTO.java | 16 +++++++--------- .../dto/AddUpDeductionRecordDTO.java | 13 ++++++------- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/resource/ecology9/sqlupgrade/SQLServer/sql202205200203.sql b/resource/ecology9/sqlupgrade/SQLServer/sql202205200203.sql index 6c1b01b6f..9025e2c46 100644 --- a/resource/ecology9/sqlupgrade/SQLServer/sql202205200203.sql +++ b/resource/ecology9/sqlupgrade/SQLServer/sql202205200203.sql @@ -1,11 +1,11 @@ ALTER TABLE hrsa_add_up_situation -ADD add_up_illness_medical varchar(255) NULL , -add_up_tax_savings varchar(255) NULL , -add_up_infant_care varchar(255) NULL +ADD add_up_illness_medical varchar(255) NOT NULL DEFAULT ('') , +add_up_tax_savings varchar(255) NOT NULL DEFAULT ('') , +add_up_infant_care varchar(255) NOT NULL DEFAULT ('') GO ALTER TABLE hrsa_add_up_deduction -ADD add_up_illness_medical varchar(255) NULL, -add_up_infant_care varchar(255) NULL +ADD add_up_illness_medical varchar(255) NOT NULL DEFAULT (''), +add_up_infant_care varchar(255) NOT NULL DEFAULT ('') GO \ No newline at end of file diff --git a/src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java index ee7bbebb4..caf885264 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java @@ -173,19 +173,19 @@ public class AddUpDeductionImportCmd extends AbstractCommonCommandCopyright: Copyright (c) 2022

@@ -96,46 +94,46 @@ public class AddUpDeductionDTO { */ @ExcelProperty(index = 7, msg = "第8列，累计子女教育解析错误，请输入数字") @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") - private BigDecimal addUpChildEducation; + private String addUpChildEducation; /** * 累计继续教育 */ @ExcelProperty(index = 8, msg = "第9列，累计继续教育教育解析错误，请输入数字") @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") - private BigDecimal addUpContinuingEducation; + private String addUpContinuingEducation; /** * 累计住房贷款利息 */ @ExcelProperty(index = 9, msg = "第10列，累计住房贷款利息解析错误，请输入数字") @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") - private BigDecimal addUpHousingLoanInterest; + private String addUpHousingLoanInterest; /** * 累计住房租金 */ @ExcelProperty(index = 10, msg = "第11列，累计住房租金解析错误，请输入数字") @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") - private BigDecimal addUpHousingRent; + private String addUpHousingRent; /** * 累计赡养老人 */ @ExcelProperty(index = 11, msg = "第12列，累计赡养老人解析错误，请输入数字") @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") - private BigDecimal addUpSupportElderly; + private String addUpSupportElderly; /** * 累计大病医疗 */ @ExcelProperty(index = 12, msg = "第13列，累计大病医疗解析错误，请输入数字") @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") - private BigDecimal addUpIllnessMedical; + private String addUpIllnessMedical; @ExcelProperty(index = 13, msg = "第14列，累计婴幼儿照护解析错误，请输入数字") @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") - private BigDecimal addUpInfantCare; + private String addUpInfantCare; @SalaryTableColumn(text = "操作", width = "20%", column = "operate") private String operate; diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java index cc3ae1e3f..826d58796 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java @@ -10,7 +10,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.math.BigDecimal; import java.util.Date; @@ -63,39 +62,39 @@ public class AddUpDeductionRecordDTO { */ @ExcelProperty(index = 5) @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") - private BigDecimal addUpChildEducation; + private String addUpChildEducation; /** * 累计继续教育 */ @ExcelProperty(index = 6) @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") - private BigDecimal addUpContinuingEducation; + private String addUpContinuingEducation; /** * 累计住房贷款利息 */ @ExcelProperty(index = 7) @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") - private BigDecimal addUpHousingLoanInterest; + private String addUpHousingLoanInterest; /** * 累计住房租金 */ @ExcelProperty(index = 8) @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") - private BigDecimal addUpHousingRent; + private String addUpHousingRent; /** * 累计赡养老人 */ @ExcelProperty(index = 9) @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") - private BigDecimal addUpSupportElderly; + private String addUpSupportElderly; @ExcelProperty(index = 10) @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") - private BigDecimal addUpIllnessMedical; + private String addUpIllnessMedical; @ExcelProperty(index = 11) @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare")