Merge remote-tracking branch 'origin/main'

zm_dev
sy 1 year ago
commit 0926a17f3d

@ -1 +1 @@
<EFBFBD>[<EFBFBD><EFBFBD>鵿<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD>[<EFBFBD><EFBFBD>鵿<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

@ -10,129 +10,13 @@
</component>
<component name="ChangeListManager">
<list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/MakeUpClockImportAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/MakeUpClockInAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/workflow/request/hrmattendance/HrmCustomCard_e9.jsp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/AskForLeaveCheckAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/EliminationsAskForLeaveAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/EliminationsEvctionCheckAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/EvctionCheckAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/OvertimePlanCheckAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/OvertimeResultCheckAction.java" afterDir="false" />
<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$/src/com/engine/attendance/workflow/service/MakeUpClockInService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/MakeUpClockInService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java" 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$/src/com/engine/common/util/DateUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/browser/service/impl/jucailin/KQCycleSetBrowserService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCalendarSettingActionApi.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCommonActionApi.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCycleSettingActionApi.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQPersonGroupActionApi.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class" afterDir="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/classes/com/engine/common/util/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DbTools.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DbTools.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSet.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetBiz.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetComInfo.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidayCountWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetCalendarWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetFormWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetImportFormWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetRightMenuWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSearchListWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSyncFormWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/HasRepeatDataWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/InitHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SaveImportWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SyncHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/InsertDataCommonCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/QueryDataCommonCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingTreeCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$3.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupSearchConditionCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/enums/FieldHtmlTypeEnum.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/exception/AttendanceRunTimeException.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/exception/ExceptionUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/DefaultWorker.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/IdGenerator.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/SnowflakeId.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/Worker.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCalendarSettingService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCommonService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCycleSettingService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQPersonGroupService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCalendarSettingServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCommonServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$3.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/Constant$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/Constant.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/DateUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/DbTools.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/KQDateUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ListConversionMethod.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/PageUidFactory.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ResponseResult.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCalendarSettingAction.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCommonAction.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCycleSettingAction.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQPersonGroupAction.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/biz/KQLeaveRulesComInfo.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/service/impl/KQHolidaySetServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestObj.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestObj.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestOneTimePayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestOneTimePayMentWay.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/TestObj.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestObj.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/TestOneTimePayMentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestOneTimePayMentWay.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -175,7 +59,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$/workflow/request/hrmattendance" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../上海考勤产品/考勤分支代码" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
@ -194,11 +78,11 @@
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\cmd\calendar" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.engine.attendance.workflow.action" />
<recent name="com.engine.common.util" />
<recent name="com.engine.kq.biz" />
<recent name="com.api.kq.browser.service.impl.jucailin" />
<recent name="com.engine.jucailin.cmd.cycle" />
<recent name="com.engine.jucailin.cmd.calendar" />
</key>
</component>
<component name="RunManager" selected="Application.TestObj">
@ -592,7 +476,7 @@
<workItem from="1710830340596" duration="22134000" />
<workItem from="1710897421350" duration="5656000" />
<workItem from="1710912514427" duration="11596000" />
<workItem from="1710984188934" duration="14595000" />
<workItem from="1710984188934" duration="25561000" />
</task>
<servers />
</component>

@ -0,0 +1,81 @@
package com.engine.attendance.workflow.action;
import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
*/
@Slf4j
public class AskForLeaveCheckAction implements Action {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
@Override
public String execute(RequestInfo requestInfo) {
String requestid = requestInfo.getRequestid();
// 流程表单主表数据
HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
// 流程表单明细表数据
List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
//补打卡人员
String qjry = mainTableData.get("qjry");
Map<String, Object> params = Maps.newHashMap();
params.put("userId",qjry);
params.put("submitDate", DateUtil.getCurrentDate());
Map<String,Object> dataMap = makeUpClockInService.getKqCycleTimeIntervalCmd(params);
List<Map<String,Object>> dateList = (List<Map<String,Object>>)dataMap.get("data");
boolean status = (boolean)dataMap.get("status");
if (!status){
log.error("该人员没有考勤周期");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("该人员没有考勤周期!");
return Action.FAILURE_AND_CONTINUE;
}
if (dateList.size()==0){
log.error("申请人员当前时间没有考勤周期,请联系管理员!");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("申请人员当前时间没有考勤周期,请联系管理员!");
return Action.FAILURE_AND_CONTINUE;
}
for (Map<String, String> detailTable:detailTableData){
String bdkrq = detailTable.get("ksrq");
boolean mark = true;
for (Map<String,Object> date:dateList){
//存在考勤周期内
String startDate = Util.null2String(date.get("startDate"));
String endDate = Util.null2String(date.get("endDate"));
if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
mark = false;
}
}
if (mark){
//已关账
log.error("补打卡日期:{},已关账无法补打卡",bdkrq);
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("补打卡日期:"+bdkrq+"所在考勤周期已经关账无法再补打卡!");
return Action.FAILURE_AND_CONTINUE;
}
}
return Action.SUCCESS;
}
}

@ -0,0 +1,87 @@
package com.engine.attendance.workflow.action;
import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.DbTools;
import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
*/
@Slf4j
public class EliminationsAskForLeaveAction implements Action {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
@Override
public String execute(RequestInfo requestInfo) {
String requestid = requestInfo.getRequestid();
// 流程表单主表数据
HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
// 流程表单明细表数据
List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
//销差人
String xjr = mainTableData.get("xjr");
Map<String, Object> params = Maps.newHashMap();
params.put("userId",xjr);
params.put("submitDate", DateUtil.getCurrentDate());
Map<String,Object> dataMap = makeUpClockInService.getKqCycleTimeIntervalCmd(params);
List<Map<String,Object>> dateList = (List<Map<String,Object>>)dataMap.get("data");
boolean status = (boolean)dataMap.get("status");
if (!status){
log.error("该人员没有考勤周期");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("该人员没有考勤周期!");
return Action.FAILURE_AND_CONTINUE;
}
if (dateList.size()==0){
log.error("申请人员当前时间没有考勤周期,请联系管理员!");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("申请人员当前时间没有考勤周期,请联系管理员!");
return Action.FAILURE_AND_CONTINUE;
}
detailTableData = detailTableData.stream().filter(e->"1".equals(e.get("cx"))).collect(Collectors.toList());
List<String> detailIds = detailTableData.stream().map(e->e.get("cxlyid")).collect(Collectors.toList());
String sql = "select id,ksrq from uf_jcl_kq_qjjl_dt1 where (cxqj is null or cxqj <> '1') and id in ("+String.join(",",detailIds)+")";
List<Map<String, Object>> detailList = DbTools.getSqlToList(sql);
for (Map<String, Object> detailTable:detailList){
String bdkrq = Util.null2String(detailTable.get("ksrq"));
boolean mark = true;
for (Map<String,Object> date:dateList){
//存在考勤周期内
String startDate = Util.null2String(date.get("startDate"));
String endDate = Util.null2String(date.get("endDate"));
if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
mark = false;
}
}
if (mark){
//已关账
log.error("补打卡日期:{},已关账无法补打卡",bdkrq);
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("补打卡日期:"+bdkrq+"所在考勤周期已经关账无法再补打卡!");
return Action.FAILURE_AND_CONTINUE;
}
}
return Action.SUCCESS;
}
}

