增加按照月份和部门自定义同步

.gitignore

@@ -8,6 +8,7 @@ target/
 .idea
 
 /test
+/src/test
 /src/rebel.xml
 /src/META-INF
 /WEB-INF/config

.idea/artifacts/weaver_develop_jar.xml

@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="weaver-develop:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/weaver_develop_jar</output-path>
+    <output-path>$PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib</output-path>
     <root id="archive" name="weaver-develop.jar">
       <element id="module-output" name="weaver-develop" />
     </root>

src/com/engine/kqsolution/service/impl/SignDataSummaryServiceImpl.java

@@ -68,7 +68,7 @@ public class SignDataSummaryServiceImpl extends Service implements SignDataSumma
         String ids = StringUtils.join(idList,",");
         rs.executeQuery("select kqdate,resourceid,signindate,signintime,signoutdate,signouttime,signMins from kq_format_detail \n" +
                 " where kqdate >= ? and kqdate <= ?" +
-                " and resourceid in in ("+ids+")",fromDate,toDate);
+                " and resourceid in ("+ids+")",fromDate,toDate);
         List<SignDataPO> pos = new ArrayList<>();
         DecimalFormat decimalFormat = new DecimalFormat("0.00");
         while (rs.next()) {

src/com/engine/kqsolution/web/SignDataSummaryAction.java

@@ -2,7 +2,6 @@ package com.engine.kqsolution.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.engine.common.util.ParamUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.kqsolution.entity.CustomSignDataParam;
 import com.engine.kqsolution.entity.SignDataParams;

src/test/MainTest.java

@@ -1,5 +1,9 @@
 package test;
 
+import weaver.common.DateUtil;
+
+import java.time.LocalDate;
+
 /**
  * @Author weaver_cl
  * @Description:
@@ -9,13 +13,12 @@ package test;
 public class MainTest {
 
     public static void main(String[] args) {
-        double punchInHours = 11.87; // 打卡工时时长为 11.87
-        double actualWorkHours = calculateActualWorkHours(punchInHours);
-        System.out.println("实际工时时长为：" + actualWorkHours + "小时");
 
-        double punchInHours2 = 3.57; // 打卡工时时长为 3.5
+        LocalDate localDate = LocalDate.parse("2029-02"+"-01");
-        double actualWorkHours2 = calculateActualWorkHours(punchInHours2);
+        String fromDate = localDate.toString();
-        System.out.println("实际工时时长为：" + actualWorkHours2 + "小时");
+        String toDate = localDate.withDayOfMonth(localDate.lengthOfMonth()).toString();
+        System.out.println(fromDate);
+        System.out.println(toDate);
     }
 
     public static double calculateActualWorkHours(double punchInHours) {