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

暂存

This commit is contained in:
钱涛 2024-01-08 16:00:15 +08:00
parent 2670236f9c
commit c54f9daa2d
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,8 +473,6 @@ public class GetDeclareTaxResultFeedbackResponse extends BaseResponse {
/**
* 已缴税额 必填：null 正常工资薪金返回Null
*/
@SalaryTableColumn(text = "已缴税额", width = "10%", column = "ykjse")
@ExcelHead(title = "已缴税额", dataIndex = "ykjse")
private BigDecimal ykjse;
/**

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

@ -31,6 +31,7 @@ import com.engine.salary.util.JsonUtil;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryEnumUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.excel.ExcelUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
@ -386,12 +387,17 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar
list.stream().map(TaxDeclarationPO::getIncomeCategory).map(IncomeCategoryEnum::parseByValue).forEach(e -> e.parseGetDeclareTaxResultFeedbackResponse(onlineDataMap, declareTaxResultFeedbackResponse));
for (String incomeCategory : localData.keySet()) {
List<Map<String, Object>> localMap = localData.get(incomeCategory);
List<Map<String, Object>> localList = localData.get(incomeCategory);
Map<String, Map<String, Object>> localMap = new HashMap<>();
for (Map<String, Object> map : localList) {
String no = map.getOrDefault("证件号码", "").toString();
localMap.put(no, map);
}
List<List<Object>> onlineData = onlineDataMap.get(incomeCategory);
List<Object> heads = onlineData.get(0);
List<List<Object>> data = onlineData.subList(1, onlineData.size());
List<Map<String, Object>> onlineMap = new ArrayList<>();
for (int i = 0; i < data.size(); i++) {
List<Object> row = data.get(i);
@ -402,11 +408,33 @@ public class TaxDeclarationValueServiceImpl extends Service implements TaxDeclar
}
onlineMap.add(m);
}
Map<String, Map<String, Object>> onlineNoMap = new HashMap<>();
for (Map<String, Object> map : onlineMap) {
String no = map.getOrDefault("证件号码", "").toString();
onlineNoMap.put(no, map);
}
Map<String, List<Object>> header = ExcelUtil.getHeader(GetDeclareTaxResultFeedbackResponse.Body.zhsd.zcgzxj.zhsdscjgbw.class);
List<Object> list1 = header.get(header);
List<Map<String, Object>> resultList = new ArrayList<>();
for (Map<String, Object> map : localList) {
String no = map.getOrDefault("证件号码", "").toString();
Map<String, Object> d1 = localMap.get(no);
Map<String, Object> d2 = onlineNoMap.get(no);
}
}
}
public static void main(String[] args) {
String a = "姓名, 证件类型, 证件号码, 本期收入, 本期免税收入, 基本养老保险费 , 基本医疗保险费, 失业保险费, 住房公积金, 企业(职业)年金, 商业健康保险, 税延养老保险, 累计收入额, 累计免税收入 , 累计减除费用, 累计专项扣除, 累计子女教育支出扣除, 累计继续教育 累计住房租金, 累计赡养老人支出扣除 , 累计3岁以下婴幼儿照护, 累计个人养老金, 累计其他扣除, 累计准予扣除的捐赠,累计应纳税所得额 ,税率, 速算扣除数, 累计应纳税额, 累计减免税额, 累计应扣缴税额, 已缴税额, 备注, incomeCategory, 证件号码,累计住房贷款利息, 累计子女教育, id, 减免税额, 累计3岁以下婴幼儿照护支出, jobNum, , employeeId, 其他, 应补(退)税额, 准予扣除的捐赠额, 累计住房贷款利息支出扣除, 累计住房租金支出扣除, 累计赡养老人, ";
String a = "姓名, 证件类型, 证件号码, 本期收入, 本期免税收入, 基本养老保险费 , 基本医疗保险费, 失业保险费, 住房公积金, 企业(职业)年金, 商业健康保险, 税延养老保险, 累计收入额, 累计免税收入 , 累计减除费用, 累计专项扣除, 累计子女教育支出扣除, 累计继续教育 累计住房租金, ,累计住房贷款利息 ,累计赡养老人 , 累计3岁以下婴幼儿照护, 累计个人养老金, 累计其他扣除, 累计准予扣除的捐赠,累计应纳税所得额 ,税率, 速算扣除数, 累计应纳税额, 累计减免税额, 累计应扣缴税额, 已缴税额, 备注, incomeCategory, 证件号码, 累计子女教育, id, 减免税额, jobNum, , employeeId, 其他, 应补(退)税额, 准予扣除的捐赠额 ";
String b = "姓名, 证件类型, 证件号码, 任职受雇日期, 离职日期, 本期收入, 本期免税收入, 本期基本养老保险费, 本期基本医疗保险费, 本期失业保险费, 本期住房公积金, 本期企业(职业)年金, 本期商业健康保险费, 本期税延养老保险费, 本期其他扣除(其他), 累计收入额, 累计免税收入, 累计减除费用, 累计专项扣除, 累计子女教育支出扣除, 累计继续教育支出扣除, 累计住房租金支出扣除, 累计房屋贷款支出扣除, 累计赡养老人支出扣除, 累计3岁以下婴幼儿照护, 累计个人养老金, 累计其他扣除, 累计准予扣除的捐赠, 累计应纳税所得额, 税率, 速算扣除数, 累计应纳税额, 累计减免税额, 累计应扣缴税额, 累计已缴税额, 已缴税额, 累计专项附加扣除额, 应补退税额, 备注";
List c = Arrays.stream(StringUtils.split(a, ",")).sorted(String::compareTo).collect(Collectors.toList());