diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java index 35922c6a7..7d2e9b552 100644 --- a/src/com/engine/salary/biz/AddUpDeductionBiz.java +++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java @@ -6,11 +6,8 @@ import com.engine.salary.encrypt.datacollection.AddUpDeductionStrDTOEncrypt; import com.engine.salary.entity.datacollection.AddUpDeduction; import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO; import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordStrDTO; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionStrDTO; import com.engine.salary.entity.datacollection.param.AddUpDeductionQueryParam; import com.engine.salary.mapper.datacollection.AddUpDeductionMapper; -import com.engine.salary.util.excel.ExcelUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; @@ -33,7 +30,7 @@ public class AddUpDeductionBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class); - List list = mapper.list(param); + List list = mapper.list(param); return AddUpDeductionStrDTOEncrypt.decryptAddUpDeductionList(list); } finally { sqlSession.close(); @@ -85,7 +82,7 @@ public class AddUpDeductionBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class); - List addUpDeductionRecordStrDTOS = mapper.recordList(param); + List addUpDeductionRecordStrDTOS = mapper.recordList(param); return AddUpDeductionRecordStrDTOEncrypt.decryptAddUpDeductionRecordDTO(addUpDeductionRecordStrDTOS); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 56f2ca417..64d2743ae 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -422,8 +422,6 @@ public class SIArchivesBiz { InsuranceArchivesSocialSchemePOEncrypt.decryptList(socialList); return socialList.size() != 0 ? socialList.get(0) : null; } finally { - - }finally { sqlSession.close(); } } diff --git a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationDeleteCmd.java b/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationDeleteCmd.java deleted file mode 100644 index 19572b59c..000000000 --- a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationDeleteCmd.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.engine.salary.cmd.taxDeclaration; - -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.salary.biz.TaxRateBiz; -import com.engine.salary.exception.SalaryRunTimeException; -import com.engine.salary.util.DataUtil; -import org.apache.commons.collections4.CollectionUtils; -import weaver.hrm.User; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -public class TaxDeclarationDeleteCmd extends AbstractCommonCommand> { - - public TaxDeclarationDeleteCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - Map apidatas = new HashMap(16); - - - List idStrs = DataUtil.castList(params.get("ids"), String.class); - if (CollectionUtils.isEmpty(idStrs)) { - throw new SalaryRunTimeException("参数错误"); - } - List ids = idStrs.stream().map(Long::valueOf).collect(Collectors.toList()); - TaxRateBiz taxRateBiz = new TaxRateBiz(); - - taxRateBiz.deleteByIds(ids); - - return apidatas; - } - - - -} diff --git a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationGetFormCmd.java b/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationGetFormCmd.java deleted file mode 100644 index 25d3a329e..000000000 --- a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationGetFormCmd.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.engine.salary.cmd.taxDeclaration; - -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.salary.biz.TaxRateBiz; -import com.engine.salary.entity.taxrate.param.TaxRateSaveParam; -import weaver.hrm.User; - -import java.util.HashMap; -import java.util.Map; - -public class TaxDeclarationGetFormCmd extends AbstractCommonCommand> { - - public TaxDeclarationGetFormCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - Map apidatas = new HashMap(16); - TaxRateBiz taxRateBiz = new TaxRateBiz(); - TaxRateSaveParam taxRateSaveParam = (TaxRateSaveParam) params.get("taxRateSaveParam"); - taxRateBiz.save(taxRateSaveParam, (long) user.getUID()); - return apidatas; - } -} diff --git a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationGetTaxDeclarationInfoCmd.java b/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationGetTaxDeclarationInfoCmd.java deleted file mode 100644 index 4d0f2bfdd..000000000 --- a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationGetTaxDeclarationInfoCmd.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.engine.salary.cmd.taxDeclaration; - -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.salary.biz.TaxRateBiz; -import com.engine.salary.entity.taxrate.param.TaxRateSaveParam; -import weaver.hrm.User; - -import java.util.HashMap; -import java.util.Map; - -public class TaxDeclarationGetTaxDeclarationInfoCmd extends AbstractCommonCommand> { - - public TaxDeclarationGetTaxDeclarationInfoCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - Map apidatas = new HashMap(16); - TaxRateBiz taxRateBiz = new TaxRateBiz(); - TaxRateSaveParam taxRateSaveParam = (TaxRateSaveParam) params.get("taxRateSaveParam"); - taxRateBiz.save(taxRateSaveParam, (long) user.getUID()); - return apidatas; - } -} diff --git a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationSaveCmd.java b/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationSaveCmd.java deleted file mode 100644 index cd369c475..000000000 --- a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationSaveCmd.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.engine.salary.cmd.taxDeclaration; - -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.salary.biz.TaxRateBiz; -import com.engine.salary.entity.taxrate.param.TaxRateSaveParam; -import weaver.hrm.User; - -import java.util.HashMap; -import java.util.Map; - -public class TaxDeclarationSaveCmd extends AbstractCommonCommand> { - - public TaxDeclarationSaveCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - Map apidatas = new HashMap(16); - TaxRateBiz taxRateBiz = new TaxRateBiz(); - TaxRateSaveParam taxRateSaveParam = (TaxRateSaveParam) params.get("taxRateSaveParam"); - taxRateBiz.save(taxRateSaveParam, (long) user.getUID()); - return apidatas; - } -} diff --git a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationUpdateCmd.java b/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationUpdateCmd.java deleted file mode 100644 index 1e54ab394..000000000 --- a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationUpdateCmd.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.engine.salary.cmd.taxDeclaration; - -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.salary.biz.TaxRateBiz; -import com.engine.salary.entity.taxrate.param.TaxRateSaveParam; -import weaver.hrm.User; - -import java.util.HashMap; -import java.util.Map; - -public class TaxDeclarationUpdateCmd extends AbstractCommonCommand> { - - public TaxDeclarationUpdateCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - Map apidatas = new HashMap(16); - TaxRateBiz taxRateBiz = new TaxRateBiz(); - TaxRateSaveParam taxRateSaveParam = (TaxRateSaveParam) params.get("taxRateSaveParam"); - taxRateBiz.update(taxRateSaveParam, (long) user.getUID()); - return apidatas; - } -} diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java index 7a6e58288..f231440bf 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionRecordStrDTOEncrypt.java @@ -2,10 +2,7 @@ package com.engine.salary.encrypt.datacollection; import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordStrDTO; -import org.apache.commons.lang.StringUtils; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -20,16 +17,18 @@ import java.util.stream.Collectors; * add_up_support_elderly */ public class AddUpDeductionRecordStrDTOEncrypt { - public static List decryptAddUpDeductionRecordDTO(List list) { + public static List decryptAddUpDeductionRecordDTO(List list) { if(list == null || list.size() == 0) { return new ArrayList<>(); } list.forEach(item -> { - item.setAddUpChildEducation(AESEncryptUtil.encrypt(item.getAddUpChildEducation())); - item.setAddUpContinuingEducation(AESEncryptUtil.encrypt(item.getAddUpContinuingEducation())); - item.setAddUpHousingLoanInterest(AESEncryptUtil.encrypt(item.getAddUpHousingLoanInterest())); - item.setAddUpHousingRent(AESEncryptUtil.encrypt(item.getAddUpHousingRent())); - item.setAddUpSupportElderly(AESEncryptUtil.encrypt(item.getAddUpSupportElderly())); + item.setAddUpChildEducation(AESEncryptUtil.decrypt(item.getAddUpChildEducation())); + item.setAddUpContinuingEducation(AESEncryptUtil.decrypt(item.getAddUpContinuingEducation())); + item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); + item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); + item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); + item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); + item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); }); return list.stream().map(item -> { return AddUpDeductionRecordDTO.builder() diff --git a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java index 0998d6189..e3ac30ef5 100644 --- a/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java +++ b/src/com/engine/salary/encrypt/datacollection/AddUpDeductionStrDTOEncrypt.java @@ -2,10 +2,7 @@ package com.engine.salary.encrypt.datacollection; import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionStrDTO; -import org.apache.commons.lang.StringUtils; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -20,7 +17,7 @@ import java.util.stream.Collectors; * add_up_support_elderly */ public class AddUpDeductionStrDTOEncrypt { - public static List decryptAddUpDeductionList(List list) { + public static List decryptAddUpDeductionList(List list) { if(list == null || list.size() == 0) { return new ArrayList<>(); } @@ -30,6 +27,8 @@ public class AddUpDeductionStrDTOEncrypt { item.setAddUpHousingLoanInterest(AESEncryptUtil.decrypt(item.getAddUpHousingLoanInterest())); item.setAddUpHousingRent(AESEncryptUtil.decrypt(item.getAddUpHousingRent())); item.setAddUpSupportElderly(AESEncryptUtil.decrypt(item.getAddUpSupportElderly())); + item.setAddUpIllnessMedical(AESEncryptUtil.decrypt(item.getAddUpIllnessMedical())); + item.setAddUpInfantCare(AESEncryptUtil.decrypt(item.getAddUpInfantCare())); }); return list.stream().map(item -> { return AddUpDeductionDTO.builder() diff --git a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java index f88f07f14..0e912c4ba 100644 --- a/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java +++ b/src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailEncrypt.java @@ -1,9 +1,8 @@ package com.engine.salary.encrypt.taxdeclaration; import com.engine.salary.encrypt.AESEncryptUtil; -import com.engine.salary.entity.taxdeclaration.TaxDeclarationDetail; +import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO; -import java.util.Collection; import java.util.List; /** @@ -12,7 +11,7 @@ import java.util.List; * field_value */ public class TaxDeclarationDetailEncrypt { - public static List encryptTaxDeclarationDetailList(List list) { + public static List encryptTaxDeclarationDetailList(List list) { if(list == null || list.size() == 0) { return list; } @@ -22,7 +21,7 @@ public class TaxDeclarationDetailEncrypt { return list; } - public static List decryptTaxDeclarationDetailList(List list) { + public static List decryptTaxDeclarationDetailList(List list) { if(list == null || list.size() == 0) { return list; } diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java index 2e112d32e..f618c3f1c 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java @@ -4,6 +4,7 @@ import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.SalaryTableOperate; +import com.engine.salary.annotation.TableTitle; import com.engine.salary.util.excel.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -44,6 +45,7 @@ public class AddUpDeductionDTO { */ @ExcelProperty(index = 0) @SalaryTableColumn(text = "姓名", width = "10%", column = "username") + @TableTitle(title = "姓名", dataIndex = "username", key = "username") private String username; /** @@ -51,6 +53,7 @@ public class AddUpDeductionDTO { */ @ExcelProperty(index = 1) @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName") + @TableTitle(title = "个税扣缴义务人", dataIndex = "taxAgentName", key = "taxAgentName") private String taxAgentName; /** diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordStrDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordStrDTO.java deleted file mode 100644 index 4d3b04db8..000000000 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordStrDTO.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.engine.salary.entity.datacollection.dto; - -import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.util.excel.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; - - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -//数据采集-累计专项附加扣除记录 -@SalaryTable(pageId = "a4f85287-3354-4275-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX) -public class AddUpDeductionRecordStrDTO { - - //主键id - @SalaryTableColumn(column = "id", display = false) - private Long id; - - //员工id - private Long employeeId; - - @ExcelProperty(index = 0) - private String username; - - //申报月份 - @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") - @SalaryTableColumn(text = "申报月份", width = "10%", column = "declareMonth", transmethod = "com.engine.salary.transmethod.TransMethod.timeToMoth") - @ExcelProperty(index = 1) - private Date declareMonth; - - //个税扣缴义务人 - @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName") - @ExcelProperty(index = 2) - private String taxAgentName; - - - //部门 - @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") - @ExcelProperty(index = 3) - private String departmentName; - - //手机号 - @SalaryTableColumn(text = "手机号", width = "10%", column = "mobile") - private String mobile; - - //工号 - @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum") - @ExcelProperty(index = 4) - private String jobNum; - - /** - * 累计子女教育 - */ - @ExcelProperty(index = 5) - @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") - private String addUpChildEducation; - - /** - * 累计继续教育 - */ - @ExcelProperty(index = 6) - @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") - private String addUpContinuingEducation; - - /** - * 累计住房贷款利息 - */ - @ExcelProperty(index = 7) - @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") - private String addUpHousingLoanInterest; - - /** - * 累计住房租金 - */ - @ExcelProperty(index = 8) - @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") - private String addUpHousingRent; - - /** - * 累计赡养老人 - */ - @ExcelProperty(index = 9) - @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") - private String addUpSupportElderly; - - @ExcelProperty(index = 10) - @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") - private String addUpIllnessMedical; - - @ExcelProperty(index = 11) - @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") - private String addUpInfantCare; - -} diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionStrDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionStrDTO.java deleted file mode 100644 index 856318028..000000000 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionStrDTO.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.engine.salary.entity.datacollection.dto; - -import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.annotation.SalaryTableOperate; -import com.engine.salary.util.excel.ExcelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * 数据采集-累计专项附加扣除 - *

Copyright: Copyright (c) 2022

- *

Company: 泛微软件

- * - * @author qiantao - * @version 1.0 - **/ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@SalaryTable(pageId = "a4f85287-e3f9-4275-adn9-7d06e54y6rj8", tableType = WeaTableType.CHECKBOX, operates = { - @SalaryTableOperate(text = "查看明细") -}) -public class AddUpDeductionStrDTO { - - /** - * 主键id - */ - @SalaryTableColumn(column = "id", display = false) - private Long id; - - /** - * 员工id - */ - private Long employeeId; - - /** - * 姓名 - */ - @ExcelProperty(index = 0) - @SalaryTableColumn(text = "姓名", width = "10%", column = "username") - private String username; - - /** - * 个税扣缴义务人 - */ - @ExcelProperty(index = 1) - @SalaryTableColumn(text = "个税扣缴义务人", width = "10%", column = "taxAgentName") - private String taxAgentName; - - /** - * 部门 - */ - @ExcelProperty(index = 2) - @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") - private String departmentName; - - /** - * 手机号 - */ - @ExcelProperty(index = 3) - @SalaryTableColumn(text = "手机号", width = "10%", column = "mobile") - private String mobile; - - /** - * 工号 - */ - @ExcelProperty(index = 4) - @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum") - private String jobNum; - - /** - * 证件号码 - */ - @ExcelProperty(index = 5) - @SalaryTableColumn(text = "证件号码", width = "10%", column = "idNo") - private String idNo; - - /** - * 入职日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @ExcelProperty(index = 6) - @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate") - private String hiredate; - - /** - * 累计子女教育 - */ - @ExcelProperty(index = 7) - @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") - private String addUpChildEducation; - - /** - * 累计继续教育 - */ - @ExcelProperty(index = 8) - @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") - private String addUpContinuingEducation; - - /** - * 累计住房贷款利息 - */ - @ExcelProperty(index = 9) - @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") - private String addUpHousingLoanInterest; - - /** - * 累计住房租金 - */ - @ExcelProperty(index = 10) - @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") - private String addUpHousingRent; - - /** - * 累计赡养老人 - */ - @ExcelProperty(index = 11) - @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") - private String addUpSupportElderly; - - /** - * 累计大病医疗 - */ - @ExcelProperty(index = 12) - @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") - private String addUpIllnessMedical; - - @ExcelProperty(index = 13) - @SalaryTableColumn(text = "累计婴幼儿照护", width = "10%", column = "addUpInfantCare") - private String addUpInfantCare; - - @SalaryTableColumn(text = "操作", width = "20%", column = "operate") - private String operate; -} diff --git a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java index 739066a33..9735469a6 100644 --- a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java +++ b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java @@ -71,7 +71,6 @@ public class TaxAgentBO { /** * 构建表格 * - * @param weaTable * @param isOpenDevolution */ public static void buildTaxAgentTable(PageInfo> listPage, boolean isOpenDevolution) { diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java index 2f3f29938..f26596063 100644 --- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java +++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.java @@ -4,8 +4,6 @@ import com.engine.salary.entity.datacollection.AddUpDeduction; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO; import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordStrDTO; -import com.engine.salary.entity.datacollection.dto.AddUpDeductionStrDTO; import com.engine.salary.entity.datacollection.param.AddUpDeductionQueryParam; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -43,7 +41,7 @@ public interface AddUpDeductionMapper { * @param param * @return */ - List list(@Param("param") AddUpDeductionQueryParam param); + List list(@Param("param") AddUpDeductionQueryParam param); /** * 根据条件查询 @@ -64,5 +62,5 @@ public interface AddUpDeductionMapper { */ void updateData(@Param("collection") List updateList); - List recordList(@Param("param") AddUpDeductionQueryParam param); + List recordList(@Param("param") AddUpDeductionQueryParam param); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml index d2e066441..741d69a11 100644 --- a/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml @@ -283,7 +283,7 @@ - SELECT FROM @@ -299,7 +299,7 @@ ORDER BY t1.id DESC - - +