Merge remote-tracking branch 'origin/main'

.idea/dataSources.local.xml

@@ -13,6 +13,7 @@
         <introspection-scope>
           <node kind="schema">
             <name qname="@" />
+            <name qname="HRM_TEST" />
             <name qname="PUBLIC" />
           </node>
         </introspection-scope>

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

@@ -1 +1 @@
-聡
饉羳
纜駗詝騷鐈踸蟸蘽襹靫觹魘蓒魗詝飦
錡郳荴㘎鱑芚鉘蝀蔤轠譠鶷賄酫馳鏨韀鈀鬠襔蘓覺襊荱鍿羃輁颲萪羍裝鮚鉛蚛鶹蟅霶蔥錟郬蚠饌
䎬苮鄖鴘鎩髙䓖鴚觵鼂鱷詘褅脃鍃葁輛鸚颴衆黊酼骙<EFBFBD>[遊鯹覽誟鷑豯韙餺踤莖靤鰏聎蘰胣辴羙詐鷎輖鰍髈鎡蟣鼁蟫魐蛅莡誸饁鑤賦詪
鴰
輳
聭
虖
聫
蠋
迬
飸
䦟
顝
蓯
藧
驇
袕
蹘
鎺
讕
駪
藧
鼛
脨
翉
葠
麘
䦛
釋
覑
茝
蠋
軗
謵
頀
鎻
鐞
蛽
缼
鐝
褢
貜
蕦
鶒
藨
螑
趲
蓴
韼
蠋
顛
讘
脫
輲
輳
蠍
趰
顜
鶑
顜
魬
鎼
軕
蕩
贀
菕
駩
茞
銖
䦶
飶
輴
蛽
脪
麖
鷳
鞁
艗
蛷
鴳
鎾
釐
蠍
謷
驉
鈱
鯇
訍
<EFBFBD><EFBFBD>
趶
迯
褣
閻
膽
鞆
鰩
霃
蹘
話
鋻
邘
鏀
銘
鞈
邟
鰢
蕏閟踴讀鎥鱱鄕詖輜鱵觵顆靫騰鉽膙鴙鹵聎閧蟤躰羖錳阨説纋鷉襨裪踙鵯羕騤黭辴麀鵿賬賬蕔蘽鄛趠<EFBFBD><EFBFBD>饈<EFBFBD><EFBFBD>鼃醻<EFBFBD>醻藑<EFBFBD>觹雫<EFBFBD>饉軀鱺<EFBFBD>醻<EFBFBD>蘿<EFBFBD>脅<EFBFBD>繬镸闙闙镸霱闙闙鍹罭隡頜臡郘荓螸鞮螹頜餗鐹錕鐺鍷鏚鍷錕鍷鉑鉑逰郕繨蔎蚄鉑鍷錕鍷釱銴袻鉑鏚鏚鍷郖鉐繨逬逰錕諰鉑鉑銴鏚鏚鏚錕鏚錕﨡蘆齀鮆鏚銴鍷鐺釱錕鉑襆銴錕鉑鏚鶭罦蒍臟鐺釱螸銴鉑鍷錕鐺錕鍷銴錕鐹翵躂貹釱鏚闗錕鉑鉑鍷訪錕錕鏚蜬
+аyГ~цЭ|дй~Й~хд|И}ф─
Л~ш}Т~М|юй~с}С}ю─
Я}У}Ь~к~Х}Н~г}ЭЖ|б}О}Ъ┌
рqчhаjЖkЛjВhТjгiлjфkзiУhЭlЩkуoжpжxЯuЭtЧvВvтwЛvа{иxяyТxЙvЮxЦvБyиxрzпwЧvзxа▌
Ы▒
Ч▓
ш░
С⌠
ж░
М░
Ч▒
С▌
ъ▐
м▌
Ж▐
С▒
Ъ▐
з░
н▌
Н▐
Ш░
з▐
Э▄
д▄
Д▒
о░
Щ▒
Ъ▀
Д⌠
в░
к▐
д█
Щ▌
Р▐
ы▒
щ░
ч▒
А░
я▐
П▌
Ь░
э░
я▒
Ю▓
ч▌
ц▒
П▒
Г▓
З▌
У█
Ъ░
л▌
о▐
щ▐
б▐
Э█
х■
д░
Ъ█
т▐
з▌
Ж▓
Т▌
Н▐
Б▒
У▐
щ█
П▒
с░
Щ▌
л░
э⌠
р▐
р▌
Ц▓
ь░
к▓
м▐
И█
п█
Й▌
П▌
Р▒
ж░
п▐
А▐
л█
и▒
Ш▓
Ф█
м▄
ю░
м▌
Ш▌
д▐
ш░
ж▌
и▌
И▐
Ж▐
ъ▐
В▌
н▒
л▐
О▐
Й█
Н└
иwбsСsЪvцsЕwаtПsщyАlГtДoфsшqлlЬqЦpЗrКlыsЖsвuрsХmхoьqЛrщlйjНZК\т^Й\ФZоVфZХXШ\РVИhбwчxкzБyп{Шzб|ш{оxОxЙ|фzд|яwи{ЗvБyК|ЦVеZюUаYфSТYхXе\цXэaцcвeщ_ЮWхWц^бTмRюTЫTПZсWж[ъTЕ]ы[ЪWТRДWгVоZГZЧUЮYСQсXЮWБYЦ[кZшgО~В~ыzю~л{РzвyК{Бxи~ц|М{ъ~тж|Ф}к~н}ы│
чaчdВ]вhп]вaь^ГaК`гaй^ж_Ш]С]И]в^Т^в^и]Т]Х`ЯkКgшgюgЩgюhШcТ]жWЬkшiцqжhЧoяLбLшLюMБMГMКMКMНMсNХMКMНMГMХMЙMНMФMХMЯKДKЕKЙKюKаJцJЪJЕKЦKБKоLшKФKГKГKЕKИKЕKЕKИJюJФJсKЕKИKФKЕKФKДKГKГKпLДKЕKшKжJаJХJДKЕKХKЦKоLЦKДKЦKИKГKФKЕKюKдJЧIсKБKЦKХKГKЕKДKГKЕKГKрLФKГKКJЪIсJтKЕKФKГKДKоLФKФKФKДKЙKДKвKшJюJФJЧKДKДKДKДK

.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_src_/schema/HRM_TEST.zrbasQ.meta

@@ -1,2 +1,2 @@
 #n:HRM_TEST
-!<md> [1710253231000, 0, null, null, -2147483648, -2147483648]
+!<md> [1716478657000, 0, null, null, -2147483648, -2147483648]

.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_staging_/schema/HRM_TEST.zrbasQ.meta

@@ -0,0 +1 @@
+#n:HRM_TEST

.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_staging_/schema/HRM_TEST.zrbasQ/table/UF_JCL_KQ_JQYE.Eneiqg.meta

@@ -0,0 +1 @@
+#n:UF_JCL_KQ_JQYE

.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_staging_/schema/HRM_TEST.zrbasQ/table/UF_JCL_KQ_JQYE.Eneiqg/trigger/UF_JCL_KQ_JQYE_ID_TRIGGER.wWWmng.meta

@@ -0,0 +1 @@
+#n:UF_JCL_KQ_JQYE_ID_TRIGGER

.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_staging_/schema/HRM_TEST.zrbasQ/table/UF_JCL_KQ_JQYE.Eneiqg/trigger/UF_JCL_KQ_JQYE_ID_TRIGGER.wWWmng.sql

@@ -0,0 +1,6 @@
+create trigger UF_JCL_KQ_JQYE_ID_TRIGGER
+    before insert
+    on UF_JCL_KQ_JQYE
+    for each row
+begin select uf_jcl_kq_jqye_Id.nextval into :new.id from dual; end;
+/

.idea/workspace.xml

@@ -11,16 +11,22 @@
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/WEB-INF/sqllog/ecologysql" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/sqllog/ecologysql" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/log/sdk.log" beforeDir="false" afterPath="$PROJECT_DIR$/log/sdk.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/VocationCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/VocationCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.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/api/attendance/summary/AttendanceSummaryActionApi.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/api/attendance/summary/AttendanceSummaryActionApi.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.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.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/workflow/cmd/GetCqSummarySearchConditionCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/cmd/GetCqSummarySearchConditionCmd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/AttendanceSummaryService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AllowanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AllowanceServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/web/AttendanceSummaryApi.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/vocation/Test1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/vocation/Test1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/vocation/Test1.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/vocation/Test1.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -63,7 +69,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File" value="PLAIN_TEXT" />
     <property name="last_directory_selection" value="$PROJECT_DIR$/src/com/engine/kq" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../easyentry" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../上海考勤产品/考勤分支代码" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
@@ -85,11 +91,11 @@
       <recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\cmd\calendar" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="calendarscheduling" />
       <recent name="vocation" />
       <recent name="com.engine.attendance.attendanceanalysis.cmd" />
       <recent name="TestAttendanceAllowance" />
       <recent name="ComprehensiveWorkingHourServiceImpl" />
-      <recent name="" />
     </key>
   </component>
   <component name="RunAnythingCache">
@@ -97,21 +103,7 @@
       <command value="organzationList" />
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.Test.testAnalysis">
+  <component name="RunManager" selected="JUnit.Test1.test1">
-    <configuration name="TestMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="shuju.TestMain" />
-      <module name="hrm-attendance" />
-      <shortenClasspath name="MANIFEST" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="shuju.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="TestObj" type="Application" factoryName="Application" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="TestObj" />
       <module name="hrm-attendance" />
@@ -143,6 +135,23 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="Test1.test2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="hrm-attendance" />
+      <shortenClasspath name="MANIFEST" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="calendarscheduling.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="calendarscheduling" />
+      <option name="MAIN_CLASS_NAME" value="calendarscheduling.Test1" />
+      <option name="METHOD_NAME" value="test2" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="Test2.testAnalysis" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="hrm-attendance" />
       <shortenClasspath name="MANIFEST" />
@@ -197,11 +206,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.Test1.test1" />
         <item itemvalue="JUnit.Test.testAnalysis" />
         <item itemvalue="JUnit.Tset_sy.test" />
+        <item itemvalue="JUnit.Test1.test2" />
         <item itemvalue="JUnit.Test2.testAnalysis" />
-        <item itemvalue="JUnit.Test1.test1" />
-        <item itemvalue="Application.TestMain" />
       </list>
     </recent_temporary>
   </component>
@@ -617,7 +626,13 @@
       <workItem from="1715923672642" duration="9625000" />
       <workItem from="1716168995101" duration="7410000" />
       <workItem from="1716182862702" duration="18415000" />
-      <workItem from="1716255298319" duration="16083000" />
+      <workItem from="1716255298319" duration="24562000" />
+      <workItem from="1716289540033" duration="9918000" />
+      <workItem from="1716341913292" duration="7187000" />
+      <workItem from="1716356126448" duration="38541000" />
+      <workItem from="1716517144358" duration="11000" />
+      <workItem from="1716528894728" duration="591000" />
+      <workItem from="1716531236250" duration="14244000" />
     </task>
     <servers />
   </component>
@@ -652,24 +667,34 @@
           <option name="timeStamp" value="54" />
         </breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java</url>
+          <url>file://$PROJECT_DIR$/../../../weaver/ecology/classbean/com/engine/cube/cmd/app/GetImpExpInfo.class</url>
-          <line>280</line>
+          <line>63</line>
-          <option name="timeStamp" value="99" />
+          <option name="timeStamp" value="106" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/../../../weaver/ecology/classbean/com/engine/cube/cmd/app/GetImpExpInfo.class</url>
+          <line>139</line>
+          <option name="timeStamp" value="107" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java</url>
+          <url>file://$PROJECT_DIR$/../../../weaver/ecology/classbean/com/engine/cube/cmd/app/GetImpExpInfo.class</url>
-          <line>254</line>
+          <line>221</line>
-          <option name="timeStamp" value="102" />
+          <option name="timeStamp" value="108" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java</url>
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java</url>
-          <line>38</line>
+          <line>69</line>
-          <option name="timeStamp" value="104" />
+          <option name="timeStamp" value="118" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java</url>
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java</url>
-          <line>81</line>
+          <line>41</line>
-          <option name="timeStamp" value="105" />
+          <option name="timeStamp" value="123" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java</url>
+          <line>111</line>
+          <option name="timeStamp" value="124" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

WEB-INF/prop/weaver.properties

@@ -1,16 +1,12 @@
-DriverClasses = com.mysql.cj.jdbc.Driver
+DriverClasses=oracle.jdbc.OracleDriver
 
-ecology.url = jdbc:mysql://221.226.25.34:8286/ecologyjcl?characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai
+ecology.url = jdbc:oracle:thin:@192.168.0.106:1521:ecology
-ecology.user = fanwei
+ecology.user = hrm_test
-ecology.password = alpwsl92
+ecology.password = ecology
 ecology.charset = ISO
 ecology.maxconn = 300
 ecology.minconn = 50
 ecology.maxusecount = 6000
 ecology.maxidletime = 600
 ecology.maxalivetime = 10
-ecology.checktime = 3600
+ecology.checktime = 3600
-
-ecology.isgoveproj = 0
-LOG_FORMAT = yyyy.MM.dd'-'hh:mm:ss
-DEBUG_MODE = false

src/com/engine/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.java

@@ -77,7 +77,7 @@ public class GetAskForLeaveCmd extends AbstractCommonCommand<Map<String,Object>>
             return resultMap;
         }
 
-        sql = "select id,hsl,hsdw,lgsbxydk,tqlghlfzs,fgsbxydk,thfghlfzs,tybcndbjlhbjs,zdycbcndfgzsd,zdycrqqjndxxb,zysd from uf_jcl_kq_kqxm where id in ("+String.join(",",jplxSet)+")";
+        sql = "select * from uf_jcl_kq_kqxm where id in ("+String.join(",",jplxSet)+")";
         Map<String,List<Map<String,Object>>> collect = DbTools.getSqlToList(sql).stream().collect(Collectors.groupingBy(e->e.get("id").toString()));
 
 

src/com/engine/attendance/attendanceanalysis/cmd/GetEvectionCmd.java

@@ -74,7 +74,7 @@ public class GetEvectionCmd extends AbstractCommonCommand<Map<String,Object>> {
         if (cclxSet.size() == 0){
             return resultMap;
         }
-        sql = "select id,hsl,hsdw,lgsbxydk,tqlghlfzs,fgsbxydk,thfghlfzs,tybcndbjlhbjs,zdycbcndfgzsd,zdycrqqjndxxb,zysd from uf_jcl_kq_kqxm where id in ("+String.join(",",cclxSet)+")";
+        sql = "select * from uf_jcl_kq_kqxm where id in ("+String.join(",",cclxSet)+")";
         Map<String,List<Map<String,Object>>> collect = DbTools.getSqlToList(sql).stream().collect(Collectors.groupingBy(e->e.get("id").toString()));
 
 

src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * 获得班次结果
+ * 获得班次信息
  * 这边改了代码，ShiftServiceImpl的getSchedulingInFormation方法打卡匹配班次类也得跟着变，里面有相同逻辑
  */
 @Slf4j
@@ -138,7 +138,7 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
                 map.put("sfkt","0");
             }
             //查找对应的考勤项目
-            String querySql = "select id keyid,ksjbbxydk,jsjbbxydk,tqdkyxfzs,thdkyxfzs,jbwdhlfzs,jbzzhlfzs,tqdkjrjb,thdkjrjb,jbscbdccsqsc,zdkcjcxxsc,ccclfs,rzdjbxss,yzdjbxss,zzdjbxss,jbzdzjqye,jbqsfzs,ccqszhdhsfzs,hsl,hsdw from uf_jcl_kq_kqxm where id=?";
+            String querySql = "select a.id keyid,a.* from uf_jcl_kq_kqxm a where id=?";
             attendanceItems = DbTools.getSqlToList(querySql,overtimePlan.get("jblx"));
 
 
@@ -269,7 +269,8 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
             }else if (ClassSegmentTypeEnum.EARLY_OVERTIME.getKey().equals(bdlx)){
                 Map<String,Object> result = new WorkOvertimeItemCmd(getWorkOverTimeParam).execute(commandContext);
                 workTimeBeItems = (List<Map<String,Object>>)result.get("attendanceItems");
-            }else if (ClassSegmentTypeEnum.OVERTIME_PLAN.getKey().equals(bdlx)){
+            }else if (ClassSegmentTypeEnum.OVERTIME_PLAN.getKey().equals(bdlx) &&
+                    ClassSegmentTypeEnum.WORK_TIME.getKey().equals(scheduleMap.get("beforeClassSegment"))){
                 Map<String,Object> result = new WorkOvertimeItemCmd(getWorkOverTimeParam).execute(commandContext);
                 workTimeBeItems = (List<Map<String,Object>>)result.get("attendanceItems");
                 scheduleMap.put("jblx",workTimeBeItems);

src/com/engine/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java

@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import weaver.general.TimeUtil;
 import weaver.general.Util;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -69,10 +70,13 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
         String realityStartTime = Util.null2String(params.get("realityStartTime"));
         //实际结束时间
         String realityEndime = Util.null2String(params.get("realityEndime"));
+        //考勤项目
+        List<Map<String,Object>> attendanceItems = (List<Map<String,Object>>)params.get("attendanceItems");
 
         long diffdays = Long.valueOf(Util.null2String(params.get("diffdays")));
 
 
+
         String rqlx = Util.null2String(scheduleMap.get("rqlx"));
 
         List<Map<String, Object>> workOverTimeResults = null;
@@ -105,13 +109,11 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
             workOverTimeResults =getWorkOverTimeResults(startDate,endDate,userId);
 
         }
-        if ("2".equals(ccclfs) && !"".equals(rzdjbxss) && DateTypeEnum.WORK_DAY.getKey().equals(rqlx)){
+        if ("2".equals(ccclfs) && !"".equals(rzdjbxss) && (DateTypeEnum.WORK_DAY.getKey().equals(rqlx) || DateTypeEnum.CHANGECLASS.getKey().equals(rqlx))){
             //工作日加班最大数
-            double dayTime = getWorkDayTime(workOverTimeResults,analysisDate) *60;
             double maxDayTime = Double.valueOf(rzdjbxss) *60;
-            double time = jbsc+dayTime;
+            if (jbsc > maxDayTime){
-            if (time > maxDayTime){
+                jbsc = maxDayTime;
-                jbsc = maxDayTime-dayTime;
             }
         }
         if ("2".equals(ccclfs) && !"".equals(zzdjbxss)){
@@ -125,7 +127,7 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
         }
         if ("2".equals(ccclfs) && !"".equals(yzdjbxss)){
             //每月最大加班数
-            double monthTime = getMonthTime(workOverTimeResults);
+            double monthTime = getMonthTime(workOverTimeResults,analysisDate);
             double maxMonthTime = Double.valueOf(yzdjbxss) *60;
             double time = jbsc+monthTime;
             if (time > maxMonthTime){
@@ -137,6 +139,12 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
         double itemduration = Utils.getItemdurationDown(workOverTimeHsl,workOverTimeHsdw,Long.valueOf(Math.round(jbsc)).intValue(),AccountingUnitEnum.MINUTES);
         workOverTimeItems.put("itemduration",itemduration);
 
+        /**
+         * 是否是有出勤结果
+         */
+        String sql = "select id from uf_jcl_kq_cqjg where ygid=? and rq=?";
+        List<Map<String,Object>> dataList = DbTools.getSqlToList(sql,userId,analysisDate);
+        String id = dataList.size()>0?Util.null2String(dataList.get(0).get("id")):"";
         /**
          * 入加班结果表
          */
@@ -148,11 +156,13 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
         insertParam.put("sjjssj",realityEndime.split(" ")[1]);
         insertParam.put("sjjbsc",itemduration);
         insertParam.put("jbjgly","4");
-        insertParam.put("jblx",workTimeBeLateItems.get(0).get("id"));
+        insertParam.put("jblx",workTimeBeLateItems.get(0).get("key"));
         insertParam.put("lyid",userId+"-"+ DateUtil.getCurrentDate());
         insertParam.put("zt","1");
-        Utils.InsertFormTable("uf_jcl_kq_jbjg",insertParam,(Map<String,String>)params.get("formmodeIdMap"));
+        insertParam.put("eddxsc",0);
-
+        insertParam.put("edjxsc",0);
+        insertParam.put("ydxsc",0);
+        insertParam.put("wdxsc",0);
         /**
          * 入假期余额
          */
@@ -162,6 +172,22 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
             insertHoliDayParam.put("ygid",userId);
             insertHoliDayParam.put("jqid",workTimeBeLateItems.get(0).get("zrdjb"));
             insertHoliDayParam.put("lyid",userId+"-"+DateUtil.getCurrentDate());
+            Map<String,Object> holidayItem = getHolidayItem(workTimeBeLateItems.get(0).get("zrdjb").toString(),attendanceItems);
+
+            double ktsc = Utils.getItemdurationDown(Double.valueOf(holidayItem.get("hsl").toString()),holidayItem.get("hsdw").toString(),Double.valueOf(jbsc).intValue(),AccountingUnitEnum.MINUTES);
+
+            insertHoliDayParam.put("ktsc",ktsc);
+            insertHoliDayParam.put("yxsc",0);
+            insertHoliDayParam.put("wxsc",ktsc);
+            insertHoliDayParam.put("ztsc",0);
+            insertHoliDayParam.put("jxsc",0);
+            insertHoliDayParam.put("yqsc",0);
+            insertHoliDayParam.put("yqyxsc",0);
+            insertHoliDayParam.put("zfsc",0);
+
+            insertParam.put("eddxsc",itemduration);
+            insertParam.put("wdxsc",itemduration);
+
             //转入的假期额度生效日期
             String yesxrq = Util.null2String(workTimeBeLateItems.get(0).get("yesxrq"));
             if ("0".equals(yesxrq)){
@@ -201,7 +227,6 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
                 //当前一年
                 insertHoliDayParam.put("jzrq",insertHoliDayParam.get("sxrq").toString().split("-")[0]+"-12-31");
             }
-            insertHoliDayParam.put("ktsc",itemduration);
 
             String zdyqsc = Util.null2String(workTimeBeLateItems.get(0).get("zdyqsc"));
             if (DelayTypeEnum.ONE_MONTH.getKey().equals(zdyqsc)){
@@ -220,12 +245,11 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
                 //一年
                 insertHoliDayParam.put("yqsxrq",DateUtil.nextMonth(insertHoliDayParam.get("jzrq").toString(),12,DateUtil.yyyyMMdd));
             }
-            insertHoliDayParam.put("yxsc","0");
-            insertHoliDayParam.put("wxsc","0");
-            insertHoliDayParam.put("ztsc","0");
-            Utils.InsertFormTable("uf_jcl_kq_jqye",insertHoliDayParam,(Map<String,String>)params.get("formmodeIdMap"));
 
+            updateholidayResult(id,insertHoliDayParam);
         }
+        updateOverTimeResult(id,insertParam);
+
         return workOverTimeItems;
     }
 
@@ -259,7 +283,8 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
         List<Map<String, Object>> list = dataList.stream().filter(e->{
             String sjksrq = Util.null2String(e.get("sjksrq"));
             if (DateUtil.getTime(sjksrq).compareTo(DateUtil.getTime(startDate)) >=0 &&
-                    DateUtil.getTime(sjksrq).compareTo(DateUtil.getTime(endDate)) >=0){
+                    DateUtil.getTime(sjksrq).compareTo(DateUtil.getTime(endDate)) <=0  &&
+                    DateUtil.getTime(sjksrq).compareTo(DateUtil.getTime(date)) !=0){
                 return true;
             }else {
                 return false;
@@ -273,8 +298,75 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
      * @param dataList
      * @return
      */
-    public int getMonthTime(List<Map<String, Object>> dataList){
+    public int getMonthTime(List<Map<String, Object>> dataList,String date){
-        int totalHour = dataList.stream().mapToInt(e->Integer.valueOf(e.get("sjjbsc").toString())).sum();
+        List<Map<String, Object>> list = dataList.stream().filter(e->DateUtil.getTime(e.get("sjksrq").toString()).compareTo(DateUtil.getTime(date)) !=0).collect(Collectors.toList());
+        int totalHour = list.stream().mapToInt(e->Integer.valueOf(e.get("sjjbsc").toString())).sum();
         return totalHour;
     }
+
+    /**
+     * 更新加班结果
+     */
+    public void updateOverTimeResult(String lyid, Map<String,Object> insertParam){
+        if (!"".equals(lyid)){
+            String sql = "select edjxsc,ydxsc from uf_jcl_kq_jbjg where lyid=?";
+            List<Map<String,Object>> overTimeResultList = DbTools.getSqlToList(sql,lyid);
+            if (overTimeResultList.size() > 0){
+                Map<String,Object> overTimeResult = overTimeResultList.get(0);
+                insertParam.put("edjxsc",overTimeResult.get("edjxsc"));
+                insertParam.put("ydxsc",overTimeResult.get("ydxsc"));
+                double eddxsc = Utils.convertDouble(insertParam.get("eddxsc"));
+                double ydxsc = Utils.convertDouble(overTimeResult.get("ydxsc"));
+                insertParam.put("wdxsc",String.format("%.2f",eddxsc-ydxsc));
+            }
+        }
+
+        Utils.InsertFormTable("uf_jcl_kq_jbjg",insertParam,(Map<String,String>)params.get("formmodeIdMap"));
+
+    }
+    /**
+     * 更新假期余额
+     * 当假期余额为0不记录假期余额，如果当天已有该加班的假期余额记录则更新。
+     */
+    public void updateholidayResult(String lyid,Map<String,Object> insertParam){
+        double ktsc = Utils.convertDouble(insertParam.get("ktsc"));
+        if (!"".equals(lyid)) {
+            String sql = "select yxsc,ztsc,zfsc,jxsc,yqsc,yqyxsc from uf_jcl_kq_jqye where lyid=?";
+            List<Map<String,Object>> holidayList = DbTools.getSqlToList(sql,lyid);
+            if (holidayList.size() > 0){
+                Map<String,Object> holidayMap = holidayList.get(0);
+                insertParam.put("yxsc",holidayMap.get("yxsc"));
+                insertParam.put("ztsc",holidayMap.get("ztsc"));
+                insertParam.put("zfsc",holidayMap.get("zfsc"));
+                insertParam.put("jxsc",holidayMap.get("jxsc"));
+                insertParam.put("yqsc",holidayMap.get("yqsc"));
+                insertParam.put("yqyxsc",holidayMap.get("yqyxsc"));
+                double wxsc = ktsc-Utils.convertDouble(insertParam.get("yxsc"))-Utils.convertDouble(holidayMap.get("ztsc"))-Utils.convertDouble(holidayMap.get("zfsc"));
+                insertParam.put("wxsc",String.format("%.2f",wxsc));
+            }else {
+                if (ktsc == 0){
+                    insertParam.put("lyid",lyid);
+                }
+            }
+            Utils.InsertFormTable("uf_jcl_kq_jqye",insertParam,(Map<String,String>)params.get("formmodeIdMap"));
+        }else {
+            if (ktsc !=0){
+                Utils.InsertFormTable("uf_jcl_kq_jqye",insertParam,(Map<String,String>)params.get("formmodeIdMap"));
+            }
+        }
+
+
+    }
+
+    public Map<String,Object> getHolidayItem(String holidayId,List<Map<String,Object>> attendanceItems){
+        List<Map<String,Object>> holidayList = attendanceItems.stream().filter(e->e.get("key").equals(holidayId)).collect(Collectors.toList());
+        if (holidayList.size() > 0){
+            return holidayList.get(0);
+        }else {
+            String sql = "select hsl,hsdw from uf_jcl_kq_kqxm where id=?";
+            holidayList = DbTools.getSqlToList(sql,holidayId);
+            return holidayList.get(0);
+        }
+    }
+
 }

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

@@ -34,7 +34,7 @@ public class AllowanceServiceImpl extends Service implements AllowanceService {
         }
         Set<String> allowances = allowanceList.stream().map(e-> e.get("jtlx").toString()).collect(Collectors.toSet());
         Map<String,List<Map<String,Object>>> allowanceGroupByList = allowanceList.stream().collect(Collectors.groupingBy(e->e.get("jtlx").toString()));
-        sql = "select id,csjthdclfs,tcscws,hsdw from uf_jcl_kq_kqxm where id in ("+String.join(",",allowances)+")";
+        sql = "select * from uf_jcl_kq_kqxm where id in ("+String.join(",",allowances)+")";
         List<Map<String,Object>> itemList = DbTools.getSqlToList(sql);
         Map<String,List<Map<String,Object>>> itemGroupbyList = itemList.stream().collect(Collectors.groupingBy(e->e.get("id").toString()));
 

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

@@ -382,7 +382,7 @@ public class ShiftServiceImpl extends Service implements ShiftService {
                 map.put("sfkt","0");
             }
             //查找对应的考勤项目
-            String querySql = "select id keyid,ksjbbxydk,jsjbbxydk,tqdkyxfzs,thdkyxfzs,jbwdhlfzs,jbzzhlfzs,tqdkjrjb,thdkjrjb,jbscbdccsqsc,zdkcjcxxsc,ccclfs,rzdjbxss,yzdjbxss,zzdjbxss,jbzdzjqye,jbqsfzs,ccqszhdhsfzs,hsl,hsdw from uf_jcl_kq_kqxm where id=?";
+            String querySql = "select a.id keyid,a.* from uf_jcl_kq_kqxm a where id=?";
             attendanceItems = DbTools.getSqlToList(querySql,overtimePlan.get("jblx"));
 
 

src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java

@@ -43,9 +43,9 @@ public class AttendanceanalysisAction {
         try {
             Map<String,Object> paramMap = ParamUtil.request2Map(request);
 //            Map<String,Object> paramMap = Maps.newHashMap();
-//            paramMap.put("startDate","2024-05-11");
+//            paramMap.put("startDate","2024-05-02");
-//            paramMap.put("endDate","2024-05-11");
+//            paramMap.put("endDate","2024-05-02");
-//            paramMap.put("userIds","31");
+//            paramMap.put("userIds","27");
 
 
             String startDate = Util.null2String(paramMap.get("startDate"));

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

@@ -330,6 +330,7 @@ public class AttendanceAnalysisWrapper extends Service {
         if (scheduleResult.get(0).get("sfxx") != null && CheckBoxEnum.CHECKED.getKey().equals(scheduleResult.get(0).get("sfxx"))){
             recordParam.put("sfxx",CheckBoxEnum.CHECKED.getKey());
             recordParam.put("cqzt",CheckBoxEnum.UNCHECKED.getKey());
+            recordParam.put("attendanceDuration",0);
         }
         utilService.recordItem(recordParam);
         return (Map<String,Object>)recordParam.get("recordDataTime");

src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java

@@ -11,12 +11,14 @@ import com.engine.attendance.component.persongroup.commonutil.PersongroupCommonU
 import com.engine.attendance.enums.CheckBoxEnum;
 import com.engine.attendance.enums.PersonGroupListTypeEnum;
 import com.engine.attendance.enums.RegularScheduleTypeEnum;
+import com.engine.common.util.CommonUtil;
 import com.engine.common.util.DateUtil;
 import com.engine.common.util.DbTools;
 import com.engine.common.util.Utils;
 import com.engine.core.impl.Service;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 import weaver.conn.RecordSet;
 import weaver.conn.constant.DBConstant;
@@ -42,7 +44,12 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
     @Override
     public Map<String, Object> getWorkRulesList(String resourceIds) {
         Map<String, Object> resultMap = new HashMap<>(4);
-
+        log.info("getWorkRulesList : [{}]",resourceIds);
+        String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_bcxx");
+        Set<String> bcids = Sets.newHashSet();
+        for (String resourceId :resourceIds.split(",")){
+            bcids.addAll(CommonUtil.getAllDataIds(resourceId,modeId,DateUtil.getCurrentDate(),DateUtil.getCurrentDate()));
+        }
         WeaTable table = new WeaTable();
         String pageId = "936b04850b7b478cafd59d1cf4cb9fc1";
         table.setPageID(pageId);
@@ -55,7 +62,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
         String fromSql = " from uf_jcl_kq_bcxx t ";
         table.setSqlform(fromSql);
 
-        String sqlWhere = " where 1=1 ";
+        String sqlWhere = " where 1=1 and t.id in ("+String.join(",",bcids)+")";
         table.setSqlwhere(sqlWhere);
 
         table.setSqlprimarykey("id");
@@ -82,7 +89,8 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
         int pageindex = Integer.valueOf(Util.null2String(params.get("pageindex")));
         String deparmentId = Util.null2String(params.get("deparment"));
         String subcompanyId = Util.null2String(params.get("subcompany"));
-        String userId = Util.null2String(user.getUID());
+//        String userId = Util.null2String(user.getUID());
+        String userId = "1";
         //0:全体人员、1：分部、2：部门
         String type = Util.null2String(params.get("type"));
 
@@ -335,21 +343,21 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
             Map<String,Object> map = Maps.newHashMap();
             map.put("dx",str);
             map.put("dxlx", "0");
+            map.put("rqlx",CommonUtil.getRqlx(str,date));
             organizationList.add(map);
         }
+        String sql = "select id,mc,sfxx from uf_jcl_kq_bcxx where id=?";
+        List<Map<String,Object>> bcxxList = DbTools.getSqlToList(sql,bcxxId);
         List<Map<String,Object>> insertDataList = Lists.newArrayList();
         Map<String,Object> insertDataMap = Maps.newHashMap();
         insertDataList.add(insertDataMap);
         insertDataMap.put("pbtj",RegularScheduleTypeEnum.CALENDAR.getKey());
         insertDataMap.put("bcrq",date);
-        insertDataMap.put("sfxx", CheckBoxEnum.UNCHECKED.getKey());
+        insertDataMap.put("sfxx", bcxxList.get(0).get("sfxx"));
         insertDataMap.put("sfdkpp",CheckBoxEnum.UNCHECKED.getKey());
         insertDataMap.put("bcxx",bcxxId);
         insertDataMap.put("pbrq",DateUtil.getCurrentDate());
         insertDataMap.put("pbsj",DateUtil.getCurrentTime("yyyy-MM-dd HH:mm").split(" ")[1]);
-        String sql = "select b.rqlx,b.rq from uf_jcl_kq_rlmc a left join uf_jcl_kq_rlxx b on a.id=b.rlmc where a.mrrl=? and b.rq=?";
-        Map<String,Object> dateMap = DbTools.getSqlToMap(sql,CheckBoxEnum.CHECKED.getKey(),date);
-        insertDataMap.put("rqlx",dateMap.get("rqlx"));
 
         /**插入排班结果表*/
         resultMap.put("result",PersongroupCommonUtil.insertShiftSchedulingResults(organizationList,insertDataList,formmodeid));

src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java

@@ -140,7 +140,13 @@ public class PersongroupCommonUtil {
         return needSkipDay;
     }
 
-
+    /**
+     * 插入排班结果公共方法
+     * @param organizationList
+     * @param insertDataList
+     * @param formmodeid
+     * @return
+     */
     public static boolean insertShiftSchedulingResults(List<Map<String,Object>> organizationList,List<Map<String,Object>> insertDataList,String formmodeid){
         RecordSet rs = new RecordSet();
         List<List> addlist = Lists.newArrayList();
@@ -152,7 +158,7 @@ public class PersongroupCommonUtil {
         Set<String> departments = Sets.newHashSet();
         Set<String> subCompanys = Sets.newHashSet();
         for (Map<String,Object> organization: organizationList){
-
+            String rqlx = Util.null2String(organization.get("rqlx"));
             for (Map<String,Object> insertData : insertDataList){
                 ArrayList<Object> list = new ArrayList<>();
                 list.add(insertData.get("pbtj"));
@@ -189,7 +195,11 @@ public class PersongroupCommonUtil {
                     subCompanys.add(Util.null2String(organization.get("dx")).split("-")[0]);
                 }
                 list.add(insertData.get("bcrq"));
-                list.add(insertData.get("rqlx"));
+                if (!rqlx.equals("")){
+                    list.add(rqlx);
+                }else {
+                    list.add(insertData.get("rqlx"));
+                }
                 list.add(insertData.get("sfxx"));
                 list.add(insertData.get("sfdkpp"));
                 list.add(insertData.get("bcxx"));

src/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.java

@@ -52,9 +52,13 @@ public class PersonGroupServiceImpl extends Service implements PersonGroupServic
 
         log.info("selectItemMap : [{}]",selectItemMap);
 
-        sql = "select type,linkurl from wf_browser_config group by type";
+        //sql = "select type,linkurl from wf_browser_config group by type";
+        sql = "select type,linkurl from wf_browser_config ";
         List<Map<String,Object>> browserTypeLists = DbTools.getSqlToList(sql);
-        Map<String,String> browserTypeMaps = browserTypeLists.stream().collect(Collectors.toMap(e->e.get("type").toString(),e->e.get("linkurl").toString()));
+        Map<String,String> browserTypeMaps = Maps.newHashMap();
+        for (Map<String,Object> browserType:browserTypeLists){
+            browserTypeMaps.put(Util.null2String(browserType.get("type")),Util.null2String(browserType.get("linkurl")));
+        }
         log.info("browserTypeMaps : [{}]",browserTypeMaps);
 
         for (Map<String,Object> map :dataList){

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

@@ -8,6 +8,7 @@ import com.engine.common.util.DbTools;
 import com.engine.common.util.Utils;
 import com.engine.core.interceptor.CommandContext;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import weaver.general.Util;
 
@@ -33,16 +34,47 @@ public class VocationCmd extends AbstractCommonCommand<Map<String,Object>> {
     @Override
     public Map<String, Object> execute(CommandContext commandContext) {
         List<Map<String,Object>> vocationList = (List<Map<String,Object>>)params.get("vocationList");
-        Map<String,Object> userMap = (Map<String,Object>)params.get("userMap");
+        List<Map<String,Object>> userList = (List<Map<String,Object>>)params.get("userList");
+        List<Map<String,Object>> userfilter = userList.stream().filter(e->"-1".equals(e.get("scopeid"))).collect(Collectors.toList());
+        Map<String,Object> userMap = userfilter.size()>0?userfilter.get(0):Maps.newHashMap();
 
         for (Map<String,Object> vocation : vocationList){
             log.info("qsrq : [{}],yjzd : [{}]",vocation.get("qsrq"),vocation.get("yjzd"));
-            String qsrq = Util.null2String(userMap.get(vocation.get("qsrq").toString().toLowerCase()));
+            String qsrq = Util.null2String(vocation.get("qsrq")).toLowerCase();
-            String yjzd = Util.null2String(userMap.get(vocation.get("yjzd").toString().toLowerCase()));
+            String yjzd = Util.null2String(vocation.get("yjzd")).toLowerCase();
-            String ljcrglyfslwz = Util.null2String(userMap.get(vocation.get("ljcrglyfslwz")));
+            String ljcrglyfslwz = Util.null2String(vocation.get("ljcrglyfslwz"));
-            vocation.put("qsrqValue",qsrq);
+            String qsrqValue = Util.null2String(userMap.get(qsrq));
-            vocation.put("yjzdValue",yjzd);
+            String yjzdValue = Util.null2String(userMap.get(yjzd));
-            vocation.put("ljcrglyfslwzValue",ljcrglyfslwz);
+            String ljcrglyfslwzValue = Util.null2String(userMap.get(ljcrglyfslwz));
+            if ("".equals(qsrqValue)){
+                for (Map<String,Object> map: userList){
+                    qsrqValue = Util.null2String(map.get(qsrq));
+                    if (!"".equals(qsrqValue)){
+                        break;
+                    }
+                }
+            }
+            if ("".equals(yjzdValue)){
+                for (Map<String,Object> map: userList){
+                    yjzdValue = Util.null2String(map.get(yjzd));
+                    if (!"".equals(yjzdValue)){
+                        break;
+                    }
+                }
+            }
+            if ("".equals(ljcrglyfslwzValue)){
+                for (Map<String,Object> map: userList){
+                    ljcrglyfslwzValue = Util.null2String(map.get(ljcrglyfslwz));
+                    if (!"".equals(ljcrglyfslwzValue)){
+                        break;
+                    }
+                }
+            }
+
+
+            vocation.put("qsrqValue",qsrqValue);
+            vocation.put("yjzdValue",yjzdValue);
+            vocation.put("ljcrglyfslwzValue",ljcrglyfslwzValue);
             vocation.put("zyzValue",getUserIds(vocation));
         }
         log.info("VocationCmd params: [{}]",params);

src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java

@@ -30,7 +30,7 @@ public class VocationServiceImpl extends Service implements VocationService {
         param.put("modeId",modeId);
         Map<String,Object> result = commandExecutor.execute(new GetPersonDateBySuitOrganzation(param));
 
-        String sql = "select a.id userid,a.*,b.* from hrmresource a left join cus_fielddata b on a.id=b.id where a.id in (";
+        String sql = "select a.id userid,a.*,b.* from hrmresource a left join cus_fielddata b on a.id=b.id where scope='HrmCustomFieldByInfoType' and a.id in (";
 
         List<String> userIds = Lists.newArrayList();
         for (Map.Entry<String, Object> entry : result.entrySet()){
@@ -42,25 +42,11 @@ public class VocationServiceImpl extends Service implements VocationService {
             String querySql = sql + String.join(",",list) +")";
             log.info("querySql : [{}]",querySql);
             List<Map<String,Object>> resultList = DbTools.getSqlToListKeySmallLetter(querySql);
-
-            List<Map<String,Object>> filterList = resultList.stream().filter(e -> "HrmCustomFieldByInfoType".equals(Util.null2String(e.get("scope"))) &&
-                    "-1".equals(Util.null2String(e.get("scopeid")))).collect(Collectors.toList());
-            dataList.addAll(filterList);
-
-            List<String> filterStrList = filterList.stream().map(e -> e.get("userid").toString()).collect(Collectors.toList());
-            resultList = resultList.stream().filter(e -> {
-                String userId = Util.null2String(e.get("userid"));
-                if (filterStrList.contains(userId)){
-                    return false;
-                }else {
-                    return true;
-                }
-
-            }).collect(Collectors.toList());
             dataList.addAll(resultList);
         }
         Map<String,List<Map<String,Object>>> userIdMap = dataList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("userid"))));
 
+
         for (Map.Entry<String, Object> entry : result.entrySet()){
             String userId = entry.getKey();
             Map<String,String> vocationMap = (Map<String, String>)entry.getValue();
@@ -76,13 +62,13 @@ public class VocationServiceImpl extends Service implements VocationService {
                     needGenerateVocationMap.put(Util.null2String(map.get("key")),vocationMap.get(map.get("key")));
                 }
             }
-            log.info("VocationServiceImpl userId:{}, userMap:{}",userId,userIdMap.get(userId));
+            log.info("VocationServiceImpl userId:{}, userList:{}",userId,userIdMap.get(userId));
             for (Map.Entry<String, Object> e:needGenerateVocationMap.entrySet()){
                 if (e.getValue() != null && ((List<Map<String,Object>>)e.getValue()).size() > 0){
                     Map<String,Object> vocationParam = Maps.newHashMap();
                     vocationParam.put("userId",userId);
                     vocationParam.put("vocationList",e.getValue());
-                    vocationParam.put("userMap",userIdMap.get(userId).get(0));
+                    vocationParam.put("userList",userIdMap.get(userId));
                     vocationParam.put("releaseDate",params.get("releaseDate"));
                     vocationParam.put("cover",params.get("cover"));
                     commandExecutor.execute(new VocationCmd(vocationParam));

src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java

@@ -35,7 +35,7 @@ public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand<Map<St
         String sql = "select dxlx,aqjb,dataid,dx from uf_jcl_syzz where modeid=?";
         //假期额度适用组织所有值集合
         List<Map<String,Object>> organzationList = DbTools.getSqlToList(sql,modeId);
-        sql = "select a.id dataid,b.id detailid,a.*,b.* from uf_jcl_kq_jqed a left join uf_jcl_kq_jqed_dt1 b on a.id=b.mainid";
+        sql = "select a.id dataid,b.id detailid,a.*,b.* from uf_jcl_kq_jqed a left join uf_jcl_kq_jqed_dt1 b on a.id=b.mainid where (gzzt is null or  gzzt <> '1')";
         //所有假期额度生成规则值
         List<Map<String,Object>> vacationList = DbTools.getSqlToList(sql);
         //人力资源id，（假别，规则id）

src/com/engine/common/util/CommonUtil.java

@@ -107,6 +107,14 @@ public class CommonUtil {
         return DbTools.updateBatch(sql,insertDataList);
     }
 
+    /**
+     * 获得包含该人员的适用范围的模块的数据id，按照人员-人员分组-部门-分部优先级取到最优先的
+     * @param resourceId
+     * @param modeId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
     public static Set<String> getDataIds(String resourceId,String modeId,String startDate,String endDate){
 
         String sql = "select dxlx,dataid,dx from uf_jcl_syzz where modeid=?";
@@ -178,6 +186,91 @@ public class CommonUtil {
         }
 
 
+        log.info("dataIds : {}",dataIds);
+
+        return dataIds;
+    }
+
+
+    /**
+     * 获得包含该人员的适用范围的模块的所有数据id，
+     * @param resourceId
+     * @param modeId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public static Set<String> getAllDataIds(String resourceId,String modeId,String startDate,String endDate){
+
+        String sql = "select dxlx,dataid,dx from uf_jcl_syzz where modeid=?";
+        List<Map<String,Object>> organizationList = DbTools.getSqlToList(sql,modeId);
+        sql = "select id,departmentid,subcompanyid1 from hrmresource where id =?";
+        Map<String,Object> departMentMap = DbTools.getSqlToMap(sql,resourceId);
+        Set<String> dataIds = Sets.newHashSet();
+        Map<String, List<Map<String,Object>>> organizationListGroupBydxlx =  organizationList.stream().collect(Collectors.groupingBy(e ->e.get("dxlx").toString()));
+        //对象类型为人员
+        List<Map<String,Object>> personOrganizationList = organizationListGroupBydxlx.get("0");
+        //对象类型为人员组织
+        List<Map<String,Object>> personGroupOrganizationList = organizationListGroupBydxlx.get("1");
+        //对象类型为部门
+        List<Map<String,Object>> departmentOrganizationList = organizationListGroupBydxlx.get("2");
+        //对象类型为分部
+        List<Map<String,Object>> subCompanyOrganizationList = organizationListGroupBydxlx.get("3");
+        if (personOrganizationList != null){
+            for (Map<String,Object> personOrganization :personOrganizationList){
+                String dx = Util.null2String(personOrganization.get("dx"));
+                String ids = dx.split("-")[0];
+                if (ids.equals(resourceId)){
+                    dataIds.add(Util.null2String(personOrganization.get("dataid")));
+                }
+            }
+        }
+        if (personGroupOrganizationList != null){
+            Set<String> personGroupIds = personGroupOrganizationList.stream().map(e -> Util.null2String(e.get("dx")).split("-")[0]).collect(Collectors.toSet());
+            sql = "select mainid,empid,filters,bdate,edate from uf_ryqz_dt1  where  mainid in ("+String.join(",",personGroupIds)+")";
+            log.info("query personGroupData : {}",sql);
+            List<Map<String,Object>> personGroupData = DbTools.getSqlToList(sql);
+            Set<String> personnelGroupIds = PersongroupCommonUtil.getPersonnelGroupingByPerson(personGroupData,resourceId,startDate,endDate);
+            log.info("personnelGroupIds : {}",personnelGroupIds);
+            for (Map<String,Object> personGroupOrganization :personGroupOrganizationList){
+                String personnelGroupId = Util.null2String(personGroupOrganization.get("dx")).split("-")[0];
+                if (personnelGroupIds.contains(personnelGroupId)){
+                    dataIds.add(Util.null2String(personGroupOrganization.get("dataid")));
+                }
+            }
+        }
+        try {
+            if (departmentOrganizationList != null){
+                String deptid = Util.null2String(departMentMap.get("departmentid"));
+                String pdeptids = "";
+                pdeptids = new DepartmentComInfo().getAllParentDepartId(Util.null2String(departMentMap.get("departmentid")), pdeptids);
+                pdeptids = deptid + pdeptids;
+                log.info("pdeptids : [{}]",pdeptids);
+                for (Map<String,Object> departmentOrganization :departmentOrganizationList){
+                    String dx = Util.null2String(departmentOrganization.get("dx"));
+                    String ids = dx.split("-")[0];
+                    for (String pdeptid : pdeptids.split(",")){
+                        if (pdeptid.equals(ids)){
+                            dataIds.add(Util.null2String(departmentOrganization.get("dataid")));
+                        }
+                    }
+                }
+            }
+        }catch (Exception e){
+            log.error("catch error :{}",e);
+        }
+        if (subCompanyOrganizationList != null){
+            String subCompanyId = Util.null2String(departMentMap.get("subcompanyid1"));
+            for (Map<String,Object> subCompanyOrganization :subCompanyOrganizationList){
+                String dx = Util.null2String(subCompanyOrganization.get("dx"));
+                String ids = dx.split("-")[0];
+                if (ids.equals(subCompanyId)){
+                    dataIds.add(Util.null2String(subCompanyOrganization.get("dataid")));
+                }
+            }
+        }
+
+
         log.info("dataIds : {}",dataIds);
 
         return dataIds;
@@ -453,16 +546,23 @@ public class CommonUtil {
     }
 
     /**
-     * 获得人员对应日期所属的默认日期类型
+     * 获得人员对应日期所属的日期类型
      * @param userId
      * @param date
      * @return
      */
-    public static String getRqlx(String userId,String date) throws Exception{
+    public static String getRqlx(String userId,String date){
         String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_rlmc");
         Set<String> calendarSetIdsSets = CommonUtil.getDataIds(userId,modeId,DateUtil.getCurrentDate(),DateUtil.getCurrentDate());
         log.info("getRqlx calendarSetIdsSets : [{}]",calendarSetIdsSets);
         String rqlx = "";
+        if (calendarSetIdsSets.size() == 0){
+            String sql = "select subcompanyid1 from hrmresource where id =?";
+            Map<String,Object> departMentMap = DbTools.getSqlToMap(sql,userId);
+            sql = "select id from uf_jcl_kq_rlmc where szjg=?";
+            List<Map<String,Object>> resultList = DbTools.getSqlToList(sql,departMentMap.get("subcompanyid1"));
+            calendarSetIdsSets = resultList.stream().map(e->e.get("id").toString()).collect(Collectors.toSet());
+        }
         if (calendarSetIdsSets.size() > 0){
             String sql = "select rqlx from uf_jcl_kq_rlxx where rlmc=? and rq=?";
             List<Map<String,Object>> dataList = DbTools.getSqlToList(sql,calendarSetIdsSets.toArray()[0],date);

src/com/engine/common/util/Utils.java

@@ -244,7 +244,7 @@ public class Utils<T> {
     }
 
     /**
-     * 根据核算量、核算单位，计算出具体项目时长
+     * 根据核算量、核算单位，计算出具体项目时长，向上核算
      * @param hsl 核算量
      * @param hsdw 核算单位
      * @param duration 时间值
@@ -308,7 +308,7 @@ public class Utils<T> {
 
 
     /**
-     * 根据核算量、核算单位，计算出具体项目时长
+     * 根据核算量、核算单位，计算出具体项目时长，向下核算
      * @param hsl 核算量
      * @param hsdw 核算单位
      * @param duration 时间值
@@ -687,8 +687,8 @@ public class Utils<T> {
 
     /**
      * 获得班次的开始时间
-     * @param schedulingMap
+     * @param schedulingMap 班次信息
-     * @param date
+     * @param date 分析日期
      * @return
      */
     public static String getkssjTime(Map<String,Object> schedulingMap,String date){
@@ -720,8 +720,8 @@ public class Utils<T> {
     }
     /**
      * 获得班次的结束时间
-     * @param schedulingMap
+     * @param schedulingMap 班次信息
-     * @param date
+     * @param date 分析日期
      * @return
      */
     public static String getjssjTime(Map<String,Object> schedulingMap,String date){
@@ -768,4 +768,13 @@ public class Utils<T> {
             return false;
         }
     }
+
+    /**
+     * 转换成double
+     * @param num
+     * @return
+     */
+    public static double convertDouble(Object num){
+        return Util.null2String(num).equals("")?0:Double.valueOf(Util.null2String(num));
+    }
 }

test/TestAttendanceAllowance/Test.java

@@ -1,6 +1,7 @@
 package TestAttendanceAllowance;
 
 import com.engine.attendance.attendanceanalysis.web.AttendanceanalysisAction;
+import com.engine.attendance.component.calendarscheduling.web.WorkRulesController;
 import com.engine.common.util.DateUtil;
 import com.google.common.collect.Maps;
 import weaver.hrm.company.SubCompanyComInfo;
@@ -22,6 +23,17 @@ Test extends beforlog{
         AttendanceanalysisAction action = new AttendanceanalysisAction();
         action.getSchedulingData(null,null);
 
+    }
+
+    @org.junit.Test
+    public void test2() throws Exception{
+        Map<String,Object> paramMap = Maps.newHashMap();
+        paramMap.put("startDate","2024-04-15");
+        paramMap.put("endDate","2024-04-15");
+        paramMap.put("userIds","31");
+
+        WorkRulesController action = new WorkRulesController();
+        action.getDepartSchedule(null,null);
 
     }
 }

test/Tset_sy.java

@@ -1,13 +1,19 @@
 
 import ComprehensiveWorkingHourServiceImpl.beforlog;
+import com.engine.attendance.enums.AccountingUnitEnum;
 import com.engine.attendance.workflow.service.AllowanceService;
 import com.engine.attendance.workflow.service.impl.AllowanceServiceImpl;
 import com.engine.common.util.DateUtil;
 import com.engine.common.util.ServiceUtil;
+import com.engine.common.util.Utils;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Author: sy
@@ -17,7 +23,14 @@ import java.util.Map;
 public class Tset_sy extends beforlog {
     @Test
     public void test() {
+        List<Map<String,Object>> browserTypeLists = Lists.newArrayList();
+        Map<String,Object> map1 = Maps.newHashMap();
+        map1.put("type","1");
+        map1.put("linkurl","wewqe");
+        browserTypeLists.add(map1);
+        browserTypeLists.add(map1);
 
-        System.out.println( DateUtil.getBetWeenMinutes("2024-05-20 11:00:00","2024-05-20 11:00:01"));
+        Map<String,String> browserTypeMaps = browserTypeLists.stream().collect(Collectors.toMap(e->e.get("type").toString(), e->e.get("linkurl").toString()));
+        System.out.println(browserTypeMaps);
     }
 }

test/calendarscheduling/Test1.java

@@ -0,0 +1,45 @@
+package calendarscheduling;
+
+import TestAttendanceAllowance.beforlog;
+import com.alibaba.fastjson.JSONObject;
+import com.engine.attendance.component.calendarscheduling.service.WorkRulesService;
+import com.engine.attendance.component.calendarscheduling.service.impl.WorkRulesServiceImpl;
+import com.engine.common.util.ServiceUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class Test1 extends beforlog {
+
+
+    @org.junit.Test
+    public void test2() throws Exception{
+        WorkRulesService basicsetService = ServiceUtil.getService(WorkRulesServiceImpl.class);
+        Map<String, Object> param = Maps.newHashMap();
+        param.put("dateTime","2024-05");
+        param.put("pageSize","10");
+        param.put("pageindex","1");
+        param.put("deparment","");
+        param.put("type","0");
+        param.put("subcompany","");
+        param.put("tableName","uf_pbjg");
+
+        Map<String, Object> result = basicsetService.getDepartSchedule(param);
+
+        Map<String, Object> apidatas = new HashMap<>();
+        apidatas.put("api_status", true);
+        apidatas.put("data", result);
+        String success = getJsonString(apidatas);
+
+        System.out.println(success);
+    }
+    public   String getJsonString(Object apidatas) throws JsonProcessingException {
+        Gson gson = new Gson();
+//        ObjectMapper mapper = new ObjectMapper();
+        return JSONObject.toJSONString(apidatas);
+    }
+}

test/calendarscheduling/beforlog.java

@@ -0,0 +1,142 @@
+package calendarscheduling;
+
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import weaver.general.GCONST;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class beforlog {
+
+
+    @Before
+    public void init(){
+        GCONST.setRootPath("");
+        GCONST.setServerName("ecology");
+
+         System.out.println("----------------开始----------------");
+    }
+
+    @After
+    public void demoAfter() throws  Exception{
+
+       System.out.println("-----------------结束---------------");
+
+
+    }
+
+
+    public HttpServletRequest CreateHttpServletOrmap(Map<String,Object> map){
+        HttpServletRequest httpServletRequest = (HttpServletRequest) EasyMock.createMock(HttpServletRequest.class);
+     //   Map<String, String> map2 = new HashMap<>();
+        for (String key:map.keySet() ) {
+            //    String[] values=
+          //  map2.put(key,map.get(key).toString());
+            EasyMock.expect(httpServletRequest.getParameter(key)).andReturn(map.get(key).toString());
+
+        }
+        //  EasyMock.expect(httpServletRequest.getParameterMap()).andReturn(map2);
+        EasyMock.expect(httpServletRequest.getParameter("2123")).andReturn("123");
+        HttpSession session = EasyMock.createStrictMock(HttpSession.class);
+        //session管理
+
+        EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_userid")).andReturn("1");
+        EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_usertype")).andReturn("0");
+        EasyMock.expect(session.getAttribute("weaver_user@bean")).andReturn(new User(290464));
+        EasyMock.expect(httpServletRequest.getSession(true)).andStubReturn(session);
+        EasyMock.replay(httpServletRequest, session);
+        return httpServletRequest;
+    }
+
+
+
+    public HttpServletRequest CreateHttpServletOr(Map<String,Object> map){
+        HttpServletRequest httpServletRequest = (HttpServletRequest) EasyMock.createMock(HttpServletRequest.class);
+        Map<String, String[]> map2 = new HashMap<>();
+        for (String key:map.keySet() ) {
+            //    String[] values=
+            map2.put(key,map.get(key).toString().split(""));
+            EasyMock.expect(httpServletRequest.getParameter(key)).andReturn(map.get(key).toString());
+
+        }
+        //  EasyMock.expect(httpServletRequest.getParameterMap()).andReturn(map2);
+        EasyMock.expect(httpServletRequest.getParameter("2123")).andReturn("123");
+        HttpSession session = EasyMock.createStrictMock(HttpSession.class);
+        //session管理
+
+        EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_userid")).andReturn("26347");
+        EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_usertype")).andReturn("0");
+        EasyMock.expect(session.getAttribute("weaver_user@bean")).andReturn(new User(26347));
+        EasyMock.expect(httpServletRequest.getSession(true)).andStubReturn(session);
+        EasyMock.replay(httpServletRequest, session);
+        return httpServletRequest;
+    }
+
+
+
+    public HttpServletRequest CreateHttpServletworkflowtodu(Map<String,Object> map,Map<String,String> headmap){
+        HttpServletRequest httpServletRequest = (HttpServletRequest) EasyMock.createMock(HttpServletRequest.class);
+        Map<String, String> map2 = new HashMap<>();
+        for (String key:map.keySet() ) {
+        //    String[] values=
+
+            EasyMock.expect(httpServletRequest.getParameter(key)).andReturn(map.get(key).toString());
+
+        }
+        for (String key:headmap.keySet() ) {
+            //    String[] values=
+
+            EasyMock.expect(httpServletRequest.getHeader(key)).andReturn(headmap.get(key).toString());
+
+        }
+        EasyMock.expect(httpServletRequest.getParameter("2123")).andReturn("123");
+        HttpSession session = EasyMock.createStrictMock(HttpSession.class);
+        //session管理
+        EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_userid")).andReturn("26347");
+        EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_usertype")).andReturn("0");
+        EasyMock.expect(session.getAttribute("weaver_user@bean")).andReturn(new User(26347));
+        EasyMock.expect(httpServletRequest.getSession(true)).andStubReturn(session);
+        EasyMock.replay(httpServletRequest, session);
+        return httpServletRequest;
+    }
+
+    public  String getUrl(){
+       String value= this.getClass().getResource("/").getPath();
+       if(value.length()>1){
+           return value.substring(1,value.length()-1);
+       }
+       return  value;
+    }
+    public String loadjson(String path) {
+        path=getUrl()+path;
+        String str = "";
+        try {
+
+            File file = new File(path);// 定义一个file对象，用来初始化FileReader
+            FileReader reader = new FileReader(file);// 定义一个fileReader对象，用来初始化BufferedReader
+            BufferedReader bReader = new BufferedReader(reader);// new一个BufferedReader对象，将文件内容读取到缓存
+            StringBuilder sb = new StringBuilder();// 定义一个字符串缓存，将字符串存放缓存中
+            String s = "";
+            while ((s = bReader.readLine()) != null) {// 逐行读取文件内容，不读取换行符和末尾的空格
+                sb.append(s + "\n");// 将读取的字符串添加换行符后累加存放在缓存中
+                System.out.println(s);
+            }
+            bReader.close();
+            str = sb.toString();
+            return str;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return str;
+    }
+}
+

test/vocation/Test1.java

@@ -3,38 +3,34 @@ package vocation;
 import com.engine.attendance.vacation.job.holidaygeneration.HolidayGenerationJob;
 import com.engine.attendance.vacation.service.VocationService;
 import com.engine.attendance.vacation.service.impl.VocationServiceImpl;
+import com.engine.common.util.ParamUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.common.util.Utils;
+import com.engine.cube.service.ModeImpExpService;
+import com.engine.cube.service.impl.ModeImpExpServiceImpl;
 import com.google.common.collect.Maps;
 import org.junit.Test;
+import weaver.hrm.User;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class Test1 extends beforlog{
+    private ModeImpExpService getService(User user) {
+        return (ModeImpExpService) ServiceUtil.getService(ModeImpExpServiceImpl.class, user);
+    }
     VocationService basicsetService = ServiceUtil.getService(VocationServiceImpl.class);
     @Test
     public  void test1() {
-
+       Map<String,Object> params = Maps.newHashMap();
         Map<String,String> formmodeIdMap = Utils.getFormmodeIdMap();
-        //假期额度模块id
         String modeId = formmodeIdMap.get("uf_jcl_kq_jqed");
-        Map<String, Object> params = Maps.newHashMap();
         params.put("modeId",modeId);
-        params.put("releaseDate","");
+
         params.put("cover",1);
         basicsetService.generateVocation(params);
-
     }
 
-    public int getScheduleIndex(){
+
-        int j = -1;
-        for (int i =0;i<10;i++){
-            if (i == 2){
-                return i;
-            }
-            j = i;
-        }
-        return j;
-    }
 }