diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat
index d86a492..3140d16 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat differ
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values
index fc773c2..bb57555 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values differ
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at
index a66731e..85e00a7 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at differ
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
index 9c3c0e3..cc22fb7 100644
--- a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
+++ b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
@@ -1 +1 @@
-~~}}}}~~}}~}~~~|~}Ā~~}~~}||~vlhjkikliliijjom|vuwuxvyxxyvvxvyxytwɉגߐǔِّۏӑٍđޑēԒِҐԑђĒёܑǏܐݓđϏŒލȓِ͓ړՌďڍގӑۏێϑ؎ҏ̍ǑڎݎȒُҏxtvsvtvryksoqpnpnrnqvqunopsjnZY][]ZVXZWWuvxy{z}{wx{{}vyxxƃ_WUZQVWZT]cfcV[^SVPWV[VZ[YZQVTY[ZXRVU\W]Wԁ||z|x{z|z{}~|~}NMMMMMMMMNMMMLLLLMMMJKKKKKKKKKKJJJKKKKKKKLKKKKKJJJKKLKKKKKKKKKJJIJKKKKKKKLKKKKJJJKKKLKKKKKKKKKJJJKKKKKKKKLKKKK
\ No newline at end of file
+~|}}}y{~{|x}|{{}W\X\UXRXZ[ZTVQYY[ZUZVXPUS]\Vdeb^U\VVQ[UW_xxyu|{{wy{{x{yxwvWX\XVY[[][[nltonosswpntopkqqotlzrvtutvtxԋݏ̏ώގɐːЏێːÐȐҐƏώܓ͓ё؏ʌˑΐڎɔώבÓݎݏϐڍܑʎٓǒƐݐ͓ÒŒ͏ϐ֒ӐڏޏђđێԒߎߒxsxxxuxvwyywxvvvvuw{mnliihlfkihlkjkt~|~~}{}}}|~~}}~~|~~~}{
\ No newline at end of file
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i
index 69a52f6..d041140 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fdd9c79..9c5bc96 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,134 +10,125 @@
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -184,7 +175,7 @@
-
+
@@ -193,11 +184,11 @@
+
-
@@ -210,7 +201,7 @@
-
+
@@ -260,8 +251,8 @@
-
@@ -637,6 +635,14 @@
301
+
+ file://$PROJECT_DIR$/src/com/engine/attendance/workflow/service/ProcessSubmitCheckService.java
+ 5
+
+
+
+
+
diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar
index 19b3c20..626de52 100644
Binary files a/out/artifacts/hrm_attendance/hrm-attendance.jar and b/out/artifacts/hrm_attendance/hrm-attendance.jar differ
diff --git a/src/com/engine/attendance/workflow/action/MakeUpClockImportAction.java b/src/com/engine/attendance/workflow/action/MakeUpClockImportAction.java
new file mode 100644
index 0000000..cc849bc
--- /dev/null
+++ b/src/com/engine/attendance/workflow/action/MakeUpClockImportAction.java
@@ -0,0 +1,68 @@
+package com.engine.attendance.workflow.action;
+
+import com.engine.common.util.CommonUtil;
+import com.engine.common.util.DateUtil;
+import com.engine.common.util.Utils;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import weaver.conn.RecordSet;
+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.UUID;
+
+/**
+ * 补打卡数据入建模表action
+ */
+@Slf4j
+public class MakeUpClockImportAction implements Action {
+
+ @Override
+ public String execute(RequestInfo requestInfo) {
+ log.info("**********MakeUpClockImportAction import data start**********");
+ // 流程表单主表数据
+ HashMap mainTableData = CommonUtil.getMainTableInfo(requestInfo);
+ // 流程表单明细表数据
+ List> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
+ //补打卡人员
+ String userId = mainTableData.get("bdkry");
+
+ String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_bdkjl");
+
+ RecordSet rs = new RecordSet();
+
+ String sql = "insert into uf_jcl_kq_bdkjl (bdkry,dkrq,dksj,dksm,bdklx,formmodeid,modeuuid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime) values (?,?,?,?,?,?,?,?,?,?,?)";
+
+ List lists = Lists.newArrayList();
+ for (Map detailTable:detailTableData){
+ List list = Lists.newArrayList();
+ list.add(userId);
+ list.add(detailTable.get("bdkrq"));
+ list.add(detailTable.get("bdksj"));
+ list.add(detailTable.get("bdksm"));
+ list.add(detailTable.get("bdklx"));
+ list.add(modeId);
+ list.add(UUID.randomUUID().toString());
+ list.add(1);
+ list.add(0);
+ list.add(DateUtil.getCurrentDate());
+ list.add(DateUtil.getCurrentTime().split(" ")[1]);
+ lists.add(list);
+ }
+ boolean result = rs.executeBatchSql(sql,lists);
+ if (!result){
+ log.error("MakeUpClockImportAction insert data:[{}]",lists);
+ log.error("添加失败");
+ requestInfo.getRequestManager().setMessageid("11111" + requestInfo.getRequestid() + "22222");
+ requestInfo.getRequestManager().setMessagecontent("添加失败！");
+ return Action.FAILURE_AND_CONTINUE;
+ }
+ log.info("**********MakeUpClockImportAction import data end**********");
+
+ return Action.SUCCESS;
+ }
+}
diff --git a/src/com/engine/attendance/workflow/action/MakeUpClockInAction.java b/src/com/engine/attendance/workflow/action/MakeUpClockInAction.java
new file mode 100644
index 0000000..d6bef9d
--- /dev/null
+++ b/src/com/engine/attendance/workflow/action/MakeUpClockInAction.java
@@ -0,0 +1,170 @@
+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.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import weaver.general.BaseBean;
+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;
+
+/**
+ * 补打卡提交校验action
+ */
+@Slf4j
+public class MakeUpClockInAction implements Action {
+
+ private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
+
+ @Override
+ public String execute(RequestInfo requestInfo) {
+ String requestid = requestInfo.getRequestid();
+ BaseBean bs = new BaseBean();
+ // 流程表单主表数据
+ HashMap mainTableData = CommonUtil.getMainTableInfo(requestInfo);
+ // 流程表单明细表数据
+ List> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
+ //补打卡人员
+ String userId = mainTableData.get("bdkry");
+
+
+ Map params = Maps.newHashMap();
+ params.put("userId",userId);
+ params.put("submitDate",DateUtil.getCurrentDate());
+
+ /**
+ * 补打卡日期是否关账
+ */
+ Map dataMap = makeUpClockInService.getKqCycleTimeIntervalCmd(params);
+ List> dateList = (List>)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;
+ }
+ try {
+ for (Map detailTable:detailTableData){
+ String bdkrq = detailTable.get("bdkrq");
+ boolean mark = true;
+ for (Map 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;
+ }
+ }
+
+ Map>> dataGroupByBdlxs = Maps.newHashMap();
+
+ //按照考勤周期对补打卡数据进行分类
+ for (int i=0;i> datas = Lists.newArrayList();
+ for (Map detailTable:detailTableData){
+ String bdkrq = detailTable.get("bdkrq");
+ if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
+ DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
+ datas.add(detailTable);
+ }
+ }
+ if (datas.size() > 0){
+ dataGroupByBdlxs.put(startDate+","+endDate,datas);
+ }
+ }
+ log.info("dataGroupByBdlxs : [{}]",dataGroupByBdlxs);
+ /**
+ *
+ */
+ for (Map.Entry>> detailentry :dataGroupByBdlxs.entrySet()){
+ List> details = detailentry.getValue();
+ String startDate = detailentry.getKey().split(",")[0];
+ String endDate = detailentry.getKey().split(",")[1];
+
+ Map>> dataGroupByBdlx = details.stream().collect(Collectors.groupingBy(e->e.get("bdklx")));
+
+ String bdklxs="";
+ for (Map.Entry>> entry :dataGroupByBdlx.entrySet()){
+ String bdklx = entry.getKey();
+ bdklxs = bdklxs + bdklx +",";
+ }
+ bdklxs = bdklxs.substring(0,bdklxs.length()-1);
+ String sql = "select id,kqzqnxzsycs,ygbcycb,xzsydcs,hbjrdkqxm from uf_jcl_kq_kqxm where id in ("+bdklxs+")";
+ List> items = DbTools.getSqlToList(sql);
+
+ Map>> itemsGroupById = items.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("id"))));
+
+
+ for (Map.Entry>> entry :dataGroupByBdlx.entrySet()){
+ String bdklx = entry.getKey();
+ //明细数据
+ List> detailDatas = entry.getValue();
+ //考勤项目
+ List> item = itemsGroupById.get(bdklx);
+ int maxclockTimes = Integer.valueOf(item.get(0).get("xzsydcs").toString());
+ int clockTimes = detailDatas.size();
+
+ //计入限制次数的其他项目
+ String hbjrdkqxm = Util.null2String(item.get(0).get("hbjrdkqxm"));
+ //计入限制次数的其他项目的明细数据
+ List> list = dataGroupByBdlx.get(hbjrdkqxm);
+ if (list != null && list.size() > 0){
+ clockTimes += list.size();
+ }
+ sql = "select bdkry,dkrq from uf_jcl_kq_bdkjl where bdkry=? and bdklx=?";
+ List> existsList = DbTools.getSqlToList(sql,userId,bdklx);
+ log.info("existsList : [{}]",existsList);
+ existsList = existsList.stream().filter(e->DateUtil.getTime(startDate).compareTo(DateUtil.getTime(e.get("dkrq").toString())) <=0 &&
+ DateUtil.getTime(endDate).compareTo(DateUtil.getTime(e.get("dkrq").toString())) >=0).collect(Collectors.toList());
+ clockTimes +=existsList.size();
+ log.info("clockTimes : [{}],maxclockTimes : [{}]",clockTimes,maxclockTimes);
+ if (clockTimes > maxclockTimes){
+ //已达到请假上限
+ log.error("考勤项目已达到补打卡上限");
+ requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
+ requestInfo.getRequestManager().setMessagecontent("考勤项目已达到补打卡上限！");
+ return Action.FAILURE_AND_CONTINUE;
+ }
+
+ }
+
+ }
+ }catch (Exception e){
+ log.error("exception : [{}]",e);
+ }
+
+ return Action.SUCCESS;
+ }
+
+
+
+}
diff --git a/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java b/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java
new file mode 100644
index 0000000..ca7dbec
--- /dev/null
+++ b/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java
@@ -0,0 +1,108 @@
+package com.engine.attendance.workflow.cmd;
+
+import com.engine.common.biz.AbstractCommonCommand;
+import com.engine.common.entity.BizLogContext;
+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.interceptor.CommandContext;
+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;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Slf4j
+public class GetKqCycleTimeIntervalCmd extends AbstractCommonCommand> {
+
+ public GetKqCycleTimeIntervalCmd(Map params){
+ this.params = params;
+ }
+
+ @Override
+ public BizLogContext getLogContext() {
+ return null;
+ }
+
+ @Override
+ public Map execute(CommandContext commandContext) {
+ String userId = Util.null2String(params.get("userId"));
+ String submitDates = Util.null2String(params.get("submitDate"));
+ log.info("GetKqCycleTimeIntervalCmd userId:[{}],submitDates:[{}]",userId,submitDates);
+ String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_kqzqmc");
+
+ Set attendanceSetIdsSets = CommonUtil.getDataIds(userId,modeId,null,null);
+ log.info("attendanceSetIdsSets : {}",attendanceSetIdsSets);
+
+
+ String sql = "select id,departmentid,subcompanyid1 from hrmresource where id =?";
+ Map departMentMap = DbTools.getSqlToMap(sql,userId);
+ String deptid = Util.null2String(departMentMap.get("departmentid"));
+ String pdeptids = "";
+ List> dateList = Lists.newArrayList();
+ Map resultMap = Maps.newHashMap();
+ resultMap.put("status",true);
+ resultMap.put("data",dateList);
+ try {
+ pdeptids = new DepartmentComInfo().getAllParentDepartId(Util.null2String(departMentMap.get("departmentid")), pdeptids);
+ pdeptids = deptid + pdeptids;
+ log.info("pdeptids : [{}]",pdeptids);
+ LocalDateTime nowLocalDateTime = DateUtil.getTime(submitDates);
+ int nowyear = nowLocalDateTime.getYear();
+ int nowMonth = nowLocalDateTime.getMonth().getValue();
+
+ LocalDateTime beforeLocalDateTime = DateUtil.getTime(submitDates).minusMonths(1);
+ int beforeYear = beforeLocalDateTime.getYear();
+ int beforeMonth = beforeLocalDateTime.getMonth().getValue();
+
+ sql = "select a.zt,a.ksrq,a.jsrq,a.gzrq,a.gzsj,b.zt dtzt,b.tsbm,b.gzrq dtgzrq,b.gzsj dtgzsj from uf_jcl_kq_kqzq a left join uf_jcl_kq_kqzq_dt1 b on a.id=b.mainid where a.mc=? and (a.nd=? and a.yf=? or a.nd=? and a.yf=?)";
+ if (attendanceSetIdsSets.toArray().length == 0){
+ resultMap.put("status",false);
+ return resultMap;
+ }
+ List> list = DbTools.getSqlToList(sql,attendanceSetIdsSets.toArray()[0],nowyear,nowMonth,beforeYear,beforeMonth);
+
+ log.info("GetKqCycleTimeIntervalCmd list : [{}]",list);
+ for (Map dataMap : list){
+ String tsbm = Util.null2String(dataMap.get("tsbm"));
+ if (!"".equals(tsbm) && CommonUtil.ifContainStr(pdeptids,tsbm,",")){
+ //人员在特殊部门里
+ String gzrq = Util.null2String(dataMap.get("dtgzrq")) +" "+Util.null2String(dataMap.get("dtgzsj")) +":00";
+ if (DateUtil.getTime(submitDates).compareTo(DateUtil.getTime(gzrq))<=0){
+ Map date = Maps.newHashMap();
+ date.put("startDate",dataMap.get("ksrq"));
+ date.put("endDate",dataMap.get("jsrq"));
+ dateList.add(date);
+ }
+ }
+ }
+
+ for (Map dataMap : list){
+ String gzrq = Util.null2String(dataMap.get("gzrq")) +" "+Util.null2String(dataMap.get("gzsj")) +":00";
+ if (DateUtil.getTime(submitDates).compareTo(DateUtil.getTime(gzrq))<=0){
+ Map date = Maps.newHashMap();
+ List> filterDate = dateList.stream().filter(e->e.get("startDate").equals(dataMap.get("ksrq"))).collect(Collectors.toList());
+ if (filterDate.size() == 0){
+ date.put("startDate",dataMap.get("ksrq"));
+ date.put("endDate",dataMap.get("jsrq"));
+ dateList.add(date);
+ }
+ }
+ }
+ }catch (Exception e){
+ log.error("catch error :{}",e);
+ }
+ log.info("GetKqCycleTimeIntervalCmd dateList : [{}]",dateList);
+
+ return resultMap;
+ }
+}
diff --git a/src/com/engine/attendance/workflow/service/MakeUpClockInService.java b/src/com/engine/attendance/workflow/service/MakeUpClockInService.java
index 2c73a81..2e322e3 100644
--- a/src/com/engine/attendance/workflow/service/MakeUpClockInService.java
+++ b/src/com/engine/attendance/workflow/service/MakeUpClockInService.java
@@ -4,4 +4,6 @@ import java.util.Map;
public interface MakeUpClockInService {
Map processSubmitCheck(Map params);
+
+ Map getKqCycleTimeIntervalCmd(Map params);
}
diff --git a/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java
index afa4167..d6d4796 100644
--- a/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java
+++ b/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java
@@ -34,11 +34,12 @@ public class BusinessTripsApplyServiceImpl extends Service implements BusinessTr
sql += " and cclx = " + businessTripsType;
}
if (!startDate.equals("")) {
- sql += " and ksrq >= " + startDate;
+ sql += " and ksrq >= '" + startDate+"'";
}
if (!endDate.equals("")) {
- sql += " and jsrq <= " + endDate;
+ sql += " and jsrq <= '" + endDate+"'";
}
+ log.info(sql);
List maidList = new ArrayList<>();
if (!targetUserId.equals("")) {
List> datas = DbTools.getSqlToList(sql);
diff --git a/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java
index 1475782..ef707f3 100644
--- a/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java
+++ b/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java
@@ -1,5 +1,7 @@
package com.engine.attendance.workflow.service.impl;
+import com.engine.attendance.component.persongroup.cmd.GetDatatableCountCmd;
+import com.engine.attendance.workflow.cmd.GetKqCycleTimeIntervalCmd;
import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.core.impl.Service;
@@ -12,4 +14,10 @@ public class MakeUpClockInServiceImpl extends Service implements MakeUpClockInSe
return null;
}
+
+ @Override
+ public Map getKqCycleTimeIntervalCmd(Map params) {
+
+ return commandExecutor.execute(new GetKqCycleTimeIntervalCmd(params));
+ }
}
diff --git a/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java
index 7b64f5e..eb9dac6 100644
--- a/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java
+++ b/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java
@@ -21,7 +21,7 @@ public class ProcessSubmitCheckServiceImpl extends Service implements ProcessSub
@Override
public Map processSubmitCheck(Map params) {
String userId = Util.null2String(params.get("userId"));
- String submitDate = Util.null2String(params.get("submitDate"));
+ String submitDates = Util.null2String(params.get("submitDate"));
//String modeId = Util.null2String(params.get("modeId"));
String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_kqzqmc");
Map resultMap = Maps.newHashMap();
@@ -29,61 +29,68 @@ public class ProcessSubmitCheckServiceImpl extends Service implements ProcessSub
Set attendanceSetIdsSets = CommonUtil.getDataIds(userId,modeId,null,null);
log.info("attendanceSetIdsSets : {}",attendanceSetIdsSets);
-
- LocalDateTime localDateTime = DateUtil.getTime(submitDate);
- int year = localDateTime.getYear();
- int month = localDateTime.getMonth().getValue();
- String sql = "select id,departmentid,subcompanyid1 from hrmresource where id =?";
- Map departMentMap = DbTools.getSqlToMap(sql,userId);
- String deptid = Util.null2String(departMentMap.get("departmentid"));
- String pdeptids = "";
- try {
- pdeptids = new DepartmentComInfo().getAllParentDepartId(Util.null2String(departMentMap.get("departmentid")), pdeptids);
- pdeptids = deptid + pdeptids;
- log.info("pdeptids : [{}]",pdeptids);
- sql = "select a.zt,a.gzrq,a.gzsj,b.zt dtzt,b.tsbm,b.gzrq dtgzrq,b.gzsj dtgzsj from uf_jcl_kq_kqzq a left join uf_jcl_kq_kqzq_dt1 b on a.id=b.mainid where a.nd=? and a.mc=? and a.yf=?";
- if (attendanceSetIdsSets.toArray().length > 0){
- List> list = DbTools.getSqlToList(sql,year,attendanceSetIdsSets.toArray()[0],month);
- for (Map dataMap : list){
- //先看人员是否在此笔考勤周期的明细中，如果在，看明细记录上的开关账状态，如果状态为关账，直接返回false，否则看明细记录上的关账日期时间是否小于当前日期时间，如果小于，返回false;
- String tsbm = Util.null2String(dataMap.get("tsbm"));
- String dtzt = Util.null2String(dataMap.get("dtzt"));
- if (!"".equals(tsbm) && CommonUtil.ifContainStr(pdeptids,tsbm,",")){
- //明细表有值
- if (dtzt.equals("1")){
- //关账
- resultMap.put("result","1");
- }else {
+ for (String submitDate:submitDates.split(",")){
+ LocalDateTime localDateTime = DateUtil.getTime(submitDate);
+ int year = localDateTime.getYear();
+ int month = localDateTime.getMonth().getValue();
+ String sql = "select id,departmentid,subcompanyid1 from hrmresource where id =?";
+ Map departMentMap = DbTools.getSqlToMap(sql,userId);
+ String deptid = Util.null2String(departMentMap.get("departmentid"));
+ String pdeptids = "";
+ try {
+ pdeptids = new DepartmentComInfo().getAllParentDepartId(Util.null2String(departMentMap.get("departmentid")), pdeptids);
+ pdeptids = deptid + pdeptids;
+ log.info("pdeptids : [{}]",pdeptids);
+ sql = "select a.zt,a.ksrq,a.gzrq,a.gzsj,b.zt dtzt,b.tsbm,b.gzrq dtgzrq,b.gzsj dtgzsj from uf_jcl_kq_kqzq a left join uf_jcl_kq_kqzq_dt1 b on a.id=b.mainid where a.nd=? and a.mc=? and a.yf=?";
+ if (attendanceSetIdsSets.toArray().length > 0){
+ List> list = DbTools.getSqlToList(sql,year,attendanceSetIdsSets.toArray()[0],month);
+ for (Map dataMap : list){
+ //先看人员是否在此笔考勤周期的明细中，如果在，看明细记录上的开关账状态，如果状态为关账，直接返回false，否则看明细记录上的关账日期时间是否小于当前日期时间，如果小于，返回false;
+ String tsbm = Util.null2String(dataMap.get("tsbm"));
+ String dtzt = Util.null2String(dataMap.get("dtzt"));
+ resultMap.put("openDate",dataMap.get("ksrq"));
+ if (!"".equals(tsbm) && CommonUtil.ifContainStr(pdeptids,tsbm,",")){
+ //明细表有值
String gzrq = Util.null2String(dataMap.get("dtgzrq")) +" "+Util.null2String(dataMap.get("dtgzsj")) +":00";
- if (DateUtil.getBetWeenMinutes(gzrq,submitDate,DateUtil.yyyyMMddHHmm) >0){
+ resultMap.put("closeDate",gzrq);
+ if (dtzt.equals("1")){
+ //关账
resultMap.put("result","1");
+ resultMap.put("submitDate",submitDate);
+ }else {
+ if (DateUtil.getBetWeenMinutes(gzrq,submitDate,DateUtil.yyyyMMddHHmm) >0){
+ resultMap.put("result","1");
+ resultMap.put("submitDate",submitDate);
+ }
}
}
}
- }
- if ("0".equals(resultMap.get("result"))){
- for (Map dataMap : list){
- //先看人员是否在此笔考勤周期的明细中，如果在，看明细记录上的开关账状态，如果状态为关账，直接返回false，否则看明细记录上的关账日期时间是否小于当前日期时间，如果小于，返回false;
- String zt = Util.null2String(dataMap.get("zt"));
- String gzrq = Util.null2String(dataMap.get("gzrq")) +" "+Util.null2String(dataMap.get("gzsj")) +":00";
- if (zt.equals("1")){
- //关账
- resultMap.put("result","1");
- }else {
- if (DateUtil.getBetWeenMinutes(gzrq,submitDate,DateUtil.yyyyMMddHHmm) >0){
+ //不在特殊部门中时
+ if (resultMap.get("closeDate") == null){
+ for (Map dataMap : list){
+ String zt = Util.null2String(dataMap.get("zt"));
+ String gzrq = Util.null2String(dataMap.get("gzrq")) +" "+Util.null2String(dataMap.get("gzsj")) +":00";
+ resultMap.put("closeDate",gzrq);
+ if (zt.equals("1")){
+ //关账
resultMap.put("result","1");
+ resultMap.put("submitDate",submitDate);
+ }else {
+ if (DateUtil.getBetWeenMinutes(gzrq,submitDate,DateUtil.yyyyMMddHHmm) >0){
+ resultMap.put("result","1");
+ resultMap.put("submitDate",submitDate);
+ }
}
-
}
}
+
}
- }
- }catch (Exception e){
- log.error("catch error :{}",e);
+ }catch (Exception e){
+ log.error("catch error :{}",e);
+ }
}
-
return resultMap;
}
}
diff --git a/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java b/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java
index cd1fbe0..6a80ee0 100644
--- a/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java
+++ b/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java
@@ -1,9 +1,7 @@
package com.engine.attendance.workflow.web;
import com.engine.attendance.workflow.service.MakeUpClockInService;
-import com.engine.attendance.workflow.service.ProcessSubmitCheckService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
-import com.engine.attendance.workflow.service.impl.ProcessSubmitCheckServiceImpl;
import com.engine.common.util.ApiReturnTools;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
@@ -26,7 +24,7 @@ public class MakeUpClockInAction {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
/**
- * 补打卡提交流程前置校验
+ * 补打卡提交流程查询
* @return
*/
@POST
diff --git a/src/com/engine/common/util/CommonUtil.java b/src/com/engine/common/util/CommonUtil.java
index adc18c7..4b2b0f0 100644
--- a/src/com/engine/common/util/CommonUtil.java
+++ b/src/com/engine/common/util/CommonUtil.java
@@ -5,10 +5,9 @@ import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.hrm.company.DepartmentComInfo;
+import weaver.soa.workflow.request.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -135,10 +134,55 @@ public class CommonUtil {
}
public static boolean ifContainStr(String fatherStr,String sonStr,String mark){
for (String pdeptid : fatherStr.split(mark)){
- if (pdeptid.equals(mark)){
+ if (pdeptid.equals(sonStr)){
return true;
}
}
return false;
}
+
+ /**
+ * 根据流程requestInfo消息对象获取流程主表字段的信息的map集合
+ * @param requestInfo
+ * @return
+ */
+ public static HashMap getMainTableInfo(RequestInfo requestInfo){
+ HashMap mainMap = new HashMap();
+ Property[] properties = requestInfo.getMainTableInfo().getProperty();// 获取表单主字段信息
+ for (int i = 0; i < properties.length; i++) {
+ String name = properties[i].getName();// 主字段名称
+ String value = Util.null2String(properties[i].getValue());// 主字段对应的值
+ mainMap.put(name, value);
+ }
+ return mainMap;
+ }
+
+
+ /**
+ * 明细
+ * @param request
+ * @return
+ */
+ public static List> getDetailTableInfo(RequestInfo request, int index) {
+ // 获取明细的信息
+ List> list = new ArrayList>();
+ DetailTable[] detailtables = request.getDetailTableInfo().getDetailTable();// 获取明细表数据
+ if (detailtables.length > index) {
+ DetailTable dt = detailtables[index];// 获取明细表 0代表明细表1
+ Row[] rows = dt.getRow();// 获取明细表中所有行的信息
+ for (int i = 0; i < rows.length; i++) {
+ Row row = rows[i];// 获取具体行信息
+ Cell[] cells = row.getCell();// 获取具体行所有列的信息
+ Map map = new HashMap();
+ for (int j = 0; j < cells.length; j++) {
+ Cell cell = cells[j];
+ String name = cell.getName().toLowerCase();// 获取字段名
+ String value = cell.getValue();// 获取具体的值
+ map.put(name, value);
+ }
+ list.add(map);
+ }
+ }
+ return list;
+ }
}
diff --git a/src/com/engine/common/util/DateUtil.java b/src/com/engine/common/util/DateUtil.java
index b39fdd6..416e874 100644
--- a/src/com/engine/common/util/DateUtil.java
+++ b/src/com/engine/common/util/DateUtil.java
@@ -18,6 +18,9 @@ public class DateUtil {
LocalDateTime localDateTime = DateUtil.getTime(time);
return localDateTime.minusMonths(month).format(yyyyMMdd);
}
+
+
+
public static String lastMonth(String time){
LocalDateTime localDateTime = DateUtil.getTime(time);
diff --git a/target/classes/com/api/attendance/workflow/BusinessTripsApplyActionApi.class b/target/classes/com/api/attendance/workflow/BusinessTripsApplyActionApi.class
new file mode 100644
index 0000000..67d0ef4
Binary files /dev/null and b/target/classes/com/api/attendance/workflow/BusinessTripsApplyActionApi.class differ
diff --git a/target/classes/com/api/kq/browser/service/impl/jucailin/KQCycleSetBrowserService.class b/target/classes/com/api/kq/browser/service/impl/jucailin/KQCycleSetBrowserService.class
deleted file mode 100644
index 5c99f69..0000000
Binary files a/target/classes/com/api/kq/browser/service/impl/jucailin/KQCycleSetBrowserService.class and /dev/null differ
diff --git a/target/classes/com/api/kq/jucailin/KQCalendarSettingActionApi.class b/target/classes/com/api/kq/jucailin/KQCalendarSettingActionApi.class
deleted file mode 100644
index 70b1352..0000000
Binary files a/target/classes/com/api/kq/jucailin/KQCalendarSettingActionApi.class and /dev/null differ
diff --git a/target/classes/com/api/kq/jucailin/KQCommonActionApi.class b/target/classes/com/api/kq/jucailin/KQCommonActionApi.class
deleted file mode 100644
index c3d4028..0000000
Binary files a/target/classes/com/api/kq/jucailin/KQCommonActionApi.class and /dev/null differ
diff --git a/target/classes/com/api/kq/jucailin/KQCycleSettingActionApi.class b/target/classes/com/api/kq/jucailin/KQCycleSettingActionApi.class
deleted file mode 100644
index ed643ff..0000000
Binary files a/target/classes/com/api/kq/jucailin/KQCycleSettingActionApi.class and /dev/null differ
diff --git a/target/classes/com/api/kq/jucailin/KQPersonGroupActionApi.class b/target/classes/com/api/kq/jucailin/KQPersonGroupActionApi.class
deleted file mode 100644
index be3b6be..0000000
Binary files a/target/classes/com/api/kq/jucailin/KQPersonGroupActionApi.class and /dev/null differ
diff --git a/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class b/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class
index b8e4617..8cc4544 100644
Binary files a/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class and b/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/MakeUpClockImportAction.class b/target/classes/com/engine/attendance/workflow/action/MakeUpClockImportAction.class
new file mode 100644
index 0000000..5ced4eb
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/MakeUpClockImportAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/MakeUpClockInAction.class b/target/classes/com/engine/attendance/workflow/action/MakeUpClockInAction.class
new file mode 100644
index 0000000..a653a4e
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/MakeUpClockInAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class b/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class
new file mode 100644
index 0000000..271dc7e
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class b/target/classes/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class
new file mode 100644
index 0000000..8b05192
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class differ
diff --git a/target/classes/com/engine/attendance/workflow/service/BusinessTripsApplyService.class b/target/classes/com/engine/attendance/workflow/service/BusinessTripsApplyService.class
new file mode 100644
index 0000000..47db16f
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/service/BusinessTripsApplyService.class differ
diff --git a/target/classes/com/engine/attendance/workflow/service/MakeUpClockInService.class b/target/classes/com/engine/attendance/workflow/service/MakeUpClockInService.class
new file mode 100644
index 0000000..7e48b84
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/service/MakeUpClockInService.class differ
diff --git a/target/classes/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.class b/target/classes/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.class
new file mode 100644
index 0000000..242ca33
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.class differ
diff --git a/target/classes/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.class b/target/classes/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.class
new file mode 100644
index 0000000..06a8962
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.class differ
diff --git a/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class b/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class
index c9432bb..56d76a4 100644
Binary files a/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class and b/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class differ
diff --git a/target/classes/com/engine/attendance/workflow/web/BusinessTripsApplyApi.class b/target/classes/com/engine/attendance/workflow/web/BusinessTripsApplyApi.class
new file mode 100644
index 0000000..e8d3826
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/web/BusinessTripsApplyApi.class differ
diff --git a/target/classes/com/engine/attendance/workflow/web/MakeUpClockInAction.class b/target/classes/com/engine/attendance/workflow/web/MakeUpClockInAction.class
new file mode 100644
index 0000000..f5fba2c
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/web/MakeUpClockInAction.class differ
diff --git a/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class b/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class
index d7c220d..87476f3 100644
Binary files a/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class and b/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class differ
diff --git a/target/classes/com/engine/common/util/CommonUtil.class b/target/classes/com/engine/common/util/CommonUtil.class
index 50e9f70..707e988 100644
Binary files a/target/classes/com/engine/common/util/CommonUtil.class and b/target/classes/com/engine/common/util/CommonUtil.class differ
diff --git a/target/classes/com/engine/common/util/Constant$1.class b/target/classes/com/engine/common/util/Constant$1.class
new file mode 100644
index 0000000..4aeb432
Binary files /dev/null and b/target/classes/com/engine/common/util/Constant$1.class differ
diff --git a/target/classes/com/engine/jucailin/util/Constant.class b/target/classes/com/engine/common/util/Constant.class
similarity index 57%
rename from target/classes/com/engine/jucailin/util/Constant.class
rename to target/classes/com/engine/common/util/Constant.class
index 3186ed4..b59775d 100644
Binary files a/target/classes/com/engine/jucailin/util/Constant.class and b/target/classes/com/engine/common/util/Constant.class differ
diff --git a/target/classes/com/engine/common/util/DateUtil.class b/target/classes/com/engine/common/util/DateUtil.class
index 4db51eb..f4fba09 100644
Binary files a/target/classes/com/engine/common/util/DateUtil.class and b/target/classes/com/engine/common/util/DateUtil.class differ
diff --git a/target/classes/com/engine/common/util/DbTools.class b/target/classes/com/engine/common/util/DbTools.class
index 53c54df..0827029 100644
Binary files a/target/classes/com/engine/common/util/DbTools.class and b/target/classes/com/engine/common/util/DbTools.class differ
diff --git a/target/classes/com/engine/common/util/Utils.class b/target/classes/com/engine/common/util/Utils.class
index 93e2033..f54fc29 100644
Binary files a/target/classes/com/engine/common/util/Utils.class and b/target/classes/com/engine/common/util/Utils.class differ
diff --git a/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSet.class b/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSet.class
deleted file mode 100644
index aeb32c1..0000000
Binary files a/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSet.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetBiz.class b/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetBiz.class
deleted file mode 100644
index 80e5382..0000000
Binary files a/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetBiz.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetComInfo.class b/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetComInfo.class
deleted file mode 100644
index 5b2a66e..0000000
Binary files a/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetComInfo.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingFormCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingFormCmd.class
deleted file mode 100644
index 4a5067b..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingFormCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd$1.class b/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd$1.class
deleted file mode 100644
index 18ebd89..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.class
deleted file mode 100644
index 5d264f7..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.class
deleted file mode 100644
index f6205b2..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class
deleted file mode 100644
index 73c4aa5..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.class
deleted file mode 100644
index 0862b87..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.class
deleted file mode 100644
index 0f4445a..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidayCountWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidayCountWithCalendarSetCmd.class
deleted file mode 100644
index d8fc7e6..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidayCountWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetCalendarWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetCalendarWithCalendarSetCmd.class
deleted file mode 100644
index 2850756..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetCalendarWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetFormWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetFormWithCalendarSetCmd.class
deleted file mode 100644
index 781fcd9..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetFormWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetImportFormWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetImportFormWithCalendarSetCmd.class
deleted file mode 100644
index c948bf7..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetImportFormWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetRightMenuWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetRightMenuWithCalendarSetCmd.class
deleted file mode 100644
index 3fb30b2..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetRightMenuWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSearchListWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSearchListWithCalendarSetCmd.class
deleted file mode 100644
index 8a46f15..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSearchListWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSyncFormWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSyncFormWithCalendarSetCmd.class
deleted file mode 100644
index 6511fb0..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSyncFormWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/HasRepeatDataWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/HasRepeatDataWithCalendarSetCmd.class
deleted file mode 100644
index 72701e3..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/HasRepeatDataWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/InitHolidaySetWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/InitHolidaySetWithCalendarSetCmd.class
deleted file mode 100644
index 82d70b8..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/InitHolidaySetWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SaveImportWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SaveImportWithCalendarSetCmd.class
deleted file mode 100644
index ac15deb..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SaveImportWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SyncHolidaySetWithCalendarSetCmd.class b/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SyncHolidaySetWithCalendarSetCmd.class
deleted file mode 100644
index 92b4d43..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SyncHolidaySetWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.class b/target/classes/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.class
deleted file mode 100644
index 99aaae3..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/common/InsertDataCommonCmd.class b/target/classes/com/engine/jucailin/cmd/common/InsertDataCommonCmd.class
deleted file mode 100644
index 9a2bce2..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/common/InsertDataCommonCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/common/QueryDataCommonCmd.class b/target/classes/com/engine/jucailin/cmd/common/QueryDataCommonCmd.class
deleted file mode 100644
index d1018e6..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/common/QueryDataCommonCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.class b/target/classes/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.class
deleted file mode 100644
index 504ed6f..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.class
deleted file mode 100644
index 4d935ba..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$1.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$1.class
deleted file mode 100644
index 9a13d24..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$2.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$2.class
deleted file mode 100644
index fa0b180..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$2.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd.class
deleted file mode 100644
index 7a6ade0..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.class
deleted file mode 100644
index 3b2fa67..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.class
deleted file mode 100644
index 788f65c..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$1.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$1.class
deleted file mode 100644
index 44cf6db..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$2.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$2.class
deleted file mode 100644
index 9f3a307..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$2.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.class
deleted file mode 100644
index 9ce3ea4..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingTreeCmd.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingTreeCmd.class
deleted file mode 100644
index 25fe18b..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingTreeCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailFormCmd.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailFormCmd.class
deleted file mode 100644
index 522328c..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailFormCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$1.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$1.class
deleted file mode 100644
index 32660d7..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$2.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$2.class
deleted file mode 100644
index 53be309..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$2.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.class b/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.class
deleted file mode 100644
index d37ec71..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailFormCmd.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailFormCmd.class
deleted file mode 100644
index d5c8709..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailFormCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$1.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$1.class
deleted file mode 100644
index a5ea56a..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$2.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$2.class
deleted file mode 100644
index d0bc235..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$2.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$3.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$3.class
deleted file mode 100644
index 63140ac..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$3.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd.class
deleted file mode 100644
index e4091b1..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupFormCmd.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupFormCmd.class
deleted file mode 100644
index 8072d8a..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupFormCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$1.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$1.class
deleted file mode 100644
index 64d03d4..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$2.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$2.class
deleted file mode 100644
index 4a80521..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$2.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.class
deleted file mode 100644
index aa4157b..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupSearchConditionCmd.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupSearchConditionCmd.class
deleted file mode 100644
index 547b063..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupSearchConditionCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.class
deleted file mode 100644
index a38a91d..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.class b/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.class
deleted file mode 100644
index c94657c..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.class b/target/classes/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.class
deleted file mode 100644
index 56facf6..0000000
Binary files a/target/classes/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/enums/FieldHtmlTypeEnum.class b/target/classes/com/engine/jucailin/enums/FieldHtmlTypeEnum.class
deleted file mode 100644
index 00fc85a..0000000
Binary files a/target/classes/com/engine/jucailin/enums/FieldHtmlTypeEnum.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/exception/AttendanceRunTimeException.class b/target/classes/com/engine/jucailin/exception/AttendanceRunTimeException.class
deleted file mode 100644
index bb7c90a..0000000
Binary files a/target/classes/com/engine/jucailin/exception/AttendanceRunTimeException.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/exception/ExceptionUtil.class b/target/classes/com/engine/jucailin/exception/ExceptionUtil.class
deleted file mode 100644
index 4e035c2..0000000
Binary files a/target/classes/com/engine/jucailin/exception/ExceptionUtil.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/genid/DefaultWorker.class b/target/classes/com/engine/jucailin/genid/DefaultWorker.class
deleted file mode 100644
index 7cef310..0000000
Binary files a/target/classes/com/engine/jucailin/genid/DefaultWorker.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/genid/IdGenerator.class b/target/classes/com/engine/jucailin/genid/IdGenerator.class
deleted file mode 100644
index d13f204..0000000
Binary files a/target/classes/com/engine/jucailin/genid/IdGenerator.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/genid/SnowflakeId.class b/target/classes/com/engine/jucailin/genid/SnowflakeId.class
deleted file mode 100644
index d3289e2..0000000
Binary files a/target/classes/com/engine/jucailin/genid/SnowflakeId.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/genid/Worker.class b/target/classes/com/engine/jucailin/genid/Worker.class
deleted file mode 100644
index 9f9497a..0000000
Binary files a/target/classes/com/engine/jucailin/genid/Worker.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/service/KQCalendarSettingService.class b/target/classes/com/engine/jucailin/service/KQCalendarSettingService.class
deleted file mode 100644
index c9d72ce..0000000
Binary files a/target/classes/com/engine/jucailin/service/KQCalendarSettingService.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/service/KQCommonService.class b/target/classes/com/engine/jucailin/service/KQCommonService.class
deleted file mode 100644
index a9c2be8..0000000
Binary files a/target/classes/com/engine/jucailin/service/KQCommonService.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/service/KQCycleSettingService.class b/target/classes/com/engine/jucailin/service/KQCycleSettingService.class
deleted file mode 100644
index 34f3a3a..0000000
Binary files a/target/classes/com/engine/jucailin/service/KQCycleSettingService.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/service/KQPersonGroupService.class b/target/classes/com/engine/jucailin/service/KQPersonGroupService.class
deleted file mode 100644
index 2009c61..0000000
Binary files a/target/classes/com/engine/jucailin/service/KQPersonGroupService.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/service/impl/KQCalendarSettingServiceImpl.class b/target/classes/com/engine/jucailin/service/impl/KQCalendarSettingServiceImpl.class
deleted file mode 100644
index 417feea..0000000
Binary files a/target/classes/com/engine/jucailin/service/impl/KQCalendarSettingServiceImpl.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/service/impl/KQCommonServiceImpl.class b/target/classes/com/engine/jucailin/service/impl/KQCommonServiceImpl.class
deleted file mode 100644
index 653c381..0000000
Binary files a/target/classes/com/engine/jucailin/service/impl/KQCommonServiceImpl.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.class b/target/classes/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.class
deleted file mode 100644
index d1bf681..0000000
Binary files a/target/classes/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.class b/target/classes/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.class
deleted file mode 100644
index ca0ad03..0000000
Binary files a/target/classes/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/CommonUtil$1.class b/target/classes/com/engine/jucailin/util/CommonUtil$1.class
deleted file mode 100644
index fdccc36..0000000
Binary files a/target/classes/com/engine/jucailin/util/CommonUtil$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/CommonUtil$2.class b/target/classes/com/engine/jucailin/util/CommonUtil$2.class
deleted file mode 100644
index 7c386fa..0000000
Binary files a/target/classes/com/engine/jucailin/util/CommonUtil$2.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/CommonUtil$3.class b/target/classes/com/engine/jucailin/util/CommonUtil$3.class
deleted file mode 100644
index 9045b06..0000000
Binary files a/target/classes/com/engine/jucailin/util/CommonUtil$3.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/CommonUtil.class b/target/classes/com/engine/jucailin/util/CommonUtil.class
deleted file mode 100644
index f13f480..0000000
Binary files a/target/classes/com/engine/jucailin/util/CommonUtil.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/Constant$1.class b/target/classes/com/engine/jucailin/util/Constant$1.class
deleted file mode 100644
index 31a4fc4..0000000
Binary files a/target/classes/com/engine/jucailin/util/Constant$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/DateUtil.class b/target/classes/com/engine/jucailin/util/DateUtil.class
deleted file mode 100644
index 8374136..0000000
Binary files a/target/classes/com/engine/jucailin/util/DateUtil.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/DbTools.class b/target/classes/com/engine/jucailin/util/DbTools.class
deleted file mode 100644
index 6ed6bf6..0000000
Binary files a/target/classes/com/engine/jucailin/util/DbTools.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil$1.class b/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil$1.class
deleted file mode 100644
index ef9cd42..0000000
Binary files a/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil$1.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil.class b/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil.class
deleted file mode 100644
index 12b386a..0000000
Binary files a/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/KQDateUtil.class b/target/classes/com/engine/jucailin/util/KQDateUtil.class
deleted file mode 100644
index 51cfa60..0000000
Binary files a/target/classes/com/engine/jucailin/util/KQDateUtil.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/ListConversionMethod.class b/target/classes/com/engine/jucailin/util/ListConversionMethod.class
deleted file mode 100644
index 88fe066..0000000
Binary files a/target/classes/com/engine/jucailin/util/ListConversionMethod.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/PageUidFactory.class b/target/classes/com/engine/jucailin/util/PageUidFactory.class
deleted file mode 100644
index efed13c..0000000
Binary files a/target/classes/com/engine/jucailin/util/PageUidFactory.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/util/ResponseResult.class b/target/classes/com/engine/jucailin/util/ResponseResult.class
deleted file mode 100644
index 468a058..0000000
Binary files a/target/classes/com/engine/jucailin/util/ResponseResult.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/web/KQCalendarSettingAction.class b/target/classes/com/engine/jucailin/web/KQCalendarSettingAction.class
deleted file mode 100644
index 6a22a9c..0000000
Binary files a/target/classes/com/engine/jucailin/web/KQCalendarSettingAction.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/web/KQCommonAction.class b/target/classes/com/engine/jucailin/web/KQCommonAction.class
deleted file mode 100644
index 0b57666..0000000
Binary files a/target/classes/com/engine/jucailin/web/KQCommonAction.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/web/KQCycleSettingAction.class b/target/classes/com/engine/jucailin/web/KQCycleSettingAction.class
deleted file mode 100644
index 42f2e94..0000000
Binary files a/target/classes/com/engine/jucailin/web/KQCycleSettingAction.class and /dev/null differ
diff --git a/target/classes/com/engine/jucailin/web/KQPersonGroupAction.class b/target/classes/com/engine/jucailin/web/KQPersonGroupAction.class
deleted file mode 100644
index a56feac..0000000
Binary files a/target/classes/com/engine/jucailin/web/KQPersonGroupAction.class and /dev/null differ
diff --git a/target/classes/com/engine/kq/biz/KQLeaveRulesComInfo.class b/target/classes/com/engine/kq/biz/KQLeaveRulesComInfo.class
deleted file mode 100644
index 8e63980..0000000
Binary files a/target/classes/com/engine/kq/biz/KQLeaveRulesComInfo.class and /dev/null differ
diff --git a/target/classes/com/engine/kq/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class b/target/classes/com/engine/kq/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class
deleted file mode 100644
index f3c674f..0000000
Binary files a/target/classes/com/engine/kq/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class and /dev/null differ
diff --git a/target/classes/com/engine/kq/service/impl/KQHolidaySetServiceImpl.class b/target/classes/com/engine/kq/service/impl/KQHolidaySetServiceImpl.class
deleted file mode 100644
index b6a7012..0000000
Binary files a/target/classes/com/engine/kq/service/impl/KQHolidaySetServiceImpl.class and /dev/null differ
diff --git a/target/test-classes/TestObj.class b/target/test-classes/TestObj.class
index 0ed482b..f83a4a7 100644
Binary files a/target/test-classes/TestObj.class and b/target/test-classes/TestObj.class differ
diff --git a/target/test-classes/TestOneTimePayMentWay.class b/target/test-classes/TestOneTimePayMentWay.class
index e805946..45f09c3 100644
Binary files a/target/test-classes/TestOneTimePayMentWay.class and b/target/test-classes/TestOneTimePayMentWay.class differ
diff --git a/test/TestObj.java b/test/TestObj.java
index 92e9580..7ec83c7 100644
--- a/test/TestObj.java
+++ b/test/TestObj.java
@@ -4,7 +4,6 @@ import com.engine.attendance.enums.ClassSegmentTypeEnum;
import com.engine.attendance.vacation.util.VocationCommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.Utils;
-import com.engine.jucailin.genid.IdGenerator;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
@@ -27,7 +26,9 @@ import java.util.stream.Collectors;
public class TestObj {
public static void main(String[] args) throws Exception{
- System.out.println(delCommon());
+ List> existsList = new ArrayList<>();
+ existsList = existsList.stream().filter(e->DateUtil.getTime("2024-03-19").compareTo(DateUtil.getTime(e.get("dkrq").toString())) <=0 &&
+ DateUtil.getTime("2024-03-19").compareTo(DateUtil.getTime(e.get("dkrq").toString())) >=0).collect(Collectors.toList());
}
public static Map delCommon() {
diff --git a/test/TestOneTimePayMentWay.java b/test/TestOneTimePayMentWay.java
index b9da191..82a72e0 100644
--- a/test/TestOneTimePayMentWay.java
+++ b/test/TestOneTimePayMentWay.java
@@ -1,6 +1,5 @@
import com.engine.attendance.vacation.job.holidaygeneration.tactics.OneTimePayMentWay;
import com.engine.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay;
-import com.engine.jucailin.util.DateUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
diff --git a/workflow/request/hrmattendance/HrmCustomCard_e9.jsp b/workflow/request/hrmattendance/HrmCustomCard_e9.jsp
new file mode 100644
index 0000000..124e6a4
--- /dev/null
+++ b/workflow/request/hrmattendance/HrmCustomCard_e9.jsp
@@ -0,0 +1,70 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+
+
+
+
+
+<%
+
+%>
+
+
diff --git a/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp b/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp
new file mode 100644
index 0000000..1497d57
--- /dev/null
+++ b/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+
+
+
+
+
+<%
+
+%>
+
+