宁波精华年终奖报表
This commit is contained in:
parent
cac6452d42
commit
d339745693
|
|
@ -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<Integer> grxsList = resultMap.computeIfAbsent(Long.valueOf(ygxm), k -> new ArrayList<Integer>());
|
||||
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"));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue