Merge branch 'lal' into develop

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -2194,6 +2194,22 @@ public class SalaryManagementController {
 			//#（上月）# 对应薪资月的-1 个税对标数据     （九月工资：对应8月的个税来计算九月的个税）
 			//#（上月）# 对应薪资月的-1 个税对标数据     （九月工资：对应8月的个税来计算九月的个税）
 			XcglAssoGsjsmx sygs = XcglAssoGsjsmx.builder().build().selectOne(new QueryWrapper<XcglAssoGsjsmx>().lambda().eq(XcglAssoGsjsmx::getUserNum, gsus).eq(XcglAssoGsjsmx::getQyid, orgcode)
 			XcglAssoGsjsmx sygs = XcglAssoGsjsmx.builder().build().selectOne(new QueryWrapper<XcglAssoGsjsmx>().lambda().eq(XcglAssoGsjsmx::getUserNum, gsus).eq(XcglAssoGsjsmx::getQyid, orgcode)
 					.eq(XcglAssoGsjsmx::getSalaryMonth, SalaryTool.getfirstlastMo(salary_month+"-01 00:00:00")));
 					.eq(XcglAssoGsjsmx::getSalaryMonth, SalaryTool.getfirstlastMo(salary_month+"-01 00:00:00")));
+			
+			boolean status = salary_month.contains("-01");
+			double childrenedu_ = 0;//累计子女教育
+			double houseloans_ = 0;//累计住房贷款利息
+			double houserents_ = 0;//累计住房租金
+			double supportolder_ = 0;//累计赡养老人
+			double continueedu_ = 0;//累计继续教育
+			double totalmoney_ = 0;//累计专项附加扣除
+			if(!status && sygs != null) {
+				childrenedu_ = sygs.getCumZljy(); 
+				houseloans_ = sygs.getCumZfdklx();  
+				houserents_ = sygs.getCumZfzj();  
+				supportolder_ = sygs.getCumSylr();
+				continueedu_ = sygs.getCumJxjy(); 
+				totalmoney_ = sygs.getCumZxfjkc();  
+			}
 			YgglMainEmp yh = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, gsus).eq(YgglMainEmp::getOrgCode, orgcode));
 			YgglMainEmp yh = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, gsus).eq(YgglMainEmp::getOrgCode, orgcode));
 			//对应算薪月份的专项附加扣除
 			//对应算薪月份的专项附加扣除
 			XcglAssoZxfjkc zxf = XcglAssoZxfjkc.builder().build().selectOne(new QueryWrapper<XcglAssoZxfjkc>().lambda().eq(XcglAssoZxfjkc::getUserid, gsus)
 			XcglAssoZxfjkc zxf = XcglAssoZxfjkc.builder().build().selectOne(new QueryWrapper<XcglAssoZxfjkc>().lambda().eq(XcglAssoZxfjkc::getUserid, gsus)
@@ -2212,12 +2228,12 @@ public class SalaryManagementController {
 				taxmonth = SalaryTool.getfirstnextMo(salary_month+"-01 00:00:00");
 				taxmonth = SalaryTool.getfirstnextMo(salary_month+"-01 00:00:00");
 			}
 			}
 			gsmx.setTaxMonth(taxmonth);//税款所属月份
 			gsmx.setTaxMonth(taxmonth);//税款所属月份
-			gsmx.setCumZljy(zxf == null ? 0 : (zxf.getChildrenedu() == null ? 0 : zxf.getChildrenedu()));//累计子女教育
-			gsmx.setCumZfdklx(zxf == null ? 0 : (zxf.getHouseloans() == null ? 0 : zxf.getHouseloans()));//累计住房贷款利息
-			gsmx.setCumZfzj(zxf == null ? 0 : (zxf.getHouserents() == null ? 0 : zxf.getHouserents()));//累计住房租金
-			gsmx.setCumSylr(zxf == null ? 0 : (zxf.getSupportolder() == null ? 0 : zxf.getSupportolder()));//累计赡养老人
-			gsmx.setCumJxjy(zxf == null ? 0 : (zxf.getContinueedu() == null ? 0 : zxf.getContinueedu()));//累计继续教育
-			gsmx.setCumZxfjkc(zxf == null ? 0 : (zxf.getTotalmoney() == null ? 0 : zxf.getTotalmoney()));//累计专项附加扣除
+			gsmx.setCumZljy(zxf == null ? 0 : (zxf.getChildrenedu() == null ? 0 : zxf.getChildrenedu()) + childrenedu_);//累计子女教育
+			gsmx.setCumZfdklx(zxf == null ? 0 : (zxf.getHouseloans() == null ? 0 : zxf.getHouseloans()) + houseloans_);//累计住房贷款利息
+			gsmx.setCumZfzj(zxf == null ? 0 : (zxf.getHouserents() == null ? 0 : zxf.getHouserents()) + houserents_);//累计住房租金
+			gsmx.setCumSylr(zxf == null ? 0 : (zxf.getSupportolder() == null ? 0 : zxf.getSupportolder()) + supportolder_);//累计赡养老人
+			gsmx.setCumJxjy(zxf == null ? 0 : (zxf.getContinueedu() == null ? 0 : zxf.getContinueedu()) + continueedu_);//累计继续教育
+			gsmx.setCumZxfjkc(zxf == null ? 0 : (zxf.getTotalmoney() == null ? 0 : zxf.getTotalmoney()) + totalmoney_);//累计专项附加扣除
 			gsmx.setTaxType("工资薪金所得");//计税类型
 			gsmx.setTaxType("工资薪金所得");//计税类型
 			gsmx.setCurrentIncome(wages_payable);//本期收入  【应发工资】
 			gsmx.setCurrentIncome(wages_payable);//本期收入  【应发工资】
 				SbgjjAssoYjzd cuspde = sbgjjassoyjzdmapper.IndividualTotalsbgjj(gsus, orgcode, salary_month);
 				SbgjjAssoYjzd cuspde = sbgjjassoyjzdmapper.IndividualTotalsbgjj(gsus, orgcode, salary_month);