Merge remote-tracking branch 'origin/main'

src/weaver/interfaces/bnkq/action/UpdateCcTimeAction.java

@@ -1,13 +1,11 @@
 
 package weaver.interfaces.bnkq.action;
 
+import com.engine.kq.biz.KQFormatBiz;
 import com.engine.kq.biz.KQWorkTime;
 import com.engine.kq.entity.WorkTimeEntity;
-import com.engine.workflow.service.HtmlToPdfService;
-import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.BaseBean;
-import weaver.general.PinyinUtil;
 import weaver.general.TimeUtil;
 import weaver.general.Util;
 import weaver.interfaces.workflow.action.Action;
@@ -66,15 +64,20 @@ public class UpdateCcTimeAction implements Action {
             KQWorkTime kqWorkTime = new KQWorkTime();
             kqWorkTime.setIsFormat(true);
 
+            List<List<Object>> paramInsert = new ArrayList<>();
             for(String date:all){
                 bb.writeLog("date:"+date);
                 WorkTimeEntity tmpworkTime = kqWorkTime.getWorkTime(sqr, date);
                 if(tmpworkTime.getWorkMins()>0){
                     bb.writeLog("当天排班了:"+tmpworkTime.getWorkMins());
                     insertLeave(reqid,Integer.valueOf(sqr),date,8.00,"3","1",szgs,szbm,date,wfid,tablaName);
-                    insertDetail(sqr, date, rs);
+                    List<Object> params = new ArrayList<>();
+                    params.add(sqr);
+                    params.add(date);
+                    paramInsert.add(params);
                 }
             }
+            new KQFormatBiz().format(paramInsert);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -87,15 +90,9 @@ public class UpdateCcTimeAction implements Action {
         return Action.SUCCESS;
     }
 
-    private void insertDetail(String resourceId, String date, RecordSet rs) {
-        String sql = "update kq_format_detail set evectionMins=480,absenteeismMins=0 where resourceid=?  and kqdate='" + date + "'";
-        rs.executeUpdate(sql, resourceId);
-    }
-
 
     /**
      * 获取两个日期之间所有的日期
-     *
      * @param date1
      * @param date2
      * @return
@@ -158,7 +155,6 @@ public class UpdateCcTimeAction implements Action {
 
     /**
      * 提供精确的乘法运算。
-     *
      * @param v1 被加数
      * @param v2 加数
      * @return 两个参数的和
@@ -171,7 +167,6 @@ public class UpdateCcTimeAction implements Action {
 
     /**
      * 插入请假拆分表
-     *
      * @param requestid
      * @param userid
      * @param fromDate
@@ -187,18 +182,4 @@ public class UpdateCcTimeAction implements Action {
         bb.writeLog("insertSql:"+sql);
     }
 
-
-    public static void main(String[] args) {
-        Set<String> all = new HashSet<>();
-        all.add("2023-12-20");
-        List<String> back = days("2023-12-20", "2023-12-20");
-        all.addAll(back);
-        all.add("2023-12-20");
-        for (String date : all) {
-            System.out.println(date);
-        }
-
-
-    }
-
 }