liuliang
/
hrm-attendance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整日期类型

Browse Source
zm_dev
liuliang 1 year ago
parent e57b7c6398
commit 51299db4b0
23 changed files with 11560 additions and 68 deletions
Show Stats Download Patch File Download Diff File

44
.idea/workspace.xml
Unescape Escape View File

@ -10,29 +10,18 @@
</component>
<component name="ChangeListManager">
<list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustClockPointAction.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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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/ComputeAttendanceDurationCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustClockPoint.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustWhenHaveTwoClockPoint.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointDTO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/SchedulingResultsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/SchedulingResultsService.java" 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$/src/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.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$/src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/enums/SchedulingApproachEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/SchedulingApproachEnum.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustClockPoint.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo$ClockPointInfoBuilder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo$ClockPointInfoBuilder.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/SchedulingResultsService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/SchedulingResultsService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/enums/SchedulingApproachEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/enums/SchedulingApproachEnum.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/TestAttendanceAllowance/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestAttendanceAllowance/Test.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -109,7 +98,7 @@
<command value="organzationList" />
</option>
</component>
<component name="RunManager" selected="JUnit.TestgetDepartSchedule.test2">
<component name="RunManager" selected="JUnit.Test.testAnalysis">
<configuration name="TestObj" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TestObj" />
<module name="hrm-attendance" />
@ -175,7 +164,7 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Test.testJob" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<configuration name="Test.testjob" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="hrm-attendance" />
<shortenClasspath name="MANIFEST" />
<extension name="coverage">
@ -186,7 +175,7 @@
</extension>
<option name="PACKAGE_NAME" value="TestAttendanceAllowance" />
<option name="MAIN_CLASS_NAME" value="TestAttendanceAllowance.Test" />
<option name="METHOD_NAME" value="testJob" />
<option name="METHOD_NAME" value="testjob" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
@ -218,11 +207,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="JUnit.Test.testAnalysis" />
<item itemvalue="JUnit.Test.testjob" />
<item itemvalue="JUnit.TestgetDepartSchedule.test2" />
<item itemvalue="JUnit.Test1.test3 (1)" />
<item itemvalue="JUnit.Test.testAnalysis" />
<item itemvalue="JUnit.Test1.test3" />
<item itemvalue="JUnit.Test.testJob" />
</list>
</recent_temporary>
</component>
@ -680,7 +669,7 @@
<workItem from="1718070961854" duration="6848000" />
<workItem from="1718084052741" duration="16357000" />
<workItem from="1718156293809" duration="8685000" />
<workItem from="1718170520728" duration="317000" />
<workItem from="1718170520728" duration="7829000" />
</task>
<servers />
</component>
@ -734,11 +723,6 @@
<line>171</line>
<option name="timeStamp" value="138" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java</url>
<line>407</line>
<option name="timeStamp" value="155" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java</url>
<line>111</line>

1173
WEB-INF/sqllog/ecologysql
View File

File diff suppressed because it is too large Load Diff

10339
log/sdk.log
View File

File diff suppressed because one or more lines are too long

BIN
out/artifacts/hrm_attendance/hrm-attendance.jar
View File

Binary file not shown.

14
src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java
Unescape Escape View File

