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

Merge branch 'dev' into dev-chenwnj

Browse Source
dev-chenwnj
chenwei 1 year ago
parent 1332bedb67 0603f8ee15
commit bb8fb2ae0a
4 changed files with 84 additions and 60 deletions
Show Stats Download Patch File Download Diff File

62
src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java
Unescape Escape View File

@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.biz.AbstractCommonCommand;
import com.engine.common.entity.BizLogContext; import com.engine.common.entity.BizLogContext;
import com.engine.core.interceptor.CommandContext; 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.cmd.shiftmanagement.toolkit.ShiftManagementToolKit;
import com.engine.kq.util.ExcelUtil; import com.engine.kq.util.ExcelUtil;
import com.engine.kq.util.KQDurationCalculatorUtil; import com.engine.kq.util.KQDurationCalculatorUtil;
@ -87,7 +87,6 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
showColumns.add("kqdate"); showColumns.add("kqdate");
showColumns.add("serialid"); showColumns.add("serialid");
showColumns.removeIf(showColumn->showColumn.trim().equals("")); showColumns.removeIf(showColumn->showColumn.trim().equals(""));
List<String> tmpShowColumns = new ArrayList<>(); List<String> tmpShowColumns = new ArrayList<>();
for(String showColumn:showColumns){ for(String showColumn:showColumns){
tmpShowColumns.add(showColumn); tmpShowColumns.add(showColumn);
@ -176,20 +175,23 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
titleList.add(title); titleList.add(title);
} }
//刘浩 导出新增列[大夜班天数]-begin if(showColumns.contains("nightdaysd")) {
title = new HashMap<>(); //刘浩 导出新增列[大夜班天数]-begin
title.put("title","大夜班天数"); title = new HashMap<>();
title.put("width",30*256); title.put("title","大夜班天数");
title.put("rowSpan", 3); title.put("width",30*256);
titleList.add(title); 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("nightdaysx")) {
//刘浩 导出新增列[小夜班天数]-begin
title = new HashMap<>();
title.put("title", "小夜班天数");
title.put("width", 30 * 256);
title.put("rowSpan", 3);
titleList.add(title);
}
//刘浩 导出新增列[夜班天数]-end //刘浩 导出新增列[夜班天数]-end
sheet.put("titleList", titleList); sheet.put("titleList", titleList);
@ -462,7 +464,7 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
double holidayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|"+kqdate+"|holidayOvertime_nonleave"))); double holidayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|"+kqdate+"|holidayOvertime_nonleave")));
holidayOvertime_nonleave = holidayOvertime_nonleave<0?0:holidayOvertime_nonleave; holidayOvertime_nonleave = holidayOvertime_nonleave<0?0:holidayOvertime_nonleave;
fieldValue = KQDurationCalculatorUtil.getDurationRound(String.valueOf(workingDayOvertime_4leave+restDayOvertime_4leave+holidayOvertime_4leave+ fieldValue = KQDurationCalculatorUtil.getDurationRound(String.valueOf(workingDayOvertime_4leave+restDayOvertime_4leave+holidayOvertime_4leave+
workingDayOvertime_nonleave+restDayOvertime_nonleave+holidayOvertime_nonleave)); workingDayOvertime_nonleave+restDayOvertime_nonleave+holidayOvertime_nonleave));
data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("overtimeTotal")))); data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("overtimeTotal"))));
continue; continue;
}else if(fieldName.equals("businessLeave") || fieldName.equals("officialBusiness")){ }else if(fieldName.equals("businessLeave") || fieldName.equals("officialBusiness")){
@ -493,7 +495,7 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
fieldValue = Util.null2String(rs.getString(fieldName)); fieldValue = Util.null2String(rs.getString(fieldName));
fieldValue = getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(fieldid)); fieldValue = getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(fieldid));
} }
if(!fieldName.equals("leave")) { if(!fieldName.equals("leave")) {
fieldValue = Util.formatMultiLang(fieldValue, "" + user.getLanguage()); fieldValue = Util.formatMultiLang(fieldValue, "" + user.getLanguage());
data.add(fieldValue); data.add(fieldValue);
@ -504,27 +506,29 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
writeLog("howec-serialidx:::::::::"+serialidx); writeLog("howec-serialidx:::::::::"+serialidx);
writeLog("howec-signintime1x:::::::::"+signintime1x); writeLog("howec-signintime1x:::::::::"+signintime1x);
writeLog("howec-signouttime1x:::::::::"+signouttime1x); writeLog("howec-signouttime1x:::::::::"+signouttime1x);
if(serialidx.contains("值夜班")) { if(showColumns.contains("nightdaysd")) {
if((!"未打卡".equals(signintime1x)) && (!"未打卡".equals(signouttime1x))) { if(serialidx.contains("值夜班")) {
data.add("1"); if((!"未打卡".equals(signintime1x)) && (!"未打卡".equals(signouttime1x))) {
data.add("1");
}else {
data.add("0");
}
}else { }else {
data.add("0"); data.add("0");
} }
}else {
data.add("0");
} }
// 刘浩 小夜班天数 -- // 刘浩 小夜班天数 --
if(serialidx.contains("两班夜班")) { if(showColumns.contains("nightdaysx")) {
if((!"未打卡".equals(signintime1x)) && (!"未打卡".equals(signouttime1x))) { if(serialidx.contains("两班夜班")) {
data.add("1"); if((!"未打卡".equals(signintime1x)) && (!"未打卡".equals(signouttime1x))) {
data.add("1");
}else {
data.add("0");
}
}else { }else {
data.add("0"); data.add("0");
} }
}else {
data.add("0");
} }
//刘浩 大小夜班天数 -- end //刘浩 大小夜班天数 -- end
dataList.add(data); dataList.add(data);
} }

