修改当没有排班时出现的bug，优化请假流程

src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java

@@ -44,7 +44,6 @@ public class GetClockInTimeListCmd extends AbstractCommonCommand<Map<String,Obje
         Map<String,Map<String,Object>> clockInTimeMap = (Map<String,Map<String,Object>>)params.get("clockInTimeMap");
         //当天班次
         List<Map<String,Object>> needGetDateScheduling = schedulingResultCollect.get(needGetDate);
-        needGetDateScheduling = needGetDateScheduling.stream().sorted(Comparator.comparing(e -> DateUtil.getTime(Utils.getkssjTime(e, needGetDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
 
         //
         Map<String, List<Map<String,Object>>> collect = (Map<String, List<Map<String,Object>>>)params.get("clockInTimeCollect");
@@ -73,6 +72,7 @@ public class GetClockInTimeListCmd extends AbstractCommonCommand<Map<String,Obje
             return resultMap;
         }
 
+        needGetDateScheduling = needGetDateScheduling.stream().sorted(Comparator.comparing(e -> DateUtil.getTime(Utils.getkssjTime(e, needGetDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
 
         List<Map<String, Object>> scheduleList = needGetDateScheduling.stream().filter(e -> {
             if (!ClassSegmentTypeEnum.REST_AND_DINE.getKey().equals(e.get("bdlx")) && !ClassSegmentTypeEnum.REST_PERIOD.getKey().equals(e.get("bdlx")) &&

src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java

@@ -340,7 +340,9 @@ public class AttendanceAnalysisWrapper extends Service {
      */
     public Map<String, Object> analysis(String userId, String analysisDate, List<Map<String, Object>> clockInTimeList, List<Map<String, Object>> scheduleResult, List<Map<String, Object>> attendanceItems, List<Map<String, Object>> workHourItems
     ,Map<String,Object> clockInTimeDataMap,List<Map<String, Object>> evectionList,List<Map<String, Object>> askforList) {
-        scheduleResult = scheduleResult.stream().sorted(Comparator.comparing(e -> DateUtil.getTime(Utils.getkssjTime(e, analysisDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
+        if (scheduleResult != null){
+            scheduleResult = scheduleResult.stream().sorted(Comparator.comparing(e -> DateUtil.getTime(Utils.getkssjTime(e, analysisDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
+        }
         Map<String, Object> recordParam = Maps.newHashMap();
         Map<String, String> formModeIdMap = Utils.getFormmodeIdMap();
         recordParam.put("userId", userId);

src/com/engine/jucailinkq/attendance/vacation/cmd/VocationCmd.java

@@ -108,15 +108,4 @@ public class VocationCmd extends AbstractCommonCommand<Map<String,Object>> {
         return null;
     }
 
-    public List<String> getUserIds(Map<String,Object> vocation){
-        List<String> userIds = Lists.newArrayList();
-        String edyj = Util.null2String(vocation.get("edyj"));
-        if (edyj.equals("3") || edyj.equals("4")){
-            String zyz = Util.null2String(vocation.get("zyz"));
-            zyz = Utils.converSQL(zyz);
-            List<Map<String,Object>> dataList =  DbTools.getSqlToList(zyz);
-            userIds = dataList.stream().map(e->Util.null2String(e.get("id"))).collect(Collectors.toList());
-        }
-        return userIds;
-    }
 }

src/com/engine/jucailinkq/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.java

@@ -144,17 +144,17 @@ public class RevokeEliminationsAskForLeaveAction implements Action {
         for(Map.Entry<String,List<Map<String,Object>>> entry: datagroupbyId.entrySet()){
             String jqyeId = entry.getKey();
             List<Map<String,Object>> list = entry.getValue();
-            double qjscTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qjsc").toString())).sum();
+            double syscTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("sysc").toString())).sum();
-            double qtjTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qtj").toString())).sum();
+            //double qtjTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qtj").toString())).sum();
-            double btjTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qtj").toString())).sum();
+            //double btjTotal = list.stream().mapToDouble(e->Double.valueOf(e.get("qtj").toString())).sum();
-            double qjsc = 0;
+            //double qjsc = 0;
-
+
-            if (AccountingUnitEnum.DAY.getKey().equals(hsdw)){
+//            if (AccountingUnitEnum.DAY.getKey().equals(hsdw)){
-                qjsc = qtjTotal+btjTotal;
+//                qjsc = qtjTotal+btjTotal;
-            }else if (AccountingUnitEnum.HOUR.getKey().equals(hsdw)){
+//            }else if (AccountingUnitEnum.HOUR.getKey().equals(hsdw)){
-                qjsc = qjscTotal + (qtjTotal+btjTotal)*8;
+//                qjsc = qjscTotal + (qtjTotal+btjTotal)*8;
-            }
+//            }
-            sql = "update uf_jcl_kq_jqye set yxsc=yxsc-"+qjsc+",wxsc=wxsc+"+qjsc+" where id=?";
+            sql = "update uf_jcl_kq_jqye set yxsc=yxsc-"+syscTotal+",wxsc=wxsc+"+syscTotal+" where id=?";
             log.debug("updateHoliday sql : [{}]",sql);
             DbTools.update(sql,jqyeId);
         }

src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.java

@@ -59,7 +59,7 @@ public class BatchAskForLeaveWorkFlowSubmitAction implements Action {
             //20241127需求变更，明细表1存在数据时，直接走原有校验逻辑；明细表1没有数据时，就根据明细表3重新生成明细表1数据，然后继续原有校验逻辑
             Map<String, Object> params = new HashMap<>();
             List<Map<String, String>> reCreateDetailList = new ArrayList<>();
-            if (detailTableData.size() == 0 && detailTable3Data.size() > 0) {
+            if (detailTable3Data.size() > 0) {
                 List<Map<String, Object>> insertDetail1List = new ArrayList<>();
                 Map<String, Object> itemResult = new HashMap<>();
                 List<Map<String, String>> itemDetailList = new ArrayList<>();
@@ -103,7 +103,8 @@ public class BatchAskForLeaveWorkFlowSubmitAction implements Action {
                     }
                 }
                 log.info("insertDetail1List : [{}]", insertDetail1List);
-                if (insertDetail1List.size() > 0 && !CommonUtil.insertBatch(insertDetail1List, detail1TableName)) {
+                String deleteSql="delete from "+detail1TableName+" where mainid=?";
+                if (insertDetail1List.size() > 0 && DbTools.update(deleteSql,mainTableData.get("id")) && !CommonUtil.insertBatch(insertDetail1List, detail1TableName)) {
                     //更新流程明细表2失败
                     String message = "新增流程明细表1失败";
                     log.error(message);

src/com/engine/jucailinkq/common/cmd/GetPersonVocationBySuitOrganzation.java

@@ -155,9 +155,9 @@ public class GetPersonVocationBySuitOrganzation extends AbstractCommonCommand<Ma
             }
         }
 
-        log.info("before personMap : [{}]",personMap);
+        log.debug("before personMap : [{}]",personMap);
         //部门id
-        log.info("departMentMap : [{}]",departMentMap);
+        log.debug("departMentMap : [{}]",departMentMap);
         for (Map.Entry<String,Object> entry : departMentMap.entrySet()){
             String departMentId = entry.getKey();
             //部门（假别，假期规则id）
@@ -183,7 +183,7 @@ public class GetPersonVocationBySuitOrganzation extends AbstractCommonCommand<Ma
             }
         }
         //分部id
-        log.info("subCompanyMap : [{}]",subCompanyMap);
+        log.debug("subCompanyMap : [{}]",subCompanyMap);
         for (Map.Entry<String,Object> entry : subCompanyMap.entrySet()){
             String subCompanyId = entry.getKey();
             //分部（假别，假期规则id）
@@ -208,7 +208,7 @@ public class GetPersonVocationBySuitOrganzation extends AbstractCommonCommand<Ma
                 }
             }
         }
-        log.info("personMap : [{}]",personMap);
+        log.debug("personMap : [{}]",personMap);
         Map<String,Object> newpersonMap = Maps.newHashMap();
         for (Map.Entry<String,Object> entry :personMap.entrySet()){
             String userId = entry.getKey();