@ -45,7 +45,8 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
Map<String,Object> schedulingResultsMap = (Map<String,Object>)params.get("schedulingResultsMap");
List<Map<String,Object>> schedulingResultsList = (List<Map<String,Object>>)schedulingResultsMap.get("data");
schedulingResultsList = Utils.getSchedulingList(schedulingResultsList);
Map<String,String> dateMap = schedulingResultsList.stream().collect(Collectors.toMap(e->Util.null2String(e.get("bcrq")),e->Util.null2String(e.get("rqlx"))));
//去除候选班组
List<Map<String,Object>> candidateSchedulingResultsList = schedulingResultsList.stream().filter(e->!"".equals(Util.null2String(e.get("hxbz"))) && "".equals(Util.null2String(e.get("bcxx")))).collect(Collectors.toList());
schedulingResultsList = schedulingResultsList.stream().filter(e->!"".equals(Util.null2String(e.get("bcxx")))).collect(Collectors.toList());
@ -55,7 +56,6 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
for (Map<String,Object> schedulingResult:schedulingResultsList){
glpb = Util.null2String(schedulingResult.get("pbgl"));
}
Map<String,List<Map<String,Object>>> schedulingMap = schedulingResultsList.stream().collect(Collectors.groupingBy(e-> Util.null2String(e.get("bcxx")).split("-")[0]));
Map<String,List<Map<String,Object>>> schedulingMapBydate = schedulingResultsList.stream().collect(Collectors.groupingBy(e-> Util.null2String(e.get("bcrq"))));
schedulMap.put("schedulingMapBydate",schedulingMapBydate);
@ -116,11 +116,11 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
//日期集合
Map<String,Object> dateParam = Maps.newHashMap();
dateParam.put("nd",Util.null2String(params.get("startDate")).split("-")[0]);
dateParam.put("glpb",glpb);
List<Map<String,Object>> list = getDate(dateParam);
Map<String,String> dateMap = list.stream().collect(Collectors.toMap(e->Util.null2String(e.get("rq")),e->Util.null2String(e.get("rqlx"))));
// Map<String,Object> dateParam = Maps.newHashMap();
// dateParam.put("nd",Util.null2String(params.get("startDate")).split("-")[0]);
// dateParam.put("glpb",glpb);
// List<Map<String,Object>> list = getDate(dateParam);
// Map<String,String> dateMap = list.stream().collect(Collectors.toMap(e->Util.null2String(e.get("rq")),e->Util.null2String(e.get("rqlx"))));
for (Map.Entry<String,List<Map<String,Object>>> e: overtimePlanMap.entrySet()){
if (resultMap.get(e.getKey()) == null){

2
src/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class AttendanceAnalysisJob extends BaseCronJob {
List<Map<String,Object>> userList = DbTools.getSqlToList(queryUserSql);
String beforeFourDayDate = DateUtil.getCurrentDateMinusDay(4);
String nowDate = DateUtil.getCurrentDate();
String nowDate = DateUtil.getCurrentDateMinusDay(1);
if (executeDate != null && !"".equals(executeDate)){
nowDate = executeDate;
beforeFourDayDate = DateUtil.beforeDay(executeDate,4);

16
src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
Unescape Escape View File

@ -353,17 +353,17 @@ public class ShiftServiceImpl extends Service implements ShiftService {
/** 加班计划*/
sql = "select b.jbry,b.ksrq,b.kssj,a.jblx,b.jsrq,b.jssj,b.jbsc from uf_jcl_kq_jbjh a left join uf_jcl_kq_jbjh_dt1 b on a.id=b.mainid where b.jbry =? and b.ksrq>=? and b.ksrq<=? and (b.jbcx=0 or b.jbcx is null)";
Map<String,List<Map<String,Object>>> overtimePlanMap = DbTools.getSqlToList(sql,params.get("pbdx"),params.get("startDate"),params.get("endDate")).stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("ksrq"))));
Map<String,List<Map<String,Object>>> overtimePlanMap = DbTools.getSqlToList(sql,params.get("pbdx"),punchDate,punchDate).stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("ksrq"))));
//考勤项目
List<Map<String,Object>> attendanceItems = new ArrayList<>();
//日期集合
Map<String,Object> dateParam = Maps.newHashMap();
dateParam.put("nd",Util.null2String(params.get("startDate")).split("-")[0]);
dateParam.put("glpb",schedulingRule);
Map<String,Object> result = commandExecutor.execute(new GetDateCmd(dateParam));
List<Map<String,Object>> list = (List<Map<String,Object>>)result.get("data");
Map<String,String> dateMap = list.stream().collect(Collectors.toMap(e->Util.null2String(e.get("rq")),e->Util.null2String(e.get("rqlx"))));
// Map<String,Object> dateParam = Maps.newHashMap();
// dateParam.put("nd",Util.null2String(params.get("startDate")).split("-")[0]);
// dateParam.put("glpb",schedulingRule);
// Map<String,Object> result = commandExecutor.execute(new GetDateCmd(dateParam));
// List<Map<String,Object>> list = (List<Map<String,Object>>)result.get("data");
// Map<String,String> dateMap = list.stream().collect(Collectors.toMap(e->Util.null2String(e.get("rq")),e->Util.null2String(e.get("rqlx"))));
for (Map.Entry<String,List<Map<String,Object>>> e: overtimePlanMap.entrySet()){
@ -406,7 +406,7 @@ public class ShiftServiceImpl extends Service implements ShiftService {
}
map.put("tqdkfzs","60");
map.put("thdkfzs","60");
map.put("rqlx",dateMap.get(e.getKey()));
map.put("rqlx",dateType);
map.put("edxss",overtimePlan.get("jbsc"));
map.put("jblx",attendanceItems);
map.put("gsrq", ClassBelongToEnum.NOWDAY.getKey());

10
src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java
Unescape Escape View File

@ -44,9 +44,9 @@ public class AttendanceanalysisAction {
try {
Map<String,Object> paramMap = ParamUtil.request2Map(request);
// Map<String,Object> paramMap = Maps.newHashMap();
// paramMap.put("startDate","2024-06-03");
// paramMap.put("endDate","2024-06-03");
// paramMap.put("userIds","31");
// paramMap.put("startDate","2024-06-11");
// paramMap.put("endDate","2024-06-11");
// paramMap.put("userIds","82");
String startDate = Util.null2String(paramMap.get("startDate"));
@ -100,7 +100,7 @@ public class AttendanceanalysisAction {
classesParamMap.put("pblx","0");
classesParamMap.put("pbdx",userId);
classesParamMap.put("current","1");
classesParamMap.put("pageSize",DateUtil.getBetWeenDays(startBeforeDate,endAfterDate)+1);
classesParamMap.put("pageSize",9999);
classesParamMap.put("recurrence",1);
classesParamMap.put("clockInTimeMap",clockInTimeMap);
classesParamMap.put("clockInData",dataList);
@ -164,7 +164,7 @@ public class AttendanceanalysisAction {
classesParamMap.put("pblx","0");
classesParamMap.put("pbdx",userId);
classesParamMap.put("current","1");
classesParamMap.put("pageSize",DateUtil.getBetWeenDays(startBeforeDate,endAfterDate)+1);
classesParamMap.put("pageSize",9999);
classesParamMap.put("recurrence",1);
classesParamMap.put("clockInTimeMap",clockInTimeMap);
classesParamMap.put("clockInData",dataList);

2
src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
Unescape Escape View File

@ -60,7 +60,7 @@ public class AttendanceAnalysisWrapper extends Service {
classesParamMap.put("pblx", "0");
classesParamMap.put("pbdx", userId);
classesParamMap.put("current", "1");
classesParamMap.put("pageSize", 10);
classesParamMap.put("pageSize", 9999);
classesParamMap.put("recurrence", 1);
classesParamMap.put("clockInTimeMap", clockInTimeMap);
classesParamMap.put("attendanceItems", attendanceItems);

16
src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java
Unescape Escape View File

@ -52,14 +52,16 @@ public class SchedulingResultsServiceImpl extends Service implements SchedulingR
List<Map<String, Object>> dataTableList = (List<Map<String, Object>>)result.get("dataTableList");
int total = dataTableList.size();
resultMap.put("total",total);
if (endindex > total){
endindex = total;
if (pageSize != 9999){
if (endindex > total){
endindex = total;
}
startindex = endindex-pageSize;
if (startindex < 0){
startindex = 0;
}
dataTableList = dataTableList.subList(startindex,endindex);
}
startindex = endindex-pageSize;
if (startindex < 0){
startindex = 0;
}
dataTableList = dataTableList.subList(startindex,endindex);
for (Map<String, Object> map:dataTableList){
SetBrowSerName(map);
}

BIN
target/classes/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/ImportAndExport/service/ExcelExportImportService.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/ImportAndExport/web/ExcelController.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class
View File

Binary file not shown.

BIN
target/classes/com/engine/common/util/excel/ExcelUtil.class
View File

Binary file not shown.

BIN
target/test-classes/TestAttendanceAllowance/Test.class
View File

Binary file not shown.

12
test/TestAttendanceAllowance/Test.java
Unescape Escape View File

@ -27,15 +27,9 @@ Test extends beforlog{
}
@org.junit.Test
public void test2() throws Exception{
Map<String,Object> paramMap = Maps.newHashMap();
paramMap.put("startDate","2024-04-28");
paramMap.put("endDate","2024-04-28");
paramMap.put("userIds","31");
WorkRulesController action = new WorkRulesController();
action.getDepartSchedule(null,null);
public void testjob() throws Exception{
AttendanceAnalysisJob attendanceAnalysisJob = new AttendanceAnalysisJob();
attendanceAnalysisJob.execute();
}
@org.junit.Test
public void testJob() {

Write Preview
Loading…
Cancel
Save