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

申报表对比功能

This commit is contained in:
钱涛 2024-01-18 09:54:56 +08:00
parent 4846cfcf18
commit e71edd1a7b
2 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/com/engine/salary/remote/tax/response/employee/GetDeclareTaxResultFeedbackResponse.java
View File

@ -282,53 +282,73 @@ public class GetDeclareTaxResultFeedbackResponse extends BaseResponse {
/**
* 基本养老保险 必填：null
*/
@SalaryTableColumn(text = "本期基本养老保险费", width = "10%", column = "jbylaobxf")
@ExcelHead(title = "本期基本养老保险费", dataIndex = "jbylaobxf")
@SalaryTableColumn(text = "基本养老保险费", width = "10%", column = "jbylaobxf")
@ExcelHead(title = "基本养老保险费", dataIndex = "jbylaobxf")
private BigDecimal jbylaobxf;
/**
* 基本医疗保险 必填：null
*/
@SalaryTableColumn(text = "本期基本医疗保险费", width = "10%", column = "jbylbxf")
@ExcelHead(title = "本期基本医疗保险费", dataIndex = "jbylbxf")
@SalaryTableColumn(text = "基本医疗保险费", width = "10%", column = "jbylbxf")
@ExcelHead(title = "基本医疗保险费", dataIndex = "jbylbxf")
private BigDecimal jbylbxf;
/**
* 失业保险 必填：null
*/
@SalaryTableColumn(text = "本期失业保险费", width = "10%", column = "sybxf")
@ExcelHead(title = "本期失业保险费", dataIndex = "sybxf")
@SalaryTableColumn(text = "失业保险费", width = "10%", column = "sybxf")
@ExcelHead(title = "失业保险费", dataIndex = "sybxf")
private BigDecimal sybxf;
/**
* 住房公积金 必填：null
*/
@SalaryTableColumn(text = "本期住房公积金", width = "10%", column = "zfgjj")
@ExcelHead(title = "本期住房公积金", dataIndex = "zfgjj")
@SalaryTableColumn(text = "住房公积金", width = "10%", column = "zfgjj")
@ExcelHead(title = "住房公积金", dataIndex = "zfgjj")
private BigDecimal zfgjj;
/**
* 年金 必填：null
*/
@SalaryTableColumn(text = "本期企业(职业)年金", width = "10%", column = "nj")
@ExcelHead(title = "本期企业(职业)年金", dataIndex = "nj")
@SalaryTableColumn(text = "企业(职业)年金", width = "10%", column = "nj")
@ExcelHead(title = "企业(职业)年金", dataIndex = "nj")
private BigDecimal nj;
/**
* 商业健康保险 必填：null
*/
@SalaryTableColumn(text = "本期商业健康保险费", width = "10%", column = "syjkbx")
@ExcelHead(title = "本期商业健康保险费", dataIndex = "syjkbx")
@SalaryTableColumn(text = "商业健康保险", width = "10%", column = "syjkbx")
@ExcelHead(title = "商业健康保险", dataIndex = "syjkbx")
private BigDecimal syjkbx;
/**
* 税延养老保险 必填：null
*/
@SalaryTableColumn(text = "本期税延养老保险费", width = "10%", column = "syylbx")
@ExcelHead(title = "本期税延养老保险费", dataIndex = "syylbx")
@SalaryTableColumn(text = "税延养老保险", width = "10%", column = "syylbx")
@ExcelHead(title = "税延养老保险", dataIndex = "syylbx")
private BigDecimal syylbx;
/**
* 其他 必填：null 按法律规定可以在税前扣除的项目
*/
@SalaryTableColumn(text = "本期其他扣除(其他)", width = "10%", column = "qt")
@ExcelHead(title = "本期其他扣除(其他)", dataIndex = "qt")
@SalaryTableColumn(text = "其他", width = "10%", column = "qt")
@ExcelHead(title = "其他", dataIndex = "qt")
private BigDecimal qt;
/**
* 准予扣除的捐赠额 必填：null
*/
@SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "zykcjze")
@ExcelHead(title = "准予扣除的捐赠额", dataIndex = "zykcjze")
private BigDecimal zykcjze;
/**
* 减免税额 必填：null
*/
@SalaryTableColumn(text = "减免税额", width = "10%", column = "jmse")
@ExcelHead(title = "减免税额", dataIndex = "jmse")
private BigDecimal jmse;
/**
* 备注 必填：null
*/
@SalaryTableColumn(text = "备注", width = "10%", column = "bz")
@ExcelHead(title = "备注", dataIndex = "bz")
private String bz;
/**
* 累计收入额 必填：null
@ -360,14 +380,14 @@ public class GetDeclareTaxResultFeedbackResponse extends BaseResponse {
/**
* 累计子女教育支出 必填：null
*/
@SalaryTableColumn(text = "累计子女教育支出扣除", width = "10%", column = "ljznjyzc")
@ExcelHead(title = "累计子女教育支出扣除", dataIndex = "ljznjyzc")
@SalaryTableColumn(text = "累计子女教育", width = "10%", column = "ljznjyzc")
@ExcelHead(title = "累计子女教育", dataIndex = "ljznjyzc")
private BigDecimal ljznjyzc;
/**
* 累计继续教育支出 必填：null
*/
@SalaryTableColumn(text = "累计继续教育支出扣除", width = "10%", column = "ljjxjyzc")
@ExcelHead(title = "累计继续教育支出扣除", dataIndex = "ljjxjyzc")
@SalaryTableColumn(text = "累计继续教育", width = "10%", column = "ljjxjyzc")
@ExcelHead(title = "累计继续教育", dataIndex = "ljjxjyzc")
private BigDecimal ljjxjyzc;
/**
* 累计非学历继续教育支持 必填：null
@ -380,20 +400,20 @@ public class GetDeclareTaxResultFeedbackResponse extends BaseResponse {
/**
* 累计住房租金支出 必填：null
*/
@SalaryTableColumn(text = "累计住房租金支出扣除", width = "10%", column = "ljzfzjzc")
@ExcelHead(title = "累计住房租金支出扣除", dataIndex = "ljzfzjzc")
@SalaryTableColumn(text = "累计住房租金", width = "10%", column = "ljzfzjzc")
@ExcelHead(title = "累计住房租金", dataIndex = "ljzfzjzc")
private BigDecimal ljzfzjzc;
/**
* 累计房屋贷款支出 必填：null
*/
@SalaryTableColumn(text = "累计房屋贷款支出扣除", width = "10%", column = "ljzfdklxzc")
@ExcelHead(title = "累计房屋贷款支出扣除", dataIndex = "ljzfdklxzc")
@SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "ljzfdklxzc")
@ExcelHead(title = "累计住房贷款利息", dataIndex = "ljzfdklxzc")
private BigDecimal ljzfdklxzc;
/**
* 累计赡养老人支出 必填：null
*/
@SalaryTableColumn(text = "累计赡养老人支出扣除", width = "10%", column = "ljsylrzc")
@ExcelHead(title = "累计赡养老人支出扣除", dataIndex = "ljsylrzc")
@SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "ljsylrzc")
@ExcelHead(title = "累计赡养老人", dataIndex = "ljsylrzc")
private BigDecimal ljsylrzc;
/**
* 累计3岁以下婴幼儿照护支出 必填：null
@ -483,17 +503,10 @@ public class GetDeclareTaxResultFeedbackResponse extends BaseResponse {
/**
* 应补退税额 必填：null 应补退税额=累计应扣缴税额-累计已缴税额
*/
@SalaryTableColumn(text = "应补退税额", width = "10%", column = "ybtse")
@ExcelHead(title = "应补退税额", dataIndex = "ybtse")
@SalaryTableColumn(text = "应补(退)税额", width = "10%", column = "ybtse")
@ExcelHead(title = "应补(退)税额", dataIndex = "ybtse")
private BigDecimal ybtse;
/**
* 备注 必填：null
*/
@SalaryTableColumn(text = "备注", width = "10%", column = "bz")
@ExcelHead(title = "备注", dataIndex = "bz")
private String bz;
/**
* 子女教育支出 必填：null
*/
@ -523,14 +536,6 @@ public class GetDeclareTaxResultFeedbackResponse extends BaseResponse {
*/
private BigDecimal yyezhzc;
/**
* 准予扣除的捐赠额 必填：null
*/
private BigDecimal zykcjze;
/**
* 减免税额 必填：null
*/
private BigDecimal jmse;
/**
* 减除费用 必填：null 正常工资薪金的减除费用。 对应保险营销员、证券经纪人的费用

33
src/com/engine/salary/service/impl/TaxDeclarationValueServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.service.impl;
import cn.hutool.core.util.NumberUtil;
import com.cloudstore.eccom.pc.table.WeaTableColumn;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
@ -38,9 +39,10 @@ import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.general.Util;
import weaver.hrm.User;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@ -422,14 +424,24 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar
String no = local.getOrDefault("证件号码", "").toString();
Map<String, Object> online = onlineNoMap.get(no);
taxReportColumns.stream().forEach(col -> {
taxReportColumns.forEach(col -> {
Map<String, Object> temp = Maps.newHashMap();
// 系统值
Object localValue = local.getOrDefault(col.getReportColumnName(), "");
// 线下值
Object onlineValue = online.getOrDefault(col.getReportColumnName(), "");
String localValue = Util.null2String(local.get(col.getReportColumnName()));
// 线上值
String onlineValue = Util.null2String(online.get(col.getReportColumnName()));
temp.put("local", localValue);
temp.put("online", onlineValue);
if (NumberUtil.isNumber(localValue) && NumberUtil.isNumber(onlineValue)) {
BigDecimal diff = new BigDecimal(localValue).subtract(new BigDecimal(onlineValue));
if (diff.compareTo(new BigDecimal(0)) != 0) {
temp.put("diff", diff);
}
} else {
if (!Objects.equals(localValue, onlineValue)) {
temp.put("diff", localValue);
}
}
result.put(col.getReportColumnName(), temp);
});
oneResultList.add(result);
@ -438,15 +450,4 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar
resultList.put("data", oneResultList);
return resultList;
}
public static void main(String[] args) {
String a = "姓名, 证件类型, 证件号码, 本期收入, 本期免税收入, 基本养老保险费 , 基本医疗保险费, 失业保险费, 住房公积金, 企业(职业)年金, 商业健康保险, 税延养老保险, 累计收入额, 累计免税收入 , 累计减除费用, 累计专项扣除, 累计子女教育支出扣除, 累计继续教育 累计住房租金, ,累计住房贷款利息 ,累计赡养老人 , 累计3岁以下婴幼儿照护, 累计个人养老金, 累计其他扣除, 累计准予扣除的捐赠,累计应纳税所得额 ,税率, 速算扣除数, 累计应纳税额, 累计减免税额, 累计应扣缴税额, 已缴税额, 备注, incomeCategory, 证件号码, 累计子女教育, id, 减免税额, jobNum, , employeeId, 其他, 应补(退)税额, 准予扣除的捐赠额 ";
String b = "姓名, 证件类型, 证件号码, 任职受雇日期, 离职日期, 本期收入, 本期免税收入, 本期基本养老保险费, 本期基本医疗保险费, 本期失业保险费, 本期住房公积金, 本期企业(职业)年金, 本期商业健康保险费, 本期税延养老保险费, 本期其他扣除(其他), 累计收入额, 累计免税收入, 累计减除费用, 累计专项扣除, 累计子女教育支出扣除, 累计继续教育支出扣除, 累计住房租金支出扣除, 累计房屋贷款支出扣除, 累计赡养老人支出扣除, 累计3岁以下婴幼儿照护, 累计个人养老金, 累计其他扣除, 累计准予扣除的捐赠, 累计应纳税所得额, 税率, 速算扣除数, 累计应纳税额, 累计减免税额, 累计应扣缴税额, 累计已缴税额, 已缴税额, 累计专项附加扣除额, 应补退税额, 备注";
List c = Arrays.stream(StringUtils.split(a, ",")).sorted(String::compareTo).collect(Collectors.toList());
List d = Arrays.stream(StringUtils.split(b, ",")).sorted(String::compareTo).collect(Collectors.toList());
System.out.println(c);
System.out.println(d);
}
}