出差流程结合外勤打卡计算考勤数据

src/com/engine/hostar/controller/KqDevController.java

@@ -35,4 +35,14 @@ public class KqDevController {
         return  new Gson().toJson(resultDatas);
     }
 
+    @POST
+    @Path("/checkApplyDate")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String checkApplyDate(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> params = ParamUtil.request2Map(request);
+        Map<String, Object> resultDatas = getKqDevService(user).checkApplyDate(params);
+        return  new Gson().toJson(resultDatas);
+    }
+
 }

src/com/engine/hostar/service/KqDevService.java

@@ -8,5 +8,8 @@ import java.util.Map;
  * @description
  **/
 public interface KqDevService {
+    /*获取考勤日期的类型*/
     Map<String, Object> getKqType(Map<String, Object> params);
+    /*检查流程发起日期是否满足指定工作日时长*/
+    Map<String, Object> checkApplyDate(Map<String, Object> params);
 }

src/com/engine/hostar/service/impl/KqDevServiceImpl.java

@@ -1,14 +1,16 @@
 package com.engine.hostar.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.engine.core.impl.Service;
 import com.engine.hostar.service.KqDevService;
+import com.engine.hostar.util.HostarUtil;
 import com.engine.kq.biz.KQOvertimeRulesBiz;
+import com.engine.kq.biz.KQWorkTime;
 import org.apache.commons.lang.StringUtils;
 import weaver.general.BaseBean;
 import weaver.general.Util;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author chenwnj
@@ -62,4 +64,88 @@ public class KqDevServiceImpl extends Service implements KqDevService {
         }
 
     }
+
+    @Override
+    public Map<String, Object> checkApplyDate(Map<String, Object> params) {
+        bb.writeLog("---checkApplyDate start---");
+        Map<String, Object> result = new HashMap<>();
+
+        String resourceId = Util.null2String(params.get("resourceId"));//申请人
+        bb.writeLog("resourceId: " + resourceId);
+        String kqDate = Util.null2String(params.get("kqDate"));//申请日期
+        bb.writeLog("kqDate: " + kqDate);
+        String offsetStr = Util.null2String(params.get("offset"));//允许的偏移量
+        bb.writeLog("offsetStr: " + offsetStr);
+
+        if ( StringUtils.isBlank(resourceId)) {
+            result.put("code",500);
+            result.put("msg","请先选择人员");
+            return result;
+        }
+        if ( StringUtils.isBlank(kqDate)) {
+            result.put("code",500);
+            result.put("msg","请先选择申请日期");
+            return result;
+        }
+        if ( StringUtils.isBlank(offsetStr)) {
+            result.put("code",500);
+            result.put("msg","请先设置偏移量");
+            return result;
+        }
+
+        Integer offset = Util.getIntValue(offsetStr);
+        bb.writeLog("offset: " + offset);
+
+        KQWorkTime kqWorkTime = new KQWorkTime();
+        HostarUtil hostarUtil = new HostarUtil();
+        String today = DateUtil.format(new Date(), "yyyy-MM-dd");
+        bb.writeLog("today: " + today);
+
+        List<String> allDates = new ArrayList<>();
+
+        if (today.compareTo(kqDate) < 0 ) {
+            if ( offset < 0) {
+                result.put("code",500);
+                result.put("msg","该流程只能提前"+Math.abs(offset)+"个工作日申请");
+                return result;
+            }
+            allDates = hostarUtil.getAllDates(today, kqDate);
+        } else if (today.compareTo(kqDate) > 0 ){
+            if ( offset > 0) {
+                result.put("code",500);
+                result.put("msg","该流程只能延后"+Math.abs(offset)+"个工作日申请");
+                return result;
+            }
+            allDates = hostarUtil.getAllDates(kqDate, today);
+        } else if (today.compareTo(kqDate) == 0) {
+            if ( offset != 0) {
+                result.put("code",500);
+                result.put("msg","该流程只能当天申请");
+                return result;
+            }
+            allDates = hostarUtil.getAllDates(kqDate, today);
+        }
+        bb.writeLog("allDates: " + allDates);
+
+        int workdays = -1;
+        for ( String date: allDates) {
+            //判断是否是工作日
+            boolean isWorkDay = kqWorkTime.isWorkDay(resourceId, date);
+            if (isWorkDay){
+                workdays ++;
+            }
+        }
+        bb.writeLog("workdays: " + workdays);
+
+        if (workdays <= Math.abs(offset)) {
+            result.put("code",200);
+            result.put("msg","允许申请");
+            return result;
+        } else {
+            result.put("code",500);
+            result.put("msg","超出允许申请的时间限制，允许申请的时间为：申请日期" +
+                    (offset>= 0?(offset>0 ?"延迟"+Math.abs(offset) + "天" : "当天" ):"提前" + Math.abs(offset) + "天") );
+            return result;
+        }
+    }
 }

src/com/engine/hostar/util/HostarUtil.java

@@ -0,0 +1,64 @@
+package com.engine.hostar.util;
+
+import weaver.general.BaseBean;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author chenwnj
+ * @date 2023/12/14
+ * @description
+ **/
+public class HostarUtil {
+
+    BaseBean bb = new BaseBean();
+
+    // 地球半径，单位：米
+    private static final int EARTH_RADIUS = 6371000;
+
+    /**
+     * 根据开始日期和结束日期，计算出之间的所有日期
+     * @params startDate 指定日期
+     * @params endDate 结束日期
+     */
+    public List<String> getAllDates(String startDate, String endDate) {
+        List<String> result = new ArrayList<>();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        LocalDate start = LocalDate.parse(startDate, formatter);
+        LocalDate end = LocalDate.parse(endDate, formatter);
+
+        while (!start.isAfter(end)) {
+            result.add(start.format(formatter));
+            start = start.plusDays(1);
+        }
+
+        return result;
+    }
+
+    /**经度、纬度
+     * 判断两个经纬度坐标之间的距离
+     * @params lat1  坐标1的纬度
+     * @params lon1  坐标1的经度
+     * @params lat2  坐标2的纬度
+     * @params lon2  坐标2的经度
+     * @return 坐标1、2间距离（米）
+     */
+    public Double calculateDistance(Double lat1, Double lon1, Double lat2, Double lon2) {
+        double dLat = Math.toRadians(lat2 - lat1);
+        double dLon = Math.toRadians(lon2 - lon1);
+
+        lat1 = Math.toRadians(lat1);
+        lat2 = Math.toRadians(lat2);
+
+        double a = Math.pow(Math.sin(dLat / 2), 2) + Math.pow(Math.sin(dLon / 2), 2) * Math.cos(lat1) * Math.cos(lat2);
+        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+
+        return EARTH_RADIUS * c;
+    }
+
+
+}

src/com/engine/kq/biz/KQFlowDataBiz.java

@@ -0,0 +1,815 @@
+package com.engine.kq.biz;
+
+import com.engine.kq.enums.FlowReportTypeEnum;
+import com.engine.kq.enums.KqSplitFlowTypeEnum;
+import com.engine.kq.wfset.bean.SplitBean;
+import net.qiyuesuo.sdk.common.utils.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+/**
+ * 考勤流程数据 相关类
+ */
+public class KQFlowDataBiz {
+
+  BaseBean bb = new BaseBean();
+
+  private String resourceid;
+  private String fromDate;
+  private String toDate;
+  private String fromTime;
+  private String toTime;
+  private String belongDate;
+  private String newLeaveType;
+  private String orderby_sql;
+
+  public KQFlowDataBiz(FlowDataParamBuilder build){
+    this.resourceid = build.resourceid;
+    this.fromDate = build.fromDate;
+    this.toDate = build.toDate;
+    this.fromTime = build.fromTime;
+    this.toTime = build.toTime;
+    this.belongDate = build.belongDate;
+    this.newLeaveType = build.newLeaveType;
+    this.orderby_sql = build.orderby_sql;
+  }
+
+  /**
+   * 获取所有的考勤数据
+   * 请假，出差，公出，加班的
+   * @param flowMaps
+   * @param isAll true的时候也返回加班的，false的时候不返回加班的，只返回可以抵扣异常的
+   * @return
+   */
+  public List<SplitBean> getAllFlowData(Map<String,Object> flowMaps,boolean isAll){
+    List<SplitBean> allSplitBeans = new ArrayList<>();
+
+    Map<String,String> flowDeductCard = getFlowDeductCard();
+
+    allSplitBeans.addAll(getLeaveData(flowMaps,flowDeductCard));
+//    allSplitBeans.addAll(getEvectionData(flowMaps,flowDeductCard));
+//    allSplitBeans.addAll(getOutData(flowMaps,flowDeductCard));
+    if(isAll){
+      allSplitBeans.addAll(getOverTimeData(flowMaps));
+    }
+    allSplitBeans.addAll(getOtherData(flowMaps));
+
+    return allSplitBeans;
+  }
+
+  /**
+   * 流程抵扣考勤
+   */
+  public Map<String,String> getFlowDeductCard() {
+
+    RecordSet rs = new RecordSet();
+    RecordSet rs1 = new RecordSet();
+    Map<String,String> flowDeductCard = new HashMap<>();
+
+    String flowDeductCardSql = "select * from kq_flow_deduct_card t where 1=1 and (isclear is null or isclear<>1) ";
+    String sqlWhere = sqlFlowCardParamWhere();
+    if(sqlWhere.length() > 0){
+      flowDeductCardSql += sqlWhere;
+    }
+    rs.execute(flowDeductCardSql);
+    while(rs.next()){
+      String requestId= rs.getString("requestId");
+      String resourceid= rs.getString("resourceid");
+      String signtype= rs.getString("signtype");
+      String serialnumber= rs.getString("serialnumber");
+      String flowtype= rs.getString("flowtype");
+      String key = requestId+"_"+resourceid+"_"+flowtype;
+      String serial_signtype = serialnumber+"_"+signtype;
+      if(flowDeductCard.containsKey(key)){
+        String tmpSignType = Util.null2String(flowDeductCard.get(key));
+        flowDeductCard.put(key, tmpSignType+","+serial_signtype);
+      }else{
+        flowDeductCard.put(key, serial_signtype);
+      }
+    }
+    return flowDeductCard;
+  }
+
+  /**
+   * 获取请假相关的数据
+   */
+  public List<SplitBean> getLeaveData(Map<String, Object> flowMaps,
+      Map<String, String> flowDeductCard){
+
+    RecordSet rs = new RecordSet();
+    RecordSet rs1 = new RecordSet();
+
+    String tablename = "select a.* from "+KqSplitFlowTypeEnum.LEAVE.getTablename()+"  a left join workflow_requestbase b on a.requestid = b.requestid where  b.requestid > 0 ";
+    String leaveSql = "select * from ("+tablename+") t where 1=1 and (status is null or status <> '1') ";
+    String sqlWhere = sqlParamWhere();
+
+    if(sqlWhere.length() > 0){
+      leaveSql += sqlWhere;
+    }
+    List<SplitBean> splitBeans = new ArrayList<>();
+    KQTimesArrayComInfo kqTimesArrayComInfo = new KQTimesArrayComInfo();
+
+    int[] initArrays = kqTimesArrayComInfo.getInitArr();
+
+    rs.execute(leaveSql);
+    while(rs.next()){
+      SplitBean splitBean = new SplitBean();
+      String requestId= rs.getString("requestId");
+      String resourceid= rs.getString("resourceid");
+      String fromdate= rs.getString("fromdate");
+      String belongdate= rs.getString("belongdate");
+      String fromtime= rs.getString("fromtime");
+      String todate= rs.getString("todate");
+      String totime= rs.getString("totime");
+      String newleavetype= rs.getString("newleavetype");
+      String duration= rs.getString("duration");
+      String durationrule= rs.getString("durationrule");
+      String leavebackrequestid= Util.null2String(rs.getString("leavebackrequestid"));
+
+      if(Util.getDoubleValue(duration) <= 0){
+        continue;
+      }
+      //计算规则 1-按天请假 2-按半天请假 3-按小时请假 4-按整天请假
+      String unitType = "4".equalsIgnoreCase(durationrule)?"1":"2";
+      String card_key = requestId+"_"+resourceid+"_"+KqSplitFlowTypeEnum.LEAVE.getFlowtype();
+      String serial_signtype = "";
+      String serial = "";
+      String signtype = "";
+      if(!flowDeductCard.isEmpty() && flowDeductCard.containsKey(card_key)){
+        serial_signtype = Util.null2String(flowDeductCard.get(card_key));
+        if(serial_signtype.split("_") != null && serial_signtype.split("_").length == 2){
+          serial = serial_signtype.split("_")[0];
+          signtype = serial_signtype.split("_")[1];
+        }
+      }
+
+      Map<String,String> infoMap = new HashMap<>();
+      infoMap.put("requestId", requestId);
+      infoMap.put(newleavetype, duration);
+      infoMap.put("begintime", fromtime);
+      infoMap.put("endtime", totime);
+      infoMap.put("unitType", unitType);
+      infoMap.put("flowtype", FlowReportTypeEnum.LEAVE.getFlowType());
+      infoMap.put("newleavetype", newleavetype);
+      infoMap.put("signtype", signtype);
+      infoMap.put("serial", serial);
+
+      String key = resourceid+"|"+belongdate;
+      if(flowMaps != null){
+        if(flowMaps.get(key) != null){
+          if(leavebackrequestid.length() > 0 && leavebackrequestid.startsWith(",")){
+            initArrays = kqTimesArrayComInfo.getInitArr();
+            int fromTimeIndex = kqTimesArrayComInfo.getArrayindexByTimes(fromtime);
+            int toTimeIndex = kqTimesArrayComInfo.getArrayindexByTimes(totime);
+            Arrays.fill(initArrays, fromTimeIndex, toTimeIndex+1, 1);
+            leavebackrequestid = leavebackrequestid.substring(1);
+            String backSql = "select * from "+KqSplitFlowTypeEnum.LEAVEBACK.getTablename()+" where "+Util.getSubINClause(leavebackrequestid, "requestid", "in")+" and fromdate= '"+fromdate+"'";
+            rs1.executeQuery(backSql);
+
+            while (rs1.next()){
+              String back_fromtime = rs1.getString("fromtime");
+              String back_totime = rs1.getString("totime");
+              if(back_fromtime.equalsIgnoreCase(fromtime)){
+                Arrays.fill(initArrays, kqTimesArrayComInfo.getArrayindexByTimes(back_fromtime), kqTimesArrayComInfo.getArrayindexByTimes(back_totime), -1);
+              }else{
+                Arrays.fill(initArrays, kqTimesArrayComInfo.getArrayindexByTimes(back_fromtime)+1, kqTimesArrayComInfo.getArrayindexByTimes(back_totime), -1);
+              }
+            }
+            List<List<String>> backLists = new ArrayList<>();
+            List<String> backList = new ArrayList<>();
+            for(int i = fromTimeIndex ; i <= toTimeIndex ; i ++){
+              if(initArrays[i] == 1){
+                backList.add(kqTimesArrayComInfo.getTimesByArrayindex(i));
+              }else{
+                if(!backList.isEmpty()){
+                  backLists.add(backList);
+                  backList = new ArrayList<>();
+                }else{
+                  continue;
+                }
+              }
+            }
+            if(!backList.isEmpty()){
+              backLists.add(backList);
+            }
+            if(backLists != null && !backLists.isEmpty()){
+              List<Map<String,String>> time_list_tmp = (List<Map<String,String>>)flowMaps.get(key);
+              for(int j = 0 ; j < backLists.size() ;j++){
+                List<String> backListTmp = backLists.get(j);
+                String back_tmp_fromtime = backListTmp.get(0);
+                String back_tmp_totime = backListTmp.get(backListTmp.size()-1);
+                infoMap = new HashMap<>();
+                infoMap.put("requestId", requestId);
+                infoMap.put(newleavetype, duration);
+                infoMap.put("begintime", back_tmp_fromtime);
+                infoMap.put("endtime", back_tmp_totime);
+                infoMap.put("unitType", unitType);
+                infoMap.put("flowtype", FlowReportTypeEnum.LEAVE.getFlowType());
+                infoMap.put("newleavetype", newleavetype);
+                time_list_tmp.add(infoMap);
+              }
+            }
+          }else{
+            List<Map<String,String>> time_list_tmp = (List<Map<String,String>>)flowMaps.get(key);
+            time_list_tmp.add(infoMap);
+          }
+        }else{
+          if(leavebackrequestid.length() > 0 && leavebackrequestid.startsWith(",")){
+            initArrays = kqTimesArrayComInfo.getInitArr();
+            int fromTimeIndex = kqTimesArrayComInfo.getArrayindexByTimes(fromtime);
+            int toTimeIndex = kqTimesArrayComInfo.getArrayindexByTimes(totime);
+            Arrays.fill(initArrays, fromTimeIndex, toTimeIndex+1, 1);
+            leavebackrequestid = leavebackrequestid.substring(1);
+            String backSql = "select * from "+KqSplitFlowTypeEnum.LEAVEBACK.getTablename()+" where "+Util.getSubINClause(leavebackrequestid, "requestid", "in")+" and fromdate= '"+fromdate+"'";
+            rs1.executeQuery(backSql);
+
+            while (rs1.next()){
+              String back_fromtime = rs1.getString("fromtime");
+              String back_totime = rs1.getString("totime");
+              if(back_fromtime.equalsIgnoreCase(fromtime)){
+                Arrays.fill(initArrays, kqTimesArrayComInfo.getArrayindexByTimes(back_fromtime), kqTimesArrayComInfo.getArrayindexByTimes(back_totime), -1);
+              }else{
+                if(back_fromtime.compareTo(back_totime) < 0){
+                  Arrays.fill(initArrays, kqTimesArrayComInfo.getArrayindexByTimes(back_fromtime)+1, kqTimesArrayComInfo.getArrayindexByTimes(back_totime), -1);
+                }
+              }
+            }
+            List<List<String>> backLists = new ArrayList<>();
+            List<String> backList = new ArrayList<>();
+            for(int i = fromTimeIndex ; i <= toTimeIndex ; i ++){
+              if(initArrays[i] == 1){
+                backList.add(kqTimesArrayComInfo.getTimesByArrayindex(i));
+              }else{
+                if(!backList.isEmpty()){
+                  backLists.add(backList);
+                  backList = new ArrayList<>();
+                }else{
+                  continue;
+                }
+              }
+            }
+            if(!backList.isEmpty()){
+              backLists.add(backList);
+            }
+            if(backLists != null && !backLists.isEmpty()){
+              List<Map<String,String>> time_list = new ArrayList<>();
+              for(int j = 0 ; j < backLists.size() ;j++){
+                List<String> backListTmp = backLists.get(j);
+                String back_tmp_fromtime = backListTmp.get(0);
+                String back_tmp_totime = backListTmp.get(backListTmp.size()-1);
+                infoMap = new HashMap<>();
+                infoMap.put("requestId", requestId);
+                infoMap.put(newleavetype, duration);
+                infoMap.put("begintime", back_tmp_fromtime);
+                infoMap.put("endtime", back_tmp_totime);
+                infoMap.put("unitType", unitType);
+                infoMap.put("flowtype", FlowReportTypeEnum.LEAVE.getFlowType());
+                infoMap.put("newleavetype", newleavetype);
+                time_list.add(infoMap);
+              }
+              flowMaps.put(key, time_list);
+            }
+          }else{
+            List<Map<String,String>> time_list = new ArrayList<>();
+            time_list.add(infoMap);
+            flowMaps.put(key, time_list);
+          }
+        }
+      }
+
+    }
+    return splitBeans;
+  }
+
+  /**
+   * 获取出差相关的数据
+   */
+  public List<SplitBean> getEvectionData(Map<String, Object> flowMaps,
+      Map<String, String> flowDeductCard){
+
+    RecordSet rs = new RecordSet();
+    String tablename = "select a.* from "+KqSplitFlowTypeEnum.EVECTION.getTablename()+"  a left join workflow_requestbase b on a.requestid = b.requestid where  b.requestid > 0 ";
+    String leaveSql = "select * from ("+tablename+") t where 1=1 and (status is null or status <> '1') ";
+    String sqlWhere = sqlParamWhere();
+
+    if(sqlWhere.length() > 0){
+      leaveSql += sqlWhere;
+    }
+
+//    /*考勤二开--出差公出流程结合外勤打卡计算考勤数据start*/
+//    //先获取考勤班次开始时间
+//    String startTime = "";
+//    Map<String, Object> serialInfo = new KQWorkTime().getSerialInfo(resourceid, fromDate, false);
+//    bb.writeLog("serialInfo: " + serialInfo);
+//
+//    String serialid = Util.null2String(serialInfo.get(fromDate));
+//    if (StringUtils.isNotBlank(serialid)) {
+//      //根据班次获取班次开始时间
+//      String acqOnOffSql = "select times, onoffworktype from kq_shiftonoffworksections where (isdelete = 0 or isdelete is null) and serialid = ? ";
+//      rs.executeQuery(acqOnOffSql, serialid);
+//      while ( rs.next()) {
+//        String times = Util.null2String(rs.getString("times"));
+//        String onoffworktype = Util.null2String(rs.getString("onoffworktype"));
+//
+//        if (onoffworktype.equals("start")) {
+//          startTime = times + ":00";
+//        }
+//      }
+//    }
+//    //只取班次开始时间前一个小时开始的打卡
+//    LocalTime specifiedLocalTime = LocalTime.parse(startTime);
+//
+//    // 获取前一个小时
+//    LocalTime previousHour = specifiedLocalTime.minusHours(1);
+//    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); // 定义时间格式
+//    startTime = previousHour.format(formatter);
+//
+//    bb.writeLog("startTime: " + startTime);
+//
+//    String sqlLeWhere = sqlLeWhere(startTime);
+//    String acqLegworkSql = "select * from mobile_sign where 1=1 " + sqlLeWhere;
+//    bb.writeLog("acqLegworkSql: " + acqLegworkSql);
+//
+//    /*考勤二开--出差公出流程结合外勤打卡计算考勤数据end*/
+
+
+
+    List<SplitBean> splitBeans = new ArrayList<>();
+    rs.execute(leaveSql);
+    while(rs.next()){
+      SplitBean splitBean = new SplitBean();
+      String requestId= rs.getString("requestId");
+      String resourceid= rs.getString("resourceid");
+      String fromdate= rs.getString("fromdate");
+      String belongdate= rs.getString("belongdate");
+      String fromtime= rs.getString("fromtime");
+      String todate= rs.getString("todate");
+      String totime= rs.getString("totime");
+      String newleavetype= rs.getString("newleavetype");
+      String duration= rs.getString("duration");
+      String durationrule= rs.getString("durationrule");
+
+      splitBean.setRequestId(requestId);
+      splitBean.setResourceId(resourceid);
+      splitBean.setFromDate(fromdate);
+      splitBean.setFromTime(fromtime);
+      splitBean.setToDate(todate);
+      splitBean.setToTime(totime);
+      splitBean.setNewLeaveType(newleavetype);
+      splitBean.setDuration(duration);
+      splitBean.setDurationrule(durationrule);
+      splitBeans.add(splitBean);
+
+      if(Util.getDoubleValue(duration) <= 0){
+        continue;
+      }
+      //计算规则 1-按天请假 2-按半天请假 3-按小时请假 4-按整天请假
+      String unitType = "4".equalsIgnoreCase(durationrule)?"1":"2";
+      String card_key = requestId+"_"+resourceid+"_"+KqSplitFlowTypeEnum.EVECTION.getFlowtype();
+      String serial_signtype = "";
+      String serial = "";
+      String signtype = "";
+      if(!flowDeductCard.isEmpty() && flowDeductCard.containsKey(card_key)){
+        serial_signtype = Util.null2String(flowDeductCard.get(card_key));
+        if(serial_signtype.split("_") != null && serial_signtype.split("_").length == 2){
+          serial = serial_signtype.split("_")[0];
+          signtype = serial_signtype.split("_")[1];
+        }
+      }
+
+      Map<String,String> infoMap = new HashMap<>();
+      infoMap.put(FlowReportTypeEnum.businessLeave.getFlowType(), duration);
+      infoMap.put("requestId", requestId);
+      infoMap.put("begintime", fromtime);
+      infoMap.put("endtime", totime);
+      infoMap.put("unitType", unitType);
+      infoMap.put("duration", duration);
+      infoMap.put("flowtype", FlowReportTypeEnum.EVECTION.getFlowType());
+      infoMap.put("signtype", signtype);
+      infoMap.put("serial", serial);
+
+      String key = resourceid+"|"+belongdate;
+      if(flowMaps != null){
+        if(flowMaps.get(key) != null){
+          List<Map<String,String>> time_list_tmp = (List<Map<String,String>>)flowMaps.get(key);
+          time_list_tmp.add(infoMap);
+        }else{
+          List<Map<String,String>> time_list = new ArrayList<>();
+          time_list.add(infoMap);
+          flowMaps.put(key, time_list);
+        }
+      }
+
+    }
+    return splitBeans;
+  }
+
+  /**
+   * 获取公出相关的数据
+   */
+  public List<SplitBean> getOutData(Map<String, Object> flowMaps,
+      Map<String, String> flowDeductCard){
+
+    RecordSet rs = new RecordSet();
+    String tablename = "select a.* from "+KqSplitFlowTypeEnum.OUT.getTablename()+"  a left join workflow_requestbase b on a.requestid = b.requestid where  b.requestid > 0 ";
+    String leaveSql = "select * from ("+tablename+") t where 1=1 and (status is null or status <> '1') ";
+    String sqlWhere = sqlParamWhere();
+
+    if(sqlWhere.length() > 0){
+      leaveSql += sqlWhere;
+    }
+    List<SplitBean> splitBeans = new ArrayList<>();
+    rs.execute(leaveSql);
+    while(rs.next()){
+      SplitBean splitBean = new SplitBean();
+      String requestId= rs.getString("requestId");
+      String resourceid= rs.getString("resourceid");
+      String fromdate= rs.getString("fromdate");
+      String belongdate= rs.getString("belongdate");
+      String fromtime= rs.getString("fromtime");
+      String todate= rs.getString("todate");
+      String totime= rs.getString("totime");
+      String newleavetype= rs.getString("newleavetype");
+      String duration= rs.getString("duration");
+      String durationrule= rs.getString("durationrule");
+
+      splitBean.setRequestId(requestId);
+      splitBean.setResourceId(resourceid);
+      splitBean.setFromDate(fromdate);
+      splitBean.setFromTime(fromtime);
+      splitBean.setToDate(todate);
+      splitBean.setToTime(totime);
+      splitBean.setNewLeaveType(newleavetype);
+      splitBean.setDuration(duration);
+      splitBean.setDurationrule(durationrule);
+      splitBeans.add(splitBean);
+
+      if(Util.getDoubleValue(duration) <= 0){
+        continue;
+      }
+      //计算规则 1-按天请假 2-按半天请假 3-按小时请假 4-按整天请假
+      String unitType = "4".equalsIgnoreCase(durationrule)?"1":"2";
+      String card_key = requestId+"_"+resourceid+"_"+KqSplitFlowTypeEnum.OUT.getFlowtype();
+      String serial_signtype = "";
+      String serial = "";
+      String signtype = "";
+      if(!flowDeductCard.isEmpty() && flowDeductCard.containsKey(card_key)){
+        serial_signtype = Util.null2String(flowDeductCard.get(card_key));
+        if(serial_signtype.split("_") != null && serial_signtype.split("_").length == 2){
+          serial = serial_signtype.split("_")[0];
+          signtype = serial_signtype.split("_")[1];
+        }
+      }
+
+      Map<String,String> infoMap = new HashMap<>();
+      infoMap.put(FlowReportTypeEnum.officialBusiness.getFlowType(), duration);
+      infoMap.put("requestId", requestId);
+      infoMap.put("begintime", fromtime);
+      infoMap.put("endtime", totime);
+      infoMap.put("unitType", unitType);
+      infoMap.put("duration", duration);
+      infoMap.put("flowtype", FlowReportTypeEnum.OUT.getFlowType());
+      infoMap.put("signtype", signtype);
+      infoMap.put("serial", serial);
+
+      String key = resourceid+"|"+belongdate;
+      if(flowMaps != null){
+        if(flowMaps.get(key) != null){
+          List<Map<String,String>> time_list_tmp = (List<Map<String,String>>)flowMaps.get(key);
+          time_list_tmp.add(infoMap);
+        }else{
+          List<Map<String,String>> time_list = new ArrayList<>();
+          time_list.add(infoMap);
+          flowMaps.put(key, time_list);
+        }
+      }
+
+    }
+    return splitBeans;
+  }
+
+  /**
+   * 获取加班相关的数据
+   */
+  public List<SplitBean> getOverTimeData(Map<String,Object> flowMaps){
+
+    RecordSet rs = new RecordSet();
+    String tablename = "select a.* from "+KqSplitFlowTypeEnum.OVERTIME.getTablename()+"  a left join workflow_requestbase b on a.requestid = b.requestid where  b.requestid > 0 ";
+    String leaveSql = "select * from ("+tablename+") t where 1=1 ";
+    String sqlWhere = sqlParamWhere();
+
+    if(sqlWhere.length() > 0){
+      leaveSql += sqlWhere;
+    }
+    List<SplitBean> splitBeans = new ArrayList<>();
+    if(orderby_sql.length() > 0){
+      leaveSql = leaveSql+orderby_sql;
+    }
+    rs.execute(leaveSql);
+    while(rs.next()){
+      SplitBean splitBean = new SplitBean();
+      String dataid= rs.getString("dataid");
+      String detailid= rs.getString("detailid");
+      String requestId= rs.getString("requestId");
+      String resourceid= rs.getString("resourceid");
+      String fromdate= rs.getString("fromdate");
+      String belongdate= rs.getString("belongdate");
+      String fromtime= rs.getString("fromtime");
+      String todate= rs.getString("todate");
+      String totime= rs.getString("totime");
+      String newleavetype= rs.getString("newleavetype");
+      String duration= rs.getString("duration");
+      String durationrule= rs.getString("durationrule");
+      String changetype= rs.getString("changetype");
+      String d_mins= rs.getString("d_mins");
+      String overtime_type= rs.getString("overtime_type");
+
+      String fromdatedb= rs.getString("fromdatedb");
+      String fromtimedb= rs.getString("fromtimedb");
+      String todatedb= rs.getString("todatedb");
+      String totimedb= rs.getString("totimedb");
+
+      splitBean.setDataId(dataid);
+      splitBean.setDetailId(detailid);
+      splitBean.setRequestId(requestId);
+      splitBean.setResourceId(resourceid);
+      splitBean.setFromDate(fromdate);
+      splitBean.setFromTime(fromtime);
+      splitBean.setToDate(todate);
+      splitBean.setToTime(totime);
+      splitBean.setNewLeaveType(newleavetype);
+      splitBean.setDuration(duration);
+      splitBean.setDurationrule(durationrule);
+      splitBean.setChangeType(Util.getIntValue(changetype));
+      splitBean.setD_Mins(Util.getDoubleValue(d_mins));
+      splitBean.setOvertime_type(overtime_type);
+      splitBean.setFromdatedb(fromdatedb);
+      splitBean.setFromtimedb(fromtimedb);
+      splitBean.setTodatedb(todatedb);
+      splitBean.setTotimedb(totimedb);
+      splitBeans.add(splitBean);
+
+      //计算规则 1-按天请假 2-按半天请假 3-按小时请假 4-按整天请假
+      String unitType = "4".equalsIgnoreCase(durationrule)?"1":"2";
+      unitType = "2".equalsIgnoreCase(durationrule)?"1":"2";
+
+      Map<String,String> infoMap = new HashMap<>();
+      infoMap.put(FlowReportTypeEnum.businessLeave.getFlowType(), duration);
+      infoMap.put("begintime", fromtime);
+      infoMap.put("endtime", totime);
+      infoMap.put("unitType", unitType);
+      infoMap.put("duration", duration);
+      infoMap.put("flowtype", FlowReportTypeEnum.OVERTIME.getFlowType());
+
+      String key = resourceid+"|"+belongdate;
+      if(flowMaps != null){
+        if(flowMaps.get(key) != null){
+          List<Map<String,String>> time_list_tmp = (List<Map<String,String>>)flowMaps.get(key);
+          time_list_tmp.add(infoMap);
+        }else{
+          List<Map<String,String>> time_list = new ArrayList<>();
+          time_list.add(infoMap);
+          flowMaps.put(key, time_list);
+        }
+      }
+    }
+    return splitBeans;
+  }
+
+  /**
+   * 获取异常流程的数据
+   */
+  public List<SplitBean> getOtherData(Map<String,Object> flowMaps){
+
+    RecordSet rs = new RecordSet();
+    String tablename = "select a.* from "+KqSplitFlowTypeEnum.OTHER.getTablename()+"  a left join workflow_requestbase b on a.requestid = b.requestid where  b.requestid > 0 ";
+    String leaveSql = "select * from ("+tablename+") t where 1=1 ";
+    String sqlWhere = sqlParamWhere();
+
+    if(sqlWhere.length() > 0){
+      leaveSql += sqlWhere;
+    }
+    List<SplitBean> splitBeans = new ArrayList<>();
+    rs.execute(leaveSql);
+    while(rs.next()){
+      SplitBean splitBean = new SplitBean();
+      String requestId= rs.getString("requestId");
+      String resourceid= rs.getString("resourceid");
+      String fromdate= rs.getString("fromdate");
+      String belongdate= rs.getString("belongdate");
+      String fromtime= rs.getString("fromtime");
+      String todate= rs.getString("todate");
+      String totime= rs.getString("totime");
+      String newleavetype= rs.getString("newleavetype");
+      String duration= rs.getString("duration");
+      String durationrule= rs.getString("durationrule");
+
+      splitBean.setRequestId(requestId);
+      splitBean.setResourceId(resourceid);
+      splitBean.setFromDate(fromdate);
+      splitBean.setFromTime(fromtime);
+      splitBean.setToDate(todate);
+      splitBean.setToTime(totime);
+      splitBean.setNewLeaveType(newleavetype);
+      splitBean.setDuration(duration);
+      splitBean.setDurationrule(durationrule);
+      splitBeans.add(splitBean);
+
+      //计算规则 1-按天请假 2-按半天请假 3-按小时请假 4-按整天请假
+      String unitType = "4".equalsIgnoreCase(durationrule)?"1":"2";
+
+      Map<String,String> infoMap = new HashMap<>();
+      infoMap.put(FlowReportTypeEnum.businessLeave.getFlowType(), duration);
+      infoMap.put("begintime", fromtime);
+      infoMap.put("endtime", totime);
+      infoMap.put("unitType", unitType);
+
+      String key = resourceid+"|"+belongdate;
+      if(flowMaps != null){
+        if(flowMaps.get(key) != null){
+          List<Map<String,String>> time_list_tmp = (List<Map<String,String>>)flowMaps.get(key);
+          time_list_tmp.add(infoMap);
+        }else{
+          List<Map<String,String>> time_list = new ArrayList<>();
+          time_list.add(infoMap);
+          flowMaps.put(key, time_list);
+        }
+      }
+    }
+    return splitBeans;
+  }
+
+  /**
+   * 根据请假类型判断是否被流程引用
+   * @param ruleid
+   * @return true表示被引用
+   */
+  public static boolean leaveTypeUsed(String ruleid){
+    KQFlowDataBiz kqFlowDataBiz = new FlowDataParamBuilder().newLeaveTypeParam(ruleid).build();
+    List<SplitBean> splitBeans = kqFlowDataBiz.getLeaveData(null, new HashMap<>());
+    if(!splitBeans.isEmpty()){
+      return true;
+    }else{
+      return false;
+    }
+  }
+
+//  /**
+//   * 生成外勤打卡查询条件
+//   * @return
+//   */
+//  private String sqlLeWhere( String startTime) {
+//    String sqlWhere = "";
+//    sqlWhere += " and operate_type = 'mobile_sign' and operate_time >='" + startTime + "' and operate_time <='23:59:59' ";
+//    if(resourceid.length() > 0){
+//      sqlWhere += " and operater in ( "+resourceid+" )";
+//    }
+//    if(belongDate.length() > 0){
+//      sqlWhere += " and operate_date = '"+belongDate+"' ";
+//    }
+//
+//    return sqlWhere;
+//  }
+
+  /**
+   * 生成相应的查询条件
+   * @return
+   */
+  private String sqlParamWhere() {
+    String sqlWhere = "";
+    if(resourceid.length() > 0){
+      sqlWhere += " and resourceid in ( "+resourceid+" )";
+    }
+    if(fromDate.length() > 0 && toDate.length() > 0){
+      sqlWhere += " and ( fromdate between '"+fromDate+"' and '"+toDate+"' or todate between '"+fromDate+"' and '"+toDate+"' )";
+    }else{
+      if(fromDate.length() > 0){
+        sqlWhere += " and fromdate between '"+fromDate+"' and '"+fromDate+"' ";
+      }
+      if(toDate.length() > 0){
+        sqlWhere += " and todate between '"+toDate+"' and '"+toDate+"' ";
+      }
+    }
+    if(belongDate.length() > 0){
+      sqlWhere += " and belongdate = '"+belongDate+"' ";
+    }
+    if(fromTime.length() > 0){
+      sqlWhere += " and fromtime >= '"+fromTime+"' ";
+    }
+    if(toTime.length() > 0){
+      sqlWhere += " and totime <= '"+toTime+"' ";
+    }
+    if(newLeaveType.length() > 0){
+      sqlWhere += " and newleavetype in ( "+newLeaveType+" )";
+    }
+    return sqlWhere;
+  }
+
+  private String sqlFlowCardParamWhere() {
+    String sqlWhere = "";
+    if(resourceid.length() > 0){
+      sqlWhere += " and resourceid in ( "+resourceid+" )";
+    }
+    if(fromDate.length() > 0 && toDate.length() > 0){
+      sqlWhere += " and ( fromdate between '"+fromDate+"' and '"+toDate+"' or todate between '"+fromDate+"' and '"+toDate+"' )";
+    }else{
+      if(fromDate.length() > 0){
+        sqlWhere += " and fromdate between '"+fromDate+"' and '"+fromDate+"' ";
+      }
+      if(toDate.length() > 0){
+        sqlWhere += " and todate between '"+toDate+"' and '"+toDate+"' ";
+      }
+    }
+    if(belongDate.length() > 0){
+      sqlWhere += " and belongdate = '"+belongDate+"' ";
+    }
+    if(fromTime.length() > 0){
+      sqlWhere += " and fromtime >= '"+fromTime+"' ";
+    }
+    if(toTime.length() > 0){
+      sqlWhere += " and totime <= '"+toTime+"' ";
+    }
+    return sqlWhere;
+  }
+
+  /**
+   * 针对可能存在的多种参数类型 创建参数静态内部类Builder
+   */
+  public static class FlowDataParamBuilder {
+
+    private String resourceid = "";
+    private String fromDate = "";
+    private String toDate = "";
+    private String fromTime = "";
+    private String toTime = "";
+    private String belongDate = "";
+    /**
+     * 请假用的请假类型
+     */
+    private String newLeaveType = "";
+    private String orderby_sql = "";
+
+    public FlowDataParamBuilder() {
+      this.resourceid = "";
+      //初始化的时候需要把其他参数先清空下
+      this.fromDate = "";
+      this.toDate = "";
+      this.fromTime = "";
+      this.toTime = "";
+      this.newLeaveType = "";
+      this.belongDate = "";
+      this.orderby_sql = "";
+    }
+
+    //成员方法返回其自身，所以可以链式调用
+    public FlowDataParamBuilder resourceidParam(final String resourceid) {
+      this.resourceid = resourceid;
+      return this;
+    }
+
+    public FlowDataParamBuilder fromDateParam(final String fromDate) {
+      this.fromDate = fromDate;
+      return this;
+    }
+
+    public FlowDataParamBuilder toDateParam(final String toDate) {
+      this.toDate = toDate;
+      return this;
+    }
+
+    public FlowDataParamBuilder fromTimeParam(final String fromTime) {
+      this.fromTime = fromTime;
+      return this;
+    }
+
+    public FlowDataParamBuilder toTimeParam(final String toTime) {
+      this.toTime = toTime;
+      return this;
+    }
+
+    public FlowDataParamBuilder newLeaveTypeParam(final String newLeaveType) {
+      this.newLeaveType = newLeaveType;
+      return this;
+    }
+
+    public FlowDataParamBuilder belongDateParam(final String belongDate) {
+      this.belongDate = belongDate;
+      return this;
+    }
+
+    public FlowDataParamBuilder orderby_sqlParam(final String orderby_sql) {
+      this.orderby_sql = orderby_sql;
+      return this;
+    }
+
+    //Builder的build方法，返回外部类的实例
+    public KQFlowDataBiz build() {
+      return new KQFlowDataBiz(this);
+    }
+  }
+}

