Merge remote-tracking branch 'origin/main'

.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s

@@ -1 +1 @@
-閫
鎫迆羮<EFBFBD>讅醹閫
襺陗鮺鰙詝鶁蓕纞騸虀觸迆<EFBFBD><EFBFBD>}膧
莮蕕謢飤閪軁鋦質鱺飗鬺鑘萰趉襥蘫薼萯躭鏸苅鷍鏹頾躮韡髒鈛蘷鑥鍃鉽賧韝駒髖觱騰謝葀謞醲讁鷗黽蓧
讙
魬
邜
菙
饛
陹
罀
鑽
鐜
賽
鐜
鲯
賾
鴳
駧
蹚
缽
討
賺
䦆
膽
駪
迲
鄭
鋺
膿
釓
髲
饗
韾
䦶
話
髴
<EFBFBD><EFBFBD>
霂
驈
賽
覑
詰
鍛
褣
顛
膾
褢
軕
菑
饛
鑿
韻
䦶
軔
鶐
輷
膽
鷯
螎
䦷
饟
鎻
蠌
鈶
陳
鋶
聬
艗
陱
迧
葥
賽
鑾
蛽
釕
趽
諏
膹
髲
趰
迬
鄳
討
蹚
銖
蹘
飷
蠎
鶐
貛
銖
螎
閹
覐
饜
缾
虓
菓
鍘
趲
輲
魩
葤
購
覐
閵
謝賢騰鎠衯觮鷙苧齳鈑鉺鏾裶<EFBFBD>p譶魀飊鑢莕膓胿顀萿閚詏觩韘苆鴑靂鵜醈芠羃繸躒鞽<EFBFBD>Z鶺鑇觰鹶齲纘鈡鋤謢閧譿駒韠襸葈辷<EFBFBD>y鎥閤苾
蒧豔豒繸<EFBFBD>Q蚔踂鬦鱐馷鷆薴骳閂蒣蘜耂鉜錚鯳耉肹蠽鋃譡齓臵齉鎂譚鮕豙臵蘕鳵鶹闡餦鳺襗鑇詠
謡詜觶<EFBFBD>聕賦鎨鮶謡鈠鼂<EFBFBD>鍈襼鴟閪藑鷧
繬镸闙闙镸霱闙闙鍹罭隡頜臡郘荓螸鞮螹頜餗鐹錕鐺鍷鏚鍷錕鍷鉑鉑逰郕繨蔎蚄鉑鍷錕鍷釱銴袻鉑鏚鏚鍷郖鉐繨逬逰錕諰鉑鉑銴鏚鏚鏚錕鏚錕﨡蘆齀鮆鏚銴鍷鐺釱錕鉑襆銴錕鉑鏚鶭罦蒍臟鐺釱螸銴鉑鍷錕鐺錕鍷銴錕鐹翵躂貹釱鏚闗錕鉑鉑鍷訪錕錕鏚蜬
+聡
饉羳
纜駗詝騷鐈踸蟸蘽襹靫觹魘蓒魗詝飦
錡郳荴㘎鱑芚鉘蝀蔤轠譠鶷賄酫馳鏨韀鈀鬠襔蘓覺襊荱鍿羃輁颲萪羍裝鮚鉛蚛鶹蟅霶蔥錟郬蚠饌
䎬苮鄖鴘鎩髙䓖鴚觵鼂鱷詘褅脃鍃葁輛鸚颴衆黊酼骙<EFBFBD>[遊鯹覽誟鷑豯韙餺踤莖靤鰏聎蘰胣辴羙詐鷎輖鰍髈鎡蟣鼁蟫魐蛅莡誸饁鑤賦詪
鴰
輳
聭
虖
聫
蠋
迬
飸
䦟
顝
蓯
藧
驇
袕
蹘
鎺
讕
駪
藧
鼛
脨
翉
葠
麘
䦛
釋
覑
茝
蠋
軗
謵
頀
鎻
鐞
蛽
缼
鐝
褢
貜
蕦
鶒
藨
螑
趲
蓴
韼
蠋
顛
讘
脫
輲
輳
蠍
趰
顜
鶑
顜
魬
鎼
軕
蕩
贀
菕
駩
茞
銖
䦶
飶
輴
蛽
脪
麖
鷳
鞁
艗
蛷
鴳
鎾
釐
蠍
謷
驉
鈱
鯇
訍
<EFBFBD><EFBFBD>
趶
迯
褣
閻
膽
鞆
鰩
霃
蹘
話
鋻
邘
鏀
銘
鞈
邟
鰢
蕏閟踴讀鎥鱱鄕詖輜鱵觵顆靫騰鉽膙鴙鹵聎閧蟤躰羖錳阨説纋鷉襨裪踙鵯羕騤黭辴麀鵿賬賬蕔蘽鄛趠<EFBFBD><EFBFBD>饈<EFBFBD><EFBFBD>鼃醻<EFBFBD>醻藑<EFBFBD>觹雫<EFBFBD>饉軀鱺<EFBFBD>醻<EFBFBD>蘿<EFBFBD>脅<EFBFBD>繬镸闙闙镸霱闙闙鍹罭隡頜臡郘荓螸鞮螹頜餗鐹錕鐺鍷鏚鍷錕鍷鉑鉑逰郕繨蔎蚄鉑鍷錕鍷釱銴袻鉑鏚鏚鍷郖鉐繨逬逰錕諰鉑鉑銴鏚鏚鏚錕鏚錕﨡蘆齀鮆鏚銴鍷鐺釱錕鉑襆銴錕鉑鏚鶭罦蒍臟鐺釱螸銴鉑鍷錕鐺錕鍷銴錕鐹翵躂貹釱鏚闗錕鉑鉑鍷訪錕錕鏚蜬

.idea/workspace.xml

@@ -10,31 +10,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/test/ComprehensiveWorkingHourServiceImpl/Test1.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/WEB-INF/prop/weaver.properties" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/prop/weaver.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/log/sdk.log" beforeDir="false" afterPath="$PROJECT_DIR$/log/sdk.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/RecordDataCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/RecordDataCmd.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/ComprehensiveWorkingHourServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/ComprehensiveWorkingHourServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/recordDataCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/recordDataCmd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/ComprehensiveWorkingHourServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/ComprehensiveWorkingHourServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$2.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/shuju/Test.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/shuju/Test.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/beforlog.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/ComprehensiveWorkingHourServiceImpl/beforlog.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/shuju/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/shuju/Test.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$2.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$3.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$4.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$5.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$5.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$6.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1$6.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/ComprehensiveWorkingHourServiceImpl/Test1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/ComprehensiveWorkingHourServiceImpl/Test1.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/ComprehensiveWorkingHourServiceImpl/Test1.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -79,7 +74,7 @@
     <property name="last_directory_selection" value="$PROJECT_DIR$/src/com/engine/kq" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../../AO史密斯/aosmithProject" />
     <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.last.edited" value="SDKs" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.14124292" />
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
@@ -567,7 +562,8 @@
       <workItem from="1712625932205" duration="4880000" />
       <workItem from="1712631543852" duration="25091000" />
       <workItem from="1712712249272" duration="6788000" />
-      <workItem from="1712726952165" duration="12400000" />
+      <workItem from="1712726952165" duration="19422000" />
+      <workItem from="1712798979811" duration="4074000" />
     </task>
     <servers />
   </component>
@@ -601,10 +597,6 @@
           <properties class="java.lang.ArithmeticException" package="java.lang" />
           <option name="timeStamp" value="54" />
         </breakpoint>
-        <breakpoint enabled="true" type="java-exception">
-          <properties class="java.lang.IllegalArgumentException" package="java.lang" />
-          <option name="timeStamp" value="73" />
-        </breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/test/TestGetClockInPoint.java</url>
           <line>301</line>

src/com/engine/attendance/attendanceanalysis/service/impl/ComprehensiveWorkingHourServiceImpl.java

@@ -243,26 +243,29 @@ public class ComprehensiveWorkingHourServiceImpl extends Service implements Comp
 
         }else if ("1".equals(rgzscjsgz)){
             //依次累加成对打卡间隔时长
-            if (clockInTimeList.size() %2 == 1){
-                clockInTimeList.remove(clockInTimeList.size()-1);
-                newClockInTimeList = clockInTimeList;
-            }
-            if (newClockInTimeList.size() > 1){
+            if (clockInTimeList.size() > 1){
                 //数据清洗
                 Set<Map<String,Object>> needRemoveData = Sets.newHashSet();
-                for (int i=0;i<newClockInTimeList.size()-1;i++){
-                    String time1 = newClockInTimeList.get(i).get("signdate")+" "+newClockInTimeList.get(i).get("signtime");
-                    for (int j=i+1;j<newClockInTimeList.size();j++){
-                        String time2 = newClockInTimeList.get(j).get("signdate")+" "+newClockInTimeList.get(j).get("signtime");
+                for (int i=0;i<clockInTimeList.size()-1;i++){
+                    String time1 = clockInTimeList.get(i).get("signdate")+" "+clockInTimeList.get(i).get("signtime");
+                    for (int j=i+1;j<clockInTimeList.size();j++){
+                        String time2 = clockInTimeList.get(j).get("signdate")+" "+clockInTimeList.get(j).get("signtime");
                         if (DateUtil.getBetWeenMinutes(time1,time2) <wdkhlfzs){
-                            needRemoveData.add(newClockInTimeList.get(j));
+                            needRemoveData.add(clockInTimeList.get(j));
                         }
                     }
                 }
                 for (Map<String,Object> map:needRemoveData){
-                    newClockInTimeList.remove(map);
+                    clockInTimeList.remove(map);
                 }
             }
+
+            if (clockInTimeList.size() %2 == 1){
+                clockInTimeList.remove(clockInTimeList.size()-1);
+                newClockInTimeList = clockInTimeList;
+            }else {
+                newClockInTimeList = clockInTimeList;
+            }
         }
 
         if (newClockInTimeList.size() > 0){

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

@@ -313,6 +313,8 @@ public class AttendanceAnalysisWrapper extends Service {
 
         List<Map<String,Object>> abnormalClockInList = updateAttendanceResultWrapper.recordAbnormalClockIn(recordAbnormalParam);
 
+
+
         /**
          * 请假
          */
@@ -338,6 +340,10 @@ public class AttendanceAnalysisWrapper extends Service {
          */
         List<Map<String,Object>> recordWorkOverTime= updateAttendanceResultWrapper.recordWorkOverTime(recordAbnormalParam);
 
+        /**
+         * 有出勤津贴
+         */
+
         /**
          * 计算出勤时长
          */

src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java

@@ -428,4 +428,14 @@ public class UpdateAttendanceResultWrapper extends Service {
     }
 
 
+    /**
+     * 津贴处理
+     * @param params
+     * @return
+     */
+    public List<Map<String,Object>> allowanceHandle(Map<String,Object> params){
+
+
+        return null;
+    }
 }

test/ComprehensiveWorkingHourServiceImpl/Test1.java

@@ -6,7 +6,6 @@ import com.engine.common.util.ServiceUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.junit.Test;
-import weaver.conn.RecordSet;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,11 +29,19 @@ public class Test1 extends beforlog {
             put("signdate","2024-04-08");
         }});
         clockInTimeList.add(new HashMap(){{
-            put("signtime","09:06:00");
+            put("signtime","11:01:00");
             put("signdate","2024-04-09");
         }});
         clockInTimeList.add(new HashMap(){{
-            put("signtime","18:04:00");
+            put("signtime","11:05:30");
+            put("signdate","2024-04-09");
+        }});
+        clockInTimeList.add(new HashMap(){{
+            put("signtime","13:00:00");
+            put("signdate","2024-04-09");
+        }});
+        clockInTimeList.add(new HashMap(){{
+            put("signtime","17:04:00");
             put("signdate","2024-04-09");
         }});
         clockInTimeList.add(new HashMap(){{
@@ -47,19 +54,19 @@ public class Test1 extends beforlog {
         }});
         workHourItem.put("wdkhlfzs","1");
         workHourItem.put("rzcgzsc","12.00");
-        workHourItem.put("rzwdkbdsj","09: 00");
+        workHourItem.put("rzwdkbdsj","09:00");
         workHourItem.put("ljcqscdhsfzs","30");
         workHourItem.put("szjg","1");
         workHourItem.put("hsgsdrqlx","4,0");
-        workHourItem.put("dzsbksd","0");
+        workHourItem.put("dzsbksd","1");
         workHourItem.put("qyrl","5");
-        workHourItem.put("rgzscjsgz","0");
+        workHourItem.put("rgzscjsgz","1");
         workHourItem.put("hlpbyxsyzhgs","1");
         workHourItem.put("zwdkxbdkssj","");
         workHourItem.put("rgzscbzhsyc","1");
-        workHourItem.put("rgzscyq","6.00");
+        workHourItem.put("rgzscyq","10.00");
         workHourItem.put("ccrgzscyqjrcqsc","1");
-        workHourItem.put("zzdksbdkssj","06: 00");
+        workHourItem.put("zzdksbdkssj","06:00");
 
 
         param.put("analysisDate","2024-04-09");