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 3140d16..13ec6d6 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 4eba079..88e0a37 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 85e00a7..a66731e 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 9a75233..40e922a 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 @@
-~|}}}y{~{|x}|{{}W\X\UXRXZ[ZTVQYY[ZUZVXPUS]\Vdeb^U\VVQ[UW_xxyu|{{wy{{x{yxwvWX\XVY[[][[nltonosswpntopkqqotlzrvtutvtxԋݏ̏ώގɐːЏێːÐȐҐƏώܓ͓ё؏ʌˑΐڎɔώבÓݎݏϐڍܑʎٓǒƐݐ͓ÒŒ͏ϐ֒ӐڏޏђđێԒߎߒxsxxxuxvwyywxvvvvuw{mnliihlfkihlkjkt~|~~}{}}}|~~}}~~|~~~}{NMMMMMMMMNMMMLLLLMMMJKKKKKKKKKKJJJKKKKKKKLKKKKKJJJKKLKKKKKKKKKJJIJKKKKKKKLKKKKJJJKKKLKKKKKKKKKJJJKKKKKKKKLKKKK
\ No newline at end of file
+~~}}}}~~}}~}~~~|~}Ā~~}~~}||~vlhjkikliliijjom|vuwuxvyxxyvvxvyxytwɉגߐǔِّۏӑٍđޑēԒِҐԑђĒёܑǏܐݓđϏŒލȓِ͓ړՌďڍގӑۏێϑ؎ҏ̍ǑڎݎȒُҏxtvsvtvryksoqpnpnrnqvqunopsjnZY][]ZVXZWWuvxy{z}{wx{{}vyxxƃ_WUZQVWZT]cfcV[^SVPWV[VZ[YZQVTY[ZXRVU\W]Wԁ||z|x{z|z{}~|~}
\ 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 d041140..69a52f6 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 92d0e4c..55e1700 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,13 +10,20 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -59,7 +66,7 @@
-
+
@@ -476,7 +483,10 @@
-
+
+
+
+
@@ -520,12 +530,12 @@
- file://$PROJECT_DIR$/src/com/engine/attendance/workflow/service/ProcessSubmitCheckService.java
+ file://$PROJECT_DIR$/src/com/engine/attendance/workflow/service/BusinessTripsApplyService.java
5
-
+
-
+
diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar
index 7b550fc..80b523a 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/cmd/GetEliminationsEvctionListCmd.java b/src/com/engine/attendance/workflow/cmd/GetEliminationsEvctionListCmd.java
new file mode 100644
index 0000000..64acccd
--- /dev/null
+++ b/src/com/engine/attendance/workflow/cmd/GetEliminationsEvctionListCmd.java
@@ -0,0 +1,69 @@
+package com.engine.attendance.workflow.cmd;
+
+import com.engine.common.biz.AbstractCommonCommand;
+import com.engine.common.entity.BizLogContext;
+import com.engine.common.util.DbTools;
+import com.engine.core.interceptor.CommandContext;
+import lombok.extern.slf4j.Slf4j;
+import weaver.general.Util;
+import java.util.*;
+
+@Slf4j
+public class GetEliminationsEvctionListCmd extends AbstractCommonCommand> {
+
+ public GetEliminationsEvctionListCmd(Map params){
+ this.params = params;
+ }
+
+ @Override
+ public BizLogContext getLogContext() {
+ return null;
+ }
+
+ @Override
+ public Map execute(CommandContext commandContext) {
+
+ Map retmap = new HashMap();
+ //获取主表id列表
+ String targetUserId = Util.null2String(params.get("targetUserId"));
+ String businessTripsType = Util.null2String(params.get("businessTripsType"));
+ String startDate = Util.null2String(params.get("startDate"));
+ String endDate = Util.null2String(params.get("endDate"));
+ log.info("targetUserId : {}, businessTripsType : {}, startDate : {}, endDate : {}",targetUserId, businessTripsType, startDate, endDate);
+ String sql = "select * from uf_jcl_kq_qjjl where qjry="+targetUserId;
+ if (!businessTripsType.equals("")) {
+ sql += " and jqlx = " + businessTripsType;
+ }
+ if (!startDate.equals("")) {
+ sql += " and ksrq >= '" + startDate+"'";
+ }
+ if (!endDate.equals("")) {
+ sql += " and jsrq <= '" + endDate+"'";
+ }
+ log.info(sql);
+ List maidList = new ArrayList<>();
+ if (!targetUserId.equals("")) {
+ List> datas = DbTools.getSqlToList(sql);
+ if (datas.size() > 0) {
+ datas.forEach(f -> {
+ maidList.add(f.get("id").toString());
+ });
+ }
+ }
+ log.info("maidList : [{}]",maidList);
+ //查询子表数据
+ if (maidList.size() > 0) {
+ String detailSql = "select a.id,a.ksrq,a.kssj,a.jsrq,a.jssj,a.qjsc,a.qtj,a.btj,a.cxqj from uf_jcl_kq_qjjl_dt1 a where mainid in ("+String.join(",",maidList)+")";
+ List> detailList = DbTools.getSqlToList(detailSql);
+ if (detailList.size() > 0) {
+ retmap.put("result", detailList);
+ } else {
+ retmap.put("result", null);
+ }
+ log.info("detailList : [{}]",detailList);
+ } else {
+ retmap.put("result", null);
+ }
+ return retmap;
+ }
+}
diff --git a/src/com/engine/attendance/workflow/service/ProcessSubmitCheckService.java b/src/com/engine/attendance/workflow/service/ProcessSubmitCheckService.java
index 555c4c1..fd40939 100644
--- a/src/com/engine/attendance/workflow/service/ProcessSubmitCheckService.java
+++ b/src/com/engine/attendance/workflow/service/ProcessSubmitCheckService.java
@@ -4,4 +4,6 @@ import java.util.Map;
public interface ProcessSubmitCheckService {
Map processSubmitCheck(Map params);
+
+ Map getEliminationsEvctionList(Map params);
}
diff --git a/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java
index eb9dac6..08c956d 100644
--- a/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java
+++ b/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java
@@ -1,5 +1,6 @@
package com.engine.attendance.workflow.service.impl;
+import com.engine.attendance.workflow.cmd.GetEliminationsEvctionListCmd;
import com.engine.attendance.workflow.service.ProcessSubmitCheckService;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
@@ -93,4 +94,9 @@ public class ProcessSubmitCheckServiceImpl extends Service implements ProcessSub
return resultMap;
}
+
+ @Override
+ public Map getEliminationsEvctionList(Map params) {
+ return commandExecutor.execute(new GetEliminationsEvctionListCmd(params));
+ }
}
diff --git a/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java b/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java
index c05b222..70cac5b 100644
--- a/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java
+++ b/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java
@@ -48,4 +48,6 @@ public class BusinessTripsApplyApi {
}
}
+
+
}
diff --git a/src/com/engine/attendance/workflow/web/ProcessSubmitCheckApi.java b/src/com/engine/attendance/workflow/web/ProcessSubmitCheckApi.java
index 60cbdcf..701b451 100644
--- a/src/com/engine/attendance/workflow/web/ProcessSubmitCheckApi.java
+++ b/src/com/engine/attendance/workflow/web/ProcessSubmitCheckApi.java
@@ -6,13 +6,17 @@ import com.engine.common.util.ApiReturnTools;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import lombok.extern.slf4j.Slf4j;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
import java.util.Map;
@Slf4j
@@ -37,6 +41,26 @@ public class ProcessSubmitCheckApi {
}
}
+ /**
+ * 获得请假
+ * @param request
+ * @param response
+ * @return
+ */
+ @GET
+ @Path("/getEliminationsEvctionList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public String getBusinessTripsApplyList(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+ try {
+ Map paramMap = ParamUtil.request2Map(request);
+ Map dataMap = basicsetService.getEliminationsEvctionList(paramMap);
+ return ApiReturnTools.success(dataMap);
+ }catch (Exception e){
+ log.error("execute fail,catch error: [{}]",e);
+ return ApiReturnTools.error("500","getBusinessTripsApplyList error");
+ }
+ }
+
}
diff --git a/target/classes/com/engine/attendance/workflow/action/AskForLeaveCheckAction.class b/target/classes/com/engine/attendance/workflow/action/AskForLeaveCheckAction.class
new file mode 100644
index 0000000..81444a8
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/AskForLeaveCheckAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/EliminationsAskForLeaveAction.class b/target/classes/com/engine/attendance/workflow/action/EliminationsAskForLeaveAction.class
new file mode 100644
index 0000000..2a81e7c
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/EliminationsAskForLeaveAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/EliminationsEvctionCheckAction.class b/target/classes/com/engine/attendance/workflow/action/EliminationsEvctionCheckAction.class
new file mode 100644
index 0000000..cf469e3
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/EliminationsEvctionCheckAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/EvctionCheckAction.class b/target/classes/com/engine/attendance/workflow/action/EvctionCheckAction.class
new file mode 100644
index 0000000..25a483c
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/EvctionCheckAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/OvertimePlanCheckAction.class b/target/classes/com/engine/attendance/workflow/action/OvertimePlanCheckAction.class
new file mode 100644
index 0000000..e6721be
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/OvertimePlanCheckAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/OvertimeResultCheckAction.class b/target/classes/com/engine/attendance/workflow/action/OvertimeResultCheckAction.class
new file mode 100644
index 0000000..5872410
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/OvertimeResultCheckAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class b/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class
index 43d1565..98d2e6c 100644
Binary files a/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class and b/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/action/ScheduleChangeCheckAction.class b/target/classes/com/engine/attendance/workflow/action/ScheduleChangeCheckAction.class
new file mode 100644
index 0000000..23a78f5
Binary files /dev/null and b/target/classes/com/engine/attendance/workflow/action/ScheduleChangeCheckAction.class differ
diff --git a/target/classes/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class b/target/classes/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class
index 8b05192..2b8489b 100644
Binary files a/target/classes/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class and b/target/classes/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class differ