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

往期累计

This commit is contained in:
钱涛 2023-09-07 18:21:22 +08:00
parent 02100c2ee3
commit 83e0b1668e
6 changed files with 205 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
View File

@ -23,7 +23,6 @@ import lombok.NoArgsConstructor;
public class AddUpSituationDTO { public class AddUpSituationDTO {
//主键id //主键id
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@SalaryTableColumn(column = "id", display = false)
private Long id; private Long id;
//员工id //员工id
@ -36,7 +35,6 @@ public class AddUpSituationDTO {
private Integer month; private Integer month;
//姓名 //姓名
@SalaryTableColumn(text = "姓名", width = "10%", column = "username")
@TableTitle(title = "姓名", dataIndex = "username", key = "username") @TableTitle(title = "姓名", dataIndex = "username", key = "username")
@ExcelProperty(index = 0) @ExcelProperty(index = 0)
private String username; private String username;
@ -45,7 +43,6 @@ public class AddUpSituationDTO {
// private String taxYearMonth; // private String taxYearMonth;
//个税扣缴义务人 //个税扣缴义务人
@SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName")
@TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName") @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName")
@ExcelProperty(index = 1) @ExcelProperty(index = 1)
private String taxAgentName; private String taxAgentName;
@ -56,162 +53,154 @@ public class AddUpSituationDTO {
private Long taxAgentId; private Long taxAgentId;
//部门 //部门
@SalaryTableColumn(text = "部门", width = "10%", column = "departmentName")
@TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName")
@ExcelProperty(index = 2) @ExcelProperty(index = 2)
private String departmentName; private String departmentName;
//手机号 //手机号
@SalaryTableColumn(text = "手机号", width = "10%", column = "mobile")
@TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile") @TableTitle(title = "手机号", dataIndex = "mobile", key = "mobile")
@ExcelProperty(index = 3) @ExcelProperty(index = 3)
private String mobile; private String mobile;
//工号 //工号
@SalaryTableColumn(text = "工号", width = "10%", column = "jobNum")
@TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum")
@ExcelProperty(index = 4) @ExcelProperty(index = 4)
private String jobNum; private String jobNum;
//证件号码 //证件号码
@SalaryTableColumn(text = "证件号码", width = "10%", column = "idNo")
@TableTitle(title = "证件号码", dataIndex = "idNo", key = "idNo") @TableTitle(title = "证件号码", dataIndex = "idNo", key = "idNo")
@ExcelProperty(index = 5) @ExcelProperty(index = 5)
private String idNo; private String idNo;
//入职日期 //入职日期
@SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate")
@TableTitle(title = "入职日期", dataIndex = "hiredate", key = "hiredate") @TableTitle(title = "入职日期", dataIndex = "hiredate", key = "hiredate")
@ExcelProperty(index = 6) @ExcelProperty(index = 6)
private String hiredate; private String hiredate;
//累计收入额 //累计收入额
@SalaryTableColumn(text = "累计收入额", width = "10%", column = "addUpIncome")
@TableTitle(title = "累计收入额", dataIndex = "addUpIncome", key = "addUpIncome") @TableTitle(title = "累计收入额", dataIndex = "addUpIncome", key = "addUpIncome")
@ExcelProperty(index = 7) @ExcelProperty(index = 7)
@Encrypt @Encrypt
private String addUpIncome; private String addUpIncome;
//累计减除费用 //累计减除费用
@SalaryTableColumn(text = "累计减除费用", width = "10%", column = "addUpSubtraction")
@TableTitle(title = "累计减除费用", dataIndex = "addUpSubtraction", key = "addUpSubtraction") @TableTitle(title = "累计减除费用", dataIndex = "addUpSubtraction", key = "addUpSubtraction")
@ExcelProperty(index = 8) @ExcelProperty(index = 8)
@Encrypt @Encrypt
private String addUpSubtraction; private String addUpSubtraction;
//累计社保个人合计 //累计社保个人合计
@SalaryTableColumn(text = "累计社保个人合计", width = "10%", column = "addUpSocialSecurityTotal")
@TableTitle(title = "累计社保个人合计", dataIndex = "addUpSocialSecurityTotal", key = "addUpSocialSecurityTotal") @TableTitle(title = "累计社保个人合计", dataIndex = "addUpSocialSecurityTotal", key = "addUpSocialSecurityTotal")
@ExcelProperty(index = 9) @ExcelProperty(index = 9)
@Encrypt @Encrypt
private String addUpSocialSecurityTotal; private String addUpSocialSecurityTotal;
//累计公积金个人合计 //累计公积金个人合计
@SalaryTableColumn(text = "累计公积金个人合计", width = "10%", column = "addUpAccumulationFundTotal")
@TableTitle(title = "累计公积金个人合计", dataIndex = "addUpAccumulationFundTotal", key = "addUpAccumulationFundTotal") @TableTitle(title = "累计公积金个人合计", dataIndex = "addUpAccumulationFundTotal", key = "addUpAccumulationFundTotal")
@ExcelProperty(index = 10) @ExcelProperty(index = 10)
@Encrypt @Encrypt
private String addUpAccumulationFundTotal; private String addUpAccumulationFundTotal;
//累计子女教育 //累计子女教育
@SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation")
@TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation")
@ExcelProperty(index = 11)
@Encrypt @Encrypt
@Deprecated
private String addUpChildEducation; private String addUpChildEducation;
//累计继续教育 //累计继续教育
@SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation")
@TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation")
@ExcelProperty(index = 12)
@Encrypt @Encrypt
@Deprecated
private String addUpContinuingEducation; private String addUpContinuingEducation;
//累计住房贷款利息 //累计住房贷款利息
@SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest")
@TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest")
@ExcelProperty(index = 13)
@Encrypt @Encrypt
@Deprecated
private String addUpHousingLoanInterest; private String addUpHousingLoanInterest;
//累计住房租金 //累计住房租金
@SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent")
@TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent")
@ExcelProperty(index = 14)
@Encrypt @Encrypt
@Deprecated
private String addUpHousingRent; private String addUpHousingRent;
//累计赡养老人 //累计赡养老人
@SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly")
@TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly")
@ExcelProperty(index = 15)
@Encrypt @Encrypt
@Deprecated
private String addUpSupportElderly; private String addUpSupportElderly;
//累计大病医疗 //累计大病医疗
@SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical")
@TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical")
@ExcelProperty(index = 16)
@Encrypt @Encrypt
@Deprecated
private String addUpIllnessMedical; private String addUpIllnessMedical;
//累计企业（职业）年金及其他福利 //累计企业（职业）年金及其他福利
@SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther")
@TableTitle(title = "累计企业（职业）年金及其他福利", dataIndex = "addUpEnterpriseAndOther", key = "addUpEnterpriseAndOther") @TableTitle(title = "累计企业（职业）年金及其他福利", dataIndex = "addUpEnterpriseAndOther", key = "addUpEnterpriseAndOther")
@ExcelProperty(index = 17) @ExcelProperty(index = 11)
@Encrypt @Encrypt
private String addUpEnterpriseAndOther; private String addUpEnterpriseAndOther;
//累计其他扣除 //累计其他扣除
@SalaryTableColumn(text = "累计其他扣除", width = "10%", column = "addUpOtherDeduction") @TableTitle(title = "累计其他免税扣除", dataIndex = "addUpOtherDeduction", key = "addUpOtherDeduction")
@TableTitle(title = "累计其他扣除", dataIndex = "addUpOtherDeduction", key = "addUpOtherDeduction") @ExcelProperty(index = 12)
@ExcelProperty(index = 18)
@Encrypt @Encrypt
private String addUpOtherDeduction; private String addUpOtherDeduction;
//累计免税收入 //累计免税收入
@SalaryTableColumn(text = "累计免税收入", width = "10%", column = "addUpTaxExemptIncome")
@TableTitle(title = "累计免税收入", dataIndex = "addUpTaxExemptIncome", key = "addUpTaxExemptIncome") @TableTitle(title = "累计免税收入", dataIndex = "addUpTaxExemptIncome", key = "addUpTaxExemptIncome")
@ExcelProperty(index = 19) @ExcelProperty(index = 13)
@Encrypt @Encrypt
private String addUpTaxExemptIncome; private String addUpTaxExemptIncome;
//累计准予扣除的捐赠额 //累计准予扣除的捐赠额
@SalaryTableColumn(text = "累计准予扣除的捐赠额", width = "10%", column = "addUpAllowedDonation")
@TableTitle(title = "累计准予扣除的捐赠额", dataIndex = "addUpAllowedDonation", key = "addUpAllowedDonation") @TableTitle(title = "累计准予扣除的捐赠额", dataIndex = "addUpAllowedDonation", key = "addUpAllowedDonation")
@ExcelProperty(index = 20) @ExcelProperty(index = 14)
@Encrypt @Encrypt
private String addUpAllowedDonation; private String addUpAllowedDonation;
//累计减免税额 //累计减免税额
@SalaryTableColumn(text = "累计减免税额", width = "10%", column = "addUpTaxSavings")
@TableTitle(title = "累计减免税额", dataIndex = "addUpTaxSavings", key = "addUpTaxSavings") @TableTitle(title = "累计减免税额", dataIndex = "addUpTaxSavings", key = "addUpTaxSavings")
@ExcelProperty(index = 21) @ExcelProperty(index = 15)
@Encrypt @Encrypt
private String addUpTaxSavings; private String addUpTaxSavings;
//累计已预扣预缴税额 //累计已预扣预缴税额
@SalaryTableColumn(text = "累计已预扣预缴税额", width = "10%", column = "addUpAdvanceTax")
@TableTitle(title = "累计已预扣预缴税额", dataIndex = "addUpAdvanceTax", key = "addUpAdvanceTax") @TableTitle(title = "累计已预扣预缴税额", dataIndex = "addUpAdvanceTax", key = "addUpAdvanceTax")
@ExcelProperty(index = 22) @ExcelProperty(index = 16)
@Encrypt @Encrypt
private String addUpAdvanceTax; private String addUpAdvanceTax;
//累计婴幼儿照护 //累计婴幼儿照护
@ExcelProperty(index = 23)
@SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare")
@TableTitle(title = "累计婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare")
@Encrypt @Encrypt
@Deprecated
private String addUpInfantCare; private String addUpInfantCare;
//累计个人养老金 //累计个人养老金
@ExcelProperty(index = 24)
@SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension")
@TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension")
@Encrypt @Encrypt
@Deprecated
private String addUpPrivatePension; private String addUpPrivatePension;
@SalaryTableColumn(text = "操作", width = "20%", column = "operate") /**
* 实际累计已预扣预缴税额
*/
@ExcelProperty(index = 17)
@TableTitle(title = "实际累计已预扣预缴税额", dataIndex = "actualAddUpAdvanceTax", key = "actualAddUpAdvanceTax")
@Encrypt
private String actualAddUpAdvanceTax;
/**
* 个税调差
*/
@ExcelProperty(index = 18)
@TableTitle(title = "个税调差", dataIndex = "taxAdjustment", key = "taxAdjustment")
@Encrypt
private String taxAdjustment;
/**
* 累计应纳税所得额
*/
@ExcelProperty(index = 19)
@TableTitle(title = "累计应纳税所得额", dataIndex = "addUpTaxableIncome", key = "addUpTaxableIncome")
@Encrypt
private String addUpTaxableIncome;
@TableTitle(title = "操作", dataIndex = "operate", key = "operate") @TableTitle(title = "操作", dataIndex = "operate", key = "operate")
private String operate; private String operate;
} }

107
src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java
View File

@ -69,111 +69,128 @@ public class AddUpSituationRecordDTO {
@ExcelProperty(index = 5) @ExcelProperty(index = 5)
private String jobNum; private String jobNum;
@SalaryTableColumn(text = "累计收入额", width = "10%", column = "addUpIncome") //累计收入额
@TableTitle(title = "累计收入额", dataIndex = "addUpIncome", key = "addUpIncome") @TableTitle(title = "累计收入额", dataIndex = "addUpIncome", key = "addUpIncome")
@ExcelProperty(index = 6) @ExcelProperty(index = 7)
@Encrypt @Encrypt
private String addUpIncome; private String addUpIncome;
@SalaryTableColumn(text = "累计减除费用", width = "10%", column = "addUpSubtraction") //累计减除费用
@TableTitle(title = "累计减除费用", dataIndex = "addUpSubtraction", key = "addUpSubtraction") @TableTitle(title = "累计减除费用", dataIndex = "addUpSubtraction", key = "addUpSubtraction")
@ExcelProperty(index = 7) @ExcelProperty(index = 8)
@Encrypt @Encrypt
private String addUpSubtraction; private String addUpSubtraction;
@SalaryTableColumn(text = "累计社保个人合计", width = "10%", column = "addUpSocialSecurityTotal") //累计社保个人合计
@TableTitle(title = "累计社保个人合计", dataIndex = "addUpSocialSecurityTotal", key = "addUpSocialSecurityTotal") @TableTitle(title = "累计社保个人合计", dataIndex = "addUpSocialSecurityTotal", key = "addUpSocialSecurityTotal")
@ExcelProperty(index = 8) @ExcelProperty(index = 9)
@Encrypt @Encrypt
private String addUpSocialSecurityTotal; private String addUpSocialSecurityTotal;
@SalaryTableColumn(text = "累计公积金个人合计", width = "10%", column = "addUpAccumulationFundTotal") //累计公积金个人合计
@TableTitle(title = "累计公积金个人合计", dataIndex = "addUpAccumulationFundTotal", key = "addUpAccumulationFundTotal") @TableTitle(title = "累计公积金个人合计", dataIndex = "addUpAccumulationFundTotal", key = "addUpAccumulationFundTotal")
@ExcelProperty(index = 9) @ExcelProperty(index = 10)
@Encrypt @Encrypt
private String addUpAccumulationFundTotal; private String addUpAccumulationFundTotal;
@ExcelProperty(index = 10) //累计子女教育
@SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation")
@TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation")
@Encrypt @Encrypt
@Deprecated
private String addUpChildEducation; private String addUpChildEducation;
@ExcelProperty(index = 11) //累计继续教育
@SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation")
@TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation")
@Encrypt @Encrypt
@Deprecated
private String addUpContinuingEducation; private String addUpContinuingEducation;
@ExcelProperty(index = 12) //累计住房贷款利息
@SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest")
@TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest")
@Encrypt @Encrypt
@Deprecated
private String addUpHousingLoanInterest; private String addUpHousingLoanInterest;
@ExcelProperty(index = 13) //累计住房租金
@SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent")
@TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent")
@Encrypt @Encrypt
@Deprecated
private String addUpHousingRent; private String addUpHousingRent;
@ExcelProperty(index = 14) //累计赡养老人
@SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly")
@TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly")
@Encrypt @Encrypt
@Deprecated
private String addUpSupportElderly; private String addUpSupportElderly;
@ExcelProperty(index = 15) //累计大病医疗
@SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical")
@TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical")
@Encrypt @Encrypt
@Deprecated
private String addUpIllnessMedical; private String addUpIllnessMedical;
@ExcelProperty(index = 16) //累计企业（职业）年金及其他福利
@SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther")
@TableTitle(title = "累计企业（职业）年金及其他福利", dataIndex = "addUpEnterpriseAndOther", key = "addUpEnterpriseAndOther") @TableTitle(title = "累计企业（职业）年金及其他福利", dataIndex = "addUpEnterpriseAndOther", key = "addUpEnterpriseAndOther")
@ExcelProperty(index = 11)
@Encrypt @Encrypt
private String addUpEnterpriseAndOther; private String addUpEnterpriseAndOther;
@ExcelProperty(index = 17) //累计其他扣除
@SalaryTableColumn(text = "累计其他扣除", width = "10%", column = "addUpOtherDeduction") @TableTitle(title = "累计其他免税扣除", dataIndex = "addUpOtherDeduction", key = "addUpOtherDeduction")
@TableTitle(title = "累计其他扣除", dataIndex = "addUpOtherDeduction", key = "addUpOtherDeduction") @ExcelProperty(index = 12)
@Encrypt @Encrypt
private String addUpOtherDeduction; private String addUpOtherDeduction;
@ExcelProperty(index = 18) //累计免税收入
@SalaryTableColumn(text = "累计免税收入", width = "10%", column = "addUpTaxExemptIncome")
@TableTitle(title = "累计免税收入", dataIndex = "addUpTaxExemptIncome", key = "addUpTaxExemptIncome") @TableTitle(title = "累计免税收入", dataIndex = "addUpTaxExemptIncome", key = "addUpTaxExemptIncome")
@ExcelProperty(index = 13)
@Encrypt @Encrypt
private String addUpTaxExemptIncome; private String addUpTaxExemptIncome;
@ExcelProperty(index = 19) //累计准予扣除的捐赠额
@SalaryTableColumn(text = "累计准予扣除的捐赠额", width = "10%", column = "addUpAllowedDonation")
@TableTitle(title = "累计准予扣除的捐赠额", dataIndex = "addUpAllowedDonation", key = "addUpAllowedDonation") @TableTitle(title = "累计准予扣除的捐赠额", dataIndex = "addUpAllowedDonation", key = "addUpAllowedDonation")
@ExcelProperty(index = 14)
@Encrypt @Encrypt
private String addUpAllowedDonation; private String addUpAllowedDonation;
@ExcelProperty(index = 20) //累计减免税额
@SalaryTableColumn(text = "累计减免税额", width = "10%", column = "addUpTaxSavings")
@TableTitle(title = "累计减免税额", dataIndex = "addUpTaxSavings", key = "addUpTaxSavings") @TableTitle(title = "累计减免税额", dataIndex = "addUpTaxSavings", key = "addUpTaxSavings")
@ExcelProperty(index = 15)
@Encrypt @Encrypt
private String addUpTaxSavings; private String addUpTaxSavings;
@ExcelProperty(index = 21) //累计已预扣预缴税额
@SalaryTableColumn(text = "累计已预扣预缴税额", width = "10%", column = "addUpAdvanceTax")
@TableTitle(title = "累计已预扣预缴税额", dataIndex = "addUpAdvanceTax", key = "addUpAdvanceTax") @TableTitle(title = "累计已预扣预缴税额", dataIndex = "addUpAdvanceTax", key = "addUpAdvanceTax")
@ExcelProperty(index = 16)
@Encrypt @Encrypt
private String addUpAdvanceTax; private String addUpAdvanceTax;
@ExcelProperty(index = 22) //累计婴幼儿照护
@SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare")
@TableTitle(title = "累计婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare")
@Encrypt @Encrypt
@Deprecated
private String addUpInfantCare; private String addUpInfantCare;
@ExcelProperty(index = 23) //累计个人养老金
@SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension")
@TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension")
@Encrypt @Encrypt
@Deprecated
private String addUpPrivatePension; private String addUpPrivatePension;
/**
* 实际累计已预扣预缴税额
*/
@ExcelProperty(index = 17)
@TableTitle(title = "实际累计已预扣预缴税额", dataIndex = "actualAddUpAdvanceTax", key = "actualAddUpAdvanceTax")
@Encrypt
private String actualAddUpAdvanceTax;
/**
* 个税调差
*/
@ExcelProperty(index = 18)
@TableTitle(title = "个税调差", dataIndex = "taxAdjustment", key = "taxAdjustment")
@Encrypt
private String taxAdjustment;
/**
* 累计应纳税所得额
*/
@ExcelProperty(index = 19)
@TableTitle(title = "累计应纳税所得额", dataIndex = "addUpTaxableIncome", key = "addUpTaxableIncome")
@Encrypt
private String addUpTaxableIncome;
} }

9
src/com/engine/salary/entity/datacollection/param/AddUpSituationParam.java
View File

@ -98,4 +98,13 @@ public class AddUpSituationParam {
//累计个人养老金 //累计个人养老金
private String addUpPrivatePension; private String addUpPrivatePension;
//实际累计已预扣预缴税额
private String actualAddUpAdvanceTax;
//个税调差
private String taxAdjustment;
//累计应纳税所得额
private String addUpTaxableIncome;
} }

