Skip to content

8
8timerapiv200
Commit 7ed9030e by leialin
Options

提交

parent 8402e3a8
Showing with 21 additions and 21 deletions
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
...@@ -3395,25 +3395,25 @@ public class SalaryManagementController { ...@@ -3395,25 +3395,25 @@ public class SalaryManagementController {
XcglAssoZxfjkc xcglas = XcglAssoZxfjkc.builder().build(); XcglAssoZxfjkc xcglas = XcglAssoZxfjkc.builder().build();
xcglas.setUserid(ygl.getEmpNum()); xcglas.setUserid(ygl.getEmpNum());
xcglas.setTaxmonth(date); xcglas.setTaxmonth(date);
xcglas.setChildrenedu(Double.valueOf(spec.getZljy()));//子女教育 xcglas.setChildrenedu(spec.getZljy() == null ? 0 : Double.valueOf(spec.getZljy()));//子女教育
xcglas.setHouseloans(Double.valueOf(spec.getZfdk()));//住房贷款利息 xcglas.setHouseloans(spec.getZfdk() == null ? 0 : Double.valueOf(spec.getZfdk()));//住房贷款利息
xcglas.setHouserents(Double.valueOf(spec.getZfzj()));//住房租金 xcglas.setHouserents(spec.getZfzj() == null ? 0 : Double.valueOf(spec.getZfzj()));//住房租金
xcglas.setSupportolder(Double.valueOf(spec.getSylr()));//赡养老人 xcglas.setSupportolder(spec.getSylr() == null ? 0 : Double.valueOf(spec.getSylr()));//赡养老人
xcglas.setContinueedu(Double.valueOf(spec.getJxjy()));//继续教育 xcglas.setContinueedu(spec.getJxjy() == null ? 0 : Double.valueOf(spec.getJxjy()));//继续教育
BigDecimal num1 = new BigDecimal(spec.getZljy()); BigDecimal num1 = new BigDecimal(spec.getZljy() == null ? 0 : Double.valueOf(spec.getZljy()));
BigDecimal num2 = new BigDecimal(spec.getZfdk()); BigDecimal num2 = new BigDecimal(spec.getZfdk() == null ? 0 : Double.valueOf(spec.getZfdk()));
double result1 = num1.add(num2).doubleValue(); double result1 = num1.add(num2).doubleValue();
BigDecimal num3 = new BigDecimal(result1); BigDecimal num3 = new BigDecimal(result1);
BigDecimal num4 = new BigDecimal(spec.getZfzj()); BigDecimal num4 = new BigDecimal(spec.getZfzj() == null ? 0 : Double.valueOf(spec.getZfzj()));
double result2 = num3.add(num4).doubleValue(); double result2 = num3.add(num4).doubleValue();
BigDecimal num5 = new BigDecimal(result2); BigDecimal num5 = new BigDecimal(result2);
BigDecimal num6 = new BigDecimal(spec.getSylr()); BigDecimal num6 = new BigDecimal(spec.getSylr() == null ? 0 : Double.valueOf(spec.getSylr()));
double result3 = num5.add(num6).doubleValue(); double result3 = num5.add(num6).doubleValue();
BigDecimal num7 = new BigDecimal(result3); BigDecimal num7 = new BigDecimal(result3);
BigDecimal num8 = new BigDecimal(spec.getJxjy()); BigDecimal num8 = new BigDecimal(spec.getJxjy() == null ? 0 : Double.valueOf(spec.getJxjy()));
double result = num7.add(num8).doubleValue(); double result = num7.add(num8).doubleValue();
xcglas.setTotalmoney(result);//累计专项附加扣除 xcglas.setTotalmoney(result);//累计专项附加扣除
...@@ -3424,25 +3424,25 @@ public class SalaryManagementController { ...@@ -3424,25 +3424,25 @@ public class SalaryManagementController {
}else { }else {
XcglAssoZxfjkc fjkc = XcglAssoZxfjkc.builder().build(); XcglAssoZxfjkc fjkc = XcglAssoZxfjkc.builder().build();
fjkc.setId(xcg.getId()); fjkc.setId(xcg.getId());
fjkc.setChildrenedu(Double.valueOf(spec.getZljy()));//子女教育 fjkc.setChildrenedu(spec.getZljy() == null ? 0 : Double.valueOf(spec.getZljy()));//子女教育
fjkc.setHouseloans(Double.valueOf(spec.getZfdk()));//住房贷款利息 fjkc.setHouseloans(spec.getZfdk() == null ? 0 : Double.valueOf(spec.getZfdk()));//住房贷款利息
fjkc.setHouserents(Double.valueOf(spec.getZfzj()));//住房租金 fjkc.setHouserents(spec.getZfzj() == null ? 0 : Double.valueOf(spec.getZfzj()));//住房租金
fjkc.setSupportolder(Double.valueOf(spec.getSylr()));//赡养老人 fjkc.setSupportolder(spec.getSylr() == null ? 0 : Double.valueOf(spec.getSylr()));//赡养老人
fjkc.setContinueedu(Double.valueOf(spec.getJxjy()));//继续教育 fjkc.setContinueedu(spec.getJxjy() == null ? 0 : Double.valueOf(spec.getJxjy()));//继续教育
BigDecimal num1 = new BigDecimal(Double.valueOf(spec.getZljy())); BigDecimal num1 = new BigDecimal(spec.getZljy() == null ? 0 : Double.valueOf(spec.getZljy()));
BigDecimal num2 = new BigDecimal(Double.valueOf(spec.getZfdk())); BigDecimal num2 = new BigDecimal(spec.getZfdk() == null ? 0 : Double.valueOf(spec.getZfdk()));
double result1 = num1.add(num2).doubleValue(); double result1 = num1.add(num2).doubleValue();
BigDecimal num3 = new BigDecimal(result1); BigDecimal num3 = new BigDecimal(result1);
BigDecimal num4 = new BigDecimal(Double.valueOf(spec.getZfzj())); BigDecimal num4 = new BigDecimal(spec.getZfzj() == null ? 0 : Double.valueOf(spec.getZfzj()));
double result2 = num3.add(num4).doubleValue(); double result2 = num3.add(num4).doubleValue();
BigDecimal num5 = new BigDecimal(result2); BigDecimal num5 = new BigDecimal(result2);
BigDecimal num6 = new BigDecimal(Double.valueOf(spec.getSylr())); BigDecimal num6 = new BigDecimal(spec.getSylr() == null ? 0 : Double.valueOf(spec.getSylr()));
double result3 = num5.add(num6).doubleValue(); double result3 = num5.add(num6).doubleValue();
BigDecimal num7 = new BigDecimal(result3); BigDecimal num7 = new BigDecimal(result3);
BigDecimal num8 = new BigDecimal(Double.valueOf(spec.getJxjy())); BigDecimal num8 = new BigDecimal(spec.getJxjy() == null ? 0 : Double.valueOf(spec.getJxjy()));
double result = num7.add(num8).doubleValue(); double result = num7.add(num8).doubleValue();
fjkc.setTotalmoney(Double.valueOf(result));//累计专项附加扣除 fjkc.setTotalmoney(Double.valueOf(result));//累计专项附加扣除
...@@ -3453,7 +3453,7 @@ public class SalaryManagementController { ...@@ -3453,7 +3453,7 @@ public class SalaryManagementController {
// e.printStackTrace(); // e.printStackTrace();
failure++; failure++;
map.put("name", name); map.put("name", name);
map.put("msg", StringUtils.isBlank(e.getMessage()) ? "用户信息错误" : e.getMessage()); map.put("msg", StringUtils.isBlank(e.getMessage()) ? "用户信息错误（例如：电话号码不正确等）" : e.getMessage());
} finally { } finally {
if(!map.isEmpty()) { if(!map.isEmpty()) {
reasons.add(map); reasons.add(map);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment