From 973efff6a76e2f5e1c859d77edb32455cd35a0a9 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 12 Oct 2022 21:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=9B=9B=E9=A1=B9=E8=A1=A5?= =?UTF-8?q?=E5=8A=A9=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java | 6 +++--- src/com/engine/bjcj220907/entity/JWJT.java | 5 ----- src/com/engine/bjcj220907/entity/JwCZInfoDetail.java | 2 +- .../service/impl/OverseasAllowanceCountServiceImpl.java | 6 ++++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java b/src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java index 27e1015..7d92c60 100644 --- a/src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java +++ b/src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java @@ -27,10 +27,10 @@ public class OverseasAllowanceDAO { public List getCZInfo(Date startAttendanceCal,Date endAttendanceCal) { RecordSet rs = new RecordSet(); //TODO 修改sqluf_bjcjtestgl - String sql="select xm,jwgzksrq,jwgzjsrq,lx,jsglts,g.btbz,jwgzdw1, a.btbz dqbtbz " + + String sql="select xm,jwgzksrq,jwgzjsrq,lx,jsglts,g.jwglbtbz,jwgzdw1, a.btbz dqbtbz " + "from UF_NJJMB_DT1 d LEFT JOIN UF_NJJMB m on d.MAINID=m.id " + "LEFT JOIN UF_DQBTBZ a on d.jwgzdw1=a.id "+ - "LEFT JOIN uf_bjcjtestgl g on g.jwgl=case when floor(jsglts/365)>5 then 5 else floor(jsglts/365) end " + + "LEFT JOIN uf_jwgl g on g.jwgl=case when floor(jsglts/365)>5 then 5 else floor(jsglts/365) end " + "WHERE lx in(0,1) " + "ORDER by JWGZKSRQ desc"; rs.execute(sql); @@ -43,7 +43,7 @@ public class OverseasAllowanceDAO { String jwgzjsrqStr = rs.getString("jwgzjsrq"); Date jwgzjsrq=null; double jsglts = rs.getDouble("jsglts"); - double btbz = rs.getDouble("btbz"); + double btbz = rs.getDouble("jwglbtbz"); String jwgzdw1 = rs.getString("JWGZDW1"); double dqbtbz = rs.getDouble("DQBTBZ"); int lx = rs.getInt("lx"); diff --git a/src/com/engine/bjcj220907/entity/JWJT.java b/src/com/engine/bjcj220907/entity/JWJT.java index bbce217..5938221 100644 --- a/src/com/engine/bjcj220907/entity/JWJT.java +++ b/src/com/engine/bjcj220907/entity/JWJT.java @@ -90,11 +90,6 @@ public class JWJT { private double jwgl; -// /** -// * 艰苦地区补贴总和 -// */ -// private double jkdqbtzh; - /** * 艰苦地区补贴 */ diff --git a/src/com/engine/bjcj220907/entity/JwCZInfoDetail.java b/src/com/engine/bjcj220907/entity/JwCZInfoDetail.java index 0c9500b..43fe683 100644 --- a/src/com/engine/bjcj220907/entity/JwCZInfoDetail.java +++ b/src/com/engine/bjcj220907/entity/JwCZInfoDetail.java @@ -25,7 +25,7 @@ public class JwCZInfoDetail { private String xm; /** - * 类型（0：开始常驻，1：结束常驻） + * 类型（ 0：开始常驻，1：结束常驻 ） */ private Integer lx; diff --git a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java index 53cd2f6..918173e 100644 --- a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java @@ -67,7 +67,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse Attend4MonthBonus build = Attend4MonthBonus.builder().beginDate(startAttendanceCal.getTime()).endDate(endAttendanceCal.getTime()).build(); Map kqDatas = GetKQ4OverseasAllowanceCountService().getKQDatas(build); baseBean.writeLog("调用考勤接口获取公务回国天数 及 缺勤天数，共："+usersXSDJ.size()); - // 封装薪酬等级、境外津贴标准、考勤天数、四项补助合计 + // 封装计算薪酬等级、境外津贴标准、考勤天数、四项补助合计 // int days = BjcjCommonUtils.getDays(startAttendanceCal.getTime(), endAttendanceCal.getTime()); getXcdjAndJwjtbz(results,usersXSDJ,kqDatas); // TODO:验证一下188 陈涛有没有考勤数据 结果不再是0.00 @@ -235,7 +235,9 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse List formatJwCZInfos = new ArrayList<>(); for (Map.Entry> entry : groupByName.entrySet()) { List values = entry.getValue(); - JwCZInfo build = new JwCZInfo().builder().xm(values.get(0).getXm()).jsglts(values.get(0).getJsglts()).glbtybz(values.get(0).getGlbtybz()).glbtrbz(values.get(0).getGlbtybz()/days).infos(entry.getValue()).build(); + JwCZInfo build = new JwCZInfo().builder().xm(values.get(0).getXm()).jsglts(values.get(0).getJsglts()) + .glbtybz(values.get(0).getGlbtybz()).glbtrbz(values.get(0).getGlbtybz()/days) + .infos(entry.getValue()).build(); formatJwCZInfos.add(build); } return formatJwCZInfos;