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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
MustangDeng 2022-05-30 09:14:33 +08:00
parent d48ef0aeec 60ae1ff35b
commit 2ccc30db96
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resource/ecology9/sqlupgrade/SQLServer/sql202205200203.sql
View File

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

10
src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java
View File

@ -173,19 +173,19 @@ public class AddUpDeductionImportCmd extends AbstractCommonCommand<Map<String, O
}
//累计子女教育
BigDecimal addUpChildEducation = dto.getAddUpChildEducation();
String addUpChildEducation = dto.getAddUpChildEducation();
addUpDeduction.setAddUpChildEducation(Util.null2String(addUpChildEducation));
//累计继续教育
BigDecimal addUpContinuingEducation = dto.getAddUpContinuingEducation();
String addUpContinuingEducation = dto.getAddUpContinuingEducation();
addUpDeduction.setAddUpContinuingEducation(Util.null2String(addUpContinuingEducation));
//累计住房贷款利息
BigDecimal addUpHousingLoanInterest = dto.getAddUpHousingLoanInterest();
String addUpHousingLoanInterest = dto.getAddUpHousingLoanInterest();
addUpDeduction.setAddUpHousingLoanInterest(Util.null2String(addUpHousingLoanInterest));
//累计住房租金
BigDecimal addUpHousingRent = dto.getAddUpHousingRent();
String addUpHousingRent = dto.getAddUpHousingRent();
addUpDeduction.setAddUpHousingRent(Util.null2String(addUpHousingRent));
//累计赡养老人
BigDecimal addUpSupportElderly = dto.getAddUpSupportElderly();
String addUpSupportElderly = dto.getAddUpSupportElderly();
addUpDeduction.setAddUpSupportElderly(Util.null2String(addUpSupportElderly));
addUpDeduction.setAddUpIllnessMedical(Util.null2String(dto.getAddUpIllnessMedical()));

16
src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
View File

@ -11,8 +11,6 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 数据采集-累计专项附加扣除
* <p>Copyright: Copyright (c) 2022</p>
@ -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;

13
src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java
View File

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