qt
/
weaver-bjcj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

核算四项补助合计

This commit is contained in:
Harryxzy 2022-10-12 21:27:46 +08:00
parent 3d9116b6ea
commit 973efff6a7
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/bjcj220907/dao/OverseasAllowanceDAO.java
View File

@ -27,10 +27,10 @@ public class OverseasAllowanceDAO {
public List<JwCZInfoDetail> 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");

5
src/com/engine/bjcj220907/entity/JWJT.java
View File

@ -90,11 +90,6 @@ public class JWJT {
private double jwgl;
// /**
// * 艰苦地区补贴总和
// */
// private double jkdqbtzh;
/**
* 艰苦地区补贴
*/

6
src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java
View File

@ -67,7 +67,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
Attend4MonthBonus build = Attend4MonthBonus.builder().beginDate(startAttendanceCal.getTime()).endDate(endAttendanceCal.getTime()).build();
Map<String, Double> 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<JwCZInfo> formatJwCZInfos = new ArrayList<>();
for (Map.Entry<String, List<JwCZInfoDetail>> entry : groupByName.entrySet()) {
List<JwCZInfoDetail> 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;