src/com/engine/kq/biz/KQFormatSignData.java

@@ -0,0 +1,774 @@
+package com.engine.kq.biz;
+
+import com.alibaba.fastjson.JSON;
+import com.engine.kq.cmd.attendanceButton.ButtonStatusEnum;
+import com.engine.kq.entity.TimeScopeEntity;
+import com.engine.kq.entity.TimeSignScopeEntity;
+import com.engine.kq.log.KQLog;
+import com.engine.kq.util.UtilKQ;
+import com.engine.kq.wfset.util.KQSignUtil;
+import com.google.common.collect.Lists;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import org.apache.commons.lang3.StringUtils;
+import weaver.common.DateUtil;
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import java.util.*;
+
+/**
+ * 获取班次打卡数据
+ */
+public class KQFormatSignData extends BaseBean {
+  private KQLog kqLog = new KQLog();
+
+  public List<Object> getSignInfo(String userId, TimeScopeEntity signTimeScope,
+      TimeScopeEntity workTimeScope, String kqDate, String preDate,
+      String nextDate, KQTimesArrayComInfo kqTimesArrayComInfo) {
+    return getSignInfo(userId, signTimeScope, workTimeScope, kqDate, preDate, nextDate, kqTimesArrayComInfo,
+        Lists.newArrayList(), "");
+  }
+
+  public List<Object> getSignInfo(String userId, TimeScopeEntity signTimeScope,
+                                  TimeScopeEntity workTimeScope, String kqDate, String preDate,
+                                  String nextDate, KQTimesArrayComInfo kqTimesArrayComInfo,ArrayList<String> hostIps,String uuid) {
+    return getSignInfo(userId, signTimeScope, workTimeScope, kqDate, preDate, nextDate, kqTimesArrayComInfo, hostIps, uuid, 0, 0);
+
+  }
+  /***
+   * 获取班次打卡数据
+   * @param userId
+   * @param signTimeScope
+   * @param workTimeScope
+   * @param kqDate
+   * @param preDate
+   * @param nextDate
+   * @param kqTimesArrayComInfo
+   * @return
+   */
+  public List<Object> getSignInfo(String userId, TimeScopeEntity signTimeScope,
+      TimeScopeEntity workTimeScope, String kqDate, String preDate,
+      String nextDate, KQTimesArrayComInfo kqTimesArrayComInfo,ArrayList<String> hostIps,String uuid, int shiftCount, int shiftI) {
+    kqLog.info("in getSignInfo ::userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid+" in ");
+    List<Object> lsCheckInfo = new ArrayList<>();
+    String count4NoonStartDateTime = "";
+    String count4NoonEndDateTime = "";
+    try{
+      Map<String, Object> checkInfo = null;
+      String base_sql = "";
+      RecordSet rs = new RecordSet();
+      String dbtype = rs.getDBType();
+
+      //获取工作上下班时间
+      String workBeginDateTime = workTimeScope.getBeginTimeAcross() ? nextDate : kqDate;
+      workBeginDateTime+=" "+kqTimesArrayComInfo.turn48to24Time(workTimeScope.getBeginTime())+":00";
+      kqLog.info("in getSignInfo ::userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid+"::workBeginDateTime::"+workBeginDateTime);
+
+      //获取工作上下班时间
+      String workEndDateTime = workTimeScope.getEndTimeAcross() ? nextDate : kqDate;
+      workEndDateTime+=" "+kqTimesArrayComInfo.turn48to24Time(workTimeScope.getEndTime())+":00";
+      kqLog.info("in getSignInfo ::userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid+"::workEndDateTime::"+workEndDateTime);
+
+      Map<String,String> flow_deduct_card_map = getflowDeductCardSql(userId,kqDate,workTimeScope.getBeginTime(),workTimeScope.getEndTime());
+
+      kqLog.info("in getSignInfo ::userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid+"::flow_deduct_card_map::"+flow_deduct_card_map);
+
+      List<Map<String,String>> sqlConditions = getCanSignInfo(signTimeScope,kqDate,preDate,nextDate,kqTimesArrayComInfo,workTimeScope, shiftCount, shiftI);
+      base_sql = signSignSql(rs);
+      new KQLog().info("sqlConditions:(userId:"+userId+":base_sql"+base_sql+":::userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid+"::flow_deduct_card_map::"+flow_deduct_card_map);
+      if(sqlConditions != null && !sqlConditions.isEmpty()){
+        if(shiftCount == 2) {
+          String fieldName = "";
+          if(shiftI == 0) {
+            fieldName = "signEndDateTime";
+          } else if(shiftI == 1) {
+            fieldName = "signBeginDateTime";
+          }
+          Map<String, String> sqlMap = sqlConditions.get(0);
+          count4NoonStartDateTime = Util.null2String(sqlMap.get(fieldName));
+          if (count4NoonStartDateTime.length() == 19) {
+            count4NoonStartDateTime = count4NoonStartDateTime.substring(0, 17) + "00";
+          }
+          sqlMap = sqlConditions.get(0);
+          count4NoonEndDateTime = Util.null2String(sqlMap.get(fieldName));
+          if (sqlConditions.size() >= 2) {
+            sqlMap = sqlConditions.get(1);
+            count4NoonEndDateTime = Util.null2String(sqlMap.get(fieldName));
+          }
+        }
+
+        for(Map<String,String> sqlMap : sqlConditions){
+          String sql = "";
+          String orderSql = "";
+          int idx = 0;
+          String signBeginDateTime = Util.null2String(sqlMap.get("signBeginDateTime"));
+          String signEndDateTime = Util.null2String(sqlMap.get("signEndDateTime"));
+          String type = Util.null2String(sqlMap.get("type"));
+          if(type.length() > 0){
+            if("signoff".equalsIgnoreCase(type)){
+              orderSql = " order by signdate desc, signtime desc ";
+            }else if("signin".equalsIgnoreCase(type)){
+              orderSql = " order by signdate asc, signtime asc ";
+            }
+            if("oracle".equalsIgnoreCase(dbtype)){
+              sql = "select * from ("+base_sql+" "+orderSql+") a where rownum=1";
+            }else if("mysql".equalsIgnoreCase(dbtype)){
+              sql = "select * from ("+base_sql+" "+orderSql+") a limit 0,1";
+            }
+            else if("postgresql".equalsIgnoreCase(dbtype)){
+              sql = "select * from ("+base_sql+" "+orderSql+") a limit 1 offset 0";
+            }
+            else if("sqlserver".equalsIgnoreCase(dbtype)){
+              sql = "select top 1 * from ("+base_sql+") a "+" "+orderSql;
+            }else{
+              sql = "select * from ("+base_sql+" "+orderSql+") a where rownum=1";
+            }
+          }else{
+            orderSql = " order by signdate asc, signtime asc ";
+            sql = base_sql+" "+orderSql;
+          }
+          rs.executeQuery(sql, userId, signBeginDateTime, signEndDateTime);
+          new KQLog().info("getSignInfo:(userId:"+userId+":signBeginDateTime:"+
+              signBeginDateTime+":signEndDateTime:"+signEndDateTime+"):sql"+sql+":counts:"+rs.getCounts()+":::userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid+"::flow_deduct_card_map::"+flow_deduct_card_map);
+          while (rs.next()) {
+            String signId = Util.null2String(rs.getString("id"));
+            String signdate = Util.null2String(rs.getString("signdate"));
+            String signtime = Util.null2String(rs.getString("signtime"));
+
+            checkInfo = new HashMap<>();
+            checkInfo.put("signId", signId);//签到签退标识
+            checkInfo.put("signDate", signdate);//签到签退日期
+            checkInfo.put("signTime", signtime);//签到签退时间
+            String signDateTime = signdate + " " + signtime;
+            idx++;
+            if(type.length() > 0){
+              if("signin".equalsIgnoreCase(type)){
+                checkInfo.put("signType", "1");
+                if(workBeginDateTime.length()>0) {
+                  checkInfo.put("signStatus", UtilKQ.getSignStatus("1", signDateTime, workBeginDateTime));
+                }
+                if(!Util.null2String(checkInfo.get("signStatus")).equalsIgnoreCase(ButtonStatusEnum.NORMAL.getStatusCode())){
+                  if(flow_deduct_card_map.containsKey("signin")){
+                    String deduct_signintime = Util.null2String(flow_deduct_card_map.get("signin"));
+                    if(deduct_signintime.length() > 0){
+                      signDateTime = signdate + " " + deduct_signintime;
+                      checkInfo.put("deduct_signintime", deduct_signintime);//流程抵扣作为打卡时间
+                      checkInfo.put("signStatus", UtilKQ.getSignStatus("1", signDateTime, workBeginDateTime));
+                    }
+                  }
+                }
+                lsCheckInfo.add(checkInfo);
+              }else {
+                checkInfo.put("signType", "2");
+                if(workEndDateTime.length()>0) {
+                  checkInfo.put("signStatus", UtilKQ.getSignStatus("2", signDateTime, workEndDateTime));
+                }
+                if(!Util.null2String(checkInfo.get("signStatus")).equalsIgnoreCase(ButtonStatusEnum.NORMAL.getStatusCode())){
+                  if(flow_deduct_card_map.containsKey("signoff")){
+                    String deduct_signofftime = Util.null2String(flow_deduct_card_map.get("signoff"));
+                    if(deduct_signofftime.length() > 0){
+                      signDateTime = signdate + " " + deduct_signofftime;
+                      checkInfo.put("deduct_signofftime", deduct_signofftime);//流程抵扣作为打卡时间
+                      checkInfo.put("signStatus", UtilKQ.getSignStatus("2", signDateTime, workEndDateTime));
+                    }
+                  }
+                }
+                lsCheckInfo.add(checkInfo);
+              }
+            }else{
+              if(idx==1){//第一条算签到
+                checkInfo.put("signType", "1");
+                if(workBeginDateTime.length()>0) {
+                  checkInfo.put("signStatus", UtilKQ.getSignStatus("1", signDateTime, workBeginDateTime));
+                }
+                if(!Util.null2String(checkInfo.get("signStatus")).equalsIgnoreCase(ButtonStatusEnum.NORMAL.getStatusCode())){
+                  if(flow_deduct_card_map.containsKey("signin")){
+                    String deduct_signintime = Util.null2String(flow_deduct_card_map.get("signin"));
+                    if(deduct_signintime.length() > 0){
+                      signDateTime = signdate + " " + deduct_signintime;
+                      checkInfo.put("deduct_signintime", deduct_signintime);//流程抵扣作为打卡时间
+                      checkInfo.put("signStatus", UtilKQ.getSignStatus("1", signDateTime, workBeginDateTime));
+                    }
+                  }
+                }
+                lsCheckInfo.add(checkInfo);
+              }else if(idx==rs.getCounts()){//最后一条算签退
+                checkInfo.put("signType", "2");
+                if(workEndDateTime.length()>0) {
+                  checkInfo.put("signStatus", UtilKQ.getSignStatus("2", signDateTime, workEndDateTime));
+                }
+                if(!Util.null2String(checkInfo.get("signStatus")).equalsIgnoreCase(ButtonStatusEnum.NORMAL.getStatusCode())){
+                  if(flow_deduct_card_map.containsKey("signoff")){
+                    String deduct_signofftime = Util.null2String(flow_deduct_card_map.get("signoff"));
+                    if(deduct_signofftime.length() > 0){
+                      signDateTime = signdate + " " + deduct_signofftime;
+                      checkInfo.put("deduct_signofftime", deduct_signofftime);//流程抵扣作为打卡时间
+                      checkInfo.put("signStatus", UtilKQ.getSignStatus("2", signDateTime, workEndDateTime));
+                    }
+                  }
+                }
+                lsCheckInfo.add(checkInfo);
+              }
+            }
+          }
+        }
+      }
+      //如果签到，签退不成对，流程抵扣异常存在，那么需要判断下是不是可以补足
+      if(lsCheckInfo.size() < 2 && !flow_deduct_card_map.isEmpty()){
+        if(lsCheckInfo.isEmpty()){
+          if(flow_deduct_card_map.containsKey("signin")){
+            String deduct_signintime = Util.null2String(flow_deduct_card_map.get("signin"));
+            if(deduct_signintime.length() > 0){
+              checkInfo = new HashMap<>();
+              String[] workBeginDateTimes = workBeginDateTime.split(" ");
+              String tmp_workBeginDate = workBeginDateTimes[0];
+              String tmp_workBeginTime = workBeginDateTimes[1];
+              checkInfo.put("signType", "1");
+              checkInfo.put("signDate", tmp_workBeginDate);//签到签退日期
+              checkInfo.put("signTime", "");//签到签退时间
+              checkInfo.put("deduct_signintime", tmp_workBeginTime);//流程抵扣作为打卡时间
+              checkInfo.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+              lsCheckInfo.add(checkInfo);
+            }
+          }
+          if(flow_deduct_card_map.containsKey("signoff")){
+            String deduct_signofftime = Util.null2String(flow_deduct_card_map.get("signoff"));
+            if(deduct_signofftime.length() > 0){
+              checkInfo = new HashMap<>();
+              String[] workEndDateTimes = workEndDateTime.split(" ");
+              String tmp_workEndDate = workEndDateTimes[0];
+              String tmp_workEndTime = workEndDateTimes[1];
+              checkInfo.put("signType", "2");
+              checkInfo.put("signDate", tmp_workEndDate);//签到签退日期
+              checkInfo.put("signTime", "");//签到签退时间
+              checkInfo.put("deduct_signofftime", tmp_workEndTime);//流程抵扣作为打卡时间
+              checkInfo.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+              lsCheckInfo.add(checkInfo);
+            }
+          }
+        }else{
+          Map<String, Object> checkCardMap = (Map<String, Object>) lsCheckInfo.get(0);
+          if(!checkCardMap.isEmpty()){
+            String signType = Util.null2String(checkCardMap.get("signType"));
+            if("1".equalsIgnoreCase(signType)){
+              //如果签到数据有了，检测下是不是有签退的流程抵扣打卡
+              if(flow_deduct_card_map.containsKey("signoff")){
+                String deduct_signofftime = Util.null2String(flow_deduct_card_map.get("signoff"));
+                if(deduct_signofftime.length() > 0){
+                  checkInfo = new HashMap<>();
+                  String[] workEndDateTimes = workEndDateTime.split(" ");
+                  String tmp_workEndDate = workEndDateTimes[0];
+                  String tmp_workEndTime = workEndDateTimes[1];
+                  checkInfo.put("signType", "2");
+                  checkInfo.put("signDate", tmp_workEndDate);//签到签退日期
+                  checkInfo.put("signTime", "");//签到签退时间
+                  checkInfo.put("deduct_signofftime", tmp_workEndTime);//流程抵扣作为打卡时间
+                  checkInfo.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+                  lsCheckInfo.add(checkInfo);
+                }
+              }
+            }else{
+              if(flow_deduct_card_map.containsKey("signin")){
+                String deduct_signintime = Util.null2String(flow_deduct_card_map.get("signin"));
+                if(deduct_signintime.length() > 0){
+                  checkInfo = new HashMap<>();
+                  String[] workBeginDateTimes = workBeginDateTime.split(" ");
+                  String tmp_workBeginDate = workBeginDateTimes[0];
+                  String tmp_workBeginTime = workBeginDateTimes[1];
+                  checkInfo.put("signType", "1");
+                  checkInfo.put("signDate", tmp_workBeginDate);//签到签退日期
+                  checkInfo.put("signTime", "");//签到签退时间
+                  checkInfo.put("deduct_signintime", tmp_workBeginTime);//流程抵扣作为打卡时间
+                  checkInfo.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+                  lsCheckInfo.add(checkInfo);
+                }
+              }
+            }
+          }
+        }
+      }
+      // 上午的签退取中间时段的第一次打卡
+      if(shiftCount == 2 && shiftI == 0) {
+        String noonSignTimeSql = KQSignUtil.buildSignSql(count4NoonStartDateTime,count4NoonEndDateTime);
+        String baseSql = "select * from hrmschedulesign where 1=1 and isInCom='1' and userid="+userId+" ";
+        String sql = baseSql;
+        sql += " and "+noonSignTimeSql + " order by signdate, signtime";
+        rs.executeQuery(sql);
+        if(rs.next()) {
+          String signId = Util.null2String(rs.getString("id"));
+          String signDate = Util.null2String(rs.getString("signdate"));
+          String signTime = Util.null2String(rs.getString("signtime"));
+          String signDateTime = signDate+" "+signTime;
+          for (int j = 0; lsCheckInfo != null && j < lsCheckInfo.size(); j++) {
+            Map<String, Object> checkInfoInner = (Map<String, Object>) lsCheckInfo.get(j);
+            if (checkInfoInner.get("signType").equals("2")) {//签退
+              String signDateInner = Util.null2String(checkInfoInner.get("signDate"));
+              String signTimeInner = Util.null2String(checkInfoInner.get("signTime"));
+              String deduct_signofftime = Util.null2String(checkInfoInner.get("deduct_signofftime"));
+              if(!"".equals(signTimeInner)) {
+                String signDateTimeInner = signDateInner+" "+signTimeInner;
+                if(signDateTime.compareTo(signDateTimeInner) < 0) {
+                  checkInfoInner.put("signId", signId);//签到签退标识
+                  checkInfoInner.put("signType", "2");
+                  checkInfoInner.put("signDate", signDateInner);//签到签退日期
+                  checkInfoInner.put("signTime", signTime);//签到签退时间
+                  checkInfoInner.put("deduct_signofftime", deduct_signofftime);//流程抵扣作为打卡时间
+                  checkInfoInner.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+                }
+              }
+            }
+          }
+        }
+      } else if(shiftCount == 2 && shiftI == 1) { // 下午的签到取中间时段的第二次打卡
+        String noonSignTimeSql = KQSignUtil.buildSignSql(count4NoonStartDateTime,count4NoonEndDateTime);
+        String baseSql = "select * from hrmschedulesign where 1=1 and isInCom='1' and userid="+userId+" ";
+        String sql = baseSql;
+        sql += " and "+noonSignTimeSql + " order by signdate, signtime";
+        rs.executeQuery(sql);
+        int count=0;
+        int counts=rs.getCounts();
+        if(counts==1){
+          lsCheckInfo.clear();
+        }
+        while (rs.next()) {
+          if(count == 0) {
+            count++;
+            continue;
+          }
+          String signId = Util.null2String(rs.getString("id"));
+          String signTime = Util.null2String(rs.getString("signtime"));
+          for (int j = 0; lsCheckInfo != null && j < lsCheckInfo.size(); j++) {
+            Map<String, Object> checkInfoInner = (Map<String, Object>) lsCheckInfo.get(j);
+            if (checkInfoInner.get("signType").equals("1")) {//签退
+              String signDateInner = Util.null2String(checkInfoInner.get("signDate"));
+              String signTimeInner = Util.null2String(checkInfoInner.get("signTime"));
+              String deduct_signofftime = Util.null2String(checkInfoInner.get("deduct_signofftime"));
+              checkInfoInner.put("signId", signId);//签到签退标识
+              checkInfoInner.put("signType", "1");
+              checkInfoInner.put("signDate", signDateInner);//签到签退日期
+              checkInfoInner.put("signTime", signTime);//签到签退时间
+              checkInfoInner.put("deduct_signofftime", deduct_signofftime);//流程抵扣作为打卡时间
+              checkInfoInner.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+            }
+          }
+          break;
+        }
+      }
+    }catch (Exception e){
+
+      kqLog.info("报表错:getSignInfo:");
+      StringWriter errorsWriter = new StringWriter();
+      e.printStackTrace(new PrintWriter(errorsWriter));
+      kqLog.info(errorsWriter.toString());
+    }
+
+    /*考勤二开--出差公出流程获取外勤打卡数据start*/
+    BaseBean bb = new BaseBean();
+
+    bb.writeLog("--出差公出流程获取外勤打卡数据start");
+    bb.writeLog("lsCheckInfo: " + lsCheckInfo);
+    //获取外勤打卡的前提是已经有归档的出差、公出流程
+    String evectionTableName = Util.null2String(bb.getPropValue("project_hostar","evectionTableName"));
+    bb.writeLog("evectionTableName: " + evectionTableName);
+
+    String outTableName = Util.null2String(bb.getPropValue("project_hostar","outTableName"));
+    bb.writeLog("outTableName: " + outTableName);
+
+    if ( StringUtils.isNotBlank(evectionTableName) && StringUtils.isNotBlank(outTableName) ) {
+      RecordSet rs = new RecordSet();
+      Integer number = -1;
+      String acqEvecAndOutSql = " select sum(a.number) as number " +
+              " from ( " +
+              " SELECT " +
+              " count(*) as number " +
+              " FROM " +
+              " workflow_requestbase " +
+              " WHERE " +
+              " requestid IN ( SELECT requestid FROM "+evectionTableName+" WHERE sqr = '"+userId+"' and ksrq <='"+kqDate+"' and yjjsrq >='"+kqDate+"' ) " +
+              " AND currentnodetype = 3 " +
+              " UNION all " +
+              " SELECT " +
+              " count(*) as number " +
+              " FROM " +
+              " workflow_requestbase " +
+              " WHERE " +
+              " requestid IN ( SELECT requestid FROM "+outTableName+" WHERE sqr = '"+userId+"' and ksrq <='"+kqDate+"' and yjjsrq >='"+kqDate+"') " +
+              " AND currentnodetype = 3 " +
+              ") a ";
+      rs.executeQuery(acqEvecAndOutSql);
+      bb.writeLog("acqEvecAndOutSql: " + acqEvecAndOutSql);
+
+      while (rs.next()) {
+        number = Util.getIntValue(Util.null2String(rs.getString("number")));
+      }
+      bb.writeLog("number: " + number);
+
+      if (lsCheckInfo.size() == 0 && number > 0) {
+        List<String> legWorkInfos = new ArrayList<>();
+        //获取允许打卡时间
+        String signBeginTime = signTimeScope.getBeginTime();
+        bb.writeLog("signBeginTime: " + signBeginTime);
+        if (StringUtils.isNotBlank(signBeginTime)) {
+          signBeginTime = signBeginTime + ":00";
+        }
+        bb.writeLog("signBeginTime: " + signBeginTime);
+        //获取上班时间
+        String workBeginTime = workTimeScope.getBeginTime();
+        bb.writeLog("workBeginTime: " + workBeginTime);
+        if (StringUtils.isNotBlank(workBeginTime)) {
+          workBeginTime = workBeginTime + ":00";
+        }
+        bb.writeLog("workBeginTime: " + workBeginTime);
+
+        String acqLegWorkSignSql = "select operate_time from mobile_sign where operater = ? and operate_date = '" + kqDate + "' and operate_time >='" + signBeginTime + "' order by operate_time asc ";
+        bb.writeLog("acqLegWorkSignSql: " + acqLegWorkSignSql);
+        bb.writeLog("userId: " + userId);
+        rs.executeQuery(acqLegWorkSignSql, userId);
+        while ( rs.next()) {
+          String operateTime = Util.null2String(rs.getString("operate_time"));
+          if ( StringUtils.isNotBlank(operateTime) ) {
+            legWorkInfos.add(operateTime);
+          }
+        }
+        bb.writeLog("legWorkInfos: " + legWorkInfos);
+
+        if (legWorkInfos != null && legWorkInfos.size() > 0 ) {
+          String tempSignIn = "";
+          String tempSignOut = "";
+          Map<String, Object> checkInfo = new HashMap<>();
+          if ( legWorkInfos.size() == 1) {//只有一笔外勤卡直接算上班
+            checkInfo.put("signType", "1");
+            checkInfo.put("signDate", kqDate);//签到签退日期
+            checkInfo.put("signTime", legWorkInfos.get(0));//签到签退时间
+            checkInfo.put("deduct_signintime", "");//流程抵扣作为打卡时间
+            checkInfo.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+            lsCheckInfo.add(legWorkInfos.get(0));
+          } else {
+            for ( String signTime : legWorkInfos) {
+              if (signTime.compareTo(workBeginTime) < 0) {//获取上班时间点之前最早的一笔卡
+                if (StringUtils.isBlank(tempSignIn)) {
+                  tempSignIn = signTime;
+                } else {
+                  if ( signTime.compareTo(tempSignIn) < 0 ) {
+                    tempSignIn = signTime;
+                  }
+                }
+              }
+              if ( signTime.compareTo(workBeginTime) > 0) {//下班卡取最晚的一笔
+                if (StringUtils.isBlank(tempSignIn)) {
+                  tempSignOut = signTime;
+                } else {
+                  if ( signTime.compareTo(tempSignOut) > 0 ) {
+                    tempSignOut = signTime;
+                  }
+                }
+              }
+            }
+            checkInfo.put("signType", "1");
+            checkInfo.put("signDate", kqDate);//签到签退日期
+            checkInfo.put("signTime", tempSignIn);//签到签退时间
+            checkInfo.put("deduct_signintime", "");//流程抵扣作为打卡时间
+            checkInfo.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+            lsCheckInfo.add(checkInfo);
+            checkInfo = new HashMap<>();
+            checkInfo.put("signType", "2");
+            checkInfo.put("signDate", kqDate);//签到签退日期
+            checkInfo.put("signTime", tempSignOut);//签到签退时间
+            checkInfo.put("deduct_signintime", "");//流程抵扣作为打卡时间
+            checkInfo.put("signStatus", ButtonStatusEnum.NORMAL.getStatusCode());
+            lsCheckInfo.add(checkInfo);
+          }
+
+        }
+      }
+    }
+    bb.writeLog("lsCheckInfo: " + lsCheckInfo);
+
+    /*考勤二开--出差公出流程获取外勤打卡数据end*/
+
+    //writeLog(sql,userId +"=="+ signBeginDateTime+"=="+signEndDateTime);
+    return lsCheckInfo;
+  }
+
+  /**
+   * 根据上下班时间获取到是否有流程抵扣打卡的数据
+   * @param userId
+   * @param kqDate
+   * @param workBeginDateTime
+   * @param workEndDateTime
+   */
+  public Map<String,String> getflowDeductCardSql(String userId, String kqDate, String workBeginDateTime, String workEndDateTime) {
+    Map<String,String> flow_deduct_card_map = new HashMap<>();
+    RecordSet rs = new RecordSet();
+    String flow_deduct_card_sql = "select * from kq_flow_deduct_card where 1=1 and (isclear is null or isclear<>1) ";
+    if(userId.length() > 0){
+      flow_deduct_card_sql += " and resourceid="+userId;
+    }
+    if(kqDate.length() > 0){
+      flow_deduct_card_sql += " and belongDate='"+kqDate+"'";
+    }
+    if(workBeginDateTime.length() > 0){
+      flow_deduct_card_sql += " and workBeginTime='"+workBeginDateTime+"'";
+    }
+    if(workEndDateTime.length() > 0){
+      flow_deduct_card_sql += " and workEndTime='"+workEndDateTime+"'";
+    }
+    rs.executeQuery(flow_deduct_card_sql);
+    while (rs.next()){
+      String signtype = rs.getString("signtype");
+      if("1".equalsIgnoreCase(signtype)){
+        flow_deduct_card_map.put("signin",workBeginDateTime);
+      }
+      if("2".equalsIgnoreCase(signtype)){
+        flow_deduct_card_map.put("signoff",workEndDateTime);
+      }
+    }
+    return flow_deduct_card_map;
+  }
+
+  /**
+   * 根据打卡的范围生成上班，下班数据获取的sql
+   * @param signTimeScope
+   * @param kqDate
+   * @param preDate
+   * @param nextDate
+   * @param kqTimesArrayComInfo
+   * @return
+   */
+  public List<Map<String,String>> getCanSignInfo(TimeScopeEntity signTimeScope, String kqDate, String preDate, String nextDate, KQTimesArrayComInfo kqTimesArrayComInfo) {
+    return getCanSignInfo(signTimeScope,kqDate,preDate,nextDate,kqTimesArrayComInfo,null);
+  }
+  public List<Map<String,String>> getCanSignInfo(TimeScopeEntity signTimeScope, String kqDate, String preDate, String nextDate, KQTimesArrayComInfo kqTimesArrayComInfo,TimeScopeEntity workTimeScope) {
+    return getCanSignInfo(signTimeScope, kqDate, preDate, nextDate, kqTimesArrayComInfo,workTimeScope, 0, 0);
+  }
+  public List<Map<String,String>> getCanSignInfo(TimeScopeEntity signTimeScope, String kqDate, String preDate, String nextDate, KQTimesArrayComInfo kqTimesArrayComInfo,TimeScopeEntity workTimeScope, int shiftCount, int shiftI) {
+
+    List<Map<String,String>> sqlConditions = new ArrayList<>();
+    Map<String,String> conditionMap = new HashMap<>();
+
+    TimeSignScopeEntity timeSignScopeEntity = signTimeScope.getTimeSignScopeEntity();
+
+    String signBeginDateTime = "";
+    String signEndDateTime = "";
+    signBeginDateTime = signTimeScope.getBeginTimeAcross() ? nextDate : kqDate;
+    if(signTimeScope.isBeginTimePreAcross()){
+      signBeginDateTime = preDate;
+    }
+    signBeginDateTime+=" "+kqTimesArrayComInfo.turn48to24Time(signTimeScope.getBeginTime())+":00";
+
+    signEndDateTime = signTimeScope.getEndTimeAcross() ? nextDate : kqDate;
+
+    if (workTimeScope != null && workTimeScope.getEndTimeAcross() && signTimeScope.getEndTimeAcross() ) {
+      if(workTimeScope.getEndTime().compareTo(signTimeScope.getEndTime())>=0){
+        signEndDateTime = DateUtil.addDate(kqDate, 2);//下下一天日期;
+      }
+    }
+    signEndDateTime+=" "+kqTimesArrayComInfo.turn48to24Time(signTimeScope.getEndTime())+":59";
+
+
+
+    if(timeSignScopeEntity == null){
+      //没有设置 签到最晚时间和签退最早时间
+      conditionMap = new HashMap<>();
+      conditionMap.put("signBeginDateTime", signBeginDateTime);
+      conditionMap.put("signEndDateTime", signEndDateTime);
+      sqlConditions.add(conditionMap);
+    }else{
+      String beginTimeEnd = timeSignScopeEntity.getBeginTimeEnd();
+      boolean beginTimeEndAcross = timeSignScopeEntity.isBeginTimeEndAcross();
+
+      String endTimeStart = timeSignScopeEntity.getEndTimeStart();
+      boolean endTimeStartAcross = timeSignScopeEntity.isEndTimeStartAcross();
+
+      if(beginTimeEnd.length() > 0){
+        //如果设置了 上班结束时间
+        if(endTimeStart.length() > 0){
+          //设置了下班开始时间
+          String signBeginDateEndTime = "";
+          String signEndDateStartTime = "";
+          signBeginDateEndTime = beginTimeEndAcross ? nextDate : kqDate;
+          signBeginDateEndTime+=" "+kqTimesArrayComInfo.turn48to24Time(beginTimeEnd)+":59";
+
+          conditionMap = new HashMap<>();
+          conditionMap.put("signBeginDateTime", signBeginDateTime);
+          conditionMap.put("signEndDateTime", signBeginDateEndTime);
+          conditionMap.put("type", "signin");
+          sqlConditions.add(conditionMap);
+
+          signEndDateStartTime = endTimeStartAcross ? nextDate : kqDate;
+          signEndDateStartTime+=" "+kqTimesArrayComInfo.turn48to24Time(endTimeStart)+":00";
+
+          conditionMap = new HashMap<>();
+          conditionMap.put("signBeginDateTime", signEndDateStartTime);
+          conditionMap.put("signEndDateTime", signEndDateTime);
+          conditionMap.put("type", "signoff");
+          sqlConditions.add(conditionMap);
+        }else{
+          //没有设置下班开始时间
+          String signBeginDateEndTime = "";
+          String signEndDateStartTime = "";
+          signBeginDateEndTime = beginTimeEndAcross ? nextDate : kqDate;
+          signBeginDateEndTime+=" "+kqTimesArrayComInfo.turn48to24Time(beginTimeEnd)+":59";
+
+          conditionMap = new HashMap<>();
+          conditionMap.put("signBeginDateTime", signBeginDateTime);
+          conditionMap.put("signEndDateTime", signBeginDateEndTime);
+          conditionMap.put("type", "signin");
+          sqlConditions.add(conditionMap);
+
+          //如果设置了上班结束时间，相当于下班开始时间也被限定了
+          String endTimeByBeginTime = kqTimesArrayComInfo.getTimesByArrayindex(kqTimesArrayComInfo.getArrayindexByTimes(beginTimeEnd)+1);
+          signEndDateStartTime = beginTimeEndAcross ? nextDate : kqDate;
+          signEndDateStartTime+=" "+kqTimesArrayComInfo.turn48to24Time(endTimeByBeginTime)+":00";
+
+          conditionMap = new HashMap<>();
+          conditionMap.put("signBeginDateTime", signEndDateStartTime);
+          conditionMap.put("signEndDateTime", signEndDateTime);
+          conditionMap.put("type", "signoff");
+          sqlConditions.add(conditionMap);
+        }
+      }else if(endTimeStart.length() > 0){
+        //如果没有设置上班结束时间，设置了下班开始时间
+        String signBeginDateEndTime = "";
+        String signEndDateStartTime = "";
+
+        //如果设置了下班开始时间，相当于上班结束时间也被限定了
+        String BeginTimeByendTime = kqTimesArrayComInfo.getTimesByArrayindex(kqTimesArrayComInfo.getArrayindexByTimes(endTimeStart)-1);
+        signBeginDateEndTime = endTimeStartAcross ? nextDate : kqDate;
+        signBeginDateEndTime+=" "+kqTimesArrayComInfo.turn48to24Time(BeginTimeByendTime)+":59";
+
+        conditionMap = new HashMap<>();
+        conditionMap.put("signBeginDateTime", signBeginDateTime);
+        conditionMap.put("signEndDateTime", signBeginDateEndTime);
+        conditionMap.put("type", "signin");
+        sqlConditions.add(conditionMap);
+
+        signEndDateStartTime = endTimeStartAcross ? nextDate : kqDate;
+        signEndDateStartTime+=" "+kqTimesArrayComInfo.turn48to24Time(endTimeStart)+":00";
+
+        conditionMap = new HashMap<>();
+        conditionMap.put("signBeginDateTime", signEndDateStartTime);
+        conditionMap.put("signEndDateTime", signEndDateTime);
+        conditionMap.put("type", "signoff");
+        sqlConditions.add(conditionMap);
+      }
+    }
+    return sqlConditions;
+  }
+
+  public String signSignSql(RecordSet rs){
+    String sql = "";
+    if(rs.getDBType().equals("oracle")){
+      sql = " select id,signdate,signtime from hrmschedulesign where isincom=1 and userid = ? and signdate||' '||signtime >= ? and signdate||' '||signtime <= ? " +
+          " ";
+    }else if("sqlserver".equals(rs.getDBType())){
+      sql = " select id,signdate,signtime from hrmschedulesign where isincom=1 and userid = ? and signdate + ' ' + signtime >= ? and signdate + ' ' + signtime <= ? " +
+          " ";
+    }else{
+      sql = " select id,signdate,signtime from hrmschedulesign where isincom=1 and userid = ? and concat(signdate,' ',signtime) >= ? and concat(signdate,' ',signtime) <= ? " +
+          " ";
+    }
+    return sql;
+  }
+
+  public List<Object> getSignInfoForAll(String userId, String signBeginDateTime, String signEndDateTime, String workBeginDateTime, String workEndDateTime) {
+    List<Object> lsCheckInfo = new ArrayList<>();
+    Map<String, Object> checkInfo = null;
+    String sql = "";
+    RecordSet rs = new RecordSet();
+
+    int idx = 0;
+    if(rs.getDBType().equals("oracle")){
+      sql = " select id,signdate,signtime from hrmschedulesign where isincom=1 and userid = ? and signdate||' '||signtime >= ? and signdate||' '||signtime <= ? " +
+          " order by signdate asc, signtime asc ";
+    }else if("sqlserver".equals(rs.getDBType())){
+      sql = " select id,signdate,signtime from hrmschedulesign where isincom=1 and userid = ? and signdate + ' ' + signtime >= ? and signdate + ' ' + signtime <= ? " +
+          " order by signdate asc, signtime asc ";
+    }else{
+      sql = " select id,signdate,signtime from hrmschedulesign where isincom=1 and userid = ? and concat(signdate,' ',signtime) >= ? and concat(signdate,' ',signtime) <= ? " +
+          " order by signdate asc, signtime asc ";
+    }
+    rs.executeQuery(sql, userId, signBeginDateTime, signEndDateTime);
+    //writeLog(sql,userId +"=="+ signBeginDateTime+"=="+signEndDateTime);
+    while (rs.next()) {
+      String signId = Util.null2String(rs.getString("id"));
+      String signdate = Util.null2String(rs.getString("signdate"));
+      String signtime = Util.null2String(rs.getString("signtime"));
+
+      checkInfo = new HashMap<>();
+      checkInfo.put("signId", signId);//签到签退标识
+      checkInfo.put("signDate", signdate);//签到签退日期
+      checkInfo.put("signTime", signtime);//签到签退时间
+      String signDateTime = signdate + " " + signtime;
+
+      idx++;
+      if(idx%2==1){
+        checkInfo.put("signType", "1");
+      }else{
+        checkInfo.put("signType", "2");
+      }
+      lsCheckInfo.add(checkInfo);
+    }
+    return lsCheckInfo;
+  }
+
+  public List<Object> getNonWorkSignInfo(String userId, String preDate, String kqDate,
+      List<TimeScopeEntity> pre_lsSignTime,
+      List<TimeScopeEntity> next_lsSignTime) {
+    List<Object> lsCheckInfo = new ArrayList<>();
+    Map<String, Object> checkInfo = null;
+    RecordSet rs = new RecordSet();
+    String pre_Worktime4Today = "";
+    if(!pre_lsSignTime.isEmpty()){
+      TimeScopeEntity pre_signTimeScope = pre_lsSignTime.get(pre_lsSignTime.size()-1);
+      if(pre_signTimeScope.getEndTimeAcross()){
+        pre_Worktime4Today = pre_signTimeScope.getEndTime();
+      }
+    }
+    String next_Worktime4Today = "";
+    if(!next_lsSignTime.isEmpty()){
+      TimeScopeEntity next_signTimeScope = next_lsSignTime.get(next_lsSignTime.size()-1);
+      if(next_signTimeScope.isBeginTimePreAcross()){
+        next_Worktime4Today = next_signTimeScope.getBeginTime();
+      }
+    }
+    String sql = "select * from hrmschedulesign where userid="+userId+" and signdate = '"+kqDate+"' ";
+    if(pre_Worktime4Today.length() > 0){
+      if(pre_Worktime4Today.length() == 5){
+        pre_Worktime4Today += ":59";
+      }
+      sql += " and signtime > '"+pre_Worktime4Today+"'";
+    }
+    if(next_Worktime4Today.length() > 0){
+      if(next_Worktime4Today.length() == 5){
+        next_Worktime4Today += ":00";
+      }
+      sql += " and signtime < '"+next_Worktime4Today+"'";
+    }
+    sql += " order by signdate asc,signtime asc ";
+    rs.executeQuery(sql);
+    int idx = 0;
+    while (rs.next()){
+      String signId = Util.null2String(rs.getString("id"));
+      String signdate = Util.null2String(rs.getString("signdate"));
+      String signtime = Util.null2String(rs.getString("signtime"));
+
+      checkInfo = new HashMap<>();
+      checkInfo.put("signId", signId);//签到签退标识
+      checkInfo.put("signDate", signdate);//签到签退日期
+      checkInfo.put("signTime", signtime);//签到签退时间
+      idx++;
+      if(idx==1){//第一条算签到
+        checkInfo.put("signType", "1");
+        lsCheckInfo.add(checkInfo);
+      }else if(idx==rs.getCounts()){//最后一条算签退
+        checkInfo.put("signType", "2");
+        lsCheckInfo.add(checkInfo);
+      }
+    }
+    return lsCheckInfo;
+  }
+
+}

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

@@ -0,0 +1,642 @@
+package com.engine.kq.cmd.report;
+
+import com.alibaba.fastjson.JSON;
+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.cmd.shiftmanagement.toolkit.ShiftManagementToolKit;
+import com.engine.kq.util.ExcelUtil;
+import com.engine.kq.util.KQDurationCalculatorUtil;
+import weaver.common.DateUtil;
+import weaver.conn.RecordSet;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.job.JobTitlesComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.systeminfo.SystemEnv;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.*;
+
+public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
+
+  private HttpServletRequest request;
+  private HttpServletResponse response;
+  private List<String> lsFieldDataKey;
+
+  public ExportDailyExcelCmd(Map<String, Object> params, HttpServletRequest request, HttpServletResponse response, User user) {
+    this.user = user;
+    this.params = params;
+    this.request = request;
+    this.response = response;
+    this.lsFieldDataKey = new ArrayList<>();
+  }
+
+  @Override
+  public Map<String, Object> execute(CommandContext commandContext) {
+    Map<String, Object> retmap = new HashMap<String, Object>();
+    RecordSet rs = new RecordSet();
+    String sql = "";
+    try {
+      SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+      DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+      ResourceComInfo resourceComInfo = new ResourceComInfo();
+      JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo();
+      ShiftManagementToolKit shiftManagementToolKit = new ShiftManagementToolKit();
+      KQWorkTime kqWorkTime = new KQWorkTime();
+      KQReportBiz kqReportBiz = new KQReportBiz();
+      KQLeaveRulesBiz kqLeaveRulesBiz = new KQLeaveRulesBiz();
+
+      JSONObject jsonObj = JSON.parseObject(Util.null2String(params.get("data")));
+      String attendanceSerial = Util.null2String(jsonObj.get("attendanceSerial"));
+      String fromDate = Util.null2String(jsonObj.get("fromDate"));
+      String toDate = Util.null2String(jsonObj.get("toDate"));
+      String typeselect =Util.null2String(jsonObj.get("typeselect"));
+      if(typeselect.length()==0)typeselect = "3";
+      if(!typeselect.equals("") && !typeselect.equals("0")&& !typeselect.equals("6")){
+        if(typeselect.equals("1")){
+          fromDate = TimeUtil.getCurrentDateString();
+          toDate = TimeUtil.getCurrentDateString();
+        }else{
+          fromDate = TimeUtil.getDateByOption(typeselect,"0");
+          toDate = TimeUtil.getDateByOption(typeselect,"1");
+        }
+      }
+      //人员状态
+      String status = Util.null2String(jsonObj.get("status"));
+      String subCompanyId = Util.null2String(jsonObj.get("subCompanyId"));
+      String departmentId = Util.null2String(jsonObj.get("departmentId"));
+      String resourceId = Util.null2String(jsonObj.get("resourceId"));
+      String allLevel = Util.null2String(jsonObj.get("allLevel"));
+      String isNoAccount = Util.null2String(jsonObj.get("isNoAccount"));
+      String viewScope = Util.null2String(jsonObj.get("viewScope"));
+      List<String> showColumns = Util.splitString2List(Util.null2String(jsonObj.get("showColumns")),",");
+      showColumns.add("lastname");
+      showColumns.add("kqdate");
+      showColumns.add("serialid");
+      showColumns.removeIf(showColumn->showColumn.trim().equals(""));
+
+      List<String> tmpShowColumns = new ArrayList<>();
+      for(String showColumn:showColumns){
+        tmpShowColumns.add(showColumn);
+        String cascadekey = "";
+        if(showColumn.equals("signin1")){
+          cascadekey = "signout1";
+        }else if(showColumn.equals("signin2")){
+          cascadekey = "signout2";
+        }else if(showColumn.equals("signin3")){
+          cascadekey = "signout3";
+        }else if(showColumn.equals("beLate")){
+          cascadekey = "beLateMins";
+        }else if(showColumn.equals("leaveEearly")){
+          cascadekey = "leaveEarlyMins";
+        }else if(showColumn.equals("graveBeLate")){
+          cascadekey = "graveBeLateMins";
+        }else if(showColumn.equals("graveLeaveEarly")){
+          cascadekey = "graveLeaveEarlyMins";
+        }else if(showColumn.equals("absenteeism")){
+          cascadekey = "absenteeismMins";
+        }else if(showColumn.equals("overtime")){
+          tmpShowColumns.add("overtime_4leave");
+          tmpShowColumns.add("overtime_nonleave");
+          tmpShowColumns.add("workingDayOvertime_nonleave");
+          tmpShowColumns.add("workingDayOvertime_4leave");
+          tmpShowColumns.add("restDayOvertime_nonleave");
+          tmpShowColumns.add("restDayOvertime_4leave");
+          tmpShowColumns.add("holidayOvertime_4leave");
+          tmpShowColumns.add("holidayOvertime_nonleave");
+        }
+        if(cascadekey.length()>0){
+          tmpShowColumns.add(cascadekey);
+        }
+      }
+      showColumns = tmpShowColumns;
+
+      String today = DateUtil.getCurrentDate();
+      if(DateUtil.compDate(today, toDate)>0){//结束如期不大于今天
+        toDate = today;
+      }
+
+      String rightSql = new KQReportBiz().getReportRight("2",""+user.getUID(),"a");
+
+      LinkedHashMap<String, Object> workbook = new LinkedHashMap<>();
+      List<Object> lsSheet = new ArrayList<>();
+      Map<String, Object> sheet = null;
+      List<Object> titleList = new ArrayList<>();
+      Map<String,Object> title = null;
+      List<List<Object>> dataList = new ArrayList<>();
+      List<Object> data = null;
+      List<Map<String,Object>> constraintList = null;
+      Map<String,Object> constraint = null;
+
+      sheet = new HashMap<>();
+      sheet.put("sheetName", SystemEnv.getHtmlLabelName(	390352, user.getLanguage()));
+      sheet.put("sheetTitle", SystemEnv.getHtmlLabelName(	390352, user.getLanguage()));
+
+      List<Map<String, Object>> leaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+      Map<String,Object> mapChildColumnInfo = null;
+      List<Object> childColumns = null;
+      KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+      while (kqReportFieldComInfo.next()){
+        if(Util.null2String(kqReportFieldComInfo.getParentid()).length()>0)continue;
+        if(!kqReportFieldComInfo.getReportType().equals("all") && !kqReportFieldComInfo.getReportType().equals("daily"))continue;
+        if (!showColumns.contains(kqReportFieldComInfo.getFieldname())&&!showColumns.contains(kqReportFieldComInfo.getParentid())) continue;
+        if("leave".equalsIgnoreCase(kqReportFieldComInfo.getFieldname())&&leaveRules.size()==0){
+          continue;
+        }
+        title = new HashMap<>();
+        String unitType = KQReportBiz.getUnitType(kqReportFieldComInfo, user);
+        if(unitType.length()>0){
+          title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage())+ "(" + unitType + ")");
+        }else{
+          title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()));
+        }
+        title.put("width",30*256);
+        this.lsFieldDataKey.add(kqReportFieldComInfo.getFieldname());
+        mapChildColumnInfo = this.getChildColumnsInfo(kqReportFieldComInfo.getFieldname(),user);
+        childColumns = (List<Object>)mapChildColumnInfo.get("childColumns");
+        if(childColumns.size()>0) {//跨列width取子列的width
+          title.put("children", childColumns);
+          title.put("colSpan",childColumns.size());
+        }else{
+          title.put("rowSpan", 3);
+        }
+        titleList.add(title);
+      }
+      sheet.put("titleList", titleList);
+
+      String forgotBeginWorkCheck_field = " b.forgotbeginworkcheck ";
+
+      if(rs.getDBType().equalsIgnoreCase("oracle")&&!Util.null2String(rs.getOrgindbtype()).equals("dm")&&!Util.null2String(rs.getOrgindbtype()).equals("st")) {
+        forgotBeginWorkCheck_field = " nvl(b.forgotBeginWorkCheck,0)  ";
+      }else if((rs.getDBType()).equalsIgnoreCase("mysql")){
+        forgotBeginWorkCheck_field = " ifnull(b.forgotBeginWorkCheck,0) ";
+      }else {
+        forgotBeginWorkCheck_field = " isnull(b.forgotBeginWorkCheck,0) ";
+      }
+
+      String backFields = " a.id,a.lastname,a.subcompanyid1 as subcompanyid,a.departmentid, a.workcode,b.jobtitle,a.dsporder," +
+              " b.kqdate, b.workdays,b.workMins,b.serialid, b.attendancedays,b.attendanceMins,b.beLate," +
+              " b.beLateMins,b.graveBeLate,b.graveBeLateMins,b.leaveEearly,b.leaveEarlyMins,b.graveLeaveEarly," +
+              " b.graveLeaveEarlyMins,b.absenteeism,b.signdays,b.signmins, "+
+              " b.absenteeismMins ,(b.forgotCheck+"+forgotBeginWorkCheck_field+") forgotCheck ";
+      String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
+      String sqlWhere = rightSql;
+      if(subCompanyId.length()>0){
+        sqlWhere +=" and a.subcompanyid1 in("+subCompanyId+") ";
+      }
+
+      if(departmentId.length()>0){
+        sqlWhere +=" and a.departmentid in("+departmentId+") ";
+      }
+
+      if(resourceId.length()>0){
+        sqlWhere +=" and a.id in("+resourceId+") ";
+      }
+
+      if(viewScope.equals("4")){//我的下属
+        if(allLevel.equals("1")){//所有下属
+          sqlWhere+=" and a.managerstr like '%,"+user.getUID()+",%'";
+        }else{
+          sqlWhere+=" and a.managerid="+user.getUID();//直接下属
+        }
+      }
+      if (!"1".equals(isNoAccount)) {
+        sqlWhere += " and a.loginid is not null "+(rs.getDBType().equals("oracle")?"":" and a.loginid<>'' ");
+      }
+
+      if(status.length()>0){
+        if (!status.equals("8") && !status.equals("9")) {
+          sqlWhere += " and a.status = "+status+ "";
+        }else if (status.equals("8")) {
+          sqlWhere += " and (a.status = 0 or a.status = 1 or a.status = 2 or a.status = 3) ";
+        }
+      }
+
+      String orderBy = " order by a.dsporder asc, a.lastname asc , b.kqDate asc ";
+      String descOrderBy = " order by a.dsporder desc, a.lastname desc ";
+      sql = "select "+backFields + sqlFrom  + sqlWhere+orderBy;
+
+      // #1475814-概述：满足考勤报分部部门显示及导出时显示全路径
+      String fullPathMainKey = "show_full_path";
+      KQSettingsComInfo kqSettingsComInfo = new KQSettingsComInfo();
+      String isShowFullPath = Util.null2String(kqSettingsComInfo.getMain_val(fullPathMainKey),"0");
+
+      Map<String,Object> flowData = kqReportBiz.getDailyFlowData(params,user);
+      rs.execute(sql);
+      while (rs.next()) {
+        data = new ArrayList<>();
+        String id = rs.getString("id");
+        String kqdate = rs.getString("kqdate");
+        Map<String,Object> signDetailInfo = this.getSignDetailInfo(id,kqdate);
+
+        for (int fieldDataKeyIdx =0;fieldDataKeyIdx<lsFieldDataKey.size();fieldDataKeyIdx++) {
+          String fieldName = lsFieldDataKey.get(fieldDataKeyIdx);
+          String fieldid =  KQReportFieldComInfo.field2Id.get(fieldName);
+          String fieldValue = "";
+          if(fieldName.equals("subcompany")){
+            String tmpSubcompanyId = Util.null2String(rs.getString("subcompanyid"));
+            if(tmpSubcompanyId.length()==0){
+              tmpSubcompanyId =  Util.null2String(resourceComInfo.getSubCompanyID(id));
+            }
+
+            fieldValue = "1".equals(isShowFullPath) ?
+                    SubCompanyComInfo.getSubcompanyRealPath(tmpSubcompanyId, "/", "0") :
+                    subCompanyComInfo.getSubCompanyname(tmpSubcompanyId);
+
+            // fieldValue = subCompanyComInfo.getSubCompanyname(tmpSubcompanyId);
+          }else if(fieldName.equals("department")){
+            String tmpDepartmentId = Util.null2String(rs.getString("departmentid"));
+            if(tmpDepartmentId.length()==0){
+              tmpDepartmentId =  Util.null2String(resourceComInfo.getDepartmentID(id));
+            }
+
+            fieldValue = "1".equals(isShowFullPath) ?
+                    departmentComInfo.getDepartmentRealPath(tmpDepartmentId, "/", "0") :
+                    departmentComInfo.getDepartmentname(tmpDepartmentId);
+
+            // fieldValue = departmentComInfo.getDepartmentname(tmpDepartmentId);
+          }else if(fieldName.equals("jobtitle")){
+            String tmpJobtitleId = Util.null2String(rs.getString("jobtitle"));
+            if(tmpJobtitleId.length()==0){
+              tmpJobtitleId =  Util.null2String(resourceComInfo.getJobTitle(id));
+            }
+            fieldValue = jobTitlesComInfo.getJobTitlesname(tmpJobtitleId);
+          } else if(fieldName.equals("serialid")){
+            String serialid = Util.null2String(rs.getString("serialid"));
+            if(serialid.length()>0){
+              fieldValue = Util.formatMultiLang(shiftManagementToolKit.getShiftOnOffWorkSections(serialid, user.getLanguage()));
+            }
+          } else if(fieldName.equals("signin1")){
+            fieldValue = Util.null2String(signDetailInfo.get("signintime1"));
+            data.add(fieldValue);
+            fieldValue = Util.null2String(signDetailInfo.get("signinstatus1"));
+            data.add(fieldValue);
+            continue;
+          } else if(fieldName.equals("signin2")){
+            fieldValue = Util.null2String(signDetailInfo.get("signintime2"));
+            data.add(fieldValue);
+            fieldValue = Util.null2String(signDetailInfo.get("signinstatus2"));
+            data.add(fieldValue);
+            continue;
+          } else if(fieldName.equals("signin3")){
+            fieldValue = Util.null2String(signDetailInfo.get("signintime3"));
+            data.add(fieldValue);
+            fieldValue = Util.null2String(signDetailInfo.get("signinstatus3"));
+            data.add(fieldValue);
+            continue;
+          } else if(fieldName.equals("signout1")){
+            fieldValue = Util.null2String(signDetailInfo.get("signouttime1"));
+            data.add(fieldValue);
+            fieldValue = Util.null2String(signDetailInfo.get("signoutstatus1"));
+            data.add(fieldValue);
+            continue;
+          } else if(fieldName.equals("signout2")){
+            fieldValue = Util.null2String(signDetailInfo.get("signouttime2"));
+            data.add(fieldValue);
+            fieldValue = Util.null2String(signDetailInfo.get("signoutstatus2"));
+            data.add(fieldValue);
+            continue;
+          } else if(fieldName.equals("signout3")){
+            fieldValue = Util.null2String(signDetailInfo.get("signouttime3"));
+            data.add(fieldValue);
+            fieldValue = Util.null2String(signDetailInfo.get("signoutstatus3"));
+            data.add(fieldValue);
+            continue;
+          } else if(fieldName.equals("leave")){
+            //请假
+            List<Map<String, Object>> allLeaveRules = KQLeaveRulesBiz.getAllLeaveRules();
+            Map<String, Object> leaveRule = null;
+            for(int i=0;allLeaveRules!=null&&i<allLeaveRules.size();i++){
+              leaveRule = (Map<String, Object>)allLeaveRules.get(i);
+              String flowType = Util.null2String("leaveType_"+leaveRule.get("id"));
+              fieldValue = Util.null2String(flowData.get(id+"|"+kqdate+"|"+flowType));
+              String flowLeaveBackType = Util.null2String("leavebackType_" + leaveRule.get("id"));
+              String leavebackData = Util.null2s(Util.null2String(flowData.get(id + "|" + kqdate + "|" + flowLeaveBackType)), "0.0");
+              String b_flowLeaveData = "";
+              String flowLeaveData = "";
+              try {
+                //以防止出现精度问题
+                if (fieldValue.length() == 0) {
+                  fieldValue = "0.0";
+                }
+                if (leavebackData.length() == 0) {
+                  leavebackData = "0.0";
+                }
+                BigDecimal b_leaveData = new BigDecimal(fieldValue);
+                BigDecimal b_leavebackData = new BigDecimal(leavebackData);
+                b_flowLeaveData = b_leaveData.subtract(b_leavebackData).toString();
+                if(Util.getDoubleValue(b_flowLeaveData, -1) < 0){
+                  b_flowLeaveData = "0.0";
+                }
+
+              } catch (Exception e) {
+                writeLog("ExportDailyExcelCmd:fieldValue" + fieldValue + ":leavebackData:" + leavebackData + ":" + e);
+              }
+              //考虑下冻结的数据
+              if (b_flowLeaveData.length() > 0) {
+                flowLeaveData = KQDurationCalculatorUtil.getDurationRound(b_flowLeaveData);
+              } else {
+                flowLeaveData = KQDurationCalculatorUtil.getDurationRound(Util.null2String(Util.getDoubleValue(fieldValue, 0.0) - Util.getDoubleValue(leavebackData, 0.0)));
+              }
+              fieldValue = flowLeaveData;
+
+              data.add(fieldValue);
+            }
+          }else if(fieldName.equals("overtime")){
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id +"|"+kqdate+ "|workingDayOvertime_nonleave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("workingDayOvertime_nonleave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id +"|"+kqdate+ "|restDayOvertime_nonleave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("restDayOvertime_nonleave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id +"|"+kqdate+ "|holidayOvertime_nonleave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("holidayOvertime_nonleave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id +"|"+kqdate+ "|workingDayOvertime_4leave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("workingDayOvertime_4leave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id +"|"+kqdate+ "|restDayOvertime_4leave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("restDayOvertime_4leave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id +"|"+kqdate+ "|holidayOvertime_4leave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("holidayOvertime_4leave"))));
+
+            double workingDayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|"+kqdate+"|workingDayOvertime_4leave")));
+            workingDayOvertime_4leave = workingDayOvertime_4leave<0?0:workingDayOvertime_4leave;
+            double restDayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|"+kqdate+"|restDayOvertime_4leave")));
+            restDayOvertime_4leave = restDayOvertime_4leave<0?0:restDayOvertime_4leave;
+            double holidayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|"+kqdate+"|holidayOvertime_4leave")));
+            holidayOvertime_4leave = holidayOvertime_4leave<0?0:holidayOvertime_4leave;
+
+            double workingDayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|"+kqdate+"|workingDayOvertime_nonleave")));
+            workingDayOvertime_nonleave = workingDayOvertime_nonleave<0?0:workingDayOvertime_nonleave;
+            double restDayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|"+kqdate+"|restDayOvertime_nonleave")));
+            restDayOvertime_nonleave = restDayOvertime_nonleave<0?0:restDayOvertime_nonleave;
+            double holidayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|"+kqdate+"|holidayOvertime_nonleave")));
+            holidayOvertime_nonleave = holidayOvertime_nonleave<0?0:holidayOvertime_nonleave;
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(String.valueOf(workingDayOvertime_4leave+restDayOvertime_4leave+holidayOvertime_4leave+
+              workingDayOvertime_nonleave+restDayOvertime_nonleave+holidayOvertime_nonleave));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("overtimeTotal"))));
+            continue;
+          }else if(fieldName.equals("businessLeave") || fieldName.equals("officialBusiness")){
+            String businessLeaveData = Util.null2s(Util.null2String(flowData.get(id+"|"+kqdate+"|"+fieldName)),"0.0");
+            String backType = fieldName+"_back";
+            String businessLeavebackData = Util.null2s(Util.null2String(flowData.get(id+"|"+kqdate+"|"+backType)),"0.0");
+            String businessLeave = "";
+            try{
+              //以防止出现精度问题
+              if(businessLeaveData.length() == 0){
+                businessLeaveData = "0.0";
+              }
+              if(businessLeavebackData.length() == 0){
+                businessLeavebackData = "0.0";
+              }
+              BigDecimal b_businessLeaveData = new BigDecimal(businessLeaveData);
+              BigDecimal b_businessLeavebackData = new BigDecimal(businessLeavebackData);
+              businessLeave = b_businessLeaveData.subtract(b_businessLeavebackData).toString();
+              if(Util.getDoubleValue(businessLeave, -1) < 0){
+                businessLeave = "0.0";
+              }
+            }catch (Exception e){
+            }
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(businessLeave);
+          }else if(fieldName.equals("kqdate")){
+            fieldValue=kqdate+" "+com.engine.portal.util.DateUtil.getDayWeekOfDate1(DateUtil.parseToDate(kqdate));
+          }  else {
+            fieldValue = Util.null2String(rs.getString(fieldName));
+            fieldValue = getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(fieldid));
+          }
+          
+          if(!fieldName.equals("leave")) {
+            fieldValue = Util.formatMultiLang(fieldValue, "" + user.getLanguage());
+            data.add(fieldValue);
+          }
+        }
+        dataList.add(data);
+      }
+      sheet.put("dataList", dataList);
+      sheet.put("constraintList",constraintList);
+      sheet.put("createFile", "1");
+      lsSheet.add(sheet);
+
+      workbook.put("sheet", lsSheet);
+      String fileName = 	SystemEnv.getHtmlLabelName(390352, user.getLanguage())+" "+fromDate+" "+toDate;;
+      workbook.put("fileName", fileName);
+      ExcelUtil ExcelUtil = new ExcelUtil();
+      Map<String,Object> exportMap= ExcelUtil.export(workbook,request,response);
+      retmap.putAll(exportMap);
+      retmap.put("status", "1");
+    } catch (Exception e) {
+      retmap.put("status", "-1");
+      retmap.put("message", SystemEnv.getHtmlLabelName(382661, user.getLanguage()));
+      writeLog(e);
+    }
+    return retmap;
+  }
+
+  private Map<String,Object> getChildColumnsInfo(String parentid, User user){
+    Map<String,Object> returnMap = new HashMap<>();
+    List<Object> titleList = new ArrayList<>();
+    Map<String,Object> title = null;
+    if(parentid.equals("leave")){
+      KQLeaveRulesBiz kqLeaveRulesBiz = new KQLeaveRulesBiz();
+      List<Map<String, Object>> leaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+      for(int i=0;leaveRules!=null&&i<leaveRules.size();i++){
+        Map<String, Object> leaveRule = leaveRules.get(i);
+        String name = Util.formatMultiLang(Util.null2String(leaveRule.get("name")),""+user.getLanguage());
+        String unitType = Util.null2String(leaveRule.get("unitType"));
+        title = new HashMap<>();
+        title.put("title",name+"("+
+                ((KQUnitBiz.isLeaveHour(unitType))?SystemEnv.getHtmlLabelName(391, user.getLanguage()):SystemEnv.getHtmlLabelName(1925, user.getLanguage()))+")");
+        title.put("width",30*256);
+        titleList.add(title);
+
+      }
+    }else if(parentid.equals("overtime")){
+      String[] overtimeChild = {"overtime_nonleave","overtime_4leave","overtimeTotal"};
+      for(int i=0;i<overtimeChild.length;i++){
+        String id = overtimeChild[i];
+        title = new HashMap();
+        String fieldlabel = "";
+        if("overtime_nonleave".equalsIgnoreCase(id)){
+          fieldlabel = "125805";
+          title.put("title", SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage()));
+          title.put("rowSpan","2");
+        }else if("overtime_4leave".equalsIgnoreCase(id)){
+          fieldlabel = "125804";
+          title.put("title", SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage()));
+          title.put("rowSpan","2");
+        }else{
+          fieldlabel = "523";
+          title.put("showDetial","1");
+          String unitType = (KQOvertimeRulesBiz.getMinimumUnit()==3 || KQOvertimeRulesBiz.getMinimumUnit()==5 ||KQOvertimeRulesBiz.getMinimumUnit()==6)?"2":"1";
+          String unitTypeName = "";
+          if(Util.null2String(unitType).length()>0){
+            if(unitType.equals("1")){
+              unitTypeName=SystemEnv.getHtmlLabelName(1925, user.getLanguage());
+            }else if(unitType.equals("2")){
+              unitTypeName=SystemEnv.getHtmlLabelName(391, user.getLanguage());
+            }else if(unitType.equals("3")){
+              unitTypeName=SystemEnv.getHtmlLabelName(18083, user.getLanguage());
+            }
+          }
+          title.put("title", SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage())+ "(" + unitTypeName + ")");
+        }
+        Map<String,Object> mapChildColumnInfo = getChildColumnsInfo(id, user);
+        int childWidth = 65;
+        List<Object> childColumns = (List<Object>)mapChildColumnInfo.get("childColumns");
+        if(childColumns.size()>0) {//跨列width取子列的width
+          title.put("children", childColumns);
+          childWidth = Util.getIntValue(Util.null2String(mapChildColumnInfo.get("sumChildColumnWidth")),65);
+        }
+        title.put("width", childWidth+"");
+        titleList.add(title);
+      }
+    } else{
+      KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+      while (kqReportFieldComInfo.next()){
+        if(kqReportFieldComInfo.getParentid().equals(parentid)) {
+          if(!kqReportFieldComInfo.getReportType().equals("daily"))continue;
+          title = new HashMap<>();
+          title.put("title",SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage())+
+                  (KQReportBiz.getUnitType(kqReportFieldComInfo, user).length()>0?"("+ KQReportBiz.getUnitType(kqReportFieldComInfo, user)+")":""));
+          title.put("width",30*256);
+          titleList.add(title);
+        }
+      }
+    }
+    returnMap.put("childColumns",titleList);
+    return returnMap;
+  }
+
+  public Map<String, Object> getSignDetailInfo(String resourceId, String kqDate){
+    Map<String, Object> data = new HashMap<>();
+    Map<String,Object> signStatusInfo = null;
+    RecordSet rs = new RecordSet();
+    String sql = "";
+    KQTimesArrayComInfo kqTimesArrayComInfo = new KQTimesArrayComInfo();
+    try{
+      sql = " select kqdate,resourceid,serialid,serialnumber,workbegindate,workbegintime, " +
+              " workenddate,workendtime,workmins,signindate,signintime,signoutdate,signouttime, \n" +
+              " attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins,forgotBeginWorkCheckMins," +
+              " leaveMins,leaveInfo,evectionMins,outMins,signinid,signoutid \n" +
+              " from kq_format_detail b \n" +
+              " where resourceid = " + resourceId + " and kqdate ='" + kqDate + "' \n" +
+              " order by serialnumber \n";
+      rs.execute(sql);
+      while (rs.next()) {
+        String resourceid = Util.null2String(rs.getString("resourceid"));
+        String kqdate = Util.null2String(rs.getString("kqdate"));
+        String serialid = Util.null2String(rs.getString("serialid"));
+        int serialnumber  = rs.getInt("serialnumber")+1;
+        String workbegindate = Util.null2String(rs.getString("workbegindate")).trim();
+        String workbegintime = Util.null2String(rs.getString("workbegintime")).trim();
+        String workenddate = Util.null2String(rs.getString("workenddate")).trim();
+        String workendtime = Util.null2String(rs.getString("workendtime")).trim();
+        int workMins = rs.getInt("workMins");
+        String signintime = Util.null2String(rs.getString("signintime")).trim();
+        String signouttime = Util.null2String(rs.getString("signouttime")).trim();
+        int attendanceMins = rs.getInt("attendanceMins");
+        String beLateMins = Util.null2String(rs.getString("beLateMins")).trim();
+        String graveBeLateMins = Util.null2String(rs.getString("graveBeLateMins")).trim();
+        String leaveEarlyMins= Util.null2String(rs.getString("leaveEarlyMins")).trim();
+        String graveLeaveEarlyMins= Util.null2String(rs.getString("graveLeaveEarlyMins")).trim();
+        String absenteeismMins= Util.null2String(rs.getString("absenteeismMins")).trim();
+        String forgotCheckMins = Util.null2String(rs.getString("forgotcheckMins")).trim();
+        String forgotBeginWorkCheckMins = Util.null2String(rs.getString("forgotBeginWorkCheckMins")).trim();
+        String signinid = Util.null2String(rs.getString("signinid")).trim();
+        String signoutid = Util.null2String(rs.getString("signoutid")).trim();
+        int leaveMins = rs.getInt("leaveMins");
+        String leaveInfo = Util.null2String(rs.getString("leaveInfo"));
+        int evectionMins = rs.getInt("evectionMins");
+        int outMins = rs.getInt("outMins");
+
+
+        if(serialid.length()>0){
+          if (workbegintime.length() > 0) {
+            signStatusInfo = new HashMap();
+            signStatusInfo.put("workdate",workbegindate);
+            signStatusInfo.put("worktime",workbegintime);
+            signStatusInfo.put("beLateMins",beLateMins);
+            signStatusInfo.put("forgotBeginWorkCheckMins",forgotBeginWorkCheckMins);
+            signStatusInfo.put("graveBeLateMins",graveBeLateMins);
+            signStatusInfo.put("absenteeismMins",absenteeismMins);
+            signStatusInfo.put("leaveMins",leaveMins);
+            signStatusInfo.put("leaveInfo",leaveInfo);
+            signStatusInfo.put("evectionMins",evectionMins);
+            signStatusInfo.put("outMins",outMins);
+
+            data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime);
+            data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
+          }
+
+          if (workendtime.length() > 0) {
+            signStatusInfo = new HashMap();
+            signStatusInfo.put("workdate",workenddate);
+            signStatusInfo.put("worktime",kqTimesArrayComInfo.turn48to24Time(workendtime));
+            signStatusInfo.put("leaveEarlyMins",leaveEarlyMins);
+            signStatusInfo.put("graveLeaveEarlyMins",graveLeaveEarlyMins);
+            signStatusInfo.put("forgotCheckMins",forgotCheckMins);
+            signStatusInfo.put("forgotBeginWorkCheckMins",forgotBeginWorkCheckMins);
+            signStatusInfo.put("absenteeismMins",absenteeismMins);
+            signStatusInfo.put("leaveMins",leaveMins);
+            signStatusInfo.put("leaveInfo",leaveInfo);
+            signStatusInfo.put("evectionMins",evectionMins);
+            signStatusInfo.put("outMins",outMins);
+
+            data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime);
+            data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off"));
+          }
+        }else{
+          if(workMins>0){
+            //弹性工时打卡时间取自签到签退数据
+          }
+          signStatusInfo = new HashMap();
+          signStatusInfo.put("leaveMins",leaveMins);
+          signStatusInfo.put("leaveInfo",leaveInfo);
+          signStatusInfo.put("evectionMins",evectionMins);
+          signStatusInfo.put("outMins",outMins);
+
+          if(signinid.length() > 0){
+            data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime);
+            data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
+            if(signoutid.length() > 0){
+              data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime);
+              data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off"));
+            }
+          }else{
+            data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
+          }
+        }
+      }
+    }catch (Exception e){
+      writeLog(e);
+    }
+    return data;
+  }
+
+  private String getFieldValueByUnitType(String fieldValue,String unittype){
+    if (Util.null2String(unittype).length() > 0) {
+      if (fieldValue.length() == 0) {
+        fieldValue = "0";
+      } else {
+        if (unittype.equals("2")) {
+          fieldValue = KQDurationCalculatorUtil.getDurationRound(("" + (Util.getDoubleValue(fieldValue) / 60.0)));
+        }
+      }
+    }
+    return fieldValue;
+  }
+
+  @Override
+  public BizLogContext getLogContext() {
+    return null;
+  }
+}

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

