From 0603f8ee155f886729faf94efc7845312b12c3f7 Mon Sep 17 00:00:00 2001 From: howec <> Date: Wed, 3 Jan 2024 18:00:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8A=A5=E6=9C=88=E6=8A=A5=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=95=E7=A4=BA=E5=88=97=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=BD=B1=E5=93=8D=E4=BA=86=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kq/cmd/report/ExportDailyExcelCmd.java | 62 ++++++++++--------- .../engine/kq/cmd/report/ExportExcelCmd.java | 56 +++++++++++------ .../kq/cmd/report/GetKQDailyReportCmd.java | 2 +- .../engine/kq/cmd/report/GetKQReportCmd.java | 24 +++---- 4 files changed, 84 insertions(+), 60 deletions(-) diff --git a/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java b/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java index 65270e2..bb7d9d3 100644 --- a/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java +++ b/src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; import com.engine.core.interceptor.CommandContext; -import com.engine.kq.biz.*; +import com.engine.kq.biz.KQReportBiz; import com.engine.kq.cmd.shiftmanagement.toolkit.ShiftManagementToolKit; import com.engine.kq.util.ExcelUtil; import com.engine.kq.util.KQDurationCalculatorUtil; @@ -87,7 +87,6 @@ public class ExportDailyExcelCmd extends AbstractCommonCommandshowColumn.trim().equals("")); - List tmpShowColumns = new ArrayList<>(); for(String showColumn:showColumns){ tmpShowColumns.add(showColumn); @@ -176,20 +175,23 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand(); - title.put("title","大夜班天数"); - title.put("width",30*256); - title.put("rowSpan", 3); - titleList.add(title); - - //刘浩 导出新增列[小夜班天数]-begin - title = new HashMap<>(); - title.put("title","小夜班天数"); - title.put("width",30*256); - title.put("rowSpan", 3); - titleList.add(title); + if(showColumns.contains("nightdaysd")) { + //刘浩 导出新增列[大夜班天数]-begin + title = new HashMap<>(); + title.put("title","大夜班天数"); + title.put("width",30*256); + title.put("rowSpan", 3); + titleList.add(title); + } + if(showColumns.contains("nightdaysx")) { + //刘浩 导出新增列[小夜班天数]-begin + title = new HashMap<>(); + title.put("title", "小夜班天数"); + title.put("width", 30 * 256); + title.put("rowSpan", 3); + titleList.add(title); + } //刘浩 导出新增列[夜班天数]-end sheet.put("titleList", titleList); @@ -462,7 +464,7 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand> { if("leave".equalsIgnoreCase(kqReportFieldComInfo.getFieldname())&&leaveRules.size()==0){ continue; } + if("nightdaysd".equals(kqReportFieldComInfo.getFieldname()) || "nightdaysx".equals(kqReportFieldComInfo.getFieldname())) { + continue; + } title = new HashMap<>(); String unitType = KQReportBiz.getUnitType(kqReportFieldComInfo, user); if(unitType.length()>0){ @@ -191,18 +194,24 @@ public class ExportExcelCmd extends AbstractCommonCommand> { } titleList.add(title); } - //刘浩 新增一列[大夜班天数] - title = new HashMap(); - title.put("title","大夜班天数"); - title.put("width", 30 * 256); - title.put("rowSpan",3); - titleList.add(title); - //刘浩 新增一列[小夜班天数] - title = new HashMap(); - title.put("title","小夜班天数"); - title.put("width", 30 * 256); - title.put("rowSpan",3); - titleList.add(title); + + + if(showColumns.contains("nightdaysd")) { + //刘浩 新增一列[大夜班天数] + title = new HashMap(); + title.put("title","大夜班天数"); + title.put("width", 30 * 256); + title.put("rowSpan",3); + titleList.add(title); + } + if(showColumns.contains("nightdaysx")) { + //刘浩 新增一列[小夜班天数] + title = new HashMap(); + title.put("title","小夜班天数"); + title.put("width", 30 * 256); + title.put("rowSpan",3); + titleList.add(title); + } sheet.put("titleList", titleList); @@ -296,6 +305,9 @@ public class ExportExcelCmd extends AbstractCommonCommand> { String fieldName = lsFieldDataKey.get(fieldDataKeyIdx); String fieldid = KQReportFieldComInfo.field2Id.get(fieldName); String fieldValue = ""; + if(fieldName.equals("nightdaysx") || fieldName.equals("nightdaysd") ) { + continue; + } if (fieldName.equals("subcompany")) { String tmpSubcompanyId = Util.null2String(rs.getString("subcompanyid")); if (tmpSubcompanyId.length() == 0) { @@ -509,7 +521,10 @@ public class ExportExcelCmd extends AbstractCommonCommand> { if (rs99.next()){ counts99 = String.valueOf(rs99.getInt("sums")); } - data.add(counts99); + if(showColumns.contains("nightdaysd")) { + data.add(counts99); + } + //刘浩--小夜班天数统计 sql88 = "select b.resourceid,b.signintime,b.signouttime,b.serialid from kq_format_detail b inner join kq_ShiftManagement c on c.id = b.serialid where b.resourceid = "+resourceid+" and b.signintime is not null and b.signouttime is not null " + @@ -525,11 +540,16 @@ public class ExportExcelCmd extends AbstractCommonCommand> { if (rs99.next()){ counts99 = String.valueOf(rs99.getInt("sums")); } - data.add(counts99); - + if(showColumns.contains("nightdaysx")) { + data.add(counts99); + } }else { - data.add("0"); - data.add("0"); + if(showColumns.contains("nightdaysd")) { + data.add("0"); + } + if(showColumns.contains("nightdaysx")) { + data.add("0"); + } } dataList.add(data); } diff --git a/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java b/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java index 9cc5c1d..6014f23 100644 --- a/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java +++ b/src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; import com.engine.core.interceptor.CommandContext; -import com.engine.kq.biz.*; +import com.engine.kq.biz.KQReportBiz; import com.engine.kq.cmd.shiftmanagement.toolkit.ShiftManagementToolKit; import com.engine.kq.entity.WorkTimeEntity; import com.engine.kq.log.KQLog; diff --git a/src/com/engine/kq/cmd/report/GetKQReportCmd.java b/src/com/engine/kq/cmd/report/GetKQReportCmd.java index e92dd89..2108b65 100644 --- a/src/com/engine/kq/cmd/report/GetKQReportCmd.java +++ b/src/com/engine/kq/cmd/report/GetKQReportCmd.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; import com.engine.core.interceptor.CommandContext; -import com.engine.kq.biz.*; +import com.engine.kq.biz.KQReportBiz; import com.engine.kq.util.KQDurationCalculatorUtil; import com.engine.kq.util.PageUidFactory; import weaver.common.DateUtil; @@ -122,17 +122,17 @@ public class GetKQReportCmd extends AbstractCommonCommand> { } //Liuhao 新增列[大夜班天数] --begin - column = new HashMap(); - column.put("title","大夜班天数"); - column.put("unit","天"); - column.put("dataIndex","nightdaysd"); - column.put("type","businessLeave"); - column.put("key","nightdaysd"); - column.put("isSystem","1"); - column.put("rowSpan","3"); - column.put("width",65); - column.put("showDetial","1"); - columns.add(column); +// column = new HashMap(); +// column.put("title","大夜班天数"); +// column.put("unit","天"); +// column.put("dataIndex","nightdaysd"); +// column.put("type","businessLeave"); +// column.put("key","nightdaysd"); +// column.put("isSystem","1"); +// column.put("rowSpan","3"); +// column.put("width",65); +// column.put("showDetial","1"); +// columns.add(column); //Liuhao 新增列[夜班天数] --end boolean isEnd = false;