diff --git a/src/com/engine/attendance/workflow/action/RevokeLeaveAction.java b/src/com/engine/attendance/workflow/action/RevokeLeaveAction.java index edde7e0..ffe2e6c 100644 --- a/src/com/engine/attendance/workflow/action/RevokeLeaveAction.java +++ b/src/com/engine/attendance/workflow/action/RevokeLeaveAction.java @@ -1,6 +1,6 @@ package com.engine.attendance.workflow.action; -import com.engine.jucailin.util.DbTools; +import com.engine.common.util.DbTools; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import weaver.general.Util; diff --git a/src/com/engine/attendance/workflow/cmd/GetBusinessTripsApplyListCmd.java b/src/com/engine/attendance/workflow/cmd/GetBusinessTripsApplyListCmd.java index 6bbe7f9..4502f4a 100644 --- a/src/com/engine/attendance/workflow/cmd/GetBusinessTripsApplyListCmd.java +++ b/src/com/engine/attendance/workflow/cmd/GetBusinessTripsApplyListCmd.java @@ -7,7 +7,7 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; import com.engine.core.interceptor.CommandContext; -import com.engine.jucailin.util.DbTools; +import com.engine.common.util.DbTools; import weaver.general.Util; import weaver.hrm.User; import weaver.systeminfo.SystemEnv; @@ -56,15 +56,15 @@ public class GetBusinessTripsApplyListCmd extends AbstractCommonCommand maidList = new ArrayList<>(); if (!targetUserId.equals("")) { - List> datas = DbTools.getSqlToList(sql); + List> datas = DbTools.getSqlToList(sql); if (datas.size() > 0) { datas.forEach(f -> { - maidList.add(f.get("id")); + maidList.add(f.get("id").toString()); }); } } - String backFields = "a.id,a.calendar_name,a.default_calendar,a.calendar_desc"; + String backFields = "a.id,a.cxcc,a.ksrq,a.kssj,a.jsrq,a.jssj,a.ccsc,a.qtcc,a.btcc,a.cxsm"; String sqlFrom = " uf_jcl_kq_ccjl_dt1 a"; String sqlWhere = " where 1=1"; if (maidList.size() > 0) { diff --git a/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java index 9e9c569..cb35c1e 100644 --- a/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java +++ b/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.attendance.workflow.service.impl; +import com.engine.attendance.workflow.cmd.GetBusinessTripsApplyListCmd; import com.engine.attendance.workflow.service.BusinessTripsApplyService; import com.engine.core.impl.Service; @@ -14,6 +15,6 @@ public class BusinessTripsApplyServiceImpl extends Service implements BusinessTr @Override public Map getBusinessTripsApplyList(Map params) { - return null; + return commandExecutor.execute(new GetBusinessTripsApplyListCmd(params, user)); } }