From cc226faf9cc0ec2711ebd2c46a2b972073fe509f Mon Sep 17 00:00:00 2001 From: chenwei <3291673014@qq.com> Date: Tue, 14 May 2024 00:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E7=A6=BB=E8=81=8C=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E8=80=83=E5=8B=A4=E6=8A=A5=E8=A1=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/kq/biz/KQReportBiz.java | 20 +-- .../kq/cmd/report/ExportDailyExcelCmd.java | 148 +++++++++++++++--- .../engine/kq/cmd/report/ExportExcelCmd.java | 29 ++-- .../kq/cmd/report/GetKQDailyReportCmd.java | 124 ++++++++++++++- .../engine/kq/cmd/report/GetKQReportCmd.java | 41 +++-- 5 files changed, 296 insertions(+), 66 deletions(-) diff --git a/src/com/engine/kq/biz/KQReportBiz.java b/src/com/engine/kq/biz/KQReportBiz.java index 54e2858..b339206 100644 --- a/src/com/engine/kq/biz/KQReportBiz.java +++ b/src/com/engine/kq/biz/KQReportBiz.java @@ -515,7 +515,7 @@ public class KQReportBiz extends BaseBean { sql = "select a.attendancemins, a.resourceid, a.kqdate from kq_format_total a left join hrmresource b on a.resourceid = b.id " + " where a.resourceid in (" + String.join(",", empTypes) + ") and kqdate >='" + fromDate + "' and kqdate <='" + toDate + "' " + sqlWhere; - + basebean.writeLog("getLaborHoursData sql:" + sql); rs.executeQuery(sql); while (rs.next()) { String resourceid = Util.null2String(rs.getString("resourceid")); @@ -529,10 +529,10 @@ public class KQReportBiz extends BaseBean { double temp = Util.getDoubleValue(Util.null2String(datas.get("LaborHoursData|" + resourceid + "|holiday"))); if (temp >=0.00) { double attendanceHours = Util.getDoubleValue(KQDurationCalculatorUtil.getDurationRound(String.valueOf(attendancemins / 60.0))) + temp; - datas.put("LaborHoursData|" + resourceid + "|holiday" , attendanceHours); + datas.put("LaborHoursData|" + resourceid + "|holidaylaborHours" , attendanceHours); } else { double attendanceHours = Util.getDoubleValue(KQDurationCalculatorUtil.getDurationRound(String.valueOf(attendancemins / 60.0))); - datas.put("LaborHoursData|" + resourceid + "|holiday" , attendanceHours); + datas.put("LaborHoursData|" + resourceid + "|holidaylaborHours" , attendanceHours); } } @@ -541,10 +541,10 @@ public class KQReportBiz extends BaseBean { double temp = Util.getDoubleValue(Util.null2String(datas.get("LaborHoursData|" + resourceid + "|workday"))); if (temp >=0.00) { double attendanceHours = Util.getDoubleValue(KQDurationCalculatorUtil.getDurationRound(String.valueOf(attendancemins / 60.0))) + temp; - datas.put("LaborHoursData|" + resourceid + "|workday" , attendanceHours); + datas.put("LaborHoursData|" + resourceid + "|workdaylaborHours" , attendanceHours); } else { double attendanceHours = Util.getDoubleValue(KQDurationCalculatorUtil.getDurationRound(String.valueOf(attendancemins / 60.0))); - datas.put("LaborHoursData|" + resourceid + "|workday" , attendanceHours); + datas.put("LaborHoursData|" + resourceid + "|workdaylaborHours" , attendanceHours); } } @@ -553,10 +553,10 @@ public class KQReportBiz extends BaseBean { double temp = Util.getDoubleValue(Util.null2String(datas.get("LaborHoursData|" + resourceid + "|restday"))); if (temp >=0.00) { double attendanceHours = Util.getDoubleValue(KQDurationCalculatorUtil.getDurationRound(String.valueOf(attendancemins / 60.0))) + temp; - datas.put("LaborHoursData|" + resourceid + "|restday" , attendanceHours); + datas.put("LaborHoursData|" + resourceid + "|restdaylaborHours" , attendanceHours); } else { double attendanceHours = Util.getDoubleValue(KQDurationCalculatorUtil.getDurationRound(String.valueOf(attendancemins / 60.0))); - datas.put("LaborHoursData|" + resourceid + "|restday" , attendanceHours); + datas.put("LaborHoursData|" + resourceid + "|restdaylaborHours" , attendanceHours); } } @@ -571,17 +571,17 @@ public class KQReportBiz extends BaseBean { String[] split = key.split("\\|"); if (split[1].contains("holiday")) { double doubleValue = Util.getDoubleValue(Util.null2String(datas.get("LaborHoursData|" + split[0] + "|holiday")), 0.00); - datas.put("LaborHoursData|" + split[0] + "|holiday" , doubleValue + value); + datas.put("LaborHoursData|" + split[0] + "|holidaylaborHours" , doubleValue + value); } if (split[1].contains("workingDay")) { double doubleValue = Util.getDoubleValue(Util.null2String(datas.get("LaborHoursData|" + split[0] + "|workday")), 0.00); - datas.put("LaborHoursData|" + split[0] + "|workday" , doubleValue + value); + datas.put("LaborHoursData|" + split[0] + "|workdaylaborHours" , doubleValue + value); } if (split[1].contains("restDay")) { double doubleValue = Util.getDoubleValue(Util.null2String(datas.get("LaborHoursData|" + split[0] + "|restday")), 0.00); - datas.put("LaborHoursData|" + split[0] + "|restday" , doubleValue + value); + datas.put("LaborHoursData|" + split[0] + "|restdaylaborHours" , doubleValue + value); } } diff --git a/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java b/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java index a221d54..15703aa 100644 --- a/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java +++ b/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java @@ -666,14 +666,16 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand> { bb.writeLog("劳务公司 fieldValue: " + fieldValue); data.add( fieldValue); continue; - } else if ("laborHours".equals(fieldName) ) { - - double holidayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|holiday")), 0.00); - double workdayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|workday")), 0.00); - double restdayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|restday")), 0.00); + } else if ("holidaylaborHours".equals(fieldName)) {//考勤二开--节假日劳务工时 + double temp = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|" + fieldName)), 0.00); + fieldValue = String.valueOf(temp); + data.add(fieldValue); + continue; + } else if ("workdaylaborHours".equals(fieldName)) {//考勤二开--工作日劳务工时 + double temp = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|" + fieldName)), 0.00); + fieldValue = String.valueOf(temp); + data.add(fieldValue); + continue; + } else if ("restdaylaborHours".equals(fieldName)) {//考勤二开--休息日劳务工时 + double temp = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|" + fieldName)), 0.00); + fieldValue = String.valueOf(temp); + data.add(fieldValue); + continue; + } else if ("laborHoursTotal".equals(fieldName) ) {//考勤二开--劳务工时总计 + double holidayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|holidaylaborHours")), 0.00); + double workdayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|workdaylaborHours")), 0.00); + double restdayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|restdaylaborHours")), 0.00); double total = holidayValue + workdayValue + restdayValue; fieldValue = String.valueOf(total); - data.add(holidayValue); - data.add(workdayValue); - data.add(restdayValue); - data.add(fieldValue); + data.add(fieldValue); continue; }else if(fieldName.equals("reissuecard")){//补卡 int intValue = Util.getIntValue(Util.null2String(flowData.get(id + "|reissueCard"))); diff --git a/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java b/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java index 119ad31..3b120d7 100644 --- a/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java +++ b/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java @@ -519,7 +519,7 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand> { bb.writeLog("workdays fieldValue: " + fieldValue); data.put(fieldName, fieldValue); - } else if ("laborHours".equals(kqReportFieldComInfo.getParentid()) ) { - - if ("laborHoursTotal".equals(fieldName)) { -// - double holidayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|holiday")), 0.00); - double workdayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|workday")), 0.00); - double restdayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|restday")), 0.00); -// - double total = holidayValue + workdayValue + restdayValue; - -// -// data.put("holiday", holidayValue); -// data.put("workday", workdayValue); -// data.put("restday", restdayValue); - fieldValue = String.valueOf(total); - - data.put(fieldName,fieldValue); + } else if ("holidaylaborHours".equals(fieldName)) {//考勤二开--节假日劳务工时 + double temp = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|" + fieldName)), 0.00); + fieldValue = String.valueOf(temp); + data.put(fieldName,fieldValue); + } else if ("workdaylaborHours".equals(fieldName)) {//考勤二开--工作日劳务工时 + double temp = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|" + fieldName)), 0.00); + fieldValue = String.valueOf(temp); + data.put(fieldName,fieldValue); + } else if ("restdaylaborHours".equals(fieldName)) {//考勤二开--休息日劳务工时 + double temp = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|" + fieldName)), 0.00); + fieldValue = String.valueOf(temp); + data.put(fieldName,fieldValue); + } else if ("laborHoursTotal".equals(fieldName) ) {//考勤二开--劳务工时总计 - }else { + double holidayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|holidaylaborHours")), 0.00); + double workdayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|workdaylaborHours")), 0.00); + double restdayValue = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|restdaylaborHours")), 0.00); + double total = holidayValue + workdayValue + restdayValue; - double temp = Util.getDoubleValue(Util.null2String(flowData.get("LaborHoursData|" + id + "|" + fieldName)), 0.00); - fieldValue = String.valueOf(temp); - data.put(fieldName,fieldValue); + fieldValue = String.valueOf(total); - } + data.put(fieldName,fieldValue); } else {