From d339745693b307bb84f031c169c045f2e14fcc51 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 7 Jan 2025 17:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E7=B2=BE=E5=8D=8E=E5=B9=B4?= =?UTF-8?q?=E7=BB=88=E5=A5=96=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryAcctResultServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index bb5bc60ff..73541aad5 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -2083,7 +2083,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe rs.execute("select ry,cql as a from uf_ndcqhz where ry in ("+StringUtils.join(part,",")+") and nd="+year); while (rs.next()) { int ry = rs.getInt("ry"); - double cql = rs.getDouble("cql"); + double cql = StringUtils.isBlank(rs.getString("cql")) ? 0 : rs.getDouble("cql"); resultMap.put(Long.valueOf(ry), cql); } }); @@ -2112,7 +2112,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe +fromDate+"' and khzq<='"+toDate+"' and b.ygxm in ("+StringUtils.join(part, ",")+")"); while (rs.next()) { int ygxm = rs.getInt("ygxm"); - int grxspd = rs.getInt("grxspd"); + int grxspd = StringUtils.isBlank(rs.getString("grxspd")) ? 0 : rs.getInt("grxspd"); List grxsList = resultMap.computeIfAbsent(Long.valueOf(ygxm), k -> new ArrayList()); grxsList.add(grxspd); } @@ -2152,10 +2152,10 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe int jllx = rs.getInt("jllx"); if (jllx == 0) { double yfjj = yfjjMap.get(Long.valueOf(rs.getInt("xm"))) == null ? 0 : (Double) yfjjMap.get(Long.valueOf(rs.getInt("xm"))); - yfjjMap.put(Long.valueOf(rs.getInt("xm")), yfjj + rs.getDouble("jlje")); + yfjjMap.put(Long.valueOf(rs.getInt("xm")), yfjj + (StringUtils.isBlank(rs.getString("jlje")) ? 0 : rs.getDouble("jlje"))); } else if(jllx == 1 || jllx ==2) { double jl = jlMap.get(Long.valueOf(rs.getInt("xm"))) == null ? 0 : (Double) jlMap.get(Long.valueOf(rs.getInt("xm"))); - jlMap.put(Long.valueOf(rs.getInt("xm")), jl + rs.getDouble("jlje")); + jlMap.put(Long.valueOf(rs.getInt("xm")), jl + (StringUtils.isBlank(rs.getString("jlje")) ? 0 : rs.getDouble("jlje"))); } } }); @@ -2190,7 +2190,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 获取明细表数据 rs.execute("SELECT xm,ndjxxs FROM uf_ndjxxstz_dt1 where mainid in ("+StringUtils.join(mainIdList, ",")+") and xm in ("+StringUtils.join(part, ",")+")"); while (rs.next()) { - resultMap.put(Long.valueOf(rs.getInt("xm")), rs.getDouble("ndjxxs")); + resultMap.put(Long.valueOf(rs.getInt("xm")), StringUtils.isBlank(rs.getString("ndjxxs")) ? 0 : rs.getDouble("ndjxxs")); } }); }