@@ -0,0 +1,603 @@
+package com.engine.kq.cmd.report;
+
+import com.alibaba.fastjson.JSON;
+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.util.ExcelUtil;
+import com.engine.kq.util.KQDurationCalculatorUtil;
+import com.engine.kq.util.UtilKQ;
+import weaver.common.DateUtil;
+import weaver.common.StringUtil;
+import weaver.conn.RecordSet;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.job.JobTitlesComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.systeminfo.SystemEnv;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.*;
+
+public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
+
+  private HttpServletRequest request;
+  private HttpServletResponse response;
+  private List<String> lsFieldDataKey;
+
+  public ExportExcelCmd(Map<String, Object> params, HttpServletRequest request, HttpServletResponse response, User user) {
+    this.user = user;
+    this.params = params;
+    this.request = request;
+    this.response = response;
+    this.lsFieldDataKey = new ArrayList<>();
+  }
+
+  @Override
+  public Map<String, Object> execute(CommandContext commandContext) {
+    Map<String, Object> retmap = new HashMap<String, Object>();
+    RecordSet rs = new RecordSet();
+    String sql = "";
+    try {
+      SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+      DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+      ResourceComInfo resourceComInfo = new ResourceComInfo();
+      JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo();
+      KQLeaveRulesBiz kqLeaveRulesBiz = new KQLeaveRulesBiz();
+      KQReportBiz kqReportBiz = new KQReportBiz();
+
+      JSONObject jsonObj = JSON.parseObject(Util.null2String(params.get("data")));
+      String attendanceSerial = Util.null2String(jsonObj.get("attendanceSerial"));
+      String fromDate = Util.null2String(jsonObj.get("fromDate"));
+      String toDate = Util.null2String(jsonObj.get("toDate"));
+      String typeselect = Util.null2String(jsonObj.get("typeselect"));
+      if (typeselect.length() == 0) typeselect = "3";
+      if (!typeselect.equals("") && !typeselect.equals("0") && !typeselect.equals("6")) {
+        if (typeselect.equals("1")) {
+          fromDate = TimeUtil.getCurrentDateString();
+          toDate = TimeUtil.getCurrentDateString();
+        } else {
+          fromDate = TimeUtil.getDateByOption(typeselect, "0");
+          toDate = TimeUtil.getDateByOption(typeselect, "1");
+        }
+      }
+      //人员状态
+      String status = Util.null2String(jsonObj.get("status"));
+      String subCompanyId = Util.null2String(jsonObj.get("subCompanyId"));
+      String departmentId = Util.null2String(jsonObj.get("departmentId"));
+      String resourceId = Util.null2String(jsonObj.get("resourceId"));
+      String allLevel = Util.null2String(jsonObj.get("allLevel"));
+      String isNoAccount = Util.null2String(jsonObj.get("isNoAccount"));
+      String viewScope = Util.null2String(jsonObj.get("viewScope"));
+      List<String> showColumns = Util.splitString2List(Util.null2String(jsonObj.get("showColumns")), ",");
+      showColumns.add("lastname");
+      showColumns.removeIf(showColumn->showColumn.trim().equals(""));
+
+      List<String> tmpShowColumns = new ArrayList<>();
+      for(String showColumn:showColumns){
+        tmpShowColumns.add(showColumn);
+        String cascadekey = "";
+        if(showColumn.equals("beLate")){
+          cascadekey = "beLateMins";
+        }else if(showColumn.equals("leaveEearly")){
+          cascadekey = "leaveEarlyMins";
+        }else if(showColumn.equals("graveBeLate")){
+          cascadekey = "graveBeLateMins";
+        }else if(showColumn.equals("graveLeaveEarly")){
+          cascadekey = "graveLeaveEarlyMins";
+        }else if(showColumn.equals("absenteeism")){
+          cascadekey = "absenteeismMins";
+        }else if(showColumn.equals("overtime")){
+          tmpShowColumns.add("overtime_4leave");
+          tmpShowColumns.add("overtime_nonleave");
+          tmpShowColumns.add("workingDayOvertime_nonleave");
+          tmpShowColumns.add("workingDayOvertime_4leave");
+          tmpShowColumns.add("restDayOvertime_nonleave");
+          tmpShowColumns.add("restDayOvertime_4leave");
+          tmpShowColumns.add("holidayOvertime_4leave");
+          tmpShowColumns.add("holidayOvertime_nonleave");
+        }
+        if(cascadekey.length()>0){
+          tmpShowColumns.add(cascadekey);
+        }
+      }
+      showColumns = tmpShowColumns;
+
+      String rightSql = new KQReportBiz().getReportRight("1", "" + user.getUID(), "a");
+
+      LinkedHashMap<String, Object> workbook = new LinkedHashMap<>();
+      List<Object> lsSheet = new ArrayList<>();
+      Map<String, Object> sheet = null;
+      List<Object> titleList = new ArrayList<>();
+      Map<String, Object> title = null;
+      List<List<Object>> dataList = new ArrayList<>();
+      List<Object> data = null;
+      List<Map<String, Object>> constraintList = null;
+
+      sheet = new HashMap<>();
+      sheet.put("sheetName", SystemEnv.getHtmlLabelName(390351, user.getLanguage()));
+      sheet.put("sheetTitle", SystemEnv.getHtmlLabelName(390351, user.getLanguage()));
+      boolean isEnd = false;
+      Calendar cal = DateUtil.getCalendar();
+
+      List<Map<String, Object>> leaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+      Map<String, Object> mapChildColumnInfo = null;
+      List<Object> childColumns = null;
+      KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+      while (kqReportFieldComInfo.next()) {
+        if (Util.null2String(kqReportFieldComInfo.getParentid()).length() > 0) continue;
+        if(kqReportFieldComInfo.getFieldname().equals("kqCalendar"))continue;
+        if(KQReportFieldComInfo.cascadekey2fieldname.keySet().contains(kqReportFieldComInfo.getFieldname()))continue;
+        if (!kqReportFieldComInfo.getReportType().equals("all") && !kqReportFieldComInfo.getReportType().equals("month"))
+          continue;
+        if (!showColumns.contains(kqReportFieldComInfo.getFieldname())&&!showColumns.contains(kqReportFieldComInfo.getParentid())) continue;
+        if("leave".equalsIgnoreCase(kqReportFieldComInfo.getFieldname())&&leaveRules.size()==0){
+          continue;
+        }
+        title = new HashMap<>();
+        String unitType = KQReportBiz.getUnitType(kqReportFieldComInfo, user);
+        if(unitType.length()>0){
+          title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage())+ "(" + unitType + ")");
+        }else{
+          title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()));
+        }
+        title.put("width", 30 * 256);
+        this.lsFieldDataKey.add(kqReportFieldComInfo.getFieldname());
+        mapChildColumnInfo = this.getChildColumnsInfo(kqReportFieldComInfo.getFieldname(), user);
+        childColumns = (List<Object>) mapChildColumnInfo.get("childColumns");
+        if (childColumns.size() > 0) {//跨列width取子列的width
+          title.put("children", childColumns);
+          title.put("colSpan", childColumns.size());
+        } else {
+          title.put("rowSpan", 3);
+        }
+        titleList.add(title);
+
+        titleList.addAll(this.getCascadeKeyColumnsInfo(kqReportFieldComInfo.getCascadekey(),user));
+      }
+
+      String today = DateUtil.getCurrentDate();
+//      if (DateUtil.compDate(today, toDate) > 0) {//结束如期不大于今天
+//        toDate = today;
+//      }
+
+      if(showColumns.contains("kqCalendar")) {
+        childColumns = new ArrayList<>();
+        for (String date = fromDate; !isEnd; ) {
+          if (date.equals(toDate)) isEnd = true;
+          title = new HashMap<>();
+          title.put("title", UtilKQ.getWeekDayShort(DateUtil.getWeek(date)-1,user.getLanguage()) +"\r\n"+ DateUtil.geDayOfMonth(date));
+          title.put("width", 30 * 256);
+          childColumns.add(title);
+          cal.setTime(DateUtil.parseToDate(date));
+          date = DateUtil.getDate(cal.getTime(), 1);
+        }
+
+        title = new HashMap();
+        title.put("title", SystemEnv.getHtmlLabelName(386476, user.getLanguage()));
+        if (childColumns.size() > 0) {//跨列width取子列的width
+          title.put("children", childColumns);
+          title.put("colSpan", childColumns.size());
+        }
+        titleList.add(title);
+      }
+      sheet.put("titleList", titleList);
+
+      String forgotBeginWorkCheck_field = " sum(b.forgotBeginWorkCheck) ";
+
+      if(rs.getDBType().equalsIgnoreCase("oracle")) {
+        forgotBeginWorkCheck_field = " sum(nvl(b.forgotBeginWorkCheck,0))  ";
+      }else if((rs.getDBType()).equalsIgnoreCase("mysql")){
+        forgotBeginWorkCheck_field = " sum(ifnull(b.forgotBeginWorkCheck,0)) ";
+      }else {
+        forgotBeginWorkCheck_field = " sum(isnull(b.forgotBeginWorkCheck,0)) ";
+      }
+
+      Map<String,Object> definedFieldInfo = new KQFormatBiz().getDefinedField();
+      String definedFieldSum = Util.null2String(definedFieldInfo.get("definedFieldSum"));
+      String backFields = " a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1 as subcompanyid,a.departmentid,a.jobtitle," +
+              " sum(b.workdays) as workdays,sum(b.workMins) as workMins,sum(b.attendancedays) as attendancedays," +
+              " sum(b.attendanceMins) as attendanceMins,sum(b.beLate) as beLate,sum(b.beLateMins) as beLateMins, " +
+              " sum(b.graveBeLate) as graveBeLate, sum(b.graveBeLateMins) as graveBeLateMins,sum(b.leaveEearly) as leaveEearly," +
+              " sum(b.leaveEarlyMins) as leaveEarlyMins, sum(b.graveLeaveEarly) as graveLeaveEarly, " +
+              " sum(b.graveLeaveEarlyMins) as graveLeaveEarlyMins,sum(b.absenteeism) as absenteeism, " +
+              " sum(b.signdays) as signdays,sum(b.signmins) as signmins, "+
+              " sum(b.absenteeismMins) as absenteeismMins, sum(b.forgotCheck)+"+forgotBeginWorkCheck_field+" as forgotCheck "+(definedFieldSum.length()>0?","+definedFieldSum+"":"");
+      if(rs.getDBType().equals("oracle")){
+        backFields = 	"/*+ index(kq_format_total IDX_KQ_FORMAT_TOTAL_KQDATE) */ "+backFields;
+      }
+      String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='" + fromDate + "' and b.kqdate <='" + toDate + "'";
+      String sqlWhere = rightSql;
+      String groupBy = " group by a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1,a.departmentid,a.jobtitle ";
+      if (subCompanyId.length() > 0) {
+        sqlWhere += " and a.subcompanyid1 in(" + subCompanyId + ") ";
+      }
+
+      if (departmentId.length() > 0) {
+        sqlWhere += " and a.departmentid in(" + departmentId + ") ";
+      }
+
+      if (resourceId.length() > 0) {
+        sqlWhere += " and a.id in(" + resourceId + ") ";
+      }
+
+      if (viewScope.equals("4")) {//我的下属
+        if (allLevel.equals("1")) {//所有下属
+          sqlWhere += " and a.managerstr like '%," + user.getUID() + ",%'";
+        } else {
+          sqlWhere += " and a.managerid=" + user.getUID();//直接下属
+        }
+      }
+      if (!"1".equals(isNoAccount)) {
+        sqlWhere += " and a.loginid is not null " + (rs.getDBType().equals("oracle") ? "" : " and a.loginid<>'' ");
+      }
+
+      if(status.length()>0){
+        if (!status.equals("8") && !status.equals("9")) {
+          sqlWhere += " and a.status = "+status+ "";
+        }else if (status.equals("8")) {
+          sqlWhere += " and (a.status = 0 or a.status = 1 or a.status = 2 or a.status = 3) ";
+        }
+      }
+
+      String orderBy = " order by a.dsporder asc, a.lastname asc ";
+      String descOrderBy = " order by a.dsporder desc, a.lastname desc ";
+      sql = "select " + backFields + sqlFrom + sqlWhere + groupBy + orderBy;
+
+      //System.out.println("start" + DateUtil.getFullDate());
+
+      KQSettingsComInfo kqSettingsComInfo = new KQSettingsComInfo();
+      String show_card_source = Util.null2String(kqSettingsComInfo.getMain_val("show_card_source"),"0");//是否显示打卡数据，以及打卡数据来源
+      params.put("show_card_source",show_card_source);
+      KQOvertimeRulesBiz kqOvertimeRulesBiz = new KQOvertimeRulesBiz();
+      int uintType = kqOvertimeRulesBiz.getMinimumUnit();//当前加班单位
+      double hoursToDay = kqOvertimeRulesBiz.getHoursToDay();//当前天跟小时计算关系
+      params.put("uintType",uintType);
+      params.put("hoursToDay",hoursToDay);
+      Map<String, Object> flowData = new KQReportBiz().getFlowData(params, user);
+      //System.out.println("end" + DateUtil.getFullDate());
+
+      // #1475814-概述：满足考勤报分部部门显示及导出时显示全路径
+      String fullPathMainKey = "show_full_path";
+      String isShowFullPath = Util.null2String(kqSettingsComInfo.getMain_val(fullPathMainKey),"0");
+
+
+      rs.execute(sql);
+      while (rs.next()) {
+        data = new ArrayList<>();
+        String id = rs.getString("id");
+        for (int fieldDataKeyIdx =0;fieldDataKeyIdx<lsFieldDataKey.size();fieldDataKeyIdx++) {
+          String fieldName = lsFieldDataKey.get(fieldDataKeyIdx);
+          String fieldid =  KQReportFieldComInfo.field2Id.get(fieldName);
+          String fieldValue = "";
+          if (fieldName.equals("subcompany")) {
+            String tmpSubcompanyId = Util.null2String(rs.getString("subcompanyid"));
+            if (tmpSubcompanyId.length() == 0) {
+              tmpSubcompanyId = Util.null2String(resourceComInfo.getSubCompanyID(id));
+            }
+
+            fieldValue = "1".equals(isShowFullPath) ?
+                    SubCompanyComInfo.getSubcompanyRealPath(tmpSubcompanyId, "/", "0") :
+                    subCompanyComInfo.getSubCompanyname(tmpSubcompanyId);
+
+            // fieldValue = subCompanyComInfo.getSubCompanyname(tmpSubcompanyId);
+          } else if (fieldName.equals("department")) {
+            String tmpDepartmentId = Util.null2String(rs.getString("departmentid"));
+            if (tmpDepartmentId.length() == 0) {
+              tmpDepartmentId = Util.null2String(resourceComInfo.getDepartmentID(id));
+            }
+
+            fieldValue = "1".equals(isShowFullPath) ?
+                    departmentComInfo.getDepartmentRealPath(tmpDepartmentId, "/", "0") :
+                    departmentComInfo.getDepartmentname(tmpDepartmentId);
+
+            // fieldValue = departmentComInfo.getDepartmentname(tmpDepartmentId);
+          } else if (fieldName.equals("jobtitle")) {
+            String tmpJobtitleId = Util.null2String(rs.getString("jobtitle"));
+            if (tmpJobtitleId.length() == 0) {
+              tmpJobtitleId = Util.null2String(resourceComInfo.getJobTitle(id));
+            }
+            fieldValue = jobTitlesComInfo.getJobTitlesname(tmpJobtitleId);
+          } else if (fieldName.equals("attendanceSerial")) {
+            List<String> serialIds = null;
+            if (Util.null2String(jsonObj.get("attendanceSerial")).length() > 0) {
+              serialIds = Util.splitString2List(Util.null2String(jsonObj.get("attendanceSerial")), ",");
+              for(int i=0;serialIds!=null&&i<serialIds.size();i++){
+                data.add(kqReportBiz.getSerialCount(id,fromDate,toDate,serialIds.get(i)));
+              }
+            }else{
+              data.add("");
+            }
+            continue;
+          } else if (fieldName.equals("leave")) {//请假
+            List<Map<String, Object>> allLeaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+            Map<String, Object> leaveRule = null;
+            for (int i = 0; allLeaveRules != null && i < allLeaveRules.size(); i++) {
+              leaveRule = allLeaveRules.get(i);
+              String flowType = Util.null2String("leaveType_" + leaveRule.get("id"));
+              String leaveData = Util.null2String(flowData.get(id + "|" + flowType));
+              String flowLeaveBackType = Util.null2String("leavebackType_" + leaveRule.get("id"));
+              String leavebackData = Util.null2s(Util.null2String(flowData.get(id + "|" + flowLeaveBackType)), "0.0");
+              String b_flowLeaveData = "";
+              String flowLeaveData = "";
+              try {
+                //以防止出现精度问题
+                if (leaveData.length() == 0) {
+                  leaveData = "0.0";
+                }
+                if (leavebackData.length() == 0) {
+                  leavebackData = "0.0";
+                }
+                BigDecimal b_leaveData = new BigDecimal(leaveData);
+                BigDecimal b_leavebackData = new BigDecimal(leavebackData);
+                b_flowLeaveData = b_leaveData.subtract(b_leavebackData).toString();
+                if(Util.getDoubleValue(b_flowLeaveData, -1) < 0){
+                  b_flowLeaveData = "0.0";
+                }
+              } catch (Exception e) {
+                writeLog("GetKQReportCmd:leaveData" + leaveData + ":leavebackData:" + leavebackData + ":" + e);
+              }
+
+              if (b_flowLeaveData.length() > 0) {
+                flowLeaveData = KQDurationCalculatorUtil.getDurationRound(b_flowLeaveData);
+              } else {
+                flowLeaveData = KQDurationCalculatorUtil.getDurationRound(Util.null2String(Util.getDoubleValue(leaveData, 0.0) - Util.getDoubleValue(leavebackData, 0.0)));
+              }
+              data.add(flowLeaveData);
+            }
+            continue;
+          }else if(fieldName.equals("overtime")){
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id + "|workingDayOvertime_nonleave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("workingDayOvertime_nonleave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id + "|restDayOvertime_nonleave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("restDayOvertime_nonleave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id + "|holidayOvertime_nonleave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("holidayOvertime_nonleave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id + "|workingDayOvertime_4leave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("workingDayOvertime_4leave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id + "|restDayOvertime_4leave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("restDayOvertime_4leave"))));
+
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id + "|holidayOvertime_4leave")));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("holidayOvertime_4leave"))));
+
+            double workingDayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|workingDayOvertime_4leave")));
+            workingDayOvertime_4leave = workingDayOvertime_4leave<0?0:workingDayOvertime_4leave;
+            double restDayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|restDayOvertime_4leave")));
+            restDayOvertime_4leave = restDayOvertime_4leave<0?0:restDayOvertime_4leave;
+            double holidayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|holidayOvertime_4leave")));
+            holidayOvertime_4leave = holidayOvertime_4leave<0?0:holidayOvertime_4leave;
+
+            double workingDayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|workingDayOvertime_nonleave")));
+            workingDayOvertime_nonleave = workingDayOvertime_nonleave<0?0:workingDayOvertime_nonleave;
+            double restDayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|restDayOvertime_nonleave")));
+            restDayOvertime_nonleave = restDayOvertime_nonleave<0?0:restDayOvertime_nonleave;
+            double holidayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|holidayOvertime_nonleave")));
+            holidayOvertime_nonleave = holidayOvertime_nonleave<0?0:holidayOvertime_nonleave;
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(String.valueOf(workingDayOvertime_4leave+restDayOvertime_4leave+holidayOvertime_4leave+
+                workingDayOvertime_nonleave+restDayOvertime_nonleave+holidayOvertime_nonleave));
+            data.add(getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(KQReportFieldComInfo.field2Id.get("overtimeTotal"))));
+            continue;
+          }else if(fieldName.equals("businessLeave") || fieldName.equals("officialBusiness")){
+            String businessLeaveData = Util.null2s(Util.null2String(flowData.get(id+"|"+fieldName)),"0.0");
+            String backType = fieldName+"_back";
+            String businessLeavebackData = Util.null2s(Util.null2String(flowData.get(id+"|"+backType)),"0.0");
+            String businessLeave = "";
+            try{
+              //以防止出现精度问题
+              if(businessLeaveData.length() == 0){
+                businessLeaveData = "0.0";
+              }
+              if(businessLeavebackData.length() == 0){
+                businessLeavebackData = "0.0";
+              }
+              BigDecimal b_businessLeaveData = new BigDecimal(businessLeaveData);
+              BigDecimal b_businessLeavebackData = new BigDecimal(businessLeavebackData);
+              businessLeave = b_businessLeaveData.subtract(b_businessLeavebackData).toString();
+              if(Util.getDoubleValue(businessLeave, -1) < 0){
+                businessLeave = "0.0";
+              }
+            }catch (Exception e){
+            }
+            fieldValue = KQDurationCalculatorUtil.getDurationRound(businessLeave);
+          } else if(Util.null2String(kqReportFieldComInfo.getCascadekey(fieldid)).length()>0){
+            fieldValue = Util.formatMultiLang(Util.null2String(rs.getString(fieldName)),""+user.getLanguage());
+            data.add(fieldValue);
+
+            List<String> lsCascadekey = Util.splitString2List(kqReportFieldComInfo.getCascadekey(fieldid),",");
+            for(int i=0;i<lsCascadekey.size();i++){
+              if(Util.null2String(rs.getString(lsCascadekey.get(i))).length()>0){
+                fieldid =  KQReportFieldComInfo.field2Id.get(lsCascadekey.get(i));
+                fieldValue = getFieldValueByUnitType(rs.getString(lsCascadekey.get(i)),kqReportFieldComInfo.getUnittype(fieldid));
+              }else{
+                fieldValue = "0";
+              }
+              data.add(fieldValue);
+            }
+            continue;
+          }else {
+            fieldValue = Util.formatMultiLang(Util.null2String(rs.getString(fieldName)),""+user.getLanguage());
+            fieldValue = getFieldValueByUnitType(fieldValue,kqReportFieldComInfo.getUnittype(fieldid));
+          }
+          fieldValue = Util.formatMultiLang(fieldValue,""+user.getLanguage());
+          data.add(fieldValue);
+        }
+        if(showColumns.contains("kqCalendar")) {
+//          Map<String, Object> detialDatas = kqReportBiz.getDetialDatas(id, fromDate, toDate, user,flowData,true);
+          Map<String, Object> detialDatas = kqReportBiz.getDetialDatas(id, fromDate, toDate, user,flowData,true,uintType,show_card_source);
+          isEnd = false;
+          for (String date = fromDate; !isEnd; ) {
+            if (date.equals(toDate)) isEnd = true;
+            if (DateUtil.compDate(today, date) > 0) {
+              data.add("");
+            } else {
+              if (detialDatas.get(id + "|" + date) != null) {
+                data.add(((Map<String, Object>) detialDatas.get(id + "|" + date)).get("text"));
+              } else {
+                data.add(SystemEnv.getHtmlLabelName(26593, user.getLanguage()));
+              }
+            }
+            cal.setTime(DateUtil.parseToDate(date));
+            date = DateUtil.getDate(cal.getTime(), 1);
+          }
+        }
+        dataList.add(data);
+      }
+      sheet.put("dataList", dataList);
+      sheet.put("constraintList", constraintList);
+      sheet.put("createFile", "1");
+      lsSheet.add(sheet);
+
+      workbook.put("sheet", lsSheet);
+      String fileName = SystemEnv.getHtmlLabelName(390351, user.getLanguage())+" "+fromDate+" "+toDate;
+      workbook.put("fileName", fileName);
+      ExcelUtil ExcelUtil = new ExcelUtil();
+      Map<String, Object> exportMap = ExcelUtil.export(workbook, request, response,true);
+      retmap.putAll(exportMap);
+      retmap.put("status", "1");
+    } catch (Exception e) {
+      retmap.put("status", "-1");
+      retmap.put("message", SystemEnv.getHtmlLabelName(382661, user.getLanguage()));
+      writeLog(e);
+    }
+    return retmap;
+  }
+
+  private Map<String, Object> getChildColumnsInfo(String parentid, User user) {
+    Map<String, Object> returnMap = new HashMap<>();
+    List<Object> titleList = new ArrayList<>();
+    Map<String, Object> title = null;
+    if (parentid.equals("attendanceSerial")) {//考勤班次
+      KQShiftManagementComInfo kqShiftManagementComInfo = new KQShiftManagementComInfo();
+      JSONObject jsonObj = JSON.parseObject(Util.null2String(params.get("data")));
+      List<String> serialIds = null;
+      if (Util.null2String(jsonObj.get("attendanceSerial")).length() > 0) {
+        serialIds = Util.splitString2List(Util.null2String(jsonObj.get("attendanceSerial")), ",");
+      }
+      for (int i = 0; serialIds != null && i < serialIds.size(); i++) {
+        title = new HashMap<>();
+        title.put("title", Util.formatMultiLang(kqShiftManagementComInfo.getSerial(serialIds.get(i)),""+user.getLanguage()));
+        title.put("width", 30 * 256);
+        titleList.add(title);
+      }
+    } else if (parentid.equals("leave")) {
+      KQLeaveRulesBiz kqLeaveRulesBiz = new KQLeaveRulesBiz();
+      List<Map<String, Object>> leaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+      for (int i = 0; leaveRules != null && i < leaveRules.size(); i++) {
+        Map<String, Object> leaveRule = leaveRules.get(i);
+        String name = Util.formatMultiLang(Util.null2String(leaveRule.get("name")),""+user.getLanguage());
+        String unitType = Util.null2String(leaveRule.get("unitType"));
+        String unitName = (KQUnitBiz.isLeaveHour(unitType)) ? SystemEnv.getHtmlLabelName(391, user.getLanguage()) : SystemEnv.getHtmlLabelName(1925, user.getLanguage());
+        title = new HashMap<>();
+        title.put("title", name + "(" + unitName + ")");
+        title.put("width", 30 * 256);
+        titleList.add(title);
+      }
+    }else if(parentid.equals("overtime")){
+      String[] overtimeChild = {"overtime_nonleave","overtime_4leave","overtimeTotal"};
+      for(int i=0;i<overtimeChild.length;i++){
+        String id = overtimeChild[i];
+        title = new HashMap();
+        String fieldlabel = "";
+        if("overtime_nonleave".equalsIgnoreCase(id)){
+          fieldlabel = "125805";
+          title.put("title", SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage()));
+          title.put("rowSpan","2");
+        }else if("overtime_4leave".equalsIgnoreCase(id)){
+          fieldlabel = "125804";
+          title.put("title", SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage()));
+          title.put("rowSpan","2");
+        }else{
+          fieldlabel = "523";
+          title.put("showDetial","1");
+          String unitType = (KQOvertimeRulesBiz.getMinimumUnit()==3 || KQOvertimeRulesBiz.getMinimumUnit()==5 ||KQOvertimeRulesBiz.getMinimumUnit()==6)?"2":"1";
+          String unitTypeName = "";
+          if(Util.null2String(unitType).length()>0){
+            if(unitType.equals("1")){
+              unitTypeName=SystemEnv.getHtmlLabelName(1925, user.getLanguage());
+            }else if(unitType.equals("2")){
+              unitTypeName=SystemEnv.getHtmlLabelName(391, user.getLanguage());
+            }else if(unitType.equals("3")){
+              unitTypeName=SystemEnv.getHtmlLabelName(18083, user.getLanguage());
+            }
+          }
+          title.put("title", SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage())+ "(" + unitTypeName + ")");
+        }
+
+        Map<String,Object> mapChildColumnInfo = getChildColumnsInfo(id, user);
+        int childWidth = 65;
+        List<Object> childColumns = (List<Object>)mapChildColumnInfo.get("childColumns");
+        if(childColumns.size()>0) {//跨列width取子列的width
+          title.put("children", childColumns);
+          childWidth = Util.getIntValue(Util.null2String(mapChildColumnInfo.get("sumChildColumnWidth")),65);
+        }
+        title.put("width", childWidth+"");
+        titleList.add(title);
+      }
+    } else {
+      KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+      while (kqReportFieldComInfo.next()) {
+        if (kqReportFieldComInfo.getParentid().equals(parentid)) {
+          if(!kqReportFieldComInfo.getReportType().equals("month"))continue;
+          title = new HashMap<>();
+          title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()) + "(" + KQReportBiz.getUnitType(kqReportFieldComInfo, user) + ")");
+          title.put("width", 30 * 256);
+          titleList.add(title);
+        }
+      }
+    }
+    returnMap.put("childColumns", titleList);
+    return returnMap;
+  }
+
+  private List<Object>  getCascadeKeyColumnsInfo(String cascadeKey, User user){
+    List<Object> titleList = new ArrayList<>();
+    Map<String, Object> title = null;
+    if(Util.null2String(cascadeKey).length()==0){
+      return titleList;
+    }
+    List<String> lsCascadeKey = Util.splitString2List(cascadeKey,",");
+    KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+    for(int i=0;i<lsCascadeKey.size();i++){
+      kqReportFieldComInfo.setTofirstRow();
+      while (kqReportFieldComInfo.next()) {
+        if(!kqReportFieldComInfo.getReportType().equals("month"))continue;
+        if (kqReportFieldComInfo.getFieldname().equals(lsCascadeKey.get(i))){
+          title = new HashMap<>();
+          title.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()) + "(" + KQReportBiz.getUnitType(kqReportFieldComInfo, user) + ")");
+          title.put("width", 30 * 256);
+          titleList.add(title);
+        }
+      }
+    }
+    return titleList;
+  }
+
+  private String getFieldValueByUnitType(String fieldValue,String unittype){
+    if (Util.null2String(unittype).length() > 0) {
+      if (fieldValue.length() == 0) {
+        fieldValue = "0";
+      } else {
+        if (unittype.equals("2")) {
+          fieldValue = KQDurationCalculatorUtil.getDurationRound(("" + (Util.getDoubleValue(fieldValue) / 60.0)));
+        }
+      }
+    }
+    return fieldValue;
+  }
+  @Override
+  public BizLogContext getLogContext() {
+    return null;
+  }
+}

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

