zm_dev
liuliang 1 year ago
parent c034115cfd
commit 46a4de5964

@ -1 +1 @@
<EFBFBD>[<EFBFBD><EFBFBD>鵿<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>}<EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>Z譿<EFBFBD>y<EFBFBD>Q<EFBFBD><EFBFBD>

@ -10,26 +10,18 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment=""> <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/AllowanceService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.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" 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" 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.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.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/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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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/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/wrapper/AttendanceAnalysisWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.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$/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/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -106,7 +98,7 @@
<command value="organzationList" /> <command value="organzationList" />
</option> </option>
</component> </component>
<component name="RunManager" selected="JUnit.Test1.test"> <component name="RunManager" selected="JUnit.Tset_sy.test">
<configuration name="Test (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="Test (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="shuju.Test" /> <option name="MAIN_CLASS_NAME" value="shuju.Test" />
<module name="hrm-attendance" /> <module name="hrm-attendance" />
@ -149,14 +141,6 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="TestMethod" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TestMethod" />
<module name="hrm-attendance" />
<shortenClasspath name="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TestObj" type="Application" factoryName="Application" nameIsGenerated="true"> <configuration name="TestObj" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TestObj" /> <option name="MAIN_CLASS_NAME" value="TestObj" />
<module name="hrm-attendance" /> <module name="hrm-attendance" />
@ -188,6 +172,17 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="Tset_sy.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="hrm-attendance" />
<shortenClasspath name="MANIFEST" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="Tset_sy" />
<option name="METHOD_NAME" value="test" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit"> <configuration default="true" type="JUnit" factoryName="JUnit">
<shortenClasspath name="MANIFEST" /> <shortenClasspath name="MANIFEST" />
<option name="TEST_OBJECT" value="class" /> <option name="TEST_OBJECT" value="class" />
@ -197,11 +192,11 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="JUnit.Tset_sy.test" />
<item itemvalue="JUnit.Test1.test" /> <item itemvalue="JUnit.Test1.test" />
<item itemvalue="Application.Test1" /> <item itemvalue="Application.Test1" />
<item itemvalue="Application.Test (1)" /> <item itemvalue="Application.Test (1)" />
<item itemvalue="Application.TestMain" /> <item itemvalue="Application.TestMain" />
<item itemvalue="Application.TestMethod" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -563,7 +558,8 @@
<workItem from="1712631543852" duration="25091000" /> <workItem from="1712631543852" duration="25091000" />
<workItem from="1712712249272" duration="6788000" /> <workItem from="1712712249272" duration="6788000" />
<workItem from="1712726952165" duration="19422000" /> <workItem from="1712726952165" duration="19422000" />
<workItem from="1712798979811" duration="4074000" /> <workItem from="1712798979811" duration="5690000" />
<workItem from="1712812681283" duration="5428000" />
</task> </task>
<servers /> <servers />
</component> </component>

File diff suppressed because one or more lines are too long

@ -86,7 +86,7 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
} }
if (recordDataTime != null && recordDataTime.size() >0){ if (recordDataTime != null && recordDataTime.size() >0){
for (Map.Entry<String,Object> entry : recordDataTime.entrySet()){ for (Map.Entry<String,Object> entry : recordDataTime.entrySet()){
sql = sql + entry.getKey()+"='"+entry.getValue()+"',"; sql = sql + entry.getKey()+"="+entry.getValue()+",";
} }
}else { }else {
for (int i=1;i<9;i++){ for (int i=1;i<9;i++){

@ -0,0 +1,8 @@
package com.engine.attendance.attendanceanalysis.service;
import java.util.List;
import java.util.Map;
public interface AllowanceService {
List<Map<String,Object>> removeAbnormal(Map<String,Object> param);
}

@ -0,0 +1,29 @@
package com.engine.attendance.attendanceanalysis.service.impl;
import com.engine.attendance.attendanceanalysis.service.AllowanceService;
import com.engine.common.util.DbTools;
import com.engine.core.impl.Service;
import weaver.general.Util;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public class AllowanceServiceImpl extends Service implements AllowanceService {
@Override
public List<Map<String, Object>> removeAbnormal(Map<String, Object> param) {
String userId = Util.null2String(param.get("userId"));
String analysisDate = Util.null2String(param.get("analysisDate"));
String sql = "select jtlx,sc,zt from uf_jcl_kq_cqjt where zt=1 and yg=? and rq=?";
List<Map<String,Object>> allowanceList = DbTools.getSqlToList(sql,userId,analysisDate);
if (allowanceList.size() == 0){
return null;
}
Map<String,List<Map<String,Object>>> allowanceGroupByList = allowanceList.stream().collect(Collectors.groupingBy(e->e.get("jtlx").toString()));
return null;
}
}

@ -357,8 +357,8 @@ public class ComprehensiveWorkingHourServiceImpl extends Service implements Comp
for (int i =0;i<logarithm;i++){ for (int i =0;i<logarithm;i++){
int index1 = i*2; int index1 = i*2;
int index2 = index1+1; int index2 = index1+1;
resultMap.put("j"+(i+1),clockInTimeList.get(index1).get("signtime")); resultMap.put("j"+(i+1),"'"+clockInTimeList.get(index1).get("signtime")+"'");
resultMap.put("c"+(i+1),clockInTimeList.get(index2).get("signtime")); resultMap.put("c"+(i+1),"'"+clockInTimeList.get(index2).get("signtime")+"'");
} }
log.info("betweenMinute : [{}]",resultMap); log.info("betweenMinute : [{}]",resultMap);
return resultMap; return resultMap;

@ -344,6 +344,7 @@ public class AttendanceAnalysisWrapper extends Service {
* *
*/ */
/** /**
* *
*/ */

Binary file not shown.

@ -2,6 +2,8 @@ package ComprehensiveWorkingHourServiceImpl;
import com.engine.attendance.attendanceanalysis.service.ComprehensiveWorkingHourService; import com.engine.attendance.attendanceanalysis.service.ComprehensiveWorkingHourService;
import com.engine.attendance.attendanceanalysis.service.impl.ComprehensiveWorkingHourServiceImpl; import com.engine.attendance.attendanceanalysis.service.impl.ComprehensiveWorkingHourServiceImpl;
import com.engine.attendance.workflow.service.AllowanceService;
import com.engine.attendance.workflow.service.impl.AllowanceServiceImpl;
import com.engine.common.util.ServiceUtil; import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -16,65 +18,73 @@ public class Test1 extends beforlog {
@Test @Test
public void test(){ public void test(){
ComprehensiveWorkingHourService comprehensiveWorkingHourService = ServiceUtil.getService(ComprehensiveWorkingHourServiceImpl.class); // ComprehensiveWorkingHourService comprehensiveWorkingHourService = ServiceUtil.getService(ComprehensiveWorkingHourServiceImpl.class);
Map<String,Object> param = Maps.newHashMap(); // Map<String,Object> param = Maps.newHashMap();
List<Map<String,Object>> clockInTimeList = Lists.newArrayList(); // List<Map<String,Object>> clockInTimeList = Lists.newArrayList();
Map<String,Object> workHourItem = Maps.newHashMap(); // Map<String,Object> workHourItem = Maps.newHashMap();
clockInTimeList.add(new HashMap(){{ // clockInTimeList.add(new HashMap(){{
put("signtime","08:05:00"); // put("signtime","08:05:00");
put("signdate","2024-04-08"); // put("signdate","2024-04-08");
}}); // }});
clockInTimeList.add(new HashMap(){{ // clockInTimeList.add(new HashMap(){{
put("signtime","19:15:00"); // put("signtime","19:15:00");
put("signdate","2024-04-08"); // put("signdate","2024-04-08");
}}); // }});
clockInTimeList.add(new HashMap(){{ // clockInTimeList.add(new HashMap(){{
put("signtime","11:01:00"); // put("signtime","11:01:00");
put("signdate","2024-04-09"); // put("signdate","2024-04-09");
}}); // }});
clockInTimeList.add(new HashMap(){{ // clockInTimeList.add(new HashMap(){{
put("signtime","11:05:30"); // put("signtime","11:05:30");
put("signdate","2024-04-09"); // put("signdate","2024-04-09");
}}); // }});
clockInTimeList.add(new HashMap(){{ // clockInTimeList.add(new HashMap(){{
put("signtime","13:00:00"); // put("signtime","13:00:00");
put("signdate","2024-04-09"); // put("signdate","2024-04-09");
}}); // }});
clockInTimeList.add(new HashMap(){{ // clockInTimeList.add(new HashMap(){{
put("signtime","17:04:00"); // put("signtime","17:04:00");
put("signdate","2024-04-09"); // put("signdate","2024-04-09");
}}); // }});
clockInTimeList.add(new HashMap(){{ // clockInTimeList.add(new HashMap(){{
put("signtime","08:16:00"); // put("signtime","08:16:00");
put("signdate","2024-04-10"); // put("signdate","2024-04-10");
}}); // }});
clockInTimeList.add(new HashMap(){{ // clockInTimeList.add(new HashMap(){{
put("signtime","21:14:00"); // put("signtime","21:14:00");
put("signdate","2024-04-10"); // put("signdate","2024-04-10");
}}); // }});
workHourItem.put("wdkhlfzs","1"); // workHourItem.put("wdkhlfzs","1");
workHourItem.put("rzcgzsc","12.00"); // workHourItem.put("rzcgzsc","12.00");
workHourItem.put("rzwdkbdsj","09:00"); // workHourItem.put("rzwdkbdsj","09:00");
workHourItem.put("ljcqscdhsfzs","30"); // workHourItem.put("ljcqscdhsfzs","30");
workHourItem.put("szjg","1"); // workHourItem.put("szjg","1");
workHourItem.put("hsgsdrqlx","4,0"); // workHourItem.put("hsgsdrqlx","4,0");
workHourItem.put("dzsbksd","1"); // workHourItem.put("dzsbksd","1");
workHourItem.put("qyrl","5"); // workHourItem.put("qyrl","5");
workHourItem.put("rgzscjsgz","1"); // workHourItem.put("rgzscjsgz","1");
workHourItem.put("hlpbyxsyzhgs","1"); // workHourItem.put("hlpbyxsyzhgs","1");
workHourItem.put("zwdkxbdkssj",""); // workHourItem.put("zwdkxbdkssj","");
workHourItem.put("rgzscbzhsyc","1"); // workHourItem.put("rgzscbzhsyc","1");
workHourItem.put("rgzscyq","10.00"); // workHourItem.put("rgzscyq","10.00");
workHourItem.put("ccrgzscyqjrcqsc","1"); // workHourItem.put("ccrgzscyqjrcqsc","1");
workHourItem.put("zzdksbdkssj","06:00"); // workHourItem.put("zzdksbdkssj","06:00");
//
//
// param.put("analysisDate","2024-04-09");
// param.put("userId","80");
// param.put("clockInTimeCollect",clockInTimeList);
// param.put("workHourItem",workHourItem);
// param.put("attendanceItems",Lists.newArrayList());
// comprehensiveWorkingHourService.excuteByWorkHour(param);
AllowanceService getAllowanceService = ServiceUtil.getService(AllowanceServiceImpl.class);
Map<String,Object> param = Maps.newHashMap();
param.put("startDate","2024-04-01");
param.put("endDate","2024-04-09");
param.put("analysisDate","2024-04-09"); getAllowanceService.addAllowanceRecords(param);
param.put("userId","80");
param.put("clockInTimeCollect",clockInTimeList);
param.put("workHourItem",workHourItem);
param.put("attendanceItems",Lists.newArrayList());
comprehensiveWorkingHourService.excuteByWorkHour(param);
} }
} }

@ -1,4 +1,5 @@
import ComprehensiveWorkingHourServiceImpl.beforlog;
import com.engine.attendance.workflow.service.AllowanceService; import com.engine.attendance.workflow.service.AllowanceService;
import com.engine.attendance.workflow.service.impl.AllowanceServiceImpl; import com.engine.attendance.workflow.service.impl.AllowanceServiceImpl;
import com.engine.common.util.ServiceUtil; import com.engine.common.util.ServiceUtil;
@ -12,7 +13,7 @@ import java.util.Map;
* @Description: * @Description:
* @Date: 2024/4/10 * @Date: 2024/4/10
**/ **/
public class Tset_sy { public class Tset_sy extends beforlog {
@Test @Test
public void test() { public void test() {
System.out.println("hello"); System.out.println("hello");

Loading…
Cancel
Save