chenwei
/
weaver-hostar
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

获取班次方法优化

Browse Source
dev-zm
zhangming 7 months ago
parent 99e8691098
commit 71072bae31
2 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File

70
src/com/engine/hostar/thread/HandleCBDataThread.java
Unescape Escape View File

@ -275,22 +275,25 @@ public class HandleCBDataThread extends BaseBean implements Runnable{
try { try {
//获取当天班次 //获取当天班次
KQWorkTime kqWorkTime = new KQWorkTime(); KQWorkTime kqWorkTime = new KQWorkTime();
Map<String, Object> serialInfo = kqWorkTime.getSerialInfo(userId, kqDate, false); WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate);
if (serialInfo != null && serialInfo.size() > 0) { String bc = workTime.getSerialId();
int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); if (StringUtils.isEmpty(bc)) {
if (serialid > 0) { return value;
if ((!CollectionUtils.isEmpty(nightShiftList)) && nightShiftList.contains(String.valueOf(serialid))) { }
value = "0"; int serialid = Integer.parseInt(bc);
} else { if (serialid > 0) {
rs.executeQuery("select zeropoint from kq_format_total where resourceid = ? and kqdate = ?", userId, kqDate); if ((!CollectionUtils.isEmpty(nightShiftList)) && nightShiftList.contains(String.valueOf(serialid))) {
if (rs.next()) {
value = rs.getString("zeropoint");
}
}
} else {
value = "0"; value = "0";
} else {
rs.executeQuery("select zeropoint from kq_format_total where resourceid = ? and kqdate = ?", userId, kqDate);
if (rs.next()) {
value = rs.getString("zeropoint");
}
} }
} else {
value = "0";
} }
} catch (Exception e) { } catch (Exception e) {
bb.writeLog("get ZeroBt error:" + e.getMessage()); bb.writeLog("get ZeroBt error:" + e.getMessage());
} }
@ -306,18 +309,20 @@ public class HandleCBDataThread extends BaseBean implements Runnable{
if (nightShiftList != null & nightShiftList.size() > 0) { if (nightShiftList != null & nightShiftList.size() > 0) {
KQWorkTime kqWorkTime = new KQWorkTime(); KQWorkTime kqWorkTime = new KQWorkTime();
//获取当天班次 WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate);
Map<String, Object> serialInfo = kqWorkTime.getSerialInfo(userId, kqDate, false); String bc = workTime.getSerialId();
if (serialInfo != null && serialInfo.size() > 0) { if (StringUtils.isEmpty(bc)) {
int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); return "0";
bb.writeLog("getNightShiftSubsidy serialid:" + serialid); }
if (serialid > 0) {
if ( !nightShiftList.contains(String.valueOf(serialid))) { int serialid = Integer.parseInt(bc);
return "0"; bb.writeLog("getNightShiftSubsidy serialid:" + serialid);
} if (serialid > 0) {
} else { if ( !nightShiftList.contains(String.valueOf(serialid))) {
return "0"; return "0";
} }
} else {
return "0";
} }
bb.writeLog("getNightShiftSubsidy groupId:" + groupId); bb.writeLog("getNightShiftSubsidy groupId:" + groupId);
@ -578,18 +583,21 @@ public class HandleCBDataThread extends BaseBean implements Runnable{
KQWorkTime kqWorkTime = new KQWorkTime(); KQWorkTime kqWorkTime = new KQWorkTime();
for (String res : resIds) { for (String res : resIds) {
//获取当天班次 //获取当天班次
Map<String, Object> serialInfo = kqWorkTime.getSerialInfo(res, kqDate, false); WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate);
if (serialInfo != null && serialInfo.size() > 0) { String bc = workTime.getSerialId();
int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); if (StringUtils.isEmpty(bc)) {
if (serialid > 0) { continue;
if (!nightShiftList.contains(String.valueOf(serialid))) { }
continue; int serialid = Integer.parseInt(bc);
} if (serialid > 0) {
} else { if (!nightShiftList.contains(String.valueOf(serialid))) {
continue; continue;
} }
} else {
continue;
} }
double workingDayOvertime_4leave = Util.getDoubleValue(Util.null2String(dailyFlowOverTimeData.get(res + "|" + kqDate + "|workingDayOvertime_4leave"))); double workingDayOvertime_4leave = Util.getDoubleValue(Util.null2String(dailyFlowOverTimeData.get(res + "|" + kqDate + "|workingDayOvertime_4leave")));
workingDayOvertime_4leave = workingDayOvertime_4leave < 0 ? 0 : workingDayOvertime_4leave; workingDayOvertime_4leave = workingDayOvertime_4leave < 0 ? 0 : workingDayOvertime_4leave;
double restDayOvertime_4leave = Util.getDoubleValue(Util.null2String(dailyFlowOverTimeData.get(res + "|" + kqDate + "|restDayOvertime_4leave"))); double restDayOvertime_4leave = Util.getDoubleValue(Util.null2String(dailyFlowOverTimeData.get(res + "|" + kqDate + "|restDayOvertime_4leave")));

80
src/weaver/interfaces/hostar/job/UpdateCbxxjlDataJob.java
Unescape Escape View File

@ -315,35 +315,29 @@ public class UpdateCbxxjlDataJob extends BaseCronJob {
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
String value = "0"; String value = "0";
try { try {
//获取夜班班次
// List<String> nightShiftList = new ArrayList<>();
// String acqNightShiftSql = "select shift from uf_nightshiftmanage where isdelete is null or isdelete = 0";
// rs.executeQuery(acqNightShiftSql);
// while (rs.next()) {
// String shift = Util.null2String(rs.getString("shift"));
// if (StringUtils.isNotBlank(shift)) {
// nightShiftList.add(shift);
// }
// }
//获取当天班次 //获取当天班次
KQWorkTime kqWorkTime = new KQWorkTime(); KQWorkTime kqWorkTime = new KQWorkTime();
Map<String, Object> serialInfo = kqWorkTime.getSerialInfo(userId, kqDate, false);
if (serialInfo != null && serialInfo.size() > 0) { WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate);
int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); String bc = workTime.getSerialId();
if (serialid > 0) { if (StringUtils.isEmpty(bc)) {
if ((!CollectionUtils.isEmpty(nightShiftList)) && nightShiftList.contains(String.valueOf(serialid))) { return value;
value = "0"; }
} else {
rs.executeQuery("select zeropoint from kq_format_total where resourceid = ? and kqdate = ?", userId, kqDate); int serialid = Integer.parseInt(bc);
if (rs.next()) { if (serialid > 0) {
value = rs.getString("zeropoint"); if ((!CollectionUtils.isEmpty(nightShiftList)) && nightShiftList.contains(String.valueOf(serialid))) {
}
}
} else {
value = "0"; value = "0";
} else {
rs.executeQuery("select zeropoint from kq_format_total where resourceid = ? and kqdate = ?", userId, kqDate);
if (rs.next()) {
value = rs.getString("zeropoint");
}
} }
} else {
value = "0";
} }
} catch (Exception e) { } catch (Exception e) {
bb.writeLog("get ZeroBt error:" + e.getMessage()); bb.writeLog("get ZeroBt error:" + e.getMessage());
} }
@ -409,18 +403,22 @@ public class UpdateCbxxjlDataJob extends BaseCronJob {
// } // }
KQWorkTime kqWorkTime = new KQWorkTime(); KQWorkTime kqWorkTime = new KQWorkTime();
WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate);
String bc = workTime.getSerialId();
if (StringUtils.isEmpty(bc)) {
return "0";
}
//获取当天班次 //获取当天班次
Map<String, Object> serialInfo = kqWorkTime.getSerialInfo(userId, kqDate, false); int serialid = Integer.parseInt(bc);
if (serialInfo != null && serialInfo.size() > 0) { if (serialid > 0) {
int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); if ( !nightShiftList.contains(String.valueOf(serialid))) {
if (serialid > 0) {
if ( !nightShiftList.contains(String.valueOf(serialid))) {
return "0";
}
} else {
return "0"; return "0";
} }
} else {
return "0";
} }
// }
// String groupId = kqGroupMemberComInfo.getKQGroupId(userId, kqDate); // String groupId = kqGroupMemberComInfo.getKQGroupId(userId, kqDate);
@ -856,16 +854,18 @@ public class UpdateCbxxjlDataJob extends BaseCronJob {
KQWorkTime kqWorkTime = new KQWorkTime(); KQWorkTime kqWorkTime = new KQWorkTime();
for (String res : resIds) { for (String res : resIds) {
//获取当天班次 //获取当天班次
Map<String, Object> serialInfo = kqWorkTime.getSerialInfo(res, kqDate, false); WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate);
if (serialInfo != null && serialInfo.size() > 0) { String bc = workTime.getSerialId();
int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); if (StringUtils.isEmpty(bc)) {
if (serialid > 0) { continue;
if (!nightShiftList.contains(String.valueOf(serialid))) { }
continue; int serialid = Integer.parseInt(bc);
} if (serialid > 0) {
} else { if (!nightShiftList.contains(String.valueOf(serialid))) {
continue; continue;
} }
} else {
continue;
} }
// Object groupIdObj = serialInfo.get("groupId"); // Object groupIdObj = serialInfo.get("groupId");

Write Preview
Loading…
Cancel
Save