From 2eceb472b2bb1f3f7bb41299fbdf10f4d8fb1381 Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Wed, 4 Dec 2024 15:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A0=E7=8F=AD=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E3=80=81=E8=AF=B7=E5=81=87=E6=B5=81=E7=A8=8Bjsp?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=80=80=E5=9B=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?bug=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=A5=E5=8E=86=E6=8E=92?= =?UTF-8?q?=E7=8F=AD=E4=BA=BA=E5=91=98=E5=88=86=E7=BB=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?bug=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AE=A1=E7=AE=97=E5=8A=A0?= =?UTF-8?q?=E7=8F=AD=E6=97=B6=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendanceanalysis/cmd/RecordDataCmd.java | 2 +- .../cmd/workovertime/GetOvertimeDurationCmd.java | 2 +- .../web/AttendanceanalysisAction.java | 6 +++--- .../service/impl/WorkRulesServiceImpl.java | 11 +++++++---- .../BatchAskForLeaveWorkFlowBackAction.java | 6 +++--- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java index d83da85..db00ed2 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java +++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java @@ -77,7 +77,7 @@ public class RecordDataCmd extends AbstractCommonCommand> { recordDataList = recordDataList.subList(0,8); } if (dataList.size() >0){ - sql = "update uf_jcl_kq_cqjg set cqsc="+attendanceDuration+",cqzt="+cqzt+",fxrq='"+DateUtil.getCurrentTime()+"',rqlx="+rqlx+",sfxx="+sfxx; + sql = "update uf_jcl_kq_cqjg set sjzt=1,cqsc="+attendanceDuration+",cqzt="+cqzt+",fxrq='"+DateUtil.getCurrentTime()+"',rqlx="+rqlx+",sfxx="+sfxx; if (classInfo.size() == 0 || classInfo.get(0).get("bcxx") == null || "".equals(classInfo.get(0).get("bcxx"))){ sql = sql + ",bc=NULL,bcbdxx=NULL,"; }else { diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java index 1818d8e..e8e8e42 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java +++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java @@ -277,7 +277,7 @@ public class GetOvertimeDurationCmd extends AbstractCommonCommand paramMap = ParamUtil.request2Map(request); // Map paramMap = Maps.newHashMap(); -// paramMap.put("startDate","2024-11-22"); -// paramMap.put("endDate","2024-11-22"); -// paramMap.put("userIds","22"); +// paramMap.put("startDate","2024-12-02"); +// paramMap.put("endDate","2024-12-02"); +// paramMap.put("userIds","25"); String startDate = Util.null2String(paramMap.get("startDate")); String startBeforeDate = DateUtil.beforeDay(startDate,2); diff --git a/src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java b/src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java index b3ea749..40bbc84 100644 --- a/src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java +++ b/src/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java @@ -98,6 +98,9 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { String psersongroup = Util.null2String(params.get("psersongroup")); String status = Util.null2String(params.get("status")); String userId = Util.null2String(user.getUID()); + int monthDays = DateUtil.getDays(dateTime, Calendar.DAY_OF_MONTH); + String startTime = dateTime+"-01"; + String endTime = dateTime+"-"+monthDays; //0:全体人员、1：分部、2：部门,3:人员 String type = Util.null2String(params.get("type")); @@ -118,7 +121,9 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { } Set psersongroupUserIds = null; if (!"".equals(psersongroup)){ - psersongroupUserIds = CommonUtil.getEmpGroupUserIds(psersongroup); + String sql = "select a.list_type,b.mainid,b.empid,b.filters,b.bdate,b.edate,b.sqltj from uf_ryqz a left join uf_ryqz_dt1 b on a.id=b.mainid where a.id=?"; + List> personnelGrouping = DbTools.getSqlToList(sql,psersongroup); + psersongroupUserIds = PersongroupCommonUtil.getUserIdsByPersonnelGrouping(personnelGrouping,startTime); if (!"".equals(employeeIds)){ Set ids = Sets.newHashSet(); for (String employeeId:employeeIds.split(",")){ @@ -149,9 +154,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { int startindex = (pageindex-1)*pageSize; int endindex = pageindex*pageSize; - int monthDays = DateUtil.getDays(dateTime, Calendar.DAY_OF_MONTH); - String startTime = dateTime+"-01"; - String endTime = dateTime+"-"+monthDays; + //当为系统管理员用户登录时 if ("1".equals(userId)){ if ("".equals(psersongroup)){ diff --git a/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java b/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java index 3fd549e..f90c36b 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java +++ b/src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java @@ -44,14 +44,14 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action { List> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0,WorkFlowTypeEnum.ASKFORLEAVE); log.info("detailTableData : [{}]",detailTableData); - String detail1TableName = CommonUtil.getDetailTableInfoTableName(requestInfo.getDetailTableInfo().getDetailTable()[1].getTableDBName(),1,WorkFlowTypeEnum.ASKFORLEAVE); + String detail1TableName = CommonUtil.getDetailTableInfoTableName(requestInfo.getDetailTableInfo().getDetailTable()[0].getTableDBName(),0,WorkFlowTypeEnum.ASKFORLEAVE); log.info("detail1ableName : [{}]", detail1TableName); //流程表单明细表2数据 - List> detailTable2 = CommonUtil.getDetailTableInfo(requestInfo,1); + List> detailTable2 = CommonUtil.getDetailTableInfo(requestInfo,1,WorkFlowTypeEnum.ASKFORLEAVE); log.info("BatchAskForLeaveWorkFlowBackAction-detailTable2Data : [{}]",detailTable2); - String detail2TableName = requestInfo.getDetailTableInfo().getDetailTable()[1].getTableDBName(); + String detail2TableName = CommonUtil.getDetailTableInfoTableName(requestInfo.getDetailTableInfo().getDetailTable()[1].getTableDBName(),1,WorkFlowTypeEnum.ASKFORLEAVE); log.info("detail2ableName : [{}]", detail2TableName); sql = "select id,jqid,sxrq,ktsc,yxsc,wxsc,yqsxrq,ztsc from uf_jcl_kq_jqye order by sxrq";