shilei
/
weaver-ningbojinghua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no.2916227 休息日加班计算加班时长注释舍掉小数&预入职流程数据传递

Browse Source
pull/3/head
chenxu1234 1 year ago
parent baad5c2e82
commit 2894f6dfbb
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File

30
src/com/engine/nbkq/service/impl/NbkqServiceImpl.java
Unescape Escape View File

@ -153,7 +153,7 @@ public class NbkqServiceImpl extends Service implements NbkqService {
requestMap.put("zy",zy);
}
if(StringUtils.isNotBlank(hklx)){
requestMap.put("hklx",hklx);
requestMap.put("hklx1",hklx);
}
if(StringUtils.isNotBlank(zc)){
requestMap.put("zc",zc);
@ -198,7 +198,7 @@ public class NbkqServiceImpl extends Service implements NbkqService {
requestMap.put("sg", sg);
}
if(StringUtils.isNotBlank(zzmm)) {
requestMap.put("zzmm", zzmm);
requestMap.put("zzmr", zzmm);
}
if(StringUtils.isNotBlank(cjgzsj)) {
requestMap.put("cjgzsj", cjgzsj);
@ -248,7 +248,7 @@ public class NbkqServiceImpl extends Service implements NbkqService {
bb.writeLog("开始处理明细");
//明细表1处理
List<Map<String,String>> list = new ArrayList<Map<String,String>>();
String sqlDt1 = " select ksrq,jsrq,xx,zy,bz from uf_yrzbd_dt1 where mainid = "+id;
String sqlDt1 = " select ksrq,jsrq,xx,zy,bz,zmr,lxdh from uf_yrzbd_dt1 where mainid = "+id;
rs.executeQuery(sqlDt1);
while (rs.next()){
Map<String,String> mapMode = new HashMap<>();
@ -257,6 +257,8 @@ public class NbkqServiceImpl extends Service implements NbkqService {
String xxNew = Util.null2String(rs.getString("xx"));
String zyNew = Util.null2String(rs.getString("zy"));
String bz = Util.null2String(rs.getString("bz"));
String zmr = Util.null2String(rs.getString("zmr"));
String lxdhDto = Util.null2String(rs.getString("lxdh"));
if (StringUtils.isNotBlank(ksrq)){
mapMode.put("ksrq",ksrq);
}
@ -272,6 +274,12 @@ public class NbkqServiceImpl extends Service implements NbkqService {
if (StringUtils.isNotBlank(bz)){
mapMode.put("bz",bz);
}
if (StringUtils.isNotBlank(zmr)){
mapMode.put("zmr",zmr);
}
if (StringUtils.isNotBlank(lxdhDto)){
mapMode.put("lxdh",lxdhDto);
}
list.add(mapMode);
}
@ -300,7 +308,7 @@ public class NbkqServiceImpl extends Service implements NbkqService {
//明细表2处理
List<Map<String,String>> list2 = new ArrayList<Map<String,String>>();
String sqlDt2 = " select ksrq,jsrq,gzdw,zw,lzyy,zmr from uf_yrzbd_dt2 where mainid = "+id;
String sqlDt2 = " select ksrq,jsrq,gzdw,zw,lzyy,zmr,xz,lxdh from uf_yrzbd_dt2 where mainid = "+id;
rs.executeQuery(sqlDt2);
while (rs.next()){
Map<String,String> mapMode = new HashMap<>();
@ -310,6 +318,8 @@ public class NbkqServiceImpl extends Service implements NbkqService {
String zw = Util.null2String(rs.getString("zw"));
String lzyy = Util.null2String(rs.getString("lzyy"));
String zmr = Util.null2String(rs.getString("zmr"));
String xz = Util.null2String(rs.getString("xz"));
String lxdhDtT = Util.null2String(rs.getString("lxdh"));
if (StringUtils.isNotBlank(ksrq)){
mapMode.put("ksrq",ksrq);
}
@ -328,6 +338,12 @@ public class NbkqServiceImpl extends Service implements NbkqService {
if (StringUtils.isNotBlank(zmr)){
mapMode.put("zmr",zmr);
}
if (StringUtils.isNotBlank(xz)){
mapMode.put("xz",xz);
}
if (StringUtils.isNotBlank(lxdhDtT)){
mapMode.put("lxdh",lxdhDtT);
}
list2.add(mapMode);
}
@ -347,7 +363,7 @@ public class NbkqServiceImpl extends Service implements NbkqService {
//明细表3处理
List<Map<String,String>> list3 = new ArrayList<Map<String,String>>();
String sqlDt3 = " select xm,nl,ybrgx,zz,zy from uf_yrzbd_dt3 where mainid = "+id;
String sqlDt3 = " select xm,nl,ybrgx,zz,zy,lxdh from uf_yrzbd_dt3 where mainid = "+id;
rs.executeQuery(sqlDt3);
while (rs.next()){
Map<String,String> mapMode = new HashMap<>();
@ -356,6 +372,7 @@ public class NbkqServiceImpl extends Service implements NbkqService {
String ybrgx = Util.null2String(rs.getString("ybrgx"));
String zz = Util.null2String(rs.getString("zz"));
String zyNew = Util.null2String(rs.getString("zy"));
String lxdhDtTh = Util.null2String(rs.getString("lxdh"));
if (StringUtils.isNotBlank(xmNew)){
mapMode.put("xm",xmNew);
@ -372,6 +389,9 @@ public class NbkqServiceImpl extends Service implements NbkqService {
if (StringUtils.isNotBlank(zyNew)){
mapMode.put("zy",zyNew);
}
if (StringUtils.isNotBlank(lxdhDtTh)){
mapMode.put("lxdh",lxdhDtTh);
}
list3.add(mapMode);
}

Write Preview
Loading…
Cancel
Save