迟到使用分钟数统计

src/com/engine/kq/cmd/report/ExportExcelCmd.java

@@ -5,14 +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.KQFormatBiz;
+import com.engine.kq.biz.*;
-import com.engine.kq.biz.KQLeaveRulesBiz;
-import com.engine.kq.biz.KQOvertimeRulesBiz;
-import com.engine.kq.biz.KQReportBiz;
-import com.engine.kq.biz.KQReportFieldComInfo;
-import com.engine.kq.biz.KQSettingsComInfo;
-import com.engine.kq.biz.KQShiftManagementComInfo;
-import com.engine.kq.biz.KQUnitBiz;
 import com.engine.kq.util.ExcelUtil;
 import com.engine.kq.util.KQDurationCalculatorUtil;
 import com.engine.kq.util.UtilKQ;
@@ -33,12 +26,7 @@ import weaver.systeminfo.SystemEnv;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
 
@@ -476,10 +464,10 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
                             if (Util.null2String(rs.getString(lsCascadekey.get(i))).length() > 0) {
                                 fieldid = KQReportFieldComInfo.field2Id.get(lsCascadekey.get(i));
                                 //迟到早退使用分钟
-                                if (fieldName.contains("LateMins") || fieldName.contains("EarlyMins")) {
+                                if (lsCascadekey.get(i).contains("LateMins") || lsCascadekey.get(i).contains("EarlyMins")) {
                                     fieldValue = rs.getString(lsCascadekey.get(i));
                                 } else {
-                                    fieldValue = getFieldValueByUnitType(rs.getString(lsCascadekey.get(i)), kqReportFieldComInfo.getUnittype(fieldid));
+                                fieldValue = getFieldValueByUnitType(rs.getString(lsCascadekey.get(i)), kqReportFieldComInfo.getUnittype(fieldid));
                                 }
                             } else {
                                 fieldValue = "0";
@@ -747,7 +735,7 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
                     if (kqReportFieldComInfo.getFieldname().contains("LateMins") || kqReportFieldComInfo.getFieldname().contains("EarlyMins")) {
                         title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()) + "(分钟)");
                     } else {
-                        title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()) + "(" + KQReportBiz.getUnitType(kqReportFieldComInfo, user) + ")");
+                    title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()) + "(" + KQReportBiz.getUnitType(kqReportFieldComInfo, user) + ")");
                     }
                     title.put("width", 30 * 256);
                     titleList.add(title);