From d77e8b0de42e94dec900d8007f5c87740245942b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 20 May 2022 14:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E6=89=A3=E9=99=A4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sql/缺少字段.sql | 25 + .../engine/salary/biz/AddUpDeductionBiz.java | 36 +- .../engine/salary/biz/AddUpSituationBiz.java | 39 +- .../engine/salary/biz/OtherDeductionBiz.java | 2 +- .../AddUpDeductionGetDetailListCmd.java | 10 +- .../AddUpDeductionImportCmd.java | 6 +- .../datacollection/AddUpDeductionListCmd.java | 4 +- .../AddUpDeductionPreviewCmd.java | 2 +- .../AddUpSituationGetDetailListCmd.java | 3 + .../AddUpSituationImportCmd.java | 6 +- .../datacollection/AddUpSituationListCmd.java | 3 + .../AddUpSituationPreviewCmd.java | 2 +- .../entity/datacollection/AddUpDeduction.java | 6 + .../entity/datacollection/AddUpSituation.java | 7 + .../datacollection/dto/AddUpDeductionDTO.java | 4 + .../dto/AddUpDeductionRecordDTO.java | 8 + .../datacollection/dto/AddUpSituationDTO.java | 12 +- .../dto/AddUpSituationRecordDTO.java | 20 +- .../datacollection/AddUpDeductionMapper.java | 40 -- .../datacollection/AddUpDeductionMapper.xml | 276 ++--------- .../datacollection/AddUpSituationMapper.java | 41 -- .../datacollection/AddUpSituationMapper.xml | 442 ++++-------------- .../impl/AddUpDeductionServiceImpl.java | 32 +- .../impl/AddUpSituationServiceImpl.java | 52 ++- .../impl/OtherDeductionServiceImpl.java | 23 +- 25 files changed, 337 insertions(+), 764 deletions(-) create mode 100644 resource/sql/缺少字段.sql diff --git a/resource/sql/缺少字段.sql b/resource/sql/缺少字段.sql new file mode 100644 index 000000000..41fc320ab --- /dev/null +++ b/resource/sql/缺少字段.sql @@ -0,0 +1,25 @@ +ALTER TABLE hrsa_add_up_situation + ADD COLUMN add_up_illness_medical varchar(255) NULL COMMENT '累计大病医疗' AFTER tenant_key, +ADD COLUMN add_up_tax_savings varchar(255) NULL COMMENT '累计减免税额' AFTER add_up_illness_medical, +ADD COLUMN add_up_infant_care varchar(255) NULL COMMENT '累计婴幼儿照护' AFTER add_up_tax_savings; + + + +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 +GO + + + +ALTER TABLE hrsa_add_up_deduction + ADD COLUMN add_up_illness_medical varchar(255) NULL COMMENT '累计大病医疗' AFTER tenant_key, +ADD COLUMN add_up_infant_care varchar(255) NULL COMMENT '累计婴幼儿照护' AFTER add_up_illness_medical; + + + +ALTER TABLE hrsa_add_up_deduction + ADD add_up_illness_medical varchar(255) NULL, +add_up_infant_care varchar(255) NULL +GO \ No newline at end of file diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java index b392e2fef..954cc157a 100644 --- a/src/com/engine/salary/biz/AddUpDeductionBiz.java +++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java @@ -121,8 +121,6 @@ public class AddUpDeductionBiz extends BaseBean { } - - /** * 导出 * @@ -135,7 +133,7 @@ public class AddUpDeductionBiz extends BaseBean { List> rowList = getExcelRowList(param); //获取excel - return ExcelUtil.genWorkbook(rowList,"累计专项附加扣除"); + return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除"); } @@ -146,7 +144,7 @@ public class AddUpDeductionBiz extends BaseBean { */ private List> getExcelRowList(AddUpDeductionQueryParam param) { //excel标题 - List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人"); + List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计婴幼儿照护"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); List list = list(param); @@ -160,12 +158,14 @@ public class AddUpDeductionBiz extends BaseBean { cellList.add(Util.null2String(dto.getMobile())); cellList.add(Util.null2String(dto.getJobNum())); cellList.add(Util.null2String(dto.getIdNo())); - cellList.add(dto.getHiredate() == null ? "" : formatter.format(dto.getHiredate())); - cellList.add(String.valueOf(dto.getAddUpChildEducation())); - cellList.add(String.valueOf(dto.getAddUpContinuingEducation())); - cellList.add(String.valueOf(dto.getAddUpHousingLoanInterest())); - cellList.add(String.valueOf(dto.getAddUpHousingRent())); - cellList.add(String.valueOf(dto.getAddUpSupportElderly())); + cellList.add(Util.null2String(dto.getHiredate())); + 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.getAddUpInfantCare())); return cellList; }).collect(Collectors.toList())) .orElse(Collections.emptyList()); @@ -189,7 +189,7 @@ public class AddUpDeductionBiz extends BaseBean { List> rowList = getExcelRowDetailList(param); //获取excel - return ExcelUtil.genWorkbook(rowList,"累计专项附加扣除明细"); + return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除明细"); } @@ -202,7 +202,7 @@ public class AddUpDeductionBiz extends BaseBean { private List> getExcelRowDetailList(AddUpDeductionQueryParam param) { //excel标题 - List title = Arrays.asList("姓名", "申报月份", "个税扣缴义务人", "部门", "工号", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人"); + List title = Arrays.asList("姓名", "申报月份", "个税扣缴义务人", "部门", "工号", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计婴幼儿照护"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); @@ -217,11 +217,13 @@ public class AddUpDeductionBiz extends BaseBean { cellList.add(Util.null2String(dto.getTaxAgentName())); cellList.add(Util.null2String(dto.getDepartmentName())); cellList.add(Util.null2String(dto.getJobNum())); - cellList.add(String.valueOf(dto.getAddUpChildEducation())); - cellList.add(String.valueOf(dto.getAddUpContinuingEducation())); - cellList.add(String.valueOf(dto.getAddUpHousingLoanInterest())); - cellList.add(String.valueOf(dto.getAddUpHousingRent())); - cellList.add(String.valueOf(dto.getAddUpSupportElderly())); + 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.getAddUpInfantCare())); return cellList; }).collect(Collectors.toList())) .orElse(Collections.emptyList()); diff --git a/src/com/engine/salary/biz/AddUpSituationBiz.java b/src/com/engine/salary/biz/AddUpSituationBiz.java index 02054a35f..fbdd25146 100644 --- a/src/com/engine/salary/biz/AddUpSituationBiz.java +++ b/src/com/engine/salary/biz/AddUpSituationBiz.java @@ -133,7 +133,7 @@ public class AddUpSituationBiz extends BaseBean { List> rowList = getExcelRowList(param); //获取excel - return ExcelUtil.genWorkbook(rowList,"累计情况"); + return ExcelUtil.genWorkbook(rowList, "累计情况"); } @@ -144,7 +144,9 @@ public class AddUpSituationBiz extends BaseBean { */ private List> getExcelRowList(AddUpSituationQueryParam param) { // excel标题 - final List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计收入额", "累计减除费用", "累计社保个人合计", "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计已预扣预缴税额"); + final List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计收入额", "累计减除费用", + "累计社保个人合计", "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", + "累计大病医疗", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); List list = list(param); @@ -168,11 +170,14 @@ public class AddUpSituationBiz extends BaseBean { cellList.add(String.valueOf(dto.getAddUpHousingLoanInterest())); cellList.add(String.valueOf(dto.getAddUpHousingRent())); cellList.add(String.valueOf(dto.getAddUpSupportElderly())); + cellList.add(String.valueOf(dto.getAddUpIllnessMedical())); cellList.add(String.valueOf(dto.getAddUpEnterpriseAndOther())); cellList.add(String.valueOf(dto.getAddUpOtherDeduction())); cellList.add(String.valueOf(dto.getAddUpTaxExemptIncome())); cellList.add(String.valueOf(dto.getAddUpAllowedDonation())); + cellList.add(String.valueOf(dto.getAddUpTaxSavings())); cellList.add(String.valueOf(dto.getAddUpAdvanceTax())); + cellList.add(String.valueOf(dto.getAddUpInfantCare())); return cellList; }).collect(Collectors.toList())) .orElse(Collections.emptyList()); @@ -196,7 +201,7 @@ public class AddUpSituationBiz extends BaseBean { List> rowList = getExcelRowDetailList(param); //获取excel - return ExcelUtil.genWorkbook(rowList,"累计情况明细"); + return ExcelUtil.genWorkbook(rowList, "累计情况明细"); } @@ -209,7 +214,9 @@ public class AddUpSituationBiz extends BaseBean { private List> getExcelRowDetailList(AddUpSituationQueryParam param) { //excel标题 - List title = Arrays.asList("姓名", "税款所属期", "个税扣缴义务人", "部门", "手机号", "工号", "累计收入额", "累计减除费用", "累计社保个人合计", "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计已预扣预缴税额"); + List title = Arrays.asList("姓名", "税款所属期", "个税扣缴义务人", "部门", "手机号", "工号", "累计收入额", "累计减除费用", "累计社保个人合计", + "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计企业（职业）年金及其他福利", + "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); //查询详细信息 @@ -218,15 +225,29 @@ public class AddUpSituationBiz extends BaseBean { .map(List::stream) .map(operatorStream -> operatorStream.map(dto -> { List cellList = new ArrayList<>(); + cellList.add(Util.null2String(dto.getUsername())); cellList.add(Util.null2String(dto.getTaxYearMonth() == null ? "" : formatter.format(dto.getTaxYearMonth()))); cellList.add(Util.null2String(dto.getTaxAgentName())); cellList.add(Util.null2String(dto.getDepartmentName())); + cellList.add(Util.null2String(dto.getMobile())); cellList.add(Util.null2String(dto.getJobNum())); - cellList.add(String.valueOf(dto.getAddUpChildEducation())); - cellList.add(String.valueOf(dto.getAddUpContinuingEducation())); - cellList.add(String.valueOf(dto.getAddUpHousingLoanInterest())); - cellList.add(String.valueOf(dto.getAddUpHousingRent())); - cellList.add(String.valueOf(dto.getAddUpSupportElderly())); + cellList.add(Util.null2String(dto.getAddUpIncome())); + cellList.add(Util.null2String(dto.getAddUpSubtraction())); + cellList.add(Util.null2String(dto.getAddUpSocialSecurityTotal())); + 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.getAddUpOtherDeduction())); + cellList.add(Util.null2String(dto.getAddUpTaxExemptIncome())); + cellList.add(Util.null2String(dto.getAddUpAllowedDonation())); + cellList.add(Util.null2String(dto.getAddUpTaxSavings())); + cellList.add(Util.null2String(dto.getAddUpAdvanceTax())); + cellList.add(Util.null2String(dto.getAddUpInfantCare())); return cellList; }).collect(Collectors.toList())) .orElse(Collections.emptyList()); diff --git a/src/com/engine/salary/biz/OtherDeductionBiz.java b/src/com/engine/salary/biz/OtherDeductionBiz.java index 859fac28b..965a4dcc0 100644 --- a/src/com/engine/salary/biz/OtherDeductionBiz.java +++ b/src/com/engine/salary/biz/OtherDeductionBiz.java @@ -158,7 +158,7 @@ public class OtherDeductionBiz extends BaseBean { cellList.add(Util.null2String(dto.getMobile())); cellList.add(Util.null2String(dto.getJobNum())); cellList.add(Util.null2String(dto.getIdNo())); - cellList.add(dto.getHiredate() == null ? "" : formatter.format(dto.getHiredate())); + cellList.add(Util.null2String(dto.getHiredate())); cellList.add(Util.null2String(dto.getBusinessHealthyInsurance())); cellList.add(Util.null2String(dto.getTaxDelayEndowmentInsurance())); cellList.add(Util.null2String(dto.getOtherDeduction())); diff --git a/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetDetailListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetDetailListCmd.java index 5577c18ad..c9110e258 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetDetailListCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpDeductionGetDetailListCmd.java @@ -80,7 +80,9 @@ public class AddUpDeductionGetDetailListCmd extends AbstractCommonCommand hiredate = queryParam.getHiredate(); @@ -163,7 +165,7 @@ public class AddUpDeductionGetDetailListCmd extends AbstractCommonCommand addUpDeductions = ExcelParseHelper.parse2Map(fileInputStream, AddUpDeductionDTO.class, 0, 1, 13, "addUpDeductionTemplate.xlsx"); + List addUpDeductions = ExcelParseHelper.parse2Map(fileInputStream, AddUpDeductionDTO.class, 0, 1, 14, "addUpDeductionTemplate.xlsx"); int total = addUpDeductions.size(); int index = 0; @@ -188,6 +188,10 @@ public class AddUpDeductionImportCmd extends AbstractCommonCommand addUpDeductions = ExcelParseHelper.parse2Map(fileInputStream, AddUpDeductionDTO.class, 0, 1, 13, "addUpDeductionTemplate.xlsx"); + List addUpDeductions = ExcelParseHelper.parse2Map(fileInputStream, AddUpDeductionDTO.class, 0, 1, 14, "addUpDeductionTemplate.xlsx"); apidatas.put("preview", addUpDeductions); } finally { IOUtils.closeQuietly(fileInputStream); diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java index 479e5d8b1..a1dfc98f0 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java @@ -88,6 +88,9 @@ public class AddUpSituationGetDetailListCmd extends AbstractCommonCommand excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 23, "template.xlsx"); + List excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 24, "template.xlsx"); int total = excelDates.size(); int index = 0; @@ -205,6 +205,10 @@ public class AddUpSituationImportCmd extends AbstractCommonCommand excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 23, "template.xlsx"); + List excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 24, "template.xlsx"); apidatas.put("preview", excelDates); } finally { IOUtils.closeQuietly(fileInputStream); diff --git a/src/com/engine/salary/entity/datacollection/AddUpDeduction.java b/src/com/engine/salary/entity/datacollection/AddUpDeduction.java index b13eda34c..98bcea5f1 100644 --- a/src/com/engine/salary/entity/datacollection/AddUpDeduction.java +++ b/src/com/engine/salary/entity/datacollection/AddUpDeduction.java @@ -74,6 +74,12 @@ public class AddUpDeduction { @SalaryFormulaVar(defaultLabel = "累计大病医疗", labelId = 105142, dataType = "number") private String addUpIllnessMedical; + /** + * 累计婴幼儿照护 + */ + @SalaryFormulaVar(defaultLabel = "累计婴幼儿照护", labelId = 117732, dataType = "number") + private String addUpInfantCare; + /** * 创建时间 */ diff --git a/src/com/engine/salary/entity/datacollection/AddUpSituation.java b/src/com/engine/salary/entity/datacollection/AddUpSituation.java index 36611898c..d507bae5f 100644 --- a/src/com/engine/salary/entity/datacollection/AddUpSituation.java +++ b/src/com/engine/salary/entity/datacollection/AddUpSituation.java @@ -19,6 +19,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @SalaryTable(pageId = "a4f83287-e3f9-4275-9527-7d06e54y6238", fields = "id,addUpSubtraction", operates = {@SalaryTableOperate(text = "删除",index = "0")}) +//hrsa_add_up_situation public class AddUpSituation { /** * 主键id @@ -105,6 +106,12 @@ public class AddUpSituation { @SalaryFormulaVar(defaultLabel = "累计大病医疗", labelId = 105142, dataType = "number") private String addUpIllnessMedical; + /** + * 累计婴幼儿照护 + */ + @SalaryFormulaVar(defaultLabel = "累计婴幼儿照护", labelId = 117732, dataType = "number") + private String addUpInfantCare; + /** * 累计企业（职业）年金及其他福利 */ diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java index 9ef51fab2..f25273c98 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java @@ -133,6 +133,10 @@ public class AddUpDeductionDTO { @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") private BigDecimal addUpIllnessMedical; + @ExcelProperty(index = 13) + @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + private BigDecimal 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 e452fecd2..cc3ae1e3f 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java @@ -93,4 +93,12 @@ public class AddUpDeductionRecordDTO { @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") private BigDecimal addUpSupportElderly; + @ExcelProperty(index = 10) + @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") + private BigDecimal addUpIllnessMedical; + + @ExcelProperty(index = 11) + @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + private String addUpInfantCare; + } diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java index 9febc5c53..1a8c71d36 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java @@ -12,8 +12,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.math.BigDecimal; - /** * 数据采集-累计情况表 */ @@ -43,6 +41,9 @@ public class AddUpSituationDTO { @SalaryTableColumn(text = "姓名", width = "10%", column = "username") @ExcelProperty(index = 0) private String username; +// +// @SalaryTableColumn(text = "申报月份", width = "10%", column = "username") +// private String taxYearMonth; //个税扣缴义务人 @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName") @@ -122,7 +123,7 @@ public class AddUpSituationDTO { //累计大病医疗 @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") @ExcelProperty(index = 16) - private BigDecimal addUpIllnessMedical; + private String addUpIllnessMedical; //累计企业（职业）年金及其他福利 @SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther") @@ -154,6 +155,11 @@ public class AddUpSituationDTO { @ExcelProperty(index = 22) private String addUpAdvanceTax; + //累计婴幼儿照护 + @ExcelProperty(index = 23) + @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + private String addUpInfantCare; + @SalaryTableColumn(text = "操作", width = "20%", column = "operate") private String operate; } \ No newline at end of file diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java index 6dba4909c..c942ece1d 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationRecordDTO.java @@ -94,22 +94,34 @@ public class AddUpSituationRecordDTO { private String addUpSupportElderly; @ExcelProperty(index = 15) + @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") + private String addUpIllnessMedical; + + @ExcelProperty(index = 16) @SalaryTableColumn(text = "累计企业（职业）年金及其他福利", width = "10%", column = "addUpEnterpriseAndOther") private String addUpEnterpriseAndOther; - @ExcelProperty(index = 16) + @ExcelProperty(index = 17) @SalaryTableColumn(text = "累计其他扣除", width = "10%", column = "addUpOtherDeduction") private String addUpOtherDeduction; - @ExcelProperty(index = 17) + @ExcelProperty(index = 18) @SalaryTableColumn(text = "累计免税收入", width = "10%", column = "addUpTaxExemptIncome") private String addUpTaxExemptIncome; - @ExcelProperty(index = 18) + @ExcelProperty(index = 19) @SalaryTableColumn(text = "累计准予扣除的捐赠额", width = "10%", column = "addUpAllowedDonation") private String addUpAllowedDonation; - @ExcelProperty(index = 19) + @ExcelProperty(index = 20) + @SalaryTableColumn(text = "累计减免税额", width = "10%", column = "addUpTaxSavings") + private String addUpTaxSavings; + + @ExcelProperty(index = 21) @SalaryTableColumn(text = "累计已预扣预缴税额", width = "10%", column = "addUpAdvanceTax") private String addUpAdvanceTax; + + @ExcelProperty(index = 22) + @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") + private String addUpInfantCare; } diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java index 6a6c77333..f26596063 100644 --- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java +++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java @@ -28,46 +28,6 @@ public interface AddUpDeductionMapper { * @return 返回记录，没有返回null */ AddUpDeduction getById(Long id); - - /** - * 新增，插入所有字段 - * - * @param addUpDeduction 新增的记录 - * @return 返回影响行数 - */ - int insert(AddUpDeduction addUpDeduction); - - /** - * 新增，忽略null字段 - * - * @param addUpDeduction 新增的记录 - * @return 返回影响行数 - */ - int insertIgnoreNull(AddUpDeduction addUpDeduction); - - /** - * 修改，修改所有字段 - * - * @param addUpDeduction 修改的记录 - * @return 返回影响行数 - */ - int update(AddUpDeduction addUpDeduction); - - /** - * 修改，忽略null字段 - * - * @param addUpDeduction 修改的记录 - * @return 返回影响行数 - */ - int updateIgnoreNull(AddUpDeduction addUpDeduction); - - /** - * 删除记录 - * - * @param addUpDeduction 待删除的记录 - * @return 返回影响行数 - */ - int delete(AddUpDeduction addUpDeduction); /** diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml index 61d4f350a..154de7d64 100644 --- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml @@ -16,6 +16,8 @@ + + @@ -36,6 +38,8 @@ , t.tax_agent_id , t.tenant_key , t.update_time + , t.add_up_illness_medical + , t.add_up_infant_care @@ -54,218 +58,6 @@ WHERE id = #{id} AND delete_type = 0 - - - INSERT INTO hrsa_add_up_deduction - - add_up_child_education, - add_up_continuing_education, - add_up_housing_loan_interest, - add_up_housing_rent, - add_up_support_elderly, - create_time, - creator, - declare_month, - delete_type, - employee_id, - id, - tax_agent_id, - tenant_key, - update_time, - - - #{addUpChildEducation}, - #{addUpContinuingEducation}, - #{addUpHousingLoanInterest}, - #{addUpHousingRent}, - #{addUpSupportElderly}, - #{createTime}, - #{creator}, - #{declareMonth}, - #{deleteType}, - #{employeeId}, - #{id}, - #{taxAgentId}, - #{tenantKey}, - #{updateTime}, - - - - - - INSERT INTO hrsa_add_up_deduction - - - - add_up_child_education, - - - add_up_continuing_education, - - - add_up_housing_loan_interest, - - - add_up_housing_rent, - - - add_up_support_elderly, - - - create_time, - - - creator, - - - declare_month, - - - delete_type, - - - employee_id, - - - id, - - - tax_agent_id, - - - tenant_key, - - - update_time, - - - - - #{addUpChildEducation}, - - - #{addUpContinuingEducation}, - - - #{addUpHousingLoanInterest}, - - - #{addUpHousingRent}, - - - #{addUpSupportElderly}, - - - #{createTime}, - - - #{creator}, - - - #{declareMonth}, - - - #{deleteType}, - - - #{employeeId}, - - - #{id}, - - - #{taxAgentId}, - - - #{tenantKey}, - - - #{updateTime}, - - - - - - - UPDATE hrsa_add_up_deduction - - add_up_child_education=#{addUpChildEducation}, - add_up_continuing_education=#{addUpContinuingEducation}, - add_up_housing_loan_interest=#{addUpHousingLoanInterest}, - add_up_housing_rent=#{addUpHousingRent}, - add_up_support_elderly=#{addUpSupportElderly}, - create_time=#{createTime}, - creator=#{creator}, - declare_month=#{declareMonth}, - delete_type=#{deleteType}, - employee_id=#{employeeId}, - tax_agent_id=#{taxAgentId}, - tenant_key=#{tenantKey}, - update_time=#{updateTime}, - - WHERE id = #{id} AND delete_type = 0 - - - - - - UPDATE hrsa_add_up_deduction - - - add_up_child_education=#{addUpChildEducation}, - - - add_up_continuing_education=#{addUpContinuingEducation}, - - - add_up_housing_loan_interest=#{addUpHousingLoanInterest}, - - - add_up_housing_rent=#{addUpHousingRent}, - - - add_up_support_elderly=#{addUpSupportElderly}, - - - create_time=#{createTime}, - - - creator=#{creator}, - - - declare_month=#{declareMonth}, - - - delete_type=#{deleteType}, - - - employee_id=#{employeeId}, - - - tax_agent_id=#{taxAgentId}, - - - tenant_key=#{tenantKey}, - - - update_time=#{updateTime}, - - - WHERE id = #{id} AND delete_type = 0 - - - - - - UPDATE hrsa_add_up_deduction - SET delete_type=1 - WHERE id = #{id} - AND delete_type = 0 - - - - INSERT INTO hrsa_add_up_situation - - add_up_accumulation_fund_total, - add_up_advance_tax, - add_up_allowed_donation, - add_up_child_education, - add_up_continuing_education, - add_up_enterprise_and_other, - add_up_housing_loan_interest, - add_up_housing_rent, - add_up_income, - add_up_other_deduction, - add_up_social_security_total, - add_up_subtraction, - add_up_support_elderly, - add_up_tax_exempt_income, - create_time, - creator, - delete_type, - employee_id, - id, - tax_agent_id, - tax_year_month, - tenant_key, - update_time, - year, - - - #{addUpAccumulationFundTotal}, - #{addUpAdvanceTax}, - #{addUpAllowedDonation}, - #{addUpChildEducation}, - #{addUpContinuingEducation}, - #{addUpEnterpriseAndOther}, - #{addUpHousingLoanInterest}, - #{addUpHousingRent}, - #{addUpIncome}, - #{addUpOtherDeduction}, - #{addUpSocialSecurityTotal}, - #{addUpSubtraction}, - #{addUpSupportElderly}, - #{addUpTaxExemptIncome}, - #{createTime}, - #{creator}, - #{deleteType}, - #{employeeId}, - #{id}, - #{taxAgentId}, - #{taxYearMonth}, - #{tenantKey}, - #{updateTime}, - #{year}, - - - - - - INSERT INTO hrsa_add_up_situation - - - - add_up_accumulation_fund_total, - - - add_up_advance_tax, - - - add_up_allowed_donation, - - - add_up_child_education, - - - add_up_continuing_education, - - - add_up_enterprise_and_other, - - - add_up_housing_loan_interest, - - - add_up_housing_rent, - - - add_up_income, - - - add_up_other_deduction, - - - add_up_social_security_total, - - - add_up_subtraction, - - - add_up_support_elderly, - - - add_up_tax_exempt_income, - - - create_time, - - - creator, - - - delete_type, - - - employee_id, - - - id, - - - tax_agent_id, - - - tax_year_month, - - - tenant_key, - - - update_time, - - - year, - - - - - #{addUpAccumulationFundTotal}, - - - #{addUpAdvanceTax}, - - - #{addUpAllowedDonation}, - - - #{addUpChildEducation}, - - - #{addUpContinuingEducation}, - - - #{addUpEnterpriseAndOther}, - - - #{addUpHousingLoanInterest}, - - - #{addUpHousingRent}, - - - #{addUpIncome}, - - - #{addUpOtherDeduction}, - - - #{addUpSocialSecurityTotal}, - - - #{addUpSubtraction}, - - - #{addUpSupportElderly}, - - - #{addUpTaxExemptIncome}, - - - #{createTime}, - - - #{creator}, - - - #{deleteType}, - - - #{employeeId}, - - - #{id}, - - - #{taxAgentId}, - - - #{taxYearMonth}, - - - #{tenantKey}, - - - #{updateTime}, - - - #{year}, - - - - - - - UPDATE hrsa_add_up_situation - - add_up_accumulation_fund_total=#{addUpAccumulationFundTotal}, - add_up_advance_tax=#{addUpAdvanceTax}, - add_up_allowed_donation=#{addUpAllowedDonation}, - add_up_child_education=#{addUpChildEducation}, - add_up_continuing_education=#{addUpContinuingEducation}, - add_up_enterprise_and_other=#{addUpEnterpriseAndOther}, - add_up_housing_loan_interest=#{addUpHousingLoanInterest}, - add_up_housing_rent=#{addUpHousingRent}, - add_up_income=#{addUpIncome}, - add_up_other_deduction=#{addUpOtherDeduction}, - add_up_social_security_total=#{addUpSocialSecurityTotal}, - add_up_subtraction=#{addUpSubtraction}, - add_up_support_elderly=#{addUpSupportElderly}, - add_up_tax_exempt_income=#{addUpTaxExemptIncome}, - create_time=#{createTime}, - creator=#{creator}, - delete_type=#{deleteType}, - employee_id=#{employeeId}, - tax_agent_id=#{taxAgentId}, - tax_year_month=#{taxYearMonth}, - tenant_key=#{tenantKey}, - update_time=#{updateTime}, - year=#{year}, - - WHERE id = #{id} AND delete_type = 0 - - - - - - UPDATE hrsa_add_up_situation - - - add_up_accumulation_fund_total=#{addUpAccumulationFundTotal}, - - - add_up_advance_tax=#{addUpAdvanceTax}, - - - add_up_allowed_donation=#{addUpAllowedDonation}, - - - add_up_child_education=#{addUpChildEducation}, - - - add_up_continuing_education=#{addUpContinuingEducation}, - - - add_up_enterprise_and_other=#{addUpEnterpriseAndOther}, - - - add_up_housing_loan_interest=#{addUpHousingLoanInterest}, - - - add_up_housing_rent=#{addUpHousingRent}, - - - add_up_income=#{addUpIncome}, - - - add_up_other_deduction=#{addUpOtherDeduction}, - - - add_up_social_security_total=#{addUpSocialSecurityTotal}, - - - add_up_subtraction=#{addUpSubtraction}, - - - add_up_support_elderly=#{addUpSupportElderly}, - - - add_up_tax_exempt_income=#{addUpTaxExemptIncome}, - - - create_time=#{createTime}, - - - creator=#{creator}, - - - delete_type=#{deleteType}, - - - employee_id=#{employeeId}, - - - tax_agent_id=#{taxAgentId}, - - - tax_year_month=#{taxYearMonth}, - - - tenant_key=#{tenantKey}, - - - update_time=#{updateTime}, - - - year=#{year}, - - - WHERE id = #{id} AND delete_type = 0 - - - - - - UPDATE hrsa_add_up_situation - SET delete_type=1 - WHERE id = #{id} - AND delete_type = 0 - t1 @@ -429,10 +103,13 @@ t1.add_up_housing_loan_interest, t1.add_up_housing_rent, t1.add_up_support_elderly, + t1.add_up_illness_medical, + t1.add_up_infant_care, t1.add_up_enterprise_and_other, t1.add_up_other_deduction, t1.add_up_tax_exempt_income, t1.add_up_allowed_donation, + t1.add_up_tax_savings, t1.add_up_advance_tax @@ -709,7 +386,10 @@ create_time, update_time, creator, - tenant_key + tenant_key, + add_up_tax_savings, + add_up_illness_medical, + add_up_infant_care ) VALUES @@ -735,7 +415,10 @@ #{item.createTime}, #{item.updateTime}, #{item.creator}, - #{item.tenantKey} + #{item.tenantKey}, + #{item.addUpTaxSavings}, + #{item.addUpIllnessMedical}, + #{item.addUpInfantCare} ) @@ -762,7 +445,10 @@ create_time, update_time, creator, - tenant_key + tenant_key, + add_up_tax_savings, + add_up_illness_medical, + add_up_infant_care ) @@ -788,37 +474,43 @@ #{item.createTime}, #{item.updateTime}, #{item.creator}, - #{item.tenantKey} + #{item.tenantKey}, + #{item.addUpTaxSavings}, + #{item.addUpIllnessMedical}, + #{item.addUpInfantCare} from dual - INSERT INTO hrsa_add_up_situation( - employee_id, - tax_agent_id, - tax_year_month, - year, - add_up_income, - add_up_subtraction, - add_up_social_security_total, - add_up_accumulation_fund_total, - add_up_child_education, - add_up_continuing_education, - add_up_housing_loan_interest, - add_up_housing_rent, - add_up_support_elderly, - add_up_enterprise_and_other, - add_up_other_deduction, - add_up_tax_exempt_income, - add_up_allowed_donation, - add_up_advance_tax, - create_time, - update_time, - creator, - tenant_key - ) - VALUES + INSERT INTO hrsa_add_up_situation( + employee_id, + tax_agent_id, + tax_year_month, + year, + add_up_income, + add_up_subtraction, + add_up_social_security_total, + add_up_accumulation_fund_total, + add_up_child_education, + add_up_continuing_education, + add_up_housing_loan_interest, + add_up_housing_rent, + add_up_support_elderly, + add_up_enterprise_and_other, + add_up_other_deduction, + add_up_tax_exempt_income, + add_up_allowed_donation, + add_up_advance_tax, + create_time, + update_time, + creator, + tenant_key, + add_up_tax_savings, + add_up_illness_medical, + add_up_infant_care + ) + VALUES ( #{item.employeeId}, #{item.taxAgentId}, @@ -841,7 +533,10 @@ #{item.createTime}, #{item.updateTime}, #{item.creator}, - #{item.tenantKey} + #{item.tenantKey}, + #{item.addUpTaxSavings}, + #{item.addUpIllnessMedical}, + #{item.addUpInfantCare} ) @@ -947,6 +642,27 @@ + + + + when id=#{item.id} then #{item.addUpTaxSavings} + + + + + + + when id=#{item.id} then #{item.addUpIllnessMedical} + + + + + + + when id=#{item.id} then #{item.addUpInfantCare} + + + where id in @@ -961,7 +677,7 @@ FROM hrsa_add_up_situation t WHERE delete_type = 0 - and tax_year_month = #{param.taxYearMonth} + and tax_year_month = #{param.taxYearMonth} AND employee_id IN diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 1981f080b..ee1405cd4 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -19,6 +19,7 @@ import com.engine.salary.util.excel.ExcelUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import weaver.general.Util; import java.time.YearMonth; import java.util.*; @@ -127,7 +128,8 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction SalaryI18nUtil.getI18nLabel(86324, "累计住房贷款利息"), SalaryI18nUtil.getI18nLabel(86325, "累计住房租金"), SalaryI18nUtil.getI18nLabel(86326, "累计赡养老人"), - SalaryI18nUtil.getI18nLabel(105142, "累计大病医疗") + SalaryI18nUtil.getI18nLabel(105142, "累计大病医疗"), + SalaryI18nUtil.getI18nLabel(105142, "累计婴幼儿照护") }; List headerList = Arrays.asList(header); // 2.表头 @@ -146,19 +148,20 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction rows.add(headerList); for (AddUpDeductionDTO dto : list) { List row = new ArrayList<>(); - row.add(dto.getUsername()); - row.add(dto.getTaxAgentName()); - row.add(dto.getDepartmentName()); - row.add(dto.getMobile()); - row.add(dto.getJobNum()); - row.add(dto.getIdNo()); - row.add(dto.getHiredate()); - row.add(dto.getAddUpChildEducation()); - row.add(dto.getAddUpContinuingEducation()); - row.add(dto.getAddUpHousingLoanInterest()); - row.add(dto.getAddUpHousingRent()); - row.add(dto.getAddUpSupportElderly()); - row.add(dto.getAddUpIllnessMedical()); + row.add(Util.null2String(dto.getUsername())); + row.add(Util.null2String(dto.getTaxAgentName())); + row.add(Util.null2String(dto.getDepartmentName())); + row.add(Util.null2String(dto.getMobile())); + row.add(Util.null2String(dto.getJobNum())); + row.add(Util.null2String(dto.getIdNo())); + row.add(Util.null2String(dto.getHiredate())); + 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.getAddUpInfantCare())); rows.add(row); } @@ -172,6 +175,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction excelComments.add(new ExcelComment(10, 0, 13, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); excelComments.add(new ExcelComment(11, 0, 14, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); excelComments.add(new ExcelComment(12, 0, 15, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); + excelComments.add(new ExcelComment(13, 0, 16, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); XSSFWorkbook book = ExcelUtil.genWorkbookV2(rows, sheetName, excelComments); diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index de6add2c3..06934ccb6 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -19,6 +19,7 @@ import com.engine.salary.util.excel.ExcelUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import weaver.general.Util; import java.time.YearMonth; import java.util.*; @@ -143,7 +144,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation SalaryI18nUtil.getI18nLabel(86704, "累计免税收入"), SalaryI18nUtil.getI18nLabel(86703, "累计准予扣除的捐赠额"), SalaryI18nUtil.getI18nLabel(105478, "累计减免税额"), - SalaryI18nUtil.getI18nLabel(86702, "累计已预扣预缴税额") + SalaryI18nUtil.getI18nLabel(86702, "累计已预扣预缴税额"), + SalaryI18nUtil.getI18nLabel(86702, "累计婴幼儿照护") }; // 2.表头 List headerList = Arrays.asList(header); @@ -160,29 +162,30 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation rows.add(headerList); for (AddUpSituationDTO dto : list) { List row = new ArrayList<>(); - row.add(dto.getUsername()); - row.add(dto.getTaxAgentName()); - row.add(dto.getDepartmentName()); - row.add(dto.getMobile()); - row.add(dto.getJobNum()); - row.add(dto.getIdNo()); - row.add(dto.getHiredate() + ""); - row.add(dto.getAddUpIncome()); - row.add(dto.getAddUpSubtraction()); - row.add(dto.getAddUpSocialSecurityTotal()); - row.add(dto.getAddUpAccumulationFundTotal()); - row.add(dto.getAddUpChildEducation()); - row.add(dto.getAddUpContinuingEducation()); - row.add(dto.getAddUpHousingLoanInterest()); - row.add(dto.getAddUpHousingRent()); - row.add(dto.getAddUpSupportElderly()); - row.add(dto.getAddUpIllnessMedical()); - row.add(dto.getAddUpEnterpriseAndOther()); - row.add(dto.getAddUpOtherDeduction()); - row.add(dto.getAddUpTaxExemptIncome()); - row.add(dto.getAddUpAllowedDonation()); - row.add(dto.getAddUpTaxSavings()); - row.add(dto.getAddUpAdvanceTax()); + row.add(Util.null2String(dto.getUsername())); + row.add(Util.null2String(dto.getTaxAgentName())); + row.add(Util.null2String(dto.getDepartmentName())); + row.add(Util.null2String(dto.getMobile())); + row.add(Util.null2String(dto.getJobNum())); + row.add(Util.null2String(dto.getIdNo())); + 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); } // 4.注释 @@ -205,6 +208,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation 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, "输入数字"))); XSSFWorkbook book = ExcelUtil.genWorkbookV2(rows, sheetName, excelComments); diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index 1fcf0c668..69f948cc7 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -19,6 +19,7 @@ import com.engine.salary.util.excel.ExcelUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import weaver.general.Util; import java.time.YearMonth; import java.util.*; @@ -146,17 +147,17 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction rows.add(headerList); for (OtherDeductionListDTO dto : list) { List row = new ArrayList<>(); - row.add(dto.getUsername()); - row.add(dto.getTaxAgentName()); - row.add(dto.getDepartmentName()); - row.add(dto.getMobile()); - row.add(dto.getJobNum()); - row.add(dto.getIdNo()); - row.add(dto.getHiredate()+""); - row.add(dto.getBusinessHealthyInsurance()); - row.add(dto.getTaxDelayEndowmentInsurance()); - row.add(dto.getOtherDeduction()); - row.add(dto.getDeductionAllowedDonation()); + row.add(Util.null2String(dto.getUsername())); + row.add(Util.null2String(dto.getTaxAgentName())); + row.add(Util.null2String(dto.getDepartmentName())); + row.add(Util.null2String(dto.getMobile())); + row.add(Util.null2String(dto.getJobNum())); + row.add(Util.null2String(dto.getIdNo())); + row.add(Util.null2String(dto.getHiredate())); + row.add(Util.null2String(dto.getBusinessHealthyInsurance())); + row.add(Util.null2String(dto.getTaxDelayEndowmentInsurance())); + row.add(Util.null2String(dto.getOtherDeduction())); + row.add(Util.null2String(dto.getDeductionAllowedDonation())); rows.add(row); } // 3.表数据