@ -0,0 +1,87 @@
package com.engine.attendance.workflow.action;
import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.DbTools;
import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
*/
@Slf4j
public class EliminationsEvctionCheckAction implements Action {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
@Override
public String execute(RequestInfo requestInfo) {
String requestid = requestInfo.getRequestid();
// 流程表单主表数据
HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
// 流程表单明细表数据
List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
//销差人
String xjr = mainTableData.get("xjr");
Map<String, Object> params = Maps.newHashMap();
params.put("userId",xjr);
params.put("submitDate", DateUtil.getCurrentDate());
Map<String,Object> dataMap = makeUpClockInService.getKqCycleTimeIntervalCmd(params);
List<Map<String,Object>> dateList = (List<Map<String,Object>>)dataMap.get("data");
boolean status = (boolean)dataMap.get("status");
if (!status){
log.error("该人员没有考勤周期");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("该人员没有考勤周期!");
return Action.FAILURE_AND_CONTINUE;
}
if (dateList.size()==0){
log.error("申请人员当前时间没有考勤周期,请联系管理员!");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("申请人员当前时间没有考勤周期,请联系管理员!");
return Action.FAILURE_AND_CONTINUE;
}
detailTableData = detailTableData.stream().filter(e->"1".equals(e.get("cx"))).collect(Collectors.toList());
List<String> detailIds = detailTableData.stream().map(e->e.get("cxlyid")).collect(Collectors.toList());
String sql = "select id,ksrq from uf_jcl_kq_ccjl_dt1 where (cxcc is null or cxcc <> '1') and id in ("+String.join(",",detailIds)+")";
List<Map<String, Object>> detailList = DbTools.getSqlToList(sql);
for (Map<String, Object> detailTable:detailList){
String bdkrq = Util.null2String(detailTable.get("ksrq"));
boolean mark = true;
for (Map<String,Object> date:dateList){
//存在考勤周期内
String startDate = Util.null2String(date.get("startDate"));
String endDate = Util.null2String(date.get("endDate"));
if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
mark = false;
}
}
if (mark){
//已关账
log.error("补打卡日期:{},已关账无法补打卡",bdkrq);
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("补打卡日期:"+bdkrq+"所在考勤周期已经关账无法再补打卡!");
return Action.FAILURE_AND_CONTINUE;
}
}
return Action.SUCCESS;
}
}

