被还原代码恢复

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

@@ -321,6 +321,99 @@ public class KQReportBiz extends BaseBean {
     return datas;
   }
 
+  /**
+   * 获取周六销假数据
+   * @param params
+   * @param user
+   * @return
+   */
+  public Map<String,Object> getSaturdayFlowLeaveBackData(Map<String,Object> params, User user){
+    Map<String,Object> datas = new HashMap<>();;
+    RecordSet rs = new RecordSet();
+    String sql = "";
+    String sqlWhere = " ";
+    try{
+      KQLeaveRulesComInfo kqLeaveRulesComInfo = new KQLeaveRulesComInfo();
+      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 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(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 b.resourceid 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<>'' ");
+      }
+
+      sql = " select resourceid, newleavetype, durationrule, sum(duration) as val from hrmresource a, "+KqSplitFlowTypeEnum.LEAVEBACK.getTablename()+" b "+
+              " where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) " +
+              "and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = " +
+              "(select top 1 groupid from kq_shiftschedule where resourceid = b.resourceid  and serialid = b.serialid and kqdate = b.belongdate)) " +sqlWhere	+
+              " group by resourceid, newleavetype, durationrule ";
+      rs.execute(sql);
+      while (rs.next()) {
+        String resourceid = rs.getString("resourceid");
+        String newleavetype = rs.getString("newleavetype");
+        String durationrule = rs.getString("durationrule");
+        double value = rs.getDouble("val")<0?0:rs.getDouble("val");
+
+        double proportion = Util.getDoubleValue(kqLeaveRulesComInfo.getProportion(newleavetype));
+        if(KQUnitBiz.isLeaveHour(newleavetype,kqLeaveRulesComInfo)){//按小时
+          if(!KQUnitBiz.isLeaveHour(durationrule)){
+            if(proportion>0) value = value*proportion;
+          }
+        }else{//按天
+          if(KQUnitBiz.isLeaveHour(durationrule)){
+            if(proportion>0) value = value/proportion;
+          }
+        }
+
+        String key = resourceid+"|leavebackType_"+newleavetype;
+        if(datas.containsKey(key)){
+          value += Util.getDoubleValue(Util.null2String(datas.get(key)));
+        }
+        //df.format 默认是不四舍五入的 0.125这样的就会直接变成0.12了
+        df.setMaximumFractionDigits(5);
+        datas.put(key,df.format(value));
+      }
+    }catch (Exception e){
+      writeLog(e);
+    }
+    return datas;
+  }
+
   /**
    * 获取周六请假数据
    * @param params
@@ -378,8 +471,11 @@ public class KQReportBiz extends BaseBean {
           sqlWhere += " and a.loginid is not null "+(rs.getDBType().equals("oracle")?"":" and a.loginid<>'' ");
         }
 
-        sql = " select resourceid, newleavetype, durationrule, sum(duration) as val from hrmresource a, "+ KqSplitFlowTypeEnum.LEAVE.getTablename()+" b "+
+        sql = " select resourceid, newleavetype, durationrule, sum(duration) as val from hrmresource a, "+KqSplitFlowTypeEnum.LEAVE.getTablename()+" b "+
-                " where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) " +sqlWhere	+
+                " where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and " +
+                "(DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 " +
+                "AND groupid = (select top 1 groupid from kq_shiftschedule where resourceid = b.resourceid " +
+                " and serialid = b.serialid and kqdate = b.belongdate)) " +sqlWhere	+
                 " group by resourceid, newleavetype, durationrule ";
         rs.execute(sql);
         while (rs.next()) {
@@ -416,6 +512,100 @@ public class KQReportBiz extends BaseBean {
     return datas;
   }
 
+  /**
+   * 获取每日销假数据
+   * @param params
+   * @param user
+   * @return
+   */
+  public Map<String,Object> getDailySaturdayFlowLeaveBackData(Map<String,Object> params, User user){
+    Map<String,Object> datas = new HashMap<>();;
+    RecordSet rs = new RecordSet();
+    String sql = "";
+    String sqlWhere = " ";
+    try{
+      KQLeaveRulesComInfo kqLeaveRulesComInfo = new KQLeaveRulesComInfo();
+      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 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(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 b.resourceid 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<>'' ");
+      }
+
+      sql = " select resourceid, newleavetype, durationrule, sum(duration) as val,belongdate from hrmresource a, "+KqSplitFlowTypeEnum.LEAVEBACK.getTablename()+" b "+
+              " where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) " +
+              "and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = " +
+              "(select top 1 groupid from kq_shiftschedule where resourceid = b.resourceid  and serialid = b.serialid and kqdate = b.belongdate)) " +sqlWhere	+
+              " group by resourceid, newleavetype, durationrule,belongdate ";
+      rs.execute(sql);
+      while (rs.next()) {
+        String resourceid = rs.getString("resourceid");
+        String belongdate = rs.getString("belongdate");
+        String newleavetype = rs.getString("newleavetype");
+        String durationrule = rs.getString("durationrule");
+        double value = rs.getDouble("val")<0?0:rs.getDouble("val");
+
+        double proportion = Util.getDoubleValue(kqLeaveRulesComInfo.getProportion(newleavetype));
+        if(KQUnitBiz.isLeaveHour(newleavetype,kqLeaveRulesComInfo)){//按小时
+          if(!KQUnitBiz.isLeaveHour(durationrule)){
+            if(proportion>0) value = value*proportion;
+          }
+        }else{//按天
+          if(KQUnitBiz.isLeaveHour(durationrule)){
+            if(proportion>0) value = value/proportion;
+          }
+        }
+
+        String key = resourceid+"|"+belongdate+"|leavebackType_"+newleavetype;
+        if(datas.containsKey(key)){
+          value += Util.getDoubleValue(Util.null2String(datas.get(key)));
+        }
+        //df.format 默认是不四舍五入的 0.125这样的就会直接变成0.12了
+        df.setMaximumFractionDigits(5);
+        datas.put(key,df.format(value));
+      }
+    }catch (Exception e){
+      writeLog(e);
+    }
+    return datas;
+  }
+
   /**
    * 获取周六请假数据
    * @param params
@@ -472,8 +662,10 @@ public class KQReportBiz extends BaseBean {
         sqlWhere += " and a.loginid is not null "+(rs.getDBType().equals("oracle")?"":" and a.loginid<>'' ");
       }
 
-      sql = " select resourceid, newleavetype, durationrule, sum(duration) as val,belongdate from hrmresource a, "+ KqSplitFlowTypeEnum.LEAVE.getTablename()+" b "+
+      sql = " select resourceid, newleavetype, durationrule, sum(duration) as val,belongdate from hrmresource a, "+KqSplitFlowTypeEnum.LEAVE.getTablename()+" b "+
-              " where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) " +sqlWhere	+
+              " where a.id = b.resourceid and belongdate >='"+fromDate+"' and belongdate <='"+toDate+"' and (DATEPART(dw, belongdate) = 7 or DATEPART(dw, belongdate) = 1) " +
+              "and belongdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND groupid = " +
+              "(select top 1 groupid from kq_shiftschedule where resourceid = b.resourceid  and serialid = b.serialid and kqdate = b.belongdate)) " +sqlWhere	+
               " group by resourceid, newleavetype, durationrule,belongdate ";
       rs.execute(sql);
       while (rs.next()) {

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

@@ -186,11 +186,11 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
             String definedFieldSum = Util.null2String(definedFieldInfo.get("definedFieldSum"));
             //支援班次统计
             String supportSerId = new BaseBean().getPropValue("nbkq_main", "supportSerId");
-            String backFields = " (select sum(workdays) from kq_format_total where resourceid = a.id and kqdate >='" + fromDate + "' and kqdate <='" + toDate + "' and (DATEPART(dw, kqdate) = 7 or DATEPART(dw, kqdate) = 1)) as saturdayworkdays," +
+            String backFields =  " (select sum(zma.workdays) from kq_format_total zma where zma.resourceid = a.id and zma.kqdate >='" + fromDate + "' and zma.kqdate <='" + toDate + "' and (DATEPART(dw, zma.kqdate) = 7 or DATEPART(dw, zma.kqdate) = 1) AND zma.kqdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND zma.groupid = groupId)) as saturdayworkdays," +
                     " (select count(0) from kq_shiftschedule where resourceid = a.id and kqdate >='" + fromDate + "' and kqdate <='" + toDate + "' and serialid=" + supportSerId + " )as supportTotal," +
-                    " (select sum(attendancedays) from kq_format_total where resourceid = a.id and kqdate >='" + fromDate + "' and kqdate <='" + toDate + "' and (DATEPART(dw, kqdate) = 7 or DATEPART(dw, kqdate) = 1)) as saturdayattendancedays," +
+                    " (select sum(zma.attendancedays) from kq_format_total zma where zma.resourceid = a.id and zma.kqdate >='" + fromDate + "' and zma.kqdate <='" + toDate + "' and (DATEPART(dw, zma.kqdate) = 7 or DATEPART(dw, zma.kqdate) = 1) AND zma.kqdate NOT IN (select holidayDate from KQ_HolidaySet where changeType = 3 AND zma.groupid = groupId)) as saturdayattendancedays," +
-                    " (select sum(workdays) from kq_format_total where resourceid = a.id and kqdate >='" + fromDate + "' and kqdate <='" + toDate + "' and DATEPART(dw, kqdate) != 7 and DATEPART(dw, kqdate) != 1) as weekdayworkdays," +
+                    " (select sum(zma.workdays) from kq_format_total zma where zma.resourceid = a.id and zma.kqdate >='" + fromDate + "' and zma.kqdate <='" + toDate + "' and ((DATEPART(dw, zma.kqdate) != 7 and DATEPART(dw, zma.kqdate) != 1) or ((DATEPART(dw, zma.kqdate) = 7 or DATEPART(dw, zma.kqdate) = 1) and zma.kqdate IN (select holidayDate from KQ_HolidaySet where changeType = 3 and zma.groupid = groupId)))) as weekdayworkdays," +
-                    " (select sum(attendancedays) from kq_format_total where resourceid = a.id and kqdate >='" + fromDate + "' and kqdate <='" + toDate + "' and DATEPART(dw, kqdate) != 7 and DATEPART(dw, kqdate) != 1) as weekdayattendancedays," +
+                    " (select sum(zma.attendancedays) from kq_format_total zma where zma.resourceid = a.id and zma.kqdate >='" + fromDate + "' and zma.kqdate <='" + toDate + "' and  ((DATEPART(dw, zma.kqdate) != 7 and DATEPART(dw, zma.kqdate) != 1) or ((DATEPART(dw, zma.kqdate) = 7 or DATEPART(dw, zma.kqdate) = 1) and zma.kqdate IN (select holidayDate from KQ_HolidaySet where changeType = 3 and zma.groupid = groupId)))) as weekdayattendancedays," +
                     "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, " +
@@ -329,6 +329,10 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 
             Map<String, Object> flowData = kqReportBiz.getFlowData(params, user);
             Map<String, Object> saturdayFlowLeaveData = kqReportBiz.getSaturdayFlowLeaveData(params, user);
+            Map<String, Object> saturdayFlowLeaveBackData = kqReportBiz.getSaturdayFlowLeaveBackData(params, user);
+            if ((!CollectionUtils.isEmpty(saturdayFlowLeaveBackData)) || saturdayFlowLeaveBackData.size() > 0) {
+                saturdayFlowLeaveData.putAll(saturdayFlowLeaveBackData);
+            }
             rs.execute(sql);
             rs.writeLog("==========  GetKQReportCmd  sql  ==========  " + sql);
             while (rs.next()) {
@@ -500,10 +504,11 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
                 }
                 String sjbjcjRes = "0.0";
                 String hjsjRes = "0.0";
-                for (int i = 0; allLeaveRules != null && i < allLeaveRules.size(); i++) {
+                for (int ia = 0; allLeaveRules != null && ia < allLeaveRules.size(); ia++) {
+                    leaveRule = (Map<String, Object>) allLeaveRules.get(ia);
+                    int i = Integer.valueOf(leaveRule.get("id").toString());
                     if (((!CollectionUtils.isEmpty(sjbjcjidList)) && sjbjcjidList.contains(i)) ||
                             ((!CollectionUtils.isEmpty(hjsjidList)) && hjsjidList.contains(i))) {
-                        leaveRule = (Map<String, Object>) allLeaveRules.get(i);
                         String flowType = Util.null2String("leaveType_" + leaveRule.get("id"));
                         String leaveData = Util.null2String(saturdayFlowLeaveData.get(id + "|" + flowType));
                         String flowLeaveBackType = Util.null2String("leavebackType_" + leaveRule.get("id"));