@@ -0,0 +1,609 @@
+package com.engine.kq.cmd.report;
+
+import com.alibaba.fastjson.JSON;
+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.cmd.shiftmanagement.toolkit.ShiftManagementToolKit;
+import com.engine.kq.entity.WorkTimeEntity;
+import com.engine.kq.log.KQLog;
+import com.engine.kq.util.KQDurationCalculatorUtil;
+import com.engine.kq.util.PageUidFactory;
+import java.math.BigDecimal;
+import weaver.common.DateUtil;
+import weaver.conn.RecordSet;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.job.JobTitlesComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.systeminfo.SystemEnv;
+
+import java.util.*;
+
+public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Object>> {
+
+  private KQLog kqLog = new KQLog();
+
+	public GetKQDailyReportCmd(Map<String, Object> params, User user) {
+		this.user = user;
+		this.params = params;
+	}
+
+	@Override
+	public Map<String, Object> execute(CommandContext commandContext) {
+		Map<String,Object> retmap = new HashMap<String,Object>();
+		RecordSet rs = new RecordSet();
+		String sql = "";
+		try{
+			String pageUid = PageUidFactory.getHrmPageUid("KQDailyReport");
+
+			SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+		  	DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+			ResourceComInfo resourceComInfo = new ResourceComInfo();
+			JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo();
+			KQWorkTime kqWorkTime = new KQWorkTime();
+			ShiftManagementToolKit shiftManagementToolKit = new ShiftManagementToolKit();
+			KQReportBiz kqReportBiz = new KQReportBiz();
+			KQLeaveRulesBiz kqLeaveRulesBiz = new KQLeaveRulesBiz();
+
+			String rightSql = new KQReportBiz().getReportRight("2",""+user.getUID(),"a");
+
+			JSONObject jsonObj = JSON.parseObject(Util.null2String(params.get("data")));
+			String fromDate = Util.null2String(jsonObj.get("fromDate"));
+			String toDate = Util.null2String(jsonObj.get("toDate"));
+			String typeselect =Util.null2String(jsonObj.get("typeselect"));
+			if(typeselect.length()==0)typeselect = "3";
+			if(!typeselect.equals("") && !typeselect.equals("0")&& !typeselect.equals("6")){
+				if(typeselect.equals("1")){
+					fromDate = TimeUtil.getCurrentDateString();
+					toDate = TimeUtil.getCurrentDateString();
+				}else{
+					fromDate = TimeUtil.getDateByOption(typeselect,"0");
+					toDate = TimeUtil.getDateByOption(typeselect,"1");
+				}
+			}
+			//人员状态
+			String status = Util.null2String(jsonObj.get("status"));
+			String subCompanyId = Util.null2String(jsonObj.get("subCompanyId"));
+			String departmentId = Util.null2String(jsonObj.get("departmentId"));
+			String resourceId = Util.null2String(jsonObj.get("resourceId"));
+			String allLevel = Util.null2String(jsonObj.get("allLevel"));
+			String isNoAccount = Util.null2String(jsonObj.get("isNoAccount"));
+			String viewScope = Util.null2String(jsonObj.get("viewScope"));
+			if(typeselect.length()==0)typeselect = "3";
+			int pageIndex = Util.getIntValue(Util.null2String(jsonObj.get("pageIndex")), 1);
+			int pageSize =  KQReportBiz.getPageSize(Util.null2String(jsonObj.get("pageSize")),pageUid,user.getUID());
+			int count = 0;
+			int pageCount = 0;
+			int isHavePre = 0;
+			int isHaveNext = 0;
+
+			List<Map<String, Object>> leaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+			List<Object> columns = new ArrayList();
+			Map<String,Object> column = null;
+			List<Object> datas = new ArrayList();
+			Map<String,Object> data = null;
+			Map<String,Object> mapChildColumnInfo = null;
+			List<Object> childColumns = null;
+			KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+			while (kqReportFieldComInfo.next()){
+				if(Util.null2String(kqReportFieldComInfo.getParentid()).length()>0)continue;
+				boolean isDaily = kqReportFieldComInfo.getReportType().equals("daily");
+				if(!kqReportFieldComInfo.getReportType().equals("all") && !isDaily)continue;
+				if("leave".equalsIgnoreCase(kqReportFieldComInfo.getFieldname())&&leaveRules.size()==0){
+					continue;
+				}
+				column = new HashMap();
+				column.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()));
+				column.put("unit", KQReportBiz.getUnitType(kqReportFieldComInfo, user));
+				column.put("dataIndex", kqReportFieldComInfo.getFieldname());
+				column.put("key", kqReportFieldComInfo.getFieldname());
+				mapChildColumnInfo = this.getChildColumnsInfo(kqReportFieldComInfo.getFieldname(),user);
+				childColumns = (List<Object>)mapChildColumnInfo.get("childColumns");
+				if(childColumns.size()>0) {//跨列width取子列的width
+					column.put("rowSpan", 1);
+					column.put("width", mapChildColumnInfo.get("sumChildColumnWidth"));
+					column.put("children", childColumns);
+				}else{
+					column.put("rowSpan", 3);
+					column.put("width", Util.getIntValue(kqReportFieldComInfo.getWidth()));
+				}
+				if(kqReportFieldComInfo.getReportType1().equals("daily")){
+				  column.put("isdaily", "1");
+				}
+				column.put("showDetial",kqReportFieldComInfo.getShowDetial());
+				columns.add(column);
+			}
+
+//			String today = DateUtil.getCurrentDate();
+//			if(DateUtil.compDate(today, toDate)>0){//结束如期不大于今天
+//				toDate = today;
+//        if(DateUtil.compDate(today, fromDate)>0){
+//          fromDate = today;
+//        }
+//			}
+			String forgotBeginWorkCheck_field = " b.forgotbeginworkcheck ";
+
+			if(rs.getDBType().equalsIgnoreCase("oracle")&&!Util.null2String(rs.getOrgindbtype()).equals("dm")&&!Util.null2String(rs.getOrgindbtype()).equals("st")&&!Util.null2String(rs.getOrgindbtype()).equals("jc")) {
+				forgotBeginWorkCheck_field = " nvl(b.forgotBeginWorkCheck,0)  ";
+			}else if((rs.getDBType()).equalsIgnoreCase("mysql")){
+				forgotBeginWorkCheck_field = " ifnull(b.forgotBeginWorkCheck,0) ";
+			}else {
+				forgotBeginWorkCheck_field = " isnull(b.forgotBeginWorkCheck,0) ";
+			}
+
+			String backFields = " a.id,a.lastname,a.subcompanyid1 as subcompanyid,a.departmentid, a.workcode,b.jobtitle,a.dsporder," +
+													" b.kqdate, b.workdays,b.workMins,b.serialid, b.attendancedays,b.attendanceMins," +
+													" b.beLate,b.beLateMins,b.graveBeLate,b.graveBeLateMins,b.leaveEearly,b.leaveEarlyMins," +
+													" b.signdays,b.signmins, "+
+													" b.graveLeaveEarly,b.graveLeaveEarlyMins,b.absenteeism ,b.absenteeismMins ,(b.forgotCheck+"+forgotBeginWorkCheck_field+") forgotCheck ";
+			String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
+			String sqlWhere = rightSql;
+			if(subCompanyId.length()>0){
+				sqlWhere +=" and a.subcompanyid1 in("+subCompanyId+") ";
+			}
+
+			if(departmentId.length()>0){
+				sqlWhere +=" and a.departmentid in("+departmentId+") ";
+			}
+
+			if(resourceId.length()>0){
+				sqlWhere +=" and a.id in("+resourceId+") ";
+			}
+
+			if(viewScope.equals("4")){//我的下属
+				if(allLevel.equals("1")){//所有下属
+					sqlWhere+=" and a.managerstr like '%,"+user.getUID()+",%'";
+				}else{
+					sqlWhere+=" and a.managerid="+user.getUID();//直接下属
+				}
+			}
+			if (!"1".equals(isNoAccount)) {
+				sqlWhere += " and a.loginid is not null "+(rs.getDBType().equals("oracle")?"":" and a.loginid<>'' ");
+			}
+			if(status.length()>0){
+				if (!status.equals("8") && !status.equals("9")) {
+				  sqlWhere += " and a.status = "+status+ "";
+				}else if (status.equals("8")) {
+				  sqlWhere += " and (a.status = 0 or a.status = 1 or a.status = 2 or a.status = 3) ";
+				}
+			}
+
+			sql = " select count(*) as c from ( select 1 as c "+sqlFrom+sqlWhere+") t";
+			rs.execute(sql);
+			if (rs.next()){
+				count = rs.getInt("c");
+			}
+
+			if (count <= 0) {
+				pageCount = 0;
+			}
+
+			pageCount = count / pageSize + ((count % pageSize > 0) ? 1 : 0);
+
+			isHaveNext = (pageIndex + 1 <= pageCount) ? 1 : 0;
+
+			isHavePre = (pageIndex - 1 >= 1) ? 1 : 0;
+
+			String orderBy = " order by a.dsporder asc, a.lastname asc, b.kqdate asc ";
+			String descOrderBy = " order by a.dsporder desc, a.lastname desc, b.kqdate desc ";
+			sql = backFields + sqlFrom  + sqlWhere + orderBy;
+
+			if (pageIndex > 0 && pageSize > 0) {
+				if (rs.getDBType().equals("oracle")) {
+					sql = " select " + sql;
+					sql = "select * from ( select row_.*, rownum rownum_ from ( " + sql + " ) row_ where rownum <= "
+									+ (pageIndex * pageSize) + ") where rownum_ > " + ((pageIndex - 1) * pageSize);
+				} else if (rs.getDBType().equals("mysql")) {
+					sql = " select " + sql;
+					sql = "select t1.* from (" + sql + ") t1 limit " + ((pageIndex - 1) * pageSize) + "," + pageSize;
+				}
+				else if (rs.getDBType().equals("postgresql")) {
+					sql = " select " + sql;
+					sql = "select t1.* from (" + sql + ") t1 limit " + pageSize+ " offset " + ((pageIndex - 1) * pageSize);
+				}
+				else {
+					orderBy = " order by dsporder asc, lastname asc, kqdate asc ";
+					descOrderBy = " order by dsporder desc, lastname desc, kqdate desc ";
+					if (pageIndex > 1) {
+						int topSize = pageSize;
+						if (pageSize * pageIndex > count) {
+							topSize = count - (pageSize * (pageIndex - 1));
+						}
+						sql = " select top " + topSize + " * from ( select top  " + topSize + " * from ( select top "
+										+ (pageIndex * pageSize) + sql+" ) tbltemp1 " + descOrderBy + ") tbltemp2 " + orderBy;
+					} else {
+						sql = " select top " + pageSize + sql;
+					}
+				}
+			} else {
+				sql = " select " + sql;
+			}
+      		Map<String,Object> flowData = kqReportBiz.getDailyFlowData(params,user);
+
+			// #1475814-概述：满足考勤报分部部门显示及导出时显示全路径
+			String fullPathMainKey = "show_full_path";
+			KQSettingsComInfo kqSettingsComInfo = new KQSettingsComInfo();
+			String isShowFullPath = Util.null2String(kqSettingsComInfo.getMain_val(fullPathMainKey),"0");
+
+			rs.execute(sql);
+			while (rs.next()) {
+				String id = rs.getString("id");
+				String kqdate = rs.getString("kqdate");
+				WorkTimeEntity workTime = kqWorkTime.getWorkTime(id, kqdate);
+				data = new HashMap<>();
+				kqReportFieldComInfo.setTofirstRow();
+				while (kqReportFieldComInfo.next()) {
+					if (!Util.null2String(kqReportFieldComInfo.getIsdataColumn()).equals("1")) continue;
+					if (!kqReportFieldComInfo.getReportType().equals("all") && !kqReportFieldComInfo.getReportType().equals("daily"))
+						continue;
+					String fieldName = kqReportFieldComInfo.getFieldname();
+					String fieldValue = "";
+					if (fieldName.equals("subcompany")) {
+						String fieldValueID = rs.getString("subcompanyid");
+						fieldValue = "1".equals(isShowFullPath) ?
+								SubCompanyComInfo.getSubcompanyRealPath(fieldValueID, "/", "0") :
+								subCompanyComInfo.getSubCompanyname(fieldValueID);
+
+						//fieldValue = subCompanyComInfo.getSubCompanyname(fieldValueID);
+
+						if (fieldValue.length() == 0) {
+							fieldValueID = resourceComInfo.getSubCompanyID(id);
+
+							fieldValue = "1".equals(isShowFullPath) ?
+									SubCompanyComInfo.getSubcompanyRealPath(fieldValueID, "/", "0") :
+									subCompanyComInfo.getSubCompanyname(fieldValueID);
+
+							// fieldValue = subCompanyComInfo.getSubCompanyname(fieldValueID);
+						}
+						data.put(fieldName + "Id", fieldValueID);
+						data.put(fieldName, fieldValue);
+					} else if (fieldName.equals("department")) {
+						String fieldValueID = rs.getString("departmentid");
+						fieldValue = "1".equals(isShowFullPath) ?
+								departmentComInfo.getDepartmentRealPath(fieldValueID, "/", "0") :
+								departmentComInfo.getDepartmentname(fieldValueID);
+						//fieldValue = departmentComInfo.getDepartmentname(fieldValueID);
+
+						if (fieldValue.length() == 0) {
+							fieldValueID = resourceComInfo.getDepartmentID(id);
+
+							fieldValue = "1".equals(isShowFullPath) ?
+									departmentComInfo.getDepartmentRealPath(fieldValueID, "/", "0") :
+									departmentComInfo.getDepartmentname(fieldValueID);
+
+							// fieldValue = departmentComInfo.getDepartmentname(fieldValueID);
+						}
+						data.put(fieldName + "Id", fieldValueID);
+						data.put(fieldName, fieldValue);
+					} else if (fieldName.equals("jobtitle")) {
+						String fieldValueID = rs.getString("jobtitle");
+						fieldValue = jobTitlesComInfo.getJobTitlesname(rs.getString("jobtitle"));
+						if (fieldValue.length() == 0) {
+							fieldValueID = resourceComInfo.getJobTitle(id);
+							fieldValue = jobTitlesComInfo.getJobTitlesname(fieldValueID);
+						}
+						data.put(fieldName + "Id", fieldValueID);
+						data.put(fieldName, fieldValue);
+					} else if (kqReportFieldComInfo.getParentid().equals("overtime") || kqReportFieldComInfo.getParentid().equals("overtime_nonleave")
+									|| kqReportFieldComInfo.getParentid().equals("overtime_4leave") || fieldName.equals("businessLeave") || fieldName.equals("officialBusiness")) {
+						if (fieldName.equals("overtimeTotal")) {
+							double workingDayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id + "|" + kqdate + "|workingDayOvertime_4leave")));
+							workingDayOvertime_4leave = workingDayOvertime_4leave < 0 ? 0 : workingDayOvertime_4leave;
+							double restDayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id + "|" + kqdate + "|restDayOvertime_4leave")));
+							restDayOvertime_4leave = restDayOvertime_4leave < 0 ? 0 : restDayOvertime_4leave;
+							double holidayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id + "|" + kqdate + "|holidayOvertime_4leave")));
+							holidayOvertime_4leave = holidayOvertime_4leave < 0 ? 0 : holidayOvertime_4leave;
+
+							double workingDayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id + "|" + kqdate + "|workingDayOvertime_nonleave")));
+							workingDayOvertime_nonleave = workingDayOvertime_nonleave < 0 ? 0 : workingDayOvertime_nonleave;
+							double restDayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id + "|" + kqdate + "|restDayOvertime_nonleave")));
+							restDayOvertime_nonleave = restDayOvertime_nonleave < 0 ? 0 : restDayOvertime_nonleave;
+							double holidayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id + "|" + kqdate + "|holidayOvertime_nonleave")));
+							holidayOvertime_nonleave = holidayOvertime_nonleave < 0 ? 0 : holidayOvertime_nonleave;
+
+							fieldValue = KQDurationCalculatorUtil.getDurationRound(String.valueOf(workingDayOvertime_4leave + restDayOvertime_4leave + holidayOvertime_4leave +
+											workingDayOvertime_nonleave + restDayOvertime_nonleave + holidayOvertime_nonleave));
+						} else {
+							fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id + "|" + kqdate + "|" + fieldName)));
+						}
+						data.put(fieldName, fieldValue);
+					} else if (fieldName.equals("serialid")) {
+						fieldValue = Util.null2String(rs.getString(fieldName));
+						if (fieldValue.length()>0) {//弹性工作制没有班次
+							data.put("serialid", shiftManagementToolKit.getShiftOnOffWorkSections(fieldValue, user.getLanguage()));
+						}
+					}else {
+						fieldValue = Util.null2String(rs.getString(fieldName));
+						if (kqReportFieldComInfo.getUnittype().equals("2") && fieldValue.length() > 0) {
+							fieldValue = KQDurationCalculatorUtil.getDurationRound(("" + (Util.getDoubleValue(fieldValue) / 60.0)));
+						}
+						data.put(fieldName, fieldValue);
+					}
+				}
+        		data.putAll(this.getSignDetailInfo(id, kqdate));
+
+				//请假
+				List<Map<String, Object>> allLeaveRules = KQLeaveRulesBiz.getAllLeaveRules();
+				Map<String, Object> leaveRule = null;
+				for (int i = 0; allLeaveRules != null && i < allLeaveRules.size(); i++) {
+					leaveRule = (Map<String, Object>) allLeaveRules.get(i);
+					String flowType = Util.null2String("leaveType_" + leaveRule.get("id"));
+					String leaveData = Util.null2String(flowData.get(id + "|" + kqdate + "|" + flowType));
+					String flowLeaveBackType = Util.null2String("leavebackType_" + leaveRule.get("id"));
+					String leavebackData = Util.null2s(Util.null2String(flowData.get(id + "|" + kqdate + "|" + flowLeaveBackType)), "0.0");
+					String b_flowLeaveData = "";
+					String flowLeaveData = "";
+					try {
+						//以防止出现精度问题
+						if (leaveData.length() == 0) {
+							leaveData = "0.0";
+						}
+						if (leavebackData.length() == 0) {
+							leavebackData = "0.0";
+						}
+						BigDecimal b_leaveData = new BigDecimal(leaveData);
+						BigDecimal b_leavebackData = new BigDecimal(leavebackData);
+						b_flowLeaveData = b_leaveData.subtract(b_leavebackData).toString();
+						if(Util.getDoubleValue(b_flowLeaveData, -1) < 0){
+						  b_flowLeaveData = "0.0";
+						}
+				
+					} catch (Exception e) {
+						kqLog.info("GetKQReportCmd:leaveData" + leaveData + ":leavebackData:" + leavebackData + ":" + e);
+					}
+
+					//考虑下冻结的数据
+					if (b_flowLeaveData.length() > 0) {
+						flowLeaveData = KQDurationCalculatorUtil.getDurationRound(b_flowLeaveData);
+					} else {
+						flowLeaveData = KQDurationCalculatorUtil.getDurationRound(Util.null2String(Util.getDoubleValue(leaveData, 0.0) - Util.getDoubleValue(leavebackData, 0.0)));
+					}
+					data.put(flowType, flowLeaveData);
+				}
+
+				data.put("resourceId", id);
+				data.put("kqdate", kqdate);
+				datas.add(data);
+			}
+
+			List<Object> lsHolidays = KQHolidaySetBiz.getHolidaySetListByScope(""+user.getUID(),fromDate,toDate);
+			retmap.put("holidays", lsHolidays);
+			retmap.put("columns",columns);
+			retmap.put("datas",datas);
+			retmap.put("pagesize", pageSize);
+			retmap.put("pageindex", pageIndex);
+			retmap.put("count", count);
+			retmap.put("pagecount", pageCount);
+			retmap.put("ishavepre", isHavePre);
+			retmap.put("ishavenext", isHaveNext);
+		}catch (Exception e){
+			writeLog(e);
+		}
+		return retmap;
+	}
+
+
+	private String getUnitType(String unitType, User user){
+		String unitTypeName = "";
+		if(Util.null2String(unitType).length()>0){
+			if(unitType.equals("1")){
+				unitTypeName=SystemEnv.getHtmlLabelName(1925, user.getLanguage());
+			}else if(unitType.equals("2")){
+				unitTypeName=SystemEnv.getHtmlLabelName(391, user.getLanguage());
+			}else if(unitType.equals("3")){
+				unitTypeName=SystemEnv.getHtmlLabelName(18083, user.getLanguage());
+			}
+		}
+		return unitTypeName;
+	}
+
+	private Map<String,Object> getChildColumnsInfo(String parentid, User user){
+		Map<String,Object> returnMap = new HashMap<>();
+		List<Object> lsChildColumns = new ArrayList<>();
+		Map column = null;
+		int sumChildColumnWidth = 0;
+		if(parentid.equals("leave")){
+			KQLeaveRulesBiz kqLeaveRulesBiz = new KQLeaveRulesBiz();
+			List<Map<String, Object>> leaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+			for(int i=0;leaveRules!=null&&i<leaveRules.size();i++){
+				Map<String, Object> leaveRule = leaveRules.get(i);
+				String id = "leaveType_"+Util.null2String(leaveRule.get("id"));
+				String name = Util.null2String(leaveRule.get("name"));
+				String unitType = Util.null2String(leaveRule.get("unitType"));
+				column = new HashMap();
+				column.put("title", name);
+				column.put("unit", KQUnitBiz.isLeaveHour(unitType) ?SystemEnv.getHtmlLabelName(391, user.getLanguage()):SystemEnv.getHtmlLabelName(1925, user.getLanguage()));
+				column.put("width", 65);
+				column.put("dataIndex", id);
+				column.put("key", id);
+				column.put("rowSpan", 2);
+				column.put("colSpan", 1);
+				column.put("showDetial","1");
+				sumChildColumnWidth+=65;
+				lsChildColumns.add(column);
+			}
+    }else if(parentid.equals("overtime")){
+      String[] overtimeChild = {"overtime_nonleave","overtime_4leave","overtimeTotal"};
+      for(int i=0;i<overtimeChild.length;i++){
+        String id = overtimeChild[i];
+        column = new HashMap();
+        String fieldlabel = "";
+        column.put("unit", "");
+        if("overtime_nonleave".equalsIgnoreCase(id)){
+          fieldlabel = "125805";
+        }else if("overtime_4leave".equalsIgnoreCase(id)){
+          fieldlabel = "125804";
+        }else{
+          fieldlabel = "523";
+          column.put("showDetial","1");
+          String unitType = (KQOvertimeRulesBiz.getMinimumUnit()==3 || KQOvertimeRulesBiz.getMinimumUnit()==5 ||KQOvertimeRulesBiz.getMinimumUnit()==6)?"2":"1";
+          String unitTypeName = "";
+          if(Util.null2String(unitType).length()>0){
+            if(unitType.equals("1")){
+              unitTypeName=SystemEnv.getHtmlLabelName(1925, user.getLanguage());
+            }else if(unitType.equals("2")){
+              unitTypeName=SystemEnv.getHtmlLabelName(391, user.getLanguage());
+            }else if(unitType.equals("3")){
+              unitTypeName=SystemEnv.getHtmlLabelName(18083, user.getLanguage());
+            }
+          }
+          column.put("unit", unitTypeName);
+        }
+        column.put("title", SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage()));
+        column.put("dataIndex", id);
+        column.put("key", id);
+        column.put("rowSpan", 1);
+        Map<String,Object> mapChildColumnInfo = getChildColumnsInfo(id, user);
+        int childWidth = 65;
+        List<Object> childColumns = (List<Object>)mapChildColumnInfo.get("childColumns");
+        if(childColumns.size()>0) {//跨列width取子列的width
+          column.put("children", childColumns);
+          childWidth = Util.getIntValue(Util.null2String(mapChildColumnInfo.get("sumChildColumnWidth")),65);
+        }
+        column.put("width", childWidth+"");
+        sumChildColumnWidth+=childWidth;
+        lsChildColumns.add(column);
+      }
+    }else{
+      KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+      while (kqReportFieldComInfo.next()){
+        if(kqReportFieldComInfo.getParentid().equals(parentid)) {
+        	if(!kqReportFieldComInfo.getReportType().equals("daily"))continue;
+          column = new HashMap();
+          column.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()));
+					column.put("unit", KQReportBiz.getUnitType(kqReportFieldComInfo, user));
+          column.put("width", Util.getIntValue(kqReportFieldComInfo.getWidth()));
+          column.put("dataIndex", kqReportFieldComInfo.getFieldname());
+          column.put("key", kqReportFieldComInfo.getFieldname());
+          column.put("rowSpan", 2);
+          column.put("colSpan", 1);
+          column.put("isdaily", kqReportFieldComInfo.getReportType1().equals("daily")?"1":"0");
+          sumChildColumnWidth+=Util.getIntValue(kqReportFieldComInfo.getWidth());
+          lsChildColumns.add(column);
+        }
+      }
+    }
+		returnMap.put("childColumns",lsChildColumns);
+		returnMap.put("sumChildColumnWidth",sumChildColumnWidth);
+		return returnMap;
+	}
+
+	public Map<String, Object> getSignDetailInfo(String resourceId, String kqDate){
+		Map<String, Object> data = new HashMap<>();
+		Map<String,Object> signStatusInfo = null;
+		RecordSet rs = new RecordSet();
+		String sql = "";
+		KQTimesArrayComInfo kqTimesArrayComInfo = new KQTimesArrayComInfo();
+		try{
+			sql = " select kqdate,resourceid,serialid,serialnumber,workbegindate,workbegintime, " +
+							" workenddate,workendtime,workmins,signindate,signintime,signoutdate,signouttime, \n" +
+							" attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins,forgotBeginWorkCheckMins," +
+							" leaveMins,leaveInfo,evectionMins,outMins,signinid,signoutid \n" +
+							" from kq_format_detail b \n" +
+							" where resourceid = " + resourceId + " and kqdate ='" + kqDate + "' \n" +
+							" order by serialnumber \n";
+			rs.execute(sql);
+			while (rs.next()) {
+				String resourceid = Util.null2String(rs.getString("resourceid"));
+				String kqdate = Util.null2String(rs.getString("kqdate"));
+				String serialid = Util.null2String(rs.getString("serialid"));
+				int serialnumber  = rs.getInt("serialnumber")+1;
+				String workbegindate = Util.null2String(rs.getString("workbegindate")).trim();
+				String workbegintime = Util.null2String(rs.getString("workbegintime")).trim();
+				String workenddate = Util.null2String(rs.getString("workenddate")).trim();
+				String workendtime = Util.null2String(rs.getString("workendtime")).trim();
+				int workMins = rs.getInt("workMins");
+				String signintime = Util.null2String(rs.getString("signintime")).trim();
+				String signouttime = Util.null2String(rs.getString("signouttime")).trim();
+				int attendanceMins = rs.getInt("attendanceMins");
+				String beLateMins = Util.null2String(rs.getString("beLateMins")).trim();
+				String graveBeLateMins = Util.null2String(rs.getString("graveBeLateMins")).trim();
+				String leaveEarlyMins= Util.null2String(rs.getString("leaveEarlyMins")).trim();
+				String graveLeaveEarlyMins= Util.null2String(rs.getString("graveLeaveEarlyMins")).trim();
+				String absenteeismMins= Util.null2String(rs.getString("absenteeismMins")).trim();
+				String forgotCheckMins = Util.null2String(rs.getString("forgotcheckMins")).trim();
+				String forgotBeginWorkCheckMins = Util.null2String(rs.getString("forgotBeginWorkCheckMins")).trim();
+        String signinid = Util.null2String(rs.getString("signinid")).trim();
+        String signoutid = Util.null2String(rs.getString("signoutid")).trim();
+				int leaveMins = rs.getInt("leaveMins");
+				String leaveInfo = Util.null2String(rs.getString("leaveInfo"));
+				int evectionMins = rs.getInt("evectionMins");
+				int outMins = rs.getInt("outMins");
+
+
+				if(serialid.length()>0){
+					if (workbegintime.length() > 0) {
+						signStatusInfo = new HashMap();
+						signStatusInfo.put("workdate",workbegindate);
+						signStatusInfo.put("worktime",workbegintime);
+						signStatusInfo.put("beLateMins",beLateMins);
+            signStatusInfo.put("forgotBeginWorkCheckMins",forgotBeginWorkCheckMins);
+						signStatusInfo.put("graveBeLateMins",graveBeLateMins);
+						signStatusInfo.put("absenteeismMins",absenteeismMins);
+						signStatusInfo.put("leaveMins",leaveMins);
+						signStatusInfo.put("leaveInfo",leaveInfo);
+						signStatusInfo.put("evectionMins",evectionMins);
+						signStatusInfo.put("outMins",outMins);
+
+						data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime);
+						data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
+					}
+
+					if (workendtime.length() > 0) {
+						signStatusInfo = new HashMap();
+						signStatusInfo.put("workdate",workenddate);
+						signStatusInfo.put("worktime",kqTimesArrayComInfo.turn48to24Time(workendtime));
+						signStatusInfo.put("leaveEarlyMins",leaveEarlyMins);
+						signStatusInfo.put("graveLeaveEarlyMins",graveLeaveEarlyMins);
+						signStatusInfo.put("forgotCheckMins",forgotCheckMins);
+						signStatusInfo.put("forgotBeginWorkCheckMins",forgotBeginWorkCheckMins);
+						signStatusInfo.put("absenteeismMins",absenteeismMins);
+						signStatusInfo.put("leaveMins",leaveMins);
+						signStatusInfo.put("leaveInfo",leaveInfo);
+						signStatusInfo.put("evectionMins",evectionMins);
+						signStatusInfo.put("outMins",outMins);
+
+						data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime);
+						data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off"));
+					}
+				}else{
+					if(workMins>0){
+					//弹性工时打卡时间取自签到签退数据
+					}
+          signStatusInfo = new HashMap();
+          signStatusInfo.put("leaveMins",leaveMins);
+          signStatusInfo.put("leaveInfo",leaveInfo);
+          signStatusInfo.put("evectionMins",evectionMins);
+          signStatusInfo.put("outMins",outMins);
+
+          if(signinid.length() > 0){
+            data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime);
+            data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
+            if(signoutid.length() > 0){
+              data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime);
+              data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off"));
+            }
+          }else{
+            data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
+          }
+				}
+			}
+		}catch (Exception e){
+			writeLog(e);
+		}
+		return data;
+	}
+
+	@Override
+	public BizLogContext getLogContext() {
+		return null;
+	}
+
+}

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