2
src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationCommon.java
View File

@ -160,7 +160,7 @@ public class TaxDeclarationCommon implements TaxDeclarationStrategy {
.addUpTaxExemptIncome(valueMap.get("addUpTaxExemptIncome")) .addUpTaxExemptIncome(valueMap.get("addUpTaxExemptIncome"))
.addUpAllowedDonation(valueMap.get("addUpAllowedDonation")) .addUpAllowedDonation(valueMap.get("addUpAllowedDonation"))
.addUpAdvanceTax(valueMap.get("addUpAdvanceTax")) .addUpAdvanceTax(valueMap.get("addUpAdvanceTax"))
// .addUpTaxableIncome(valueMap.get("addUpTaxableIncome")) .addUpTaxableIncome(valueMap.get("addUpTaxableIncome"))
// .modifier(taxDeclaration.getCreator()) // .modifier(taxDeclaration.getCreator())
.creator(taxDeclaration.getCreator()) .creator(taxDeclaration.getCreator())
.createTime(taxDeclaration.getCreateTime()) .createTime(taxDeclaration.getCreateTime())

62
src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml
View File

@ -20,6 +20,9 @@
<result column="add_up_tax_savings" property="addUpTaxSavings"/> <result column="add_up_tax_savings" property="addUpTaxSavings"/>
<result column="add_up_infant_care" property="addUpInfantCare"/> <result column="add_up_infant_care" property="addUpInfantCare"/>
<result column="add_up_private_pension" property="addUpPrivatePension"/> <result column="add_up_private_pension" property="addUpPrivatePension"/>
<result column="actual_add_up_advance_tax" property="actualAddUpAdvanceTax"/>
<result column="tax_adjustment" property="taxAdjustment"/>
<result column="add_up_taxable_income" property="addUpTaxableIncome"/>
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="creator" property="creator"/> <result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/> <result column="delete_type" property="deleteType"/>
@ -64,6 +67,9 @@
, t.add_up_tax_savings , t.add_up_tax_savings
, t.add_up_infant_care , t.add_up_infant_care
, t.add_up_private_pension , t.add_up_private_pension
, t.actual_add_up_advance_tax
, t.tax_adjustment
, t.add_up_taxable_income
</sql> </sql>
<!--批量删除--> <!--批量删除-->
@ -126,7 +132,10 @@
t1.add_up_tax_exempt_income, t1.add_up_tax_exempt_income,
t1.add_up_allowed_donation, t1.add_up_allowed_donation,
t1.add_up_tax_savings, t1.add_up_tax_savings,
t1.add_up_advance_tax t1.add_up_advance_tax,
t1.actual_add_up_advance_tax,
t1.tax_adjustment,
t1.add_up_taxable_income
</sql> </sql>
<sql id="paramSql"> <sql id="paramSql">
@ -438,7 +447,10 @@
add_up_tax_savings, add_up_tax_savings,
add_up_illness_medical, add_up_illness_medical,
add_up_infant_care, add_up_infant_care,
add_up_private_pension add_up_private_pension,
actual_add_up_advance_tax,
tax_adjustment,
add_up_taxable_income
) )
VALUES VALUES
<foreach collection="collection" item="item" separator=","> <foreach collection="collection" item="item" separator=",">
@ -468,7 +480,10 @@
#{item.addUpTaxSavings}, #{item.addUpTaxSavings},
#{item.addUpIllnessMedical}, #{item.addUpIllnessMedical},
#{item.addUpInfantCare}, #{item.addUpInfantCare},
#{item.addUpPrivatePension} #{item.addUpPrivatePension},
#{item.actualAddUpAdvanceTax},
#{item.taxAdjustment},
#{item.addUpTaxableIncome}
) )
</foreach> </foreach>
</insert> </insert>
@ -499,7 +514,10 @@
add_up_tax_savings, add_up_tax_savings,
add_up_illness_medical, add_up_illness_medical,
add_up_infant_care, add_up_infant_care,
add_up_private_pension add_up_private_pension,
actual_add_up_advance_tax,
tax_adjustment,
add_up_taxable_income
) )
<foreach collection="collection" item="item" separator="union all"> <foreach collection="collection" item="item" separator="union all">
@ -529,7 +547,10 @@
#{item.addUpTaxSavings,jdbcType=VARCHAR}, #{item.addUpTaxSavings,jdbcType=VARCHAR},
#{item.addUpIllnessMedical,jdbcType=VARCHAR}, #{item.addUpIllnessMedical,jdbcType=VARCHAR},
#{item.addUpInfantCare,jdbcType=VARCHAR}, #{item.addUpInfantCare,jdbcType=VARCHAR},
#{item.addUpPrivatePension,jdbcType=VARCHAR} #{item.addUpPrivatePension,jdbcType=VARCHAR},
#{item.actualAddUpAdvanceTax,jdbcType=VARCHAR},
#{item.taxAdjustment,jdbcType=VARCHAR},
#{item.addUpTaxableIncome,jdbcType=VARCHAR}
from dual from dual
</foreach> </foreach>
</insert> </insert>
@ -561,7 +582,10 @@
add_up_tax_savings, add_up_tax_savings,
add_up_illness_medical, add_up_illness_medical,
add_up_infant_care, add_up_infant_care,
add_up_private_pension add_up_private_pension,
actual_add_up_advance_tax,
tax_adjustment,
add_up_taxable_income
) )
VALUES VALUES
( (
@ -590,7 +614,10 @@
#{item.addUpTaxSavings}, #{item.addUpTaxSavings},
#{item.addUpIllnessMedical}, #{item.addUpIllnessMedical},
#{item.addUpInfantCare}, #{item.addUpInfantCare},
#{item.addUpPrivatePension} #{item.addUpPrivatePension},
#{item.actualAddUpAdvanceTax},
#{item.taxAdjustment},
#{item.addUpTaxableIncome}
) )
</foreach> </foreach>
</insert> </insert>
@ -724,6 +751,27 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="actual_add_up_advance_tax =case" suffix="end,">
<foreach collection="collection" item="item" index="index">
<if test="item.actualAddUpAdvanceTax!=null">
when id=#{item.id} then #{item.actualAddUpAdvanceTax}
</if>
</foreach>
</trim>
<trim prefix="tax_adjustment =case" suffix="end,">
<foreach collection="collection" item="item" index="index">
<if test="item.taxAdjustment!=null">
when id=#{item.id} then #{item.taxAdjustment}
</if>
</foreach>
</trim>
<trim prefix="add_up_taxable_income =case" suffix="end,">
<foreach collection="collection" item="item" index="index">
<if test="item.addUpTaxableIncome!=null">
when id=#{item.id} then #{item.addUpTaxableIncome}
</if>
</foreach>
</trim>
</trim> </trim>
where where
id in id in