@ -0,0 +1,80 @@
package com.engine.attendance.workflow.action;
import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
*/
@Slf4j
public class EvctionCheckAction implements Action {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
@Override
public String execute(RequestInfo requestInfo) {
String requestid = requestInfo.getRequestid();
// 流程表单主表数据
HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
// 流程表单明细表数据
List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
//出差人员
String ccr = mainTableData.get("ccr");
Map<String, Object> params = Maps.newHashMap();
params.put("userId",ccr);
params.put("submitDate", DateUtil.getCurrentDate());
Map<String,Object> dataMap = makeUpClockInService.getKqCycleTimeIntervalCmd(params);
List<Map<String,Object>> dateList = (List<Map<String,Object>>)dataMap.get("data");
boolean status = (boolean)dataMap.get("status");
if (!status){
log.error("该人员没有考勤周期");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("该人员没有考勤周期!");
return Action.FAILURE_AND_CONTINUE;
}
if (dateList.size()==0){
log.error("申请人员当前时间没有考勤周期,请联系管理员!");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("申请人员当前时间没有考勤周期,请联系管理员!");
return Action.FAILURE_AND_CONTINUE;
}
for (Map<String, String> detailTable:detailTableData){
String bdkrq = detailTable.get("ksrq");
boolean mark = true;
for (Map<String,Object> date:dateList){
//存在考勤周期内
String startDate = Util.null2String(date.get("startDate"));
String endDate = Util.null2String(date.get("endDate"));
if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
mark = false;
}
}
if (mark){
//已关账
log.error("补打卡日期:{},已关账无法补打卡",bdkrq);
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("补打卡日期:"+bdkrq+"所在考勤周期已经关账无法再补打卡!");
return Action.FAILURE_AND_CONTINUE;
}
}
return Action.SUCCESS;
}
}