56
src/com/engine/kq/cmd/report/ExportExcelCmd.java
Unescape Escape View File

@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.biz.AbstractCommonCommand;
import com.engine.common.entity.BizLogContext; import com.engine.common.entity.BizLogContext;
import com.engine.core.interceptor.CommandContext; import com.engine.core.interceptor.CommandContext;
import com.engine.kq.biz.*; import com.engine.kq.biz.KQReportBiz;
import com.engine.kq.util.ExcelUtil; import com.engine.kq.util.ExcelUtil;
import com.engine.kq.util.KQDurationCalculatorUtil; import com.engine.kq.util.KQDurationCalculatorUtil;
import com.engine.kq.util.UtilKQ; import com.engine.kq.util.UtilKQ;
@ -143,6 +143,9 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
if("leave".equalsIgnoreCase(kqReportFieldComInfo.getFieldname())&&leaveRules.size()==0){ if("leave".equalsIgnoreCase(kqReportFieldComInfo.getFieldname())&&leaveRules.size()==0){
continue; continue;
} }
if("nightdaysd".equals(kqReportFieldComInfo.getFieldname()) || "nightdaysx".equals(kqReportFieldComInfo.getFieldname())) {
continue;
}
title = new HashMap<>(); title = new HashMap<>();
String unitType = KQReportBiz.getUnitType(kqReportFieldComInfo, user); String unitType = KQReportBiz.getUnitType(kqReportFieldComInfo, user);
if(unitType.length()>0){ if(unitType.length()>0){
@ -191,18 +194,24 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
} }
titleList.add(title); titleList.add(title);
} }
//刘浩 新增一列[大夜班天数]
title = new HashMap();
title.put("title","大夜班天数"); if(showColumns.contains("nightdaysd")) {
title.put("width", 30 * 256); //刘浩 新增一列[大夜班天数]
title.put("rowSpan",3); title = new HashMap();
titleList.add(title); title.put("title","大夜班天数");
//刘浩 新增一列[小夜班天数] title.put("width", 30 * 256);
title = new HashMap(); title.put("rowSpan",3);
title.put("title","小夜班天数"); titleList.add(title);
title.put("width", 30 * 256); }
title.put("rowSpan",3); if(showColumns.contains("nightdaysx")) {
titleList.add(title); //刘浩 新增一列[小夜班天数]
title = new HashMap();
title.put("title","小夜班天数");
title.put("width", 30 * 256);
title.put("rowSpan",3);
titleList.add(title);
}
sheet.put("titleList", titleList); sheet.put("titleList", titleList);
@ -296,6 +305,9 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
String fieldName = lsFieldDataKey.get(fieldDataKeyIdx); String fieldName = lsFieldDataKey.get(fieldDataKeyIdx);
String fieldid = KQReportFieldComInfo.field2Id.get(fieldName); String fieldid = KQReportFieldComInfo.field2Id.get(fieldName);
String fieldValue = ""; String fieldValue = "";
if(fieldName.equals("nightdaysx") || fieldName.equals("nightdaysd") ) {
continue;
}
if (fieldName.equals("subcompany")) { if (fieldName.equals("subcompany")) {
String tmpSubcompanyId = Util.null2String(rs.getString("subcompanyid")); String tmpSubcompanyId = Util.null2String(rs.getString("subcompanyid"));
if (tmpSubcompanyId.length() == 0) { if (tmpSubcompanyId.length() == 0) {
@ -509,7 +521,10 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
if (rs99.next()){ if (rs99.next()){
counts99 = String.valueOf(rs99.getInt("sums")); 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 " + 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<Map<String, Object>> {
if (rs99.next()){ if (rs99.next()){
counts99 = String.valueOf(rs99.getInt("sums")); counts99 = String.valueOf(rs99.getInt("sums"));
} }
data.add(counts99); if(showColumns.contains("nightdaysx")) {
data.add(counts99);
}
}else { }else {
data.add("0"); if(showColumns.contains("nightdaysd")) {
data.add("0"); data.add("0");
}
if(showColumns.contains("nightdaysx")) {
data.add("0");
}
} }
dataList.add(data); dataList.add(data);
} }

2
src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java
Unescape Escape View File

@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.biz.AbstractCommonCommand;
import com.engine.common.entity.BizLogContext; import com.engine.common.entity.BizLogContext;
import com.engine.core.interceptor.CommandContext; 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.cmd.shiftmanagement.toolkit.ShiftManagementToolKit;
import com.engine.kq.entity.WorkTimeEntity; import com.engine.kq.entity.WorkTimeEntity;
import com.engine.kq.log.KQLog; import com.engine.kq.log.KQLog;

24
src/com/engine/kq/cmd/report/GetKQReportCmd.java
Unescape Escape View File

@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.biz.AbstractCommonCommand;
import com.engine.common.entity.BizLogContext; import com.engine.common.entity.BizLogContext;
import com.engine.core.interceptor.CommandContext; 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.KQDurationCalculatorUtil;
import com.engine.kq.util.PageUidFactory; import com.engine.kq.util.PageUidFactory;
import weaver.common.DateUtil; import weaver.common.DateUtil;
@ -122,17 +122,17 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
} }
//Liuhao 新增列[大夜班天数] --begin //Liuhao 新增列[大夜班天数] --begin
column = new HashMap(); // column = new HashMap();
column.put("title","大夜班天数"); // column.put("title","大夜班天数");
column.put("unit","天"); // column.put("unit","天");
column.put("dataIndex","nightdaysd"); // column.put("dataIndex","nightdaysd");
column.put("type","businessLeave"); // column.put("type","businessLeave");
column.put("key","nightdaysd"); // column.put("key","nightdaysd");
column.put("isSystem","1"); // column.put("isSystem","1");
column.put("rowSpan","3"); // column.put("rowSpan","3");
column.put("width",65); // column.put("width",65);
column.put("showDetial","1"); // column.put("showDetial","1");
columns.add(column); // columns.add(column);
//Liuhao 新增列[夜班天数] --end //Liuhao 新增列[夜班天数] --end
boolean isEnd = false; boolean isEnd = false;

Write Preview
Loading…
Cancel
Save