From 71072bae314714cbc007e4736eeb9f64f1328782 Mon Sep 17 00:00:00 2001 From: zhangming <965499528@qq.com> Date: Fri, 27 Sep 2024 17:46:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=8F=AD=E6=AC=A1=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hostar/thread/HandleCBDataThread.java | 70 +++++++++------- .../hostar/job/UpdateCbxxjlDataJob.java | 80 +++++++++---------- 2 files changed, 79 insertions(+), 71 deletions(-) diff --git a/src/com/engine/hostar/thread/HandleCBDataThread.java b/src/com/engine/hostar/thread/HandleCBDataThread.java index 8603785..9c33f80 100644 --- a/src/com/engine/hostar/thread/HandleCBDataThread.java +++ b/src/com/engine/hostar/thread/HandleCBDataThread.java @@ -275,22 +275,25 @@ public class HandleCBDataThread extends BaseBean implements Runnable{ try { //获取当天班次 KQWorkTime kqWorkTime = new KQWorkTime(); - Map serialInfo = kqWorkTime.getSerialInfo(userId, kqDate, false); - if (serialInfo != null && serialInfo.size() > 0) { - int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); - if (serialid > 0) { - if ((!CollectionUtils.isEmpty(nightShiftList)) && nightShiftList.contains(String.valueOf(serialid))) { - 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 { + WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate); + String bc = workTime.getSerialId(); + if (StringUtils.isEmpty(bc)) { + return value; + } + int serialid = Integer.parseInt(bc); + if (serialid > 0) { + if ((!CollectionUtils.isEmpty(nightShiftList)) && nightShiftList.contains(String.valueOf(serialid))) { 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) { bb.writeLog("get ZeroBt error:" + e.getMessage()); } @@ -306,18 +309,20 @@ public class HandleCBDataThread extends BaseBean implements Runnable{ if (nightShiftList != null & nightShiftList.size() > 0) { KQWorkTime kqWorkTime = new KQWorkTime(); - //获取当天班次 - Map serialInfo = kqWorkTime.getSerialInfo(userId, kqDate, false); - if (serialInfo != null && serialInfo.size() > 0) { - int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); - bb.writeLog("getNightShiftSubsidy serialid:" + serialid); - if (serialid > 0) { - if ( !nightShiftList.contains(String.valueOf(serialid))) { - return "0"; - } - } else { + WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate); + String bc = workTime.getSerialId(); + if (StringUtils.isEmpty(bc)) { + return "0"; + } + + int serialid = Integer.parseInt(bc); + bb.writeLog("getNightShiftSubsidy serialid:" + serialid); + if (serialid > 0) { + if ( !nightShiftList.contains(String.valueOf(serialid))) { return "0"; } + } else { + return "0"; } bb.writeLog("getNightShiftSubsidy groupId:" + groupId); @@ -578,18 +583,21 @@ public class HandleCBDataThread extends BaseBean implements Runnable{ KQWorkTime kqWorkTime = new KQWorkTime(); for (String res : resIds) { //获取当天班次 - Map serialInfo = kqWorkTime.getSerialInfo(res, kqDate, false); - if (serialInfo != null && serialInfo.size() > 0) { - int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); - if (serialid > 0) { - if (!nightShiftList.contains(String.valueOf(serialid))) { - continue; - } - } else { + WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate); + String bc = workTime.getSerialId(); + if (StringUtils.isEmpty(bc)) { + continue; + } + int serialid = Integer.parseInt(bc); + if (serialid > 0) { + if (!nightShiftList.contains(String.valueOf(serialid))) { continue; } + } else { + continue; } + double workingDayOvertime_4leave = Util.getDoubleValue(Util.null2String(dailyFlowOverTimeData.get(res + "|" + kqDate + "|workingDayOvertime_4leave"))); workingDayOvertime_4leave = workingDayOvertime_4leave < 0 ? 0 : workingDayOvertime_4leave; double restDayOvertime_4leave = Util.getDoubleValue(Util.null2String(dailyFlowOverTimeData.get(res + "|" + kqDate + "|restDayOvertime_4leave"))); diff --git a/src/weaver/interfaces/hostar/job/UpdateCbxxjlDataJob.java b/src/weaver/interfaces/hostar/job/UpdateCbxxjlDataJob.java index 6ccc0c5..2146847 100644 --- a/src/weaver/interfaces/hostar/job/UpdateCbxxjlDataJob.java +++ b/src/weaver/interfaces/hostar/job/UpdateCbxxjlDataJob.java @@ -315,35 +315,29 @@ public class UpdateCbxxjlDataJob extends BaseCronJob { RecordSet rs = new RecordSet(); String value = "0"; try { - //获取夜班班次 -// List 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(); - Map serialInfo = kqWorkTime.getSerialInfo(userId, kqDate, false); - if (serialInfo != null && serialInfo.size() > 0) { - int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); - if (serialid > 0) { - if ((!CollectionUtils.isEmpty(nightShiftList)) && nightShiftList.contains(String.valueOf(serialid))) { - 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 { + + WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate); + String bc = workTime.getSerialId(); + if (StringUtils.isEmpty(bc)) { + return value; + } + + int serialid = Integer.parseInt(bc); + if (serialid > 0) { + if ((!CollectionUtils.isEmpty(nightShiftList)) && nightShiftList.contains(String.valueOf(serialid))) { 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) { bb.writeLog("get ZeroBt error:" + e.getMessage()); } @@ -409,18 +403,22 @@ public class UpdateCbxxjlDataJob extends BaseCronJob { // } KQWorkTime kqWorkTime = new KQWorkTime(); + WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate); + String bc = workTime.getSerialId(); + if (StringUtils.isEmpty(bc)) { + return "0"; + } + //获取当天班次 - Map serialInfo = kqWorkTime.getSerialInfo(userId, kqDate, false); - if (serialInfo != null && serialInfo.size() > 0) { - int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); - if (serialid > 0) { - if ( !nightShiftList.contains(String.valueOf(serialid))) { - return "0"; - } - } else { + int serialid = Integer.parseInt(bc); + if (serialid > 0) { + if ( !nightShiftList.contains(String.valueOf(serialid))) { return "0"; } + } else { + return "0"; } +// } // String groupId = kqGroupMemberComInfo.getKQGroupId(userId, kqDate); @@ -856,16 +854,18 @@ public class UpdateCbxxjlDataJob extends BaseCronJob { KQWorkTime kqWorkTime = new KQWorkTime(); for (String res : resIds) { //获取当天班次 - Map serialInfo = kqWorkTime.getSerialInfo(res, kqDate, false); - if (serialInfo != null && serialInfo.size() > 0) { - int serialid = Util.getIntValue(Util.null2String(serialInfo.get(kqDate)), 0); - if (serialid > 0) { - if (!nightShiftList.contains(String.valueOf(serialid))) { - continue; - } - } else { + WorkTimeEntity workTime = kqWorkTime.getWorkTime(userId, kqDate); + String bc = workTime.getSerialId(); + if (StringUtils.isEmpty(bc)) { + continue; + } + int serialid = Integer.parseInt(bc); + if (serialid > 0) { + if (!nightShiftList.contains(String.valueOf(serialid))) { continue; } + } else { + continue; } // Object groupIdObj = serialInfo.get("groupId");