调整加班流程、请假流程jsp，修改退回流程bug，修改日历排班人员分组查询bug，优化计算加班时长

src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/RecordDataCmd.java

@@ -77,7 +77,7 @@ public class RecordDataCmd extends AbstractCommonCommand<Map<String,Object>> {
             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 {

src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.java

@@ -277,7 +277,7 @@ public class GetOvertimeDurationCmd extends AbstractCommonCommand<Map<String, Ob
         int dinnerTime = 0;
         //20240912注释下面几行代码，加班计划已经根据设置“是否扣除时间区间内的就餐休息时长”信息去除了相应时长
         double workflowBetweenHour = Double.valueOf(String.format("%.2f", DateUtil.getBetWeenMinutes(kssj,jssj) / 60.0));
-        if (workflowBetweenHour <=  Double.valueOf(Util.null2String(scheduleMap.get("edxss"))) && scheduleMap.get("bdlx").equals(ClassSegmentTypeEnum.OVERTIME_PLAN.getKey())){
+        if (workflowBetweenHour <=  Double.valueOf(Util.null2String(scheduleMap.get("edxss")))){
             //当为加班计划时，前台流程未扣过休息时长
             if (CheckBoxEnum.CHECKED.getKey().equals(zdkcjcxxsc)){
                 //扣除就餐段时长

src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java

@@ -49,9 +49,9 @@ public class AttendanceanalysisAction {
             log.info("********AttendanceanalysisAction  start********");
             Map<String,Object> paramMap = ParamUtil.request2Map(request);
 //            Map<String,Object> paramMap = Maps.newHashMap();
-//            paramMap.put("startDate","2024-11-22");
+//            paramMap.put("startDate","2024-12-02");
-//            paramMap.put("endDate","2024-11-22");
+//            paramMap.put("endDate","2024-12-02");
-//            paramMap.put("userIds","22");
+//            paramMap.put("userIds","25");
 
             String startDate = Util.null2String(paramMap.get("startDate"));
             String startBeforeDate = DateUtil.beforeDay(startDate,2);

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<String> 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<Map<String,Object>> personnelGrouping = DbTools.getSqlToList(sql,psersongroup);
+            psersongroupUserIds = PersongroupCommonUtil.getUserIdsByPersonnelGrouping(personnelGrouping,startTime);
             if (!"".equals(employeeIds)){
                 Set<String> 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)){

src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowBackAction.java

@@ -44,14 +44,14 @@ public class BatchAskForLeaveWorkFlowBackAction implements Action {
         List<Map<String, String>> 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<Map<String, String>> detailTable2 = CommonUtil.getDetailTableInfo(requestInfo,1);
+        List<Map<String, String>> 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";