@ -0,0 +1,81 @@
package com.engine.attendance.workflow.action;
import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
*/
@Slf4j
public class OvertimePlanCheckAction implements Action {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
@Override
public String execute(RequestInfo requestInfo) {
String requestid = requestInfo.getRequestid();
// 流程表单主表数据
HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
// 流程表单明细表数据
List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
//加班人员
String jbry = mainTableData.get("jbry");
Map<String, Object> params = Maps.newHashMap();
params.put("userId",jbry);
params.put("submitDate", DateUtil.getCurrentDate());
Map<String,Object> dataMap = makeUpClockInService.getKqCycleTimeIntervalCmd(params);
List<Map<String,Object>> dateList = (List<Map<String,Object>>)dataMap.get("data");
boolean status = (boolean)dataMap.get("status");
if (!status){
log.error("该人员没有考勤周期");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("该人员没有考勤周期!");
return Action.FAILURE_AND_CONTINUE;
}
if (dateList.size()==0){
log.error("申请人员当前时间没有考勤周期,请联系管理员!");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("申请人员当前时间没有考勤周期,请联系管理员!");
return Action.FAILURE_AND_CONTINUE;
}
for (Map<String, String> detailTable:detailTableData){
String bdkrq = detailTable.get("ksrq");
boolean mark = true;
for (Map<String,Object> date:dateList){
//存在考勤周期内
String startDate = Util.null2String(date.get("startDate"));
String endDate = Util.null2String(date.get("endDate"));
if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
mark = false;
}
}
if (mark){
//已关账
log.error("补打卡日期:{},已关账无法补打卡",bdkrq);
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("补打卡日期:"+bdkrq+"所在考勤周期已经关账无法再补打卡!");
return Action.FAILURE_AND_CONTINUE;
}
}
return Action.SUCCESS;
}
}

@ -0,0 +1,78 @@
package com.engine.attendance.workflow.action;
import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
*/
@Slf4j
public class OvertimeResultCheckAction implements Action {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
@Override
public String execute(RequestInfo requestInfo) {
String requestid = requestInfo.getRequestid();
// 流程表单主表数据
HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
//加班人员
String jbry = mainTableData.get("jbry");
Map<String, Object> params = Maps.newHashMap();
params.put("userId",jbry);
params.put("submitDate", DateUtil.getCurrentDate());
Map<String,Object> dataMap = makeUpClockInService.getKqCycleTimeIntervalCmd(params);
List<Map<String,Object>> dateList = (List<Map<String,Object>>)dataMap.get("data");
boolean status = (boolean)dataMap.get("status");
if (!status){
log.error("该人员没有考勤周期");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("该人员没有考勤周期!");
return Action.FAILURE_AND_CONTINUE;
}
if (dateList.size()==0){
log.error("申请人员当前时间没有考勤周期,请联系管理员!");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("申请人员当前时间没有考勤周期,请联系管理员!");
return Action.FAILURE_AND_CONTINUE;
}
String bdkrq = mainTableData.get("ksrq");
boolean mark = true;
for (Map<String,Object> date:dateList){
//存在考勤周期内
String startDate = Util.null2String(date.get("startDate"));
String endDate = Util.null2String(date.get("endDate"));
if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
mark = false;
}
}
if (mark){
//已关账
log.error("补打卡日期:{},已关账无法补打卡",bdkrq);
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("补打卡日期:"+bdkrq+"所在考勤周期已经关账无法再补打卡!");
return Action.FAILURE_AND_CONTINUE;
}
return Action.SUCCESS;
}
}

@ -11,10 +11,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

@ -119,6 +119,8 @@
obj[WfForm.convertFieldNameToId("qt", "detail_1")] = {value:item.qtcc};
//半天
obj[WfForm.convertFieldNameToId("bt", "detail_1")] = {value:item.btcc};
//撤销id
obj[WfForm.convertFieldNameToId("cxlyid", "detail_1")] = {value:item.id};
WfForm.addDetailRow("detail_1", obj);
})

Loading…
Cancel
Save