@@ -0,0 +1,647 @@
+package com.engine.kq.cmd.report;
+
+import com.alibaba.fastjson.JSON;
+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.log.KQLog;
+import com.engine.kq.util.KQDurationCalculatorUtil;
+import com.engine.kq.util.PageUidFactory;
+import weaver.common.DateUtil;
+import weaver.conn.RecordSet;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.job.JobTitlesComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.systeminfo.SystemEnv;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
+
+	public GetKQReportCmd(Map<String, Object> params, User user) {
+		this.user = user;
+		this.params = params;
+	}
+
+	@Override
+	public Map<String, Object> execute(CommandContext commandContext) {
+		Map<String,Object> retmap = new HashMap<String,Object>();
+		RecordSet rs = new RecordSet();
+		String sql = "";
+		try{
+			String pageUid = PageUidFactory.getHrmPageUid("KQReport");
+
+			SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+		  DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+			ResourceComInfo resourceComInfo = new ResourceComInfo();
+			JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo();
+			KQLeaveRulesBiz kqLeaveRulesBiz = new KQLeaveRulesBiz();
+			KQReportBiz kqReportBiz = new KQReportBiz();
+
+			JSONObject jsonObj = JSON.parseObject(Util.null2String(params.get("data")));
+			String attendanceSerial = Util.null2String(jsonObj.get("attendanceSerial"));
+			String fromDate = Util.null2String(jsonObj.get("fromDate"));
+			String toDate = Util.null2String(jsonObj.get("toDate"));
+			String typeselect =Util.null2String(jsonObj.get("typeselect"));
+			if(typeselect.length()==0)typeselect = "3";
+			if(!typeselect.equals("") && !typeselect.equals("0")&& !typeselect.equals("6")){
+				if(typeselect.equals("1")){
+					fromDate = TimeUtil.getCurrentDateString();
+					toDate = TimeUtil.getCurrentDateString();
+				}else{
+					fromDate = TimeUtil.getDateByOption(typeselect,"0");
+					toDate = TimeUtil.getDateByOption(typeselect,"1");
+				}
+			}
+			//人员状态
+			String status = Util.null2String(jsonObj.get("status"));
+			String subCompanyId = Util.null2String(jsonObj.get("subCompanyId"));
+			String departmentId = Util.null2String(jsonObj.get("departmentId"));
+			String resourceId = Util.null2String(jsonObj.get("resourceId"));
+			String allLevel = Util.null2String(jsonObj.get("allLevel"));
+			String isNoAccount = Util.null2String(jsonObj.get("isNoAccount"));
+			String viewScope = Util.null2String(jsonObj.get("viewScope"));
+			String isFromMyAttendance = Util.null2String(jsonObj.get("isFromMyAttendance"));//是否是来自我的考勤的请求，如果是，不加载考勤报表权限共享的限制，不然我的考勤会提示无权限
+			int pageIndex = Util.getIntValue(Util.null2String(jsonObj.get("pageIndex")), 1);
+			int pageSize =  KQReportBiz.getPageSize(Util.null2String(jsonObj.get("pageSize")),pageUid,user.getUID());
+			int count = 0;
+			int pageCount = 0;
+			int isHavePre = 0;
+			int isHaveNext = 0;
+
+
+			String rightSql = kqReportBiz.getReportRight("1",""+user.getUID(),"a");
+			if(isFromMyAttendance.equals("1")){
+				rightSql = "";
+			}
+
+			List<Map<String, Object>> leaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+			List<Object> columns = new ArrayList();
+			Map<String,Object> column = null;
+			List<Object> datas = new ArrayList();
+			Map<String,Object> data = null;
+			Map<String,Object> mapChildColumnInfo = null;
+			List<Object> childColumns = null;
+			KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+			while (kqReportFieldComInfo.next()){
+				if(Util.null2String(kqReportFieldComInfo.getParentid()).length()>0)continue;
+				if(kqReportFieldComInfo.getFieldname().equals("kqCalendar"))continue;
+				if(KQReportFieldComInfo.cascadekey2fieldname.keySet().contains(kqReportFieldComInfo.getFieldname()))continue;
+				if(!kqReportFieldComInfo.getReportType().equals("all") && !kqReportFieldComInfo.getReportType().equals("month"))continue;
+				if("leave".equalsIgnoreCase(kqReportFieldComInfo.getFieldname())&&leaveRules.size()==0)continue;
+
+				column = new HashMap();
+				column.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()));
+				column.put("unit", KQReportBiz.getUnitType(kqReportFieldComInfo, user));
+				column.put("dataIndex", kqReportFieldComInfo.getFieldname());
+				column.put("type", kqReportFieldComInfo.getFieldname());
+				column.put("key", kqReportFieldComInfo.getFieldname());
+				column.put("isSystem", kqReportFieldComInfo.getIsSystem());
+				mapChildColumnInfo = this.getChildColumnsInfo(kqReportFieldComInfo.getFieldname(),user);
+				childColumns = (List<Object>)mapChildColumnInfo.get("childColumns");
+				if(childColumns.size()>0) {//跨列width取子列的width
+					column.put("rowSpan", 1);
+					column.put("width", mapChildColumnInfo.get("sumChildColumnWidth"));
+					column.put("children", childColumns);
+				}else{
+					column.put("rowSpan", 3);
+					column.put("width", Util.getIntValue(kqReportFieldComInfo.getWidth()));
+				}
+				column.put("showDetial",kqReportFieldComInfo.getShowDetial());
+				columns.add(column);
+				columns.addAll(this.getCascadeKeyColumnsInfo(kqReportFieldComInfo.getCascadekey(),user));
+			}
+
+			boolean isEnd = false;
+			Calendar cal = DateUtil.getCalendar();
+			String today = DateUtil.getCurrentDate();
+//			if(DateUtil.compDate(today, toDate)>0){//结束日期不大于今天
+//				toDate = today;
+//				if(DateUtil.compDate(today, fromDate)>0){//结束日期不大于今天
+//          fromDate = today;
+//        }
+//			}
+
+			childColumns = new ArrayList<>();
+			for(String date=fromDate; !isEnd;) {
+				if(date.equals(toDate)) isEnd = true;
+				column = new HashMap();
+				column.put("title", DateUtil.geDayOfMonth(date));
+				column.put("dataIndex", date);
+				column.put("key", date);
+				column.put("type", date);
+				column.put("rowSpan", 1);
+				column.put("width", 90);
+				column.put("isCalendar", 1);
+				childColumns.add(column);
+				cal.setTime(DateUtil.parseToDate(date));
+				date = DateUtil.getDate(cal.getTime(), 1);
+			}
+
+			column = new HashMap();
+			column.put("title", SystemEnv.getHtmlLabelName(386476, user.getLanguage()));
+			column.put("dataIndex", "kqCalendar");
+			column.put("key", "kqCalendar");
+			if(childColumns.size()>0) {//跨列width取子列的width
+				column.put("rowSpan", 1);
+				column.put("width", childColumns.size()*90);
+				column.put("children", childColumns);
+			}
+			columns.add(column);
+
+			String forgotBeginWorkCheck_field = " sum(b.forgotBeginWorkCheck) ";
+
+      if(rs.getDBType().equalsIgnoreCase("oracle")) {
+        forgotBeginWorkCheck_field = " sum(nvl(b.forgotBeginWorkCheck,0))  ";
+      }else if((rs.getDBType()).equalsIgnoreCase("mysql")){
+        forgotBeginWorkCheck_field = " sum(ifnull(b.forgotBeginWorkCheck,0)) ";
+      }else {
+        forgotBeginWorkCheck_field = " sum(isnull(b.forgotBeginWorkCheck,0)) ";
+      }
+
+			Map<String,Object> definedFieldInfo = new KQFormatBiz().getDefinedField();
+			String definedFieldSum = Util.null2String(definedFieldInfo.get("definedFieldSum"));
+
+			String backFields = " a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1 as subcompanyid,a.departmentid,a.jobtitle," +
+													" sum(b.workdays) as workdays,sum(b.workMins) as workMins,sum(b.attendancedays) as attendancedays," +
+													" sum(b.attendanceMins) as attendanceMins,sum(b.beLate) as beLate,sum(b.beLateMins) as beLateMins, " +
+													" sum(b.graveBeLate) as graveBeLate, sum(b.graveBeLateMins) as graveBeLateMins,sum(b.leaveEearly) as leaveEearly," +
+													" sum(b.leaveEarlyMins) as leaveEarlyMins, sum(b.graveLeaveEarly) as graveLeaveEarly, " +
+												  " sum(b.graveLeaveEarlyMins) as graveLeaveEarlyMins,sum(b.absenteeism) as absenteeism, " +
+													" sum(b.signdays) as signdays,sum(b.signmins) as signmins, "+
+													" sum(b.absenteeismMins) as absenteeismMins, sum(b.forgotCheck)+"+forgotBeginWorkCheck_field+" as forgotCheck "+(definedFieldSum.length()>0?","+definedFieldSum+"":"");
+
+			if(rs.getDBType().equals("oracle")){
+				backFields = 	"/*+ index(kq_format_total IDX_KQ_FORMAT_TOTAL_KQDATE) */ "+backFields;
+			}
+			String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
+			String sqlWhere = rightSql;
+			String groupBy = " group by a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1,a.departmentid,a.jobtitle ";
+			if(subCompanyId.length()>0){
+				sqlWhere +=" and a.subcompanyid1 in("+subCompanyId+") ";
+			}
+
+			if(departmentId.length()>0){
+				sqlWhere +=" and a.departmentid in("+departmentId+") ";
+			}
+
+			if(resourceId.length()>0){
+				sqlWhere +=" and a.id in("+resourceId+") ";
+			}
+
+			if(viewScope.equals("4")){//我的下属
+				if(allLevel.equals("1")){//所有下属
+					sqlWhere+=" and a.managerstr like '%,"+user.getUID()+",%'";
+				}else{
+					sqlWhere+=" and a.managerid="+user.getUID();//直接下属
+				}
+			}
+			if (!"1".equals(isNoAccount)) {
+				sqlWhere += " and a.loginid is not null "+(rs.getDBType().equals("oracle")?"":" and a.loginid<>'' ");
+			}
+
+      if(status.length()>0){
+        if (!status.equals("8") && !status.equals("9")) {
+          sqlWhere += " and a.status = "+status+ "";
+        }else if (status.equals("8")) {
+          sqlWhere += " and (a.status = 0 or a.status = 1 or a.status = 2 or a.status = 3) ";
+        }
+      }
+
+			sql = " select count(*) as c from ( select 1 as c "+sqlFrom+sqlWhere+groupBy+") t";
+			rs.execute(sql);
+			if (rs.next()){
+				count = rs.getInt("c");
+			}
+
+			if (count <= 0) {
+				pageCount = 0;
+			}
+
+			pageCount = count / pageSize + ((count % pageSize > 0) ? 1 : 0);
+
+			isHaveNext = (pageIndex + 1 <= pageCount) ? 1 : 0;
+
+			isHavePre = (pageIndex - 1 >= 1) ? 1 : 0;
+
+			String orderBy = " order by t.dsporder asc, t.lastname asc ";
+			String descOrderBy = " order by t.dsporder desc, t.lastname desc ";
+
+			//默认排序设置 start，有性能问题，先取消，后面再看看有没有好的方式
+//			String orderBySql = "select * from kq_report_order where userId=? and sort=1 order by orders";
+//			rs.executeQuery(orderBySql, user.getUID());
+//			if (rs.getCounts() <= 0) {
+//				orderBySql = "select * from kq_report_order where userId=0 and sort=1 order by orders";
+//				rs.executeQuery(orderBySql);
+//			}
+//			while (rs.next()) {
+//				String dataIndex = rs.getString("dataIndex");
+//				String ascOrDesc = rs.getString("ascOrDesc");
+//				String ascOrDesc1 = (ascOrDesc.equals("")||ascOrDesc.equals("asc"))?"desc":"asc";
+//				if (dataIndex.equals("organization")) {
+//					orderBy += ",showOrderOfDeptTree " + ascOrDesc + ",dept_id " + ascOrDesc;
+//					descOrderBy += ",showOrderOfDeptTree " + ascOrDesc1 + ",dept_id " + ascOrDesc1;
+//				}
+//				if (dataIndex.equalsIgnoreCase("dspOrder") || dataIndex.equalsIgnoreCase("lastName")) {
+//					orderBy += "," + dataIndex + " " + ascOrDesc + ",id " + ascOrDesc;
+//					descOrderBy += "," + dataIndex + " " + ascOrDesc1 + ",id " + ascOrDesc1;
+//				} else if (dataIndex.equalsIgnoreCase("deptShowOrder") || dataIndex.equalsIgnoreCase("deptName")) {
+//					orderBy += "," + dataIndex + " " + ascOrDesc + ",dept_id " + ascOrDesc;
+//					descOrderBy += "," + dataIndex + " " + ascOrDesc1 + ",dept_id " + ascOrDesc1;
+//				} else if (dataIndex.equalsIgnoreCase("subcomShowOrder") || dataIndex.equalsIgnoreCase("subcomName")) {
+//					orderBy += "," + dataIndex + " " + ascOrDesc + ",subcom_id " + ascOrDesc;
+//					descOrderBy += "," + dataIndex + " " + ascOrDesc1 + ",subcom_id " + ascOrDesc1;
+//				}
+//			}
+//			orderBy = orderBy.startsWith(",") ? orderBy.substring(1) : orderBy;
+//			descOrderBy = descOrderBy.startsWith(",") ? descOrderBy.substring(1) : descOrderBy;
+//			orderBy = orderBy.equals("") ? " t.dspOrder,t.id " : orderBy;
+//			descOrderBy = descOrderBy.equals("") ? " t.dspOrder,t.id " : descOrderBy;
+//			orderBy = "order by "+orderBy;
+
+			sql = backFields + sqlFrom  + sqlWhere + groupBy;
+
+			if (pageIndex > 0 && pageSize > 0) {
+				if (rs.getDBType().equals("oracle")) {
+					sql = " select * from (select " + sql+") t "+orderBy;
+					sql = "select * from ( select row_.*, rownum rownum_ from ( " + sql + " ) row_ where rownum <= "
+						+ (pageIndex * pageSize) + ") where rownum_ > " + ((pageIndex - 1) * pageSize);
+				} else if (rs.getDBType().equals("mysql")) {
+					sql = " select * from (select " + sql+") t "+orderBy;
+					sql = "select t1.* from (" + sql + ") t1 limit " + ((pageIndex - 1) * pageSize) + "," + pageSize;
+				}
+				else if (rs.getDBType().equals("postgresql")) {
+					sql = " select * from (select " + sql+") t "+orderBy;
+					sql = "select t1.* from (" + sql + ") t1 limit " +pageSize + " offset " + ((pageIndex - 1) * pageSize);
+				}
+				else {
+					orderBy = " order by dsporder asc, lastname asc ";
+					descOrderBy = " order by dsporder desc, lastname desc ";
+					if (pageIndex > 1) {
+						int topSize = pageSize;
+						if (pageSize * pageIndex > count) {
+							topSize = count - (pageSize * (pageIndex - 1));
+						}
+						sql = " select top " + topSize + " * from ( select top  " + topSize + " * from ( select top "
+							+ (pageIndex * pageSize) + sql + orderBy+ " ) tbltemp1 " + descOrderBy + ") tbltemp2 " + orderBy;
+					} else {
+						sql = " select top " + pageSize + sql+orderBy;
+					}
+				}
+			} else {
+				sql = " select " + sql;
+			}
+
+
+			// #1475814-概述：满足考勤报分部部门显示及导出时显示全路径
+			String fullPathMainKey = "show_full_path";
+			KQSettingsComInfo kqSettingsComInfo = new KQSettingsComInfo();
+			String isShowFullPath = Util.null2String(kqSettingsComInfo.getMain_val(fullPathMainKey),"0");
+
+			String show_card_source = Util.null2String(kqSettingsComInfo.getMain_val("show_card_source"),"0");//是否显示打卡数据，以及打卡数据来源
+			params.put("show_card_source",show_card_source);
+			KQOvertimeRulesBiz kqOvertimeRulesBiz = new KQOvertimeRulesBiz();
+			int uintType = kqOvertimeRulesBiz.getMinimumUnit();//当前加班单位
+			double hoursToDay = kqOvertimeRulesBiz.getHoursToDay();//当前天跟小时计算关系
+			params.put("uintType",uintType);
+			params.put("hoursToDay",hoursToDay);
+			Map<String,Object> flowData = kqReportBiz.getFlowData(params,user);
+
+
+			rs.execute(sql);
+			while (rs.next()) {
+				data = new HashMap<>();
+				kqReportFieldComInfo.setTofirstRow();
+				String id = rs.getString("id");
+				data.put("resourceId",id);
+				while (kqReportFieldComInfo.next()){
+					if(!Util.null2String(kqReportFieldComInfo.getIsdataColumn()).equals("1"))continue;
+					if(!kqReportFieldComInfo.getReportType().equals("all") && !kqReportFieldComInfo.getReportType().equals("month"))continue;
+					if("leave".equalsIgnoreCase(kqReportFieldComInfo.getFieldname())&&leaveRules.size()==0){
+						continue;
+					}
+					String fieldName = kqReportFieldComInfo.getFieldname();
+					String fieldValue = "";
+					if(fieldName.equals("subcompany")){
+						String tmpSubcompanyId = Util.null2String(rs.getString("subcompanyid"));
+						if(tmpSubcompanyId.length()==0){
+							tmpSubcompanyId =  Util.null2String(resourceComInfo.getSubCompanyID(id));
+						}
+						data.put("subcompanyId",tmpSubcompanyId);
+
+						fieldValue = "1".equals(isShowFullPath) ?
+								SubCompanyComInfo.getSubcompanyRealPath(tmpSubcompanyId, "/", "0") :
+								subCompanyComInfo.getSubCompanyname(tmpSubcompanyId);
+
+						// fieldValue = subCompanyComInfo.getSubCompanyname(tmpSubcompanyId);
+					}else if(fieldName.equals("department")){
+						String tmpDepartmentId = Util.null2String(rs.getString("departmentid"));
+						if(tmpDepartmentId.length()==0){
+							tmpDepartmentId =  Util.null2String(resourceComInfo.getDepartmentID(id));
+						}
+						data.put("departmentId",tmpDepartmentId);
+
+						fieldValue = "1".equals(isShowFullPath) ?
+								departmentComInfo.getDepartmentRealPath(tmpDepartmentId, "/", "0") :
+								departmentComInfo.getDepartmentname(tmpDepartmentId);
+
+						// fieldValue = departmentComInfo.getDepartmentname(tmpDepartmentId);
+					}else if(fieldName.equals("jobtitle")){
+						String tmpJobtitleId = Util.null2String(rs.getString("jobtitle"));
+						if(tmpJobtitleId.length()==0){
+							tmpJobtitleId =  Util.null2String(resourceComInfo.getJobTitle(id));
+						}
+						data.put("jobtitleId",tmpJobtitleId);
+						fieldValue = jobTitlesComInfo.getJobTitlesname(tmpJobtitleId);
+					}else if(fieldName.equals("attendanceSerial")){
+						List<String> serialIds = null;
+						if(attendanceSerial.length()>0){
+							serialIds = Util.splitString2List(attendanceSerial,",");
+						}
+						for(int i=0;serialIds!=null&&i<serialIds.size();i++){
+							data.put(serialIds.get(i), kqReportBiz.getSerialCount(id,fromDate,toDate,serialIds.get(i)));
+						}
+					}else if(kqReportFieldComInfo.getParentid().equals("overtime")||kqReportFieldComInfo.getParentid().equals("overtime_nonleave")
+              ||kqReportFieldComInfo.getParentid().equals("overtime_4leave")||fieldName.equals("businessLeave") || fieldName.equals("officialBusiness")){
+						if(fieldName.equals("overtimeTotal")){
+							double workingDayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|workingDayOvertime_4leave")));
+							workingDayOvertime_4leave = workingDayOvertime_4leave<0?0:workingDayOvertime_4leave;
+							double restDayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|restDayOvertime_4leave")));
+							restDayOvertime_4leave = restDayOvertime_4leave<0?0:restDayOvertime_4leave;
+							double holidayOvertime_4leave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|holidayOvertime_4leave")));
+							holidayOvertime_4leave = holidayOvertime_4leave<0?0:holidayOvertime_4leave;
+
+              double workingDayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|workingDayOvertime_nonleave")));
+              workingDayOvertime_nonleave = workingDayOvertime_nonleave<0?0:workingDayOvertime_nonleave;
+              double restDayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|restDayOvertime_nonleave")));
+              restDayOvertime_nonleave = restDayOvertime_nonleave<0?0:restDayOvertime_nonleave;
+              double holidayOvertime_nonleave = Util.getDoubleValue(Util.null2String(flowData.get(id+"|holidayOvertime_nonleave")));
+              holidayOvertime_nonleave = holidayOvertime_nonleave<0?0:holidayOvertime_nonleave;
+
+							fieldValue = KQDurationCalculatorUtil.getDurationRound(String.valueOf(workingDayOvertime_4leave+restDayOvertime_4leave+holidayOvertime_4leave+
+                  workingDayOvertime_nonleave+restDayOvertime_nonleave+holidayOvertime_nonleave));
+						}else if(fieldName.equals("businessLeave") || fieldName.equals("officialBusiness")){
+              String businessLeaveData = Util.null2s(Util.null2String(flowData.get(id+"|"+fieldName)),"0.0");
+              String backType = fieldName+"_back";
+              String businessLeavebackData = Util.null2s(Util.null2String(flowData.get(id+"|"+backType)),"0.0");
+              String businessLeave = "";
+              try{
+                //以防止出现精度问题
+                if(businessLeaveData.length() == 0){
+                  businessLeaveData = "0.0";
+                }
+                if(businessLeavebackData.length() == 0){
+                  businessLeavebackData = "0.0";
+                }
+                BigDecimal b_businessLeaveData = new BigDecimal(businessLeaveData);
+                BigDecimal b_businessLeavebackData = new BigDecimal(businessLeavebackData);
+                businessLeave = b_businessLeaveData.subtract(b_businessLeavebackData).toString();
+                if(Util.getDoubleValue(businessLeave, -1) < 0){
+                  businessLeave = "0.0";
+                }
+              }catch (Exception e){
+              }
+              fieldValue = KQDurationCalculatorUtil.getDurationRound(businessLeave);
+            }else{
+							fieldValue = KQDurationCalculatorUtil.getDurationRound(Util.null2String(flowData.get(id+"|"+fieldName)));
+						}
+					} else {
+						fieldValue = Util.null2String(rs.getString(fieldName));
+						if(Util.null2String(kqReportFieldComInfo.getUnittype()).length()>0) {
+							if(fieldValue.length() == 0){
+								fieldValue="0";
+							}else{
+								if (kqReportFieldComInfo.getUnittype().equals("2")) {
+									fieldValue = KQDurationCalculatorUtil.getDurationRound(("" + (Util.getDoubleValue(fieldValue) / 60.0)));
+								}
+							}
+						}
+					}
+					data.put(fieldName,fieldValue);
+				}
+
+				//请假
+				List<Map<String, Object>> allLeaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+				Map<String, Object> leaveRule = null;
+				for(int i=0;allLeaveRules!=null&&i<allLeaveRules.size();i++){
+					leaveRule = (Map<String, Object>)allLeaveRules.get(i);
+					String flowType = Util.null2String("leaveType_"+leaveRule.get("id"));
+					String leaveData = Util.null2String(flowData.get(id+"|"+flowType));
+					String flowLeaveBackType = Util.null2String("leavebackType_"+leaveRule.get("id"));
+					String leavebackData = Util.null2s(Util.null2String(flowData.get(id+"|"+flowLeaveBackType)),"0.0");
+					String b_flowLeaveData = "";
+          String flowLeaveData = "";
+					try{
+            //以防止出现精度问题
+            if(leaveData.length() == 0){
+              leaveData = "0.0";
+            }
+            if(leavebackData.length() == 0){
+              leavebackData = "0.0";
+            }
+            BigDecimal b_leaveData = new BigDecimal(leaveData);
+            BigDecimal b_leavebackData = new BigDecimal(leavebackData);
+            b_flowLeaveData = b_leaveData.subtract(b_leavebackData).toString();
+            if(Util.getDoubleValue(b_flowLeaveData, -1) < 0){
+              b_flowLeaveData = "0.0";
+            }
+          }catch (Exception e){
+					  writeLog("GetKQReportCmd:leaveData"+leaveData+":leavebackData:"+leavebackData+":"+e);
+          }
+
+          //考虑下冻结的数据
+          if(b_flowLeaveData.length() > 0){
+            flowLeaveData = KQDurationCalculatorUtil.getDurationRound(b_flowLeaveData);
+          }else{
+            flowLeaveData = KQDurationCalculatorUtil.getDurationRound(Util.null2String(Util.getDoubleValue(leaveData,0.0)-Util.getDoubleValue(leavebackData,0.0)));
+          }
+					data.put(flowType,flowLeaveData);
+				}
+
+				Map<String,Object> detialDatas = kqReportBiz.getDetialDatas(id,fromDate,toDate,user,flowData,false,uintType,show_card_source);
+//        new KQLog().info("id:"+id+":detialDatas:"+detialDatas);
+				isEnd = false;
+				for(String date=fromDate; !isEnd;) {
+					if(date.equals(toDate)) isEnd = true;
+					if(DateUtil.compDate(today, date)>0){
+						data.put(date,"");
+					}else{
+//            new KQLog().info("id:date:"+(id+"|"+date)+":detialDatas.get:"+detialDatas.get(id+"|"+date));
+						data.put(date,detialDatas.get(id+"|"+date)==null?SystemEnv.getHtmlLabelName(26593, user.getLanguage()):detialDatas.get(id+"|"+date));
+					}
+					cal.setTime(DateUtil.parseToDate(date));
+					date = DateUtil.getDate(cal.getTime(), 1);
+				}
+				datas.add(data);
+			}
+
+			List<Object> lsHolidays = KQHolidaySetBiz.getHolidaySetListByScope(""+user.getUID(),fromDate,toDate);
+			retmap.put("holidays", lsHolidays);
+
+			retmap.put("columns",columns);
+			retmap.put("datas",datas);
+			retmap.put("pagesize", pageSize);
+			retmap.put("pageindex", pageIndex);
+			retmap.put("count", count);
+			retmap.put("pagecount", pageCount);
+			retmap.put("ishavepre", isHavePre);
+			retmap.put("ishavenext", isHaveNext);
+		}catch (Exception e){
+			writeLog(e);
+		}
+		return retmap;
+	}
+
+	private Map<String,Object> getChildColumnsInfo(String parentid, User user){
+		Map<String,Object> returnMap = new HashMap<>();
+		List<Object> lsChildColumns = new ArrayList<>();
+		Map column = null;
+		int sumChildColumnWidth = 0;
+		if(parentid.equals("attendanceSerial")){//考勤班次
+			KQShiftManagementComInfo kqShiftManagementComInfo = new KQShiftManagementComInfo();
+			JSONObject jsonObj = JSON.parseObject(Util.null2String(params.get("data")));
+			List<String> serialIds = null;
+			if(Util.null2String(jsonObj.get("attendanceSerial")).length()>0){
+				serialIds = Util.splitString2List(Util.null2String(jsonObj.get("attendanceSerial")),",");
+			}
+			for(int i=0;serialIds!=null&&i<serialIds.size();i++){
+				column = new HashMap();
+				column.put("title", kqShiftManagementComInfo.getSerial(serialIds.get(i)));
+				column.put("unit", "");
+				column.put("width", 65);
+				column.put("dataIndex", serialIds.get(i));
+				column.put("key", serialIds.get(i));
+        column.put("rowSpan", 2);
+				column.put("colSpan", 1);
+				sumChildColumnWidth+=65;
+				lsChildColumns.add(column);
+			}
+		}else if(parentid.equals("leave")){
+			KQLeaveRulesBiz kqLeaveRulesBiz = new KQLeaveRulesBiz();
+			List<Map<String, Object>> leaveRules = kqLeaveRulesBiz.getAllLeaveRules();
+			for(int i=0;leaveRules!=null&&i<leaveRules.size();i++){
+				Map<String, Object> leaveRule = leaveRules.get(i);
+				String id = "leaveType_"+Util.null2String(leaveRule.get("id"));
+				String name = Util.null2String(leaveRule.get("name"));
+				String unitType = Util.null2String(leaveRule.get("unitType"));
+				column = new HashMap();
+				column.put("title", name);
+				column.put("unit", KQUnitBiz.isLeaveHour(unitType) ?SystemEnv.getHtmlLabelName(391, user.getLanguage()):SystemEnv.getHtmlLabelName(1925, user.getLanguage()));
+				column.put("width", 65);
+				column.put("dataIndex", id);
+				column.put("key", id);
+				column.put("rowSpan", 2);
+				column.put("colSpan", 1);
+				column.put("showDetial","1");
+				sumChildColumnWidth+=65;
+				lsChildColumns.add(column);
+			}
+		}else if(parentid.equals("overtime")){
+      String[] overtimeChild = {"overtime_nonleave","overtime_4leave","overtimeTotal"};
+      for(int i=0;i<overtimeChild.length;i++){
+        String id = overtimeChild[i];
+        column = new HashMap();
+        String fieldlabel = "";
+        column.put("unit", "");
+        if("overtime_nonleave".equalsIgnoreCase(id)){
+          fieldlabel = "125805";
+        }else if("overtime_4leave".equalsIgnoreCase(id)){
+          fieldlabel = "125804";
+        }else{
+          fieldlabel = "523";
+          column.put("showDetial","1");
+          String unitType = (KQOvertimeRulesBiz.getMinimumUnit()==3 || KQOvertimeRulesBiz.getMinimumUnit()==5 ||KQOvertimeRulesBiz.getMinimumUnit()==6)?"2":"1";
+          String unitTypeName = "";
+          if(Util.null2String(unitType).length()>0){
+            if(unitType.equals("1")){
+              unitTypeName=SystemEnv.getHtmlLabelName(1925, user.getLanguage());
+            }else if(unitType.equals("2")){
+              unitTypeName=SystemEnv.getHtmlLabelName(391, user.getLanguage());
+            }else if(unitType.equals("3")){
+              unitTypeName=SystemEnv.getHtmlLabelName(18083, user.getLanguage());
+            }
+          }
+          column.put("unit", unitTypeName);
+        }
+        column.put("title", SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage()));
+        column.put("dataIndex", id);
+        column.put("key", id);
+        column.put("rowSpan", 1);
+        Map<String,Object> mapChildColumnInfo = getChildColumnsInfo(id, user);
+        int childWidth = 65;
+        List<Object> childColumns = (List<Object>)mapChildColumnInfo.get("childColumns");
+        if(childColumns.size()>0) {//跨列width取子列的width
+          column.put("children", childColumns);
+          childWidth = Util.getIntValue(Util.null2String(mapChildColumnInfo.get("sumChildColumnWidth")),65);
+        }
+        column.put("width", childWidth+"");
+        sumChildColumnWidth+=childWidth;
+        lsChildColumns.add(column);
+      }
+    }else{
+			KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+			while (kqReportFieldComInfo.next()){
+				if(kqReportFieldComInfo.getParentid().equals(parentid)) {
+					if(!kqReportFieldComInfo.getReportType().equals("month"))continue;
+					column = new HashMap();
+					column.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()));
+					column.put("unit", KQReportBiz.getUnitType(kqReportFieldComInfo, user));
+					column.put("width", Util.getIntValue(kqReportFieldComInfo.getWidth()));
+					column.put("dataIndex", kqReportFieldComInfo.getFieldname());
+					column.put("key", kqReportFieldComInfo.getFieldname());
+					column.put("rowSpan", 1);
+					column.put("colSpan", 1);
+					column.put("showDetial",kqReportFieldComInfo.getShowDetial());
+					sumChildColumnWidth+=Util.getIntValue(kqReportFieldComInfo.getWidth());
+					lsChildColumns.add(column);
+				}
+			}
+		}
+		returnMap.put("childColumns",lsChildColumns);
+		returnMap.put("sumChildColumnWidth",sumChildColumnWidth);
+		return returnMap;
+	}
+
+	private List<Object>  getCascadeKeyColumnsInfo(String cascadeKey, User user){
+		List<Object> lsChildColumns = new ArrayList<>();
+		if(Util.null2String(cascadeKey).length()==0){
+			return lsChildColumns;
+		}
+		Map<String,Object> column = null;
+		List<String> lsCascadeKey = Util.splitString2List(cascadeKey,",");
+		KQReportFieldComInfo kqReportFieldComInfo = new KQReportFieldComInfo();
+		for(int i=0;i<lsCascadeKey.size();i++){
+			kqReportFieldComInfo.setTofirstRow();
+			while (kqReportFieldComInfo.next()) {
+				if(!kqReportFieldComInfo.getReportType().equals("month"))continue;
+				if (kqReportFieldComInfo.getFieldname().equals(lsCascadeKey.get(i))){
+					column = new HashMap();
+					column.put("title", SystemEnv.getHtmlLabelNames(kqReportFieldComInfo.getFieldlabel(), user.getLanguage()));
+					column.put("unit", KQReportBiz.getUnitType(kqReportFieldComInfo, user));
+					column.put("width", Util.getIntValue(kqReportFieldComInfo.getWidth()));
+					column.put("dataIndex", kqReportFieldComInfo.getFieldname());
+					column.put("key", kqReportFieldComInfo.getFieldname());
+					column.put("rowSpan", 1);
+					column.put("colSpan", 1);
+					column.put("showDetial",kqReportFieldComInfo.getShowDetial());
+					column.put("isSystem", kqReportFieldComInfo.getIsSystem());
+					lsChildColumns.add(column);
+				}
+			}
+		}
+		return lsChildColumns;
+	}
+
+	@Override
+	public BizLogContext getLogContext() {
+		return null;
+	}
+
+}