93
src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
View File

@ -298,8 +298,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
long employeeId = user.getUID(); long employeeId = user.getUID();
// excel标题 // excel标题
final List<String> title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计收入额", "累计减除费用", final List<String> title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计收入额", "累计减除费用",
"累计社保个人合计", "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计社保个人合计", "累计公积金个人合计", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额",
"累计大病医疗", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护", "累计个人养老金"); "累计已预扣预缴税额", "实际累计已预扣预缴税额", "个税调差", "累计应纳税所得额");
//排序配置 //排序配置
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
@ -329,20 +329,15 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
cellList.add(Util.null2String(dto.getAddUpSubtraction())); cellList.add(Util.null2String(dto.getAddUpSubtraction()));
cellList.add(Util.null2String(dto.getAddUpSocialSecurityTotal())); cellList.add(Util.null2String(dto.getAddUpSocialSecurityTotal()));
cellList.add(Util.null2String(dto.getAddUpAccumulationFundTotal())); cellList.add(Util.null2String(dto.getAddUpAccumulationFundTotal()));
cellList.add(Util.null2String(dto.getAddUpChildEducation()));
cellList.add(Util.null2String(dto.getAddUpContinuingEducation()));
cellList.add(Util.null2String(dto.getAddUpHousingLoanInterest()));
cellList.add(Util.null2String(dto.getAddUpHousingRent()));
cellList.add(Util.null2String(dto.getAddUpSupportElderly()));
cellList.add(Util.null2String(dto.getAddUpIllnessMedical()));
cellList.add(Util.null2String(dto.getAddUpEnterpriseAndOther())); cellList.add(Util.null2String(dto.getAddUpEnterpriseAndOther()));
cellList.add(Util.null2String(dto.getAddUpOtherDeduction())); cellList.add(Util.null2String(dto.getAddUpOtherDeduction()));
cellList.add(Util.null2String(dto.getAddUpTaxExemptIncome())); cellList.add(Util.null2String(dto.getAddUpTaxExemptIncome()));
cellList.add(Util.null2String(dto.getAddUpAllowedDonation())); cellList.add(Util.null2String(dto.getAddUpAllowedDonation()));
cellList.add(Util.null2String(dto.getAddUpTaxSavings())); cellList.add(Util.null2String(dto.getAddUpTaxSavings()));
cellList.add(Util.null2String(dto.getAddUpAdvanceTax())); cellList.add(Util.null2String(dto.getAddUpAdvanceTax()));
cellList.add(Util.null2String(dto.getAddUpInfantCare())); cellList.add(Util.null2String(dto.getActualAddUpAdvanceTax()));
cellList.add(Util.null2String(dto.getAddUpPrivatePension())); cellList.add(Util.null2String(dto.getTaxAdjustment()));
cellList.add(Util.null2String(dto.getAddUpTaxableIncome()));
return cellList; return cellList;
}).collect(Collectors.toList())) }).collect(Collectors.toList()))
.orElse(Collections.emptyList()); .orElse(Collections.emptyList());
@ -363,9 +358,9 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
private List<List<String>> getExcelRowDetailList(AddUpSituationQueryParam param) { private List<List<String>> getExcelRowDetailList(AddUpSituationQueryParam param) {
long employeeId = user.getUID(); long employeeId = user.getUID();
//excel标题 //excel标题
List<String> title = Arrays.asList("姓名", "税款所属期", "个税扣缴义务人", "部门", "手机号", "工号", "累计收入额", "累计减除费用", "累计社保个人合计", List<String> title = Arrays.asList("姓名", "税款所属期", "个税扣缴义务人", "部门", "手机号", "工号", "累计收入额", "累计减除费用",
"累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计企业（职业）年金及其他福利", "累计社保个人合计", "累计公积金个人合计", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额",
"累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护", "累计个人养老金"); "累计已预扣预缴税额", "实际累计已预扣预缴税额", "个税调差", "累计应纳税所得额");
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
//查询详细信息 //查询详细信息
@ -393,20 +388,15 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
cellList.add(Util.null2String(dto.getAddUpSubtraction())); cellList.add(Util.null2String(dto.getAddUpSubtraction()));
cellList.add(Util.null2String(dto.getAddUpSocialSecurityTotal())); cellList.add(Util.null2String(dto.getAddUpSocialSecurityTotal()));
cellList.add(Util.null2String(dto.getAddUpAccumulationFundTotal())); cellList.add(Util.null2String(dto.getAddUpAccumulationFundTotal()));
cellList.add(Util.null2String(dto.getAddUpChildEducation()));
cellList.add(Util.null2String(dto.getAddUpContinuingEducation()));
cellList.add(Util.null2String(dto.getAddUpHousingLoanInterest()));
cellList.add(Util.null2String(dto.getAddUpHousingRent()));
cellList.add(Util.null2String(dto.getAddUpSupportElderly()));
cellList.add(Util.null2String(dto.getAddUpIllnessMedical()));
cellList.add(Util.null2String(dto.getAddUpEnterpriseAndOther())); cellList.add(Util.null2String(dto.getAddUpEnterpriseAndOther()));
cellList.add(Util.null2String(dto.getAddUpOtherDeduction())); cellList.add(Util.null2String(dto.getAddUpOtherDeduction()));
cellList.add(Util.null2String(dto.getAddUpTaxExemptIncome())); cellList.add(Util.null2String(dto.getAddUpTaxExemptIncome()));
cellList.add(Util.null2String(dto.getAddUpAllowedDonation())); cellList.add(Util.null2String(dto.getAddUpAllowedDonation()));
cellList.add(Util.null2String(dto.getAddUpTaxSavings())); cellList.add(Util.null2String(dto.getAddUpTaxSavings()));
cellList.add(Util.null2String(dto.getAddUpAdvanceTax())); cellList.add(Util.null2String(dto.getAddUpAdvanceTax()));
cellList.add(Util.null2String(dto.getAddUpInfantCare())); cellList.add(Util.null2String(dto.getActualAddUpAdvanceTax()));
cellList.add(Util.null2String(dto.getAddUpPrivatePension())); cellList.add(Util.null2String(dto.getTaxAdjustment()));
cellList.add(Util.null2String(dto.getAddUpTaxableIncome()));
return cellList; return cellList;
}).collect(Collectors.toList())) }).collect(Collectors.toList()))
.orElse(Collections.emptyList()); .orElse(Collections.emptyList());
@ -470,20 +460,15 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
SalaryI18nUtil.getI18nLabel(86711, "累计减除费用"), SalaryI18nUtil.getI18nLabel(86711, "累计减除费用"),
SalaryI18nUtil.getI18nLabel(86710, "累计社保个人合计"), SalaryI18nUtil.getI18nLabel(86710, "累计社保个人合计"),
SalaryI18nUtil.getI18nLabel(86709, "累计公积金个人合计"), SalaryI18nUtil.getI18nLabel(86709, "累计公积金个人合计"),
SalaryI18nUtil.getI18nLabel(86321, "累计子女教育"),
SalaryI18nUtil.getI18nLabel(86323, "累计继续教育"),
SalaryI18nUtil.getI18nLabel(86324, "累计住房贷款利息"),
SalaryI18nUtil.getI18nLabel(86325, "累计住房租金"),
SalaryI18nUtil.getI18nLabel(86326, "累计赡养老人"),
SalaryI18nUtil.getI18nLabel(105142, "累计大病医疗"),
SalaryI18nUtil.getI18nLabel(90567, "累计企业（职业）年金及其他福利"), SalaryI18nUtil.getI18nLabel(90567, "累计企业（职业）年金及其他福利"),
SalaryI18nUtil.getI18nLabel(93902, "累计其他免税扣除"), SalaryI18nUtil.getI18nLabel(93902, "累计其他免税扣除"),
SalaryI18nUtil.getI18nLabel(86704, "累计免税收入"), SalaryI18nUtil.getI18nLabel(86704, "累计免税收入"),
SalaryI18nUtil.getI18nLabel(86703, "累计准予扣除的捐赠额"), SalaryI18nUtil.getI18nLabel(86703, "累计准予扣除的捐赠额"),
SalaryI18nUtil.getI18nLabel(105478, "累计减免税额"), SalaryI18nUtil.getI18nLabel(105478, "累计减免税额"),
SalaryI18nUtil.getI18nLabel(86702, "累计已预扣预缴税额"), SalaryI18nUtil.getI18nLabel(86702, "累计已预扣预缴税额"),
SalaryI18nUtil.getI18nLabel(86702, "累计婴幼儿照护"), SalaryI18nUtil.getI18nLabel(86702, "实际累计已预扣预缴税额"),
SalaryI18nUtil.getI18nLabel(86702, "累计个人养老金") SalaryI18nUtil.getI18nLabel(86702, "个税调差"),
SalaryI18nUtil.getI18nLabel(86702, "累计应纳税所得额")
}; };
// 2.表头 // 2.表头
List<Object> headerList = Arrays.asList(header); List<Object> headerList = Arrays.asList(header);
@ -521,23 +506,6 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
row.add(Util.null2String(dto.getJobNum())); row.add(Util.null2String(dto.getJobNum()));
row.add(Util.null2String(dto.getIdNo())); row.add(Util.null2String(dto.getIdNo()));
row.add(Util.null2String(dto.getHiredate())); row.add(Util.null2String(dto.getHiredate()));
// row.add(Util.null2String(dto.getAddUpIncome()));
// row.add(Util.null2String(dto.getAddUpSubtraction()));
// row.add(Util.null2String(dto.getAddUpSocialSecurityTotal()));
// row.add(Util.null2String(dto.getAddUpAccumulationFundTotal()));
// row.add(Util.null2String(dto.getAddUpChildEducation()));
// row.add(Util.null2String(dto.getAddUpContinuingEducation()));
// row.add(Util.null2String(dto.getAddUpHousingLoanInterest()));
// row.add(Util.null2String(dto.getAddUpHousingRent()));
// row.add(Util.null2String(dto.getAddUpSupportElderly()));
// row.add(Util.null2String(dto.getAddUpIllnessMedical()));
// row.add(Util.null2String(dto.getAddUpEnterpriseAndOther()));
// row.add(Util.null2String(dto.getAddUpOtherDeduction()));
// row.add(Util.null2String(dto.getAddUpTaxExemptIncome()));
// row.add(Util.null2String(dto.getAddUpAllowedDonation()));
// row.add(Util.null2String(dto.getAddUpTaxSavings()));
// row.add(Util.null2String(dto.getAddUpAdvanceTax()));
// row.add(Util.null2String(dto.getAddUpInfantCare()));
rows.add(row); rows.add(row);
} }
// 4.注释 // 4.注释
@ -557,11 +525,6 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
excelComments.add(new ExcelComment(17, 0, 22, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); excelComments.add(new ExcelComment(17, 0, 22, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(18, 0, 23, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); excelComments.add(new ExcelComment(18, 0, 23, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(19, 0, 24, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); excelComments.add(new ExcelComment(19, 0, 24, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(20, 0, 25, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(21, 0, 26, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(22, 0, 27, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(23, 0, 28, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
excelComments.add(new ExcelComment(24, 0, 29, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字")));
return ExcelUtil.genWorkbookV2(rows, sheetName, excelComments); return ExcelUtil.genWorkbookV2(rows, sheetName, excelComments);
} }
@ -596,7 +559,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
InputStream fileInputStream = null; InputStream fileInputStream = null;
try { try {
fileInputStream = ImageFileManager.getInputStreamById(Integer.valueOf(imageId)); fileInputStream = ImageFileManager.getInputStreamById(Integer.valueOf(imageId));
List<AddUpSituationDTO> excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 25, "template.xlsx"); List<AddUpSituationDTO> excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 20, "template.xlsx");
apidatas.put("preview", excelDates); apidatas.put("preview", excelDates);
} finally { } finally {
IOUtils.closeQuietly(fileInputStream); IOUtils.closeQuietly(fileInputStream);
@ -650,7 +613,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
try { try {
fileInputStream = ImageFileManager.getInputStreamById(Integer.parseInt(imageId)); fileInputStream = ImageFileManager.getInputStreamById(Integer.parseInt(imageId));
List<AddUpSituationDTO> excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 25, "template.xlsx"); List<AddUpSituationDTO> excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 20, "template.xlsx");
int total = excelDates.size(); int total = excelDates.size();
int index = 0; int index = 0;
@ -829,6 +792,16 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
po.setAddUpInfantCare(dto.getAddUpInfantCare()); po.setAddUpInfantCare(dto.getAddUpInfantCare());
po.setAddUpPrivatePension(dto.getAddUpPrivatePension()); po.setAddUpPrivatePension(dto.getAddUpPrivatePension());
//实际累计已预扣预缴税额
String actualAddUpAdvanceTax = dto.getActualAddUpAdvanceTax();
po.setActualAddUpAdvanceTax(actualAddUpAdvanceTax);
//个税调差
String taxAdjustment = dto.getTaxAdjustment();
po.setTaxAdjustment(taxAdjustment);
//累计应纳税所得额
String addUpTaxableIncome = dto.getAddUpTaxableIncome();
po.setAddUpTaxableIncome(addUpTaxableIncome);
if (errorSum == 0) { if (errorSum == 0) {
successCount += 1; successCount += 1;
// 合格数据 // 合格数据
@ -922,6 +895,9 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
.addUpTaxSavings(addUpSituationParam.getAddUpTaxSavings()).addUpAdvanceTax(addUpSituationParam.getAddUpAdvanceTax()) .addUpTaxSavings(addUpSituationParam.getAddUpTaxSavings()).addUpAdvanceTax(addUpSituationParam.getAddUpAdvanceTax())
.addUpInfantCare(addUpSituationParam.getAddUpInfantCare()) .addUpInfantCare(addUpSituationParam.getAddUpInfantCare())
.addUpPrivatePension(addUpSituationParam.getAddUpPrivatePension()) .addUpPrivatePension(addUpSituationParam.getAddUpPrivatePension())
.actualAddUpAdvanceTax(addUpSituationParam.getActualAddUpAdvanceTax())
.taxAdjustment(addUpSituationParam.getTaxAdjustment())
.addUpTaxableIncome(addUpSituationParam.getAddUpTaxableIncome())
.build(); .build();
updateList.add(build); updateList.add(build);
biz.batchUpdate(updateList); biz.batchUpdate(updateList);
@ -1058,6 +1034,14 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
po.setAddUpTaxSavings(addUpSituationParam.getAddUpTaxSavings()); po.setAddUpTaxSavings(addUpSituationParam.getAddUpTaxSavings());
po.setAddUpInfantCare(addUpSituationParam.getAddUpInfantCare()); po.setAddUpInfantCare(addUpSituationParam.getAddUpInfantCare());
po.setAddUpPrivatePension(addUpSituationParam.getAddUpPrivatePension()); po.setAddUpPrivatePension(addUpSituationParam.getAddUpPrivatePension());
//实际累计已预扣预缴税额
po.setActualAddUpAdvanceTax(addUpSituationParam.getActualAddUpAdvanceTax());
//个税调差
po.setTaxAdjustment(addUpSituationParam.getTaxAdjustment());
//累计应纳税所得额
po.setAddUpTaxableIncome(addUpSituationParam.getAddUpTaxableIncome());
insertList.add(po); insertList.add(po);
//入库 //入库
@ -1223,6 +1207,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
continue; continue;
} }
List<AddUpSituation> poList = getAddUpSituationMapper().listSome((AddUpSituation.builder().taxYearMonth(param.getDeclareMonth()).taxAgentId(returnPO.getTaxAgentId()).build())); List<AddUpSituation> poList = getAddUpSituationMapper().listSome((AddUpSituation.builder().taxYearMonth(param.getDeclareMonth()).taxAgentId(returnPO.getTaxAgentId()).build()));
encryptUtil.decryptList(poList,AddUpSituation.class);
Map<String, AddUpSituation> poMap = SalaryEntityUtil.convert2Map(poList, e -> e.getTaxAgentId() + "-" + e.getEmployeeId()); Map<String, AddUpSituation> poMap = SalaryEntityUtil.convert2Map(poList, e -> e.getTaxAgentId() + "-" + e.getEmployeeId());
// 内部员工（身份证信息） // 内部员工（身份证信息）
@ -1346,7 +1331,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
private Map<Long, List<EmployeeDeclarePO>> getEmpDeclareMap(Collection<Long> taxAgentIds, Date declareMonth) { private Map<Long, List<EmployeeDeclarePO>> getEmpDeclareMap(Collection<Long> taxAgentIds, Date declareMonth) {
List<EmployeeDeclarePO> employeeDeclarePOS = getEmployeeDeclarePOList(taxAgentIds, declareMonth); List<EmployeeDeclarePO> employeeDeclarePOS = getEmployeeDeclarePOList(taxAgentIds, declareMonth);
SalaryAssert.notEmpty(employeeDeclarePOS, SalaryI18nUtil.getI18nLabel(183783, "暂无人员报送状态为正常的数据，请先报送再获取累计专项附加扣除数据。")); SalaryAssert.notEmpty(employeeDeclarePOS, SalaryI18nUtil.getI18nLabel(183783, "暂无人员报送状态为正常的数据，请先报送再获取往期累计数据。"));
return employeeDeclarePOS.stream().collect(Collectors.groupingBy(EmployeeDeclarePO::getTaxAgentId)); return employeeDeclarePOS.stream().collect(Collectors.groupingBy(EmployeeDeclarePO::getTaxAgentId));
} }