diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar index f3568c3..180a3ff 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/attendanceanalysis/web/AttendanceanalysisAction.java b/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java index 57b2773..235ce4e 100644 --- a/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java +++ b/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java @@ -102,28 +102,47 @@ public class AttendanceanalysisAction { List> dataList = DbTools.getSqlToList(sql,startDate,endDate); Map>> collect = dataList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("userid")))); + //考勤项目 + sql = "select id,mc from uf_jcl_kq_kqxm"; + List> items = DbTools.getSqlToList(sql); + Map itemMap = items.stream().collect(Collectors.toMap(e->Util.null2String(e.get("id")),e->Util.null2String(e.get("mc")))); + + //请假记录 sql = "select a.qjry,a.jqlx,a.cxjqj,b.ksrq,b.kssj,b.jsrq,b.jssj,b.qjsc,b.qtj,b.btj from uf_jcl_kq_qjjl a left join uf_jcl_kq_qjjl_dt1 b on a.id = b.mainid where a.qjry in ("+userIds+") and b.ksrq>=? and b.ksrq<=? and (b.cxqj=0 or b.cxqj is null) order by b.ksrq,b.kssj"; List> askforLeaveList = DbTools.getSqlToList(sql,startDate,endDate); + for (Map map :askforLeaveList){ + map.put("jqlx_name",itemMap.get(map.get("jqlx"))); + } Map>> askforLeavecollect = askforLeaveList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("qjry")))); //出差记录 sql = "select b.ccr,a.cclx,a.ccsd,b.ksrq,b.jsrq,b.kssj,b.jssj,b.ccsc,b.qtcc,b.btcc,b.cxcc from uf_jcl_kq_ccjl a left join uf_jcl_kq_ccjl_dt1 b on a.id = b.mainid where b.ccr in ("+userIds+") and b.ksrq>=? and b.ksrq<=? and (b.cxcc=0 or b.cxcc is null) order by b.ksrq,b.kssj"; List> evectionList = DbTools.getSqlToList(sql,startDate,endDate); + for (Map map :evectionList){ + map.put("cclx_name",itemMap.get(map.get("cclx"))); + } Map>> evectioncollect = evectionList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("ccr")))); //加班计划 sql = "select b.jbry,b.ksrq,b.kssj,a.jblx,b.jsrq,b.jssj,b.jbsc from uf_jcl_kq_jbjh a left join uf_jcl_kq_jbjh_dt1 b on a.id=b.mainid where b.jbry in ("+userIds+") and b.ksrq>=? and b.ksrq<=? and (b.jbcx=0 or b.jbcx is null) order by b.ksrq,b.kssj"; List> overPlanDataList = DbTools.getSqlToList(sql,startDate,endDate); + for (Map map :overPlanDataList){ + map.put("jblx_name",itemMap.get(map.get("jblx"))); + } Map>> overPlancollect = overPlanDataList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("jbry")))); //加班结果 sql = "select szjg,jbry,sjksrq,jbjgly,sjjsrq,sjkssj,sjjssj,sjjbsc,jblx,zt from uf_jcl_kq_jbjg where jbry in ("+userIds+") and sjksrq>=? and sjjsrq<=? order by sjksrq,sjkssj"; List> overPlanResultList = DbTools.getSqlToList(sql,startDate,endDate); + for (Map map :overPlanResultList){ + map.put("jblx_name",itemMap.get(map.get("jblx"))); + } Map>> overResultcollect = overPlanResultList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("jbry")))); + List> resultList = Lists.newArrayList(); for (String userId : userIds.split(",")){ Map map = Maps.newHashMap(); diff --git a/src/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.java b/src/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.java index 7c991f7..2db49ee 100644 --- a/src/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.java +++ b/src/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.java @@ -15,19 +15,10 @@ import java.util.Map; @Slf4j public class SchedulingJob extends BaseCronJob { - /** - * 规律排班模块id - */ - private String modeId; /** * 生成天数 */ private String day; - /** - * 排班结果模块id - */ - private String formmodeid; - private List rulers; { rulers = new Utils().getAllClassByInterface(RegularScheduling.class); @@ -38,6 +29,11 @@ public class SchedulingJob extends BaseCronJob { String currentDate = DateUtil.getCurrentDate(); String sql = "select * from uf_jcl_kq_glpb where edate > ? and bdate<=?"; List> dataList = DbTools.getSqlToList(sql,currentDate,currentDate); + Map formmodeIdMap = Utils.getFormmodeIdMap(); + //规律排班模块id + String modeId = formmodeIdMap.get("uf_jcl_kq_glpb"); + //排班结果模块 + String formmodeid = formmodeIdMap.get("uf_pbjg"); log.info("dataList : [{}]",dataList); try { dataList.forEach(e -> { diff --git a/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java index 9f35191..34803a1 100644 --- a/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java +++ b/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java @@ -4,6 +4,7 @@ import com.engine.attendance.workflow.service.ProcessSubmitCheckService; 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.impl.Service; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; @@ -21,7 +22,8 @@ public class ProcessSubmitCheckServiceImpl extends Service implements ProcessSub public Map processSubmitCheck(Map params) { String userId = Util.null2String(params.get("userId")); String submitDate = Util.null2String(params.get("submitDate")); - String modeId = Util.null2String(params.get("modeId")); + //String modeId = Util.null2String(params.get("modeId")); + String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_kqzqmc"); Map resultMap = Maps.newHashMap(); resultMap.put("result","0"); diff --git a/src/com/engine/common/util/Utils.java b/src/com/engine/common/util/Utils.java index 427e0eb..a0d1c7f 100644 --- a/src/com/engine/common/util/Utils.java +++ b/src/com/engine/common/util/Utils.java @@ -468,9 +468,9 @@ public class Utils { * @return */ public static Map getFormmodeIdMap(){ - String sql = "select modeid,tablename from uf_jcl_form_table "; + String sql = "select c.id,b.tablename from uf_jcl_form_table a left join workflow_bill b on a.tablename=b.tablename left join modeinfo c on b.id=c.formid"; List> dataList = DbTools.getSqlToList(sql); - return dataList.stream().collect(Collectors.toMap(e->e.get("tablename").toString(),e->e.get("modeid").toString())); + return dataList.stream().collect(Collectors.toMap(e->e.get("tablename").toString(),e->e.get("id").toString())); } @@ -537,4 +537,8 @@ public class Utils { } return 0; } + public static void test1(){ + Object obj = new Object(); + System.out.println(obj); + } } diff --git a/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class b/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class index 946858f..2115565 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class and b/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class differ diff --git a/target/classes/com/engine/common/util/Utils.class b/target/classes/com/engine/common/util/Utils.class index cc67354..78c1658 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/test-classes/TestObj.class b/target/test-classes/TestObj.class new file mode 100644 index 0000000..cd71984 Binary files /dev/null and b/target/test-classes/TestObj.class differ diff --git a/test/TestObj.java b/test/TestObj.java new file mode 100644 index 0000000..9dcc241 --- /dev/null +++ b/test/TestObj.java @@ -0,0 +1,8 @@ +import com.engine.common.util.Utils; + +public class TestObj { + public static void main(String[] args) { + Utils.test1(); + Utils.test1(); + } +}