From 5ddbc8a8ba492e9864f95b1438085defa2e87f38 Mon Sep 17 00:00:00 2001
From: ilal <lalqqhy@163.com>
Date: Mon, 2 Nov 2020 18:04:29 +0800
Subject: [PATCH] 提交数据
---
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
index 85e0192..008b488 100644
--- a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+++ b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
@@ -2187,24 +2187,28 @@ public class SalaryManagementController {
gsmx.setCurrentSpecialDeduction(cuspde == null ? 0 : Double.valueOf(cuspde.getGrjltotal()));//本期专项扣除 【个人的社保公积金缴纳扣除】
gsmx.setCumSre(wages_payable+(sygs == null ? 0 : sygs.getCumSre()));//累计收入额 【本期收入+累计收入额(上月)】
double cumjcfy = 0;
- int xcy = 0;
- YgglMainEmp xzrz = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, gsus).eq(YgglMainEmp::getOrgCode, orgcode));
- if(xzrz != null) {
- String entry_date = ClockInTool.SunNovCSTYMD(xzrz.getRzTime());//yyyyMMdd
- if(bssz.getTaxReturnCycle().equals(1)) {//当月报税
- if(entry_date.substring(0,4).equals(strY)) {//判断是否是本年
- xcy = SalaryTool.getMonthDiff(entry_date, salary_month+"-01");
- }else {
- xcy = SalaryTool.getMonthDiff(strY+"-01-01", salary_month+"-01");
- }
- cumjcfy = xcy*5000;
- }else {//次月报税
- if(entry_date.substring(0,4).equals(strY)) {//判断是否是本年
- xcy = SalaryTool.getMonthDiff(entry_date, salary_month+"-01")+1;
- }else {
- xcy = SalaryTool.getMonthDiff(strY+"-01-01", salary_month+"-01")+1;
+ if(sygs.getCumJcfy() > 0) {
+ cumjcfy = sygs.getCumJcfy() + 5000;
+ }else {
+ int xcy = 0;
+ YgglMainEmp xzrz = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, gsus).eq(YgglMainEmp::getOrgCode, orgcode));
+ if(xzrz != null) {
+ String entry_date = ClockInTool.SunNovCSTYMD(xzrz.getRzTime());//yyyyMMdd
+ if(bssz.getTaxReturnCycle().equals(1)) {//当月报税
+ if(entry_date.substring(0,4).equals(strY)) {//判断是否是本年
+ xcy = SalaryTool.getMonthDiff(entry_date, salary_month+"-01");
+ }else {
+ xcy = SalaryTool.getMonthDiff(strY+"-01-01", salary_month+"-01");
+ }
+ cumjcfy = xcy*5000;
+ }else {//次月报税
+ if(entry_date.substring(0,4).equals(strY)) {//判断是否是本年
+ xcy = SalaryTool.getMonthDiff(entry_date, salary_month+"-01")+1;
+ }else {
+ xcy = SalaryTool.getMonthDiff(strY+"-01-01", salary_month+"-01")+1;
+ }
+ cumjcfy = xcy*5000;
}
- cumjcfy = xcy*5000;
}
}
gsmx.setCumJcfy(cumjcfy);//累计减除费用 【5000*在职月份数】
--
libgit2 0.26.0