feat: 修改排班管理接口，修改配置文件

guzijian
1 parent bc5995c3
Showing 22 changed files with 317 additions and 106 deletions
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
ruoyi-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
ruoyi-admin/src/main/java/com/ruoyi/controller/AttendanceController.java
ruoyi-admin/src/main/java/com/ruoyi/domain/RuleAttendanceMainHelp.java
ruoyi-admin/src/main/java/com/ruoyi/mapper/RuleAttendanceMainMapper.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/PeopleRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/TableMonthRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/TableMonthResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/AttendanceService.java
ruoyi-admin/src/main/java/com/ruoyi/service/RuleAttendanceMainHelpService.java
ruoyi-admin/src/main/java/com/ruoyi/service/RuleAttendanceMainService.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/RuleAttendanceMainServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/utils/ConstDateUtil.java
ruoyi-admin/src/main/resources/application-druid-dev.yml
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/application-druid-uat.yml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/mapper/RuleAttendanceMainHelpMapper.xml
@@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import javax.annotation.PostConstruct;
@@ -32,7 +33,7 @@ public class RuoYiApplication {
     public static void main(String[] args) throws UnknownHostException {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         ConfigurableApplicationContext app = SpringApplication.run(RuoYiApplication.class, args);
-        ConfigurableEnvironment env = app.getEnvironment();
+        Environment env = app.getEnvironment();
         log.info("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +
@@ -42,7 +42,7 @@ public class SchedulingCache {
     public SchedulingCache() {
         log.info("项目启动加载中获取实时班次-----");
-        schedulingInit();
+//        schedulingInit();
     }
@@ -129,18 +129,12 @@ public class AttendanceController extends BaseController {
         }
     }
-    @ApiOperation("获取排班表人员信息")
+    @ApiOperation("获取一个月的排班table")
     @GetMapping("/list/people")
-    public Result<?> getPeopleList(@ModelAttribute PeopleRequestVo vo){
-        return Result.OK(attendanceService.getPeopleList(vo));
+    public TableDataInfo getTableMonth(@ModelAttribute PeopleRequestVo vo){
+        List<TableMonthResponseVo> vos = attendanceService.getTableMonth(vo);
+        return getDataTable(vos);
     }
-    @GetMapping("/table/month")
-    @ApiOperation("获取一个月的table")
-    public Result<?> getTableMonth(){
-        // 修改周期
-        return null;
-    }
-
 }
@@ -42,6 +42,8 @@ public class RuleAttendanceMainHelp implements Serializable {
     private String fleetName;
+    private String ruleDictName;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
@@ -3,9 +3,12 @@ package com.ruoyi.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.pojo.vo.DeleteAttendanceVo;
+import com.ruoyi.pojo.vo.PeopleRequestVo;
 import com.ruoyi.pojo.vo.UpdateAttendanceVo;
 import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
 /**
 * @author 20412
 * @description 针对表【rule_attendance_main(考勤表)】的数据库操作Mapper
@@ -26,6 +29,14 @@ public interface RuleAttendanceMainMapper extends BaseMapper&lt;RuleAttendanceMain&gt;
      * @param vo
      */
     void deleteByJobCodeTotalRecord(DeleteAttendanceVo vo);
+
+    /**
+     * 获取当月的日期数据
+     * @param vo
+     * @param jobCodes
+     * @return
+     */
+    List<RuleAttendanceMain> queryNowMonthDate(@Param("vo") PeopleRequestVo vo, @Param("jobCodes")List<String> jobCodes);
 }
@@ -2,14 +2,17 @@ package com.ruoyi.pojo.vo;
 import lombok.Data;
+import javax.validation.constraints.NotBlank;
+
 /**
  * @author 20412
  */
 @Data
 public class PeopleRequestVo {
+    @NotBlank
     private String date;
     private String jobCode;
     private String name;
     private String posts;
-    private String fleeName;
+    private String fleetName;
 }
+package com.ruoyi.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * @author 20412
+ */
+@Data
+public class TableMonthRequestVo {
+    private String jobCode;
+    private String name;
+    private String date;
+}
 package com.ruoyi.pojo.vo;
-import com.ruoyi.domain.RuleAttendanceMain;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
 import java.util.List;
 /**
@@ -15,9 +16,25 @@ public class TableMonthResponseVo {
     private String name;
     private String fleetName;
     private String posts;
-    private List<RuleAttendanceMain> monthList;
-    private Integer nowMonthDaysCount;
-//
-//    @Data
-//    public
+    private List<WorkItemVo> monthList;
+    private String ruleDictName;
+
+    @Data
+    public static class WorkItemVo {
+        /**
+         * 日期范围
+         */
+        private String rangeTime;
+
+        /**
+         * 调度日期
+         */
+        @DateTimeFormat(pattern = "yyyy-MM-dd")
+        private Date schedulingDate;
+
+        private String day;
+
+        private String week;
+    }
+
 }
 package com.ruoyi.service;
 import com.ruoyi.domain.RuleAttendanceMain;
-import com.ruoyi.domain.RuleAttendanceMainHelp;
 import com.ruoyi.pojo.dto.SchedulingDto;
 import com.ruoyi.pojo.dto.SchedulingSettingDto;
 import com.ruoyi.pojo.vo.*;
@@ -56,6 +55,11 @@ public interface AttendanceService {
     void updateAttendance(UpdateAttendanceVo vo);
     void deleteAttendance(DeleteAttendanceVo vo);
+    /**
+     * 获取当月所有排班日期
+     * @param vo
+     * @return
+     */
+    List<TableMonthResponseVo> getTableMonth(PeopleRequestVo vo);
-    List<RuleAttendanceMainHelp> getPeopleList(PeopleRequestVo vo);
 }
@@ -3,6 +3,7 @@ package com.ruoyi.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.RuleAttendanceMainHelp;
 import com.ruoyi.pojo.vo.PeopleRequestVo;
+import com.ruoyi.pojo.vo.TableMonthRequestVo;
 import java.util.List;
@@ -19,4 +20,5 @@ public interface RuleAttendanceMainHelpService extends IService&lt;RuleAttendanceMa
      * @return
      */
     List<RuleAttendanceMainHelp> queryNowMonthPeople(PeopleRequestVo vo);
+
 }
@@ -37,4 +37,12 @@ public interface RuleAttendanceMainService extends IService&lt;RuleAttendanceMain&gt; 
      * @return
      */
     List<RuleAttendanceMainHelp> queryPeopleList(PeopleRequestVo vo);
+
+    /**
+     * 获取当月的日期数据
+     * @param vo
+     * @param jobCodes
+     * @return
+     */
+    List<RuleAttendanceMain> queryNowMonthDate(PeopleRequestVo vo, List<String> jobCodes);
 }
@@ -25,7 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -39,6 +41,11 @@ import static com.ruoyi.common.WeekEnum.FREE;
 @Service
 public class AttendanceServiceImpl implements AttendanceService {
+    /**
+     * 中文星期声明
+     */
+    private static String[] weekDays = {"周日", "周一", "周二", "周三", "周四", "周五", "周六"};
+
     @Autowired
     private DriverMapper driverMapper;
@@ -58,6 +65,9 @@ public class AttendanceServiceImpl implements AttendanceService {
     private RuleAttendanceMainService attendanceMainService;
     @Autowired
+    private RuleAttendanceMainHelpService helpService;
+
+    @Autowired
     private IRuleNumService ruleNumService;
@@ -152,7 +162,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         List<RuleAttendanceMain> list = attendanceMainService.list(new QueryWrapper<RuleAttendanceMain>()
                 .lambda()
                 .eq(RuleAttendanceMain::getSchedulingDate, vo.getDate())
-                .eq(StringUtils.isNotEmpty(vo.getJocCode()),RuleAttendanceMain::getJobCode,vo.getJocCode()));
+                .eq(StringUtils.isNotEmpty(vo.getJocCode()), RuleAttendanceMain::getJobCode, vo.getJocCode()));
         return list;
     }
@@ -191,8 +201,103 @@ public class AttendanceServiceImpl implements AttendanceService {
     }
     @Override
-    public List<RuleAttendanceMainHelp> getPeopleList(PeopleRequestVo vo) {
-        return attendanceMainService.queryPeopleList(vo);
+    public List<TableMonthResponseVo> getTableMonth(PeopleRequestVo vo) {
+        PageUtils.startPage();
+        List<RuleAttendanceMainHelp> helpList = attendanceMainService.queryPeopleList(vo);
+        List<String> jobCodes = helpList.stream().map(RuleAttendanceMainHelp::getJobCode).collect(Collectors.toList());
+        List<RuleAttendanceMain> mainList = attendanceMainService.queryNowMonthDate(vo, jobCodes);
+        return handleTableMonthResponseVo(vo.getDate(), helpList, mainList);
+    }
+
+    private List<TableMonthResponseVo> handleTableMonthResponseVo(@NotBlank String date, List<RuleAttendanceMainHelp> helpList, List<RuleAttendanceMain> mainList) {
+        Map<String, List<RuleAttendanceMain>> mainMap = transformMapByRuleAttendanceMain(mainList);
+        List<TableMonthResponseVo> vos = new ArrayList<>(10);
+        for (RuleAttendanceMainHelp help : helpList) {
+            TableMonthResponseVo vo = new TableMonthResponseVo();
+            BeanUtils.copyProperties(help, vo);
+            vo.setMonthList(handleMonthWorkList(date, mainMap.get(help.getJobCode())));
+            vos.add(vo);
+        }
+        return vos;
+    }
+
+    private List<TableMonthResponseVo.WorkItemVo> handleMonthWorkList(@NotBlank String date, List<RuleAttendanceMain> mains) {
+        List<TableMonthResponseVo.WorkItemVo> vos = new ArrayList<>(30);
+        for (RuleAttendanceMain main : mains) {
+            TableMonthResponseVo.WorkItemVo itemVo = new TableMonthResponseVo.WorkItemVo();
+            itemVo.setSchedulingDate(main.getSchedulingDate());
+            itemVo.setRangeTime(handleRangeTime(main));
+            itemVo.setDay(ConstDateUtil.formatDate("MM月dd日", main.getSchedulingDate()));
+            itemVo.setWeek(handleNowWeek(main.getSchedulingDate()));
+            vos.add(itemVo);
+        }
+        // 为未生成的日期进行补充
+        String[] split = date.split(TOMORROW_NO_STRING);
+        int year = Integer.parseInt(split[0]);
+        int month = Integer.parseInt(split[1]);
+        List<LocalDate> dateList = ConstDateUtil.getAllDatesOfTheMonth(year, month);
+        if (vos.size() != dateList.size()) {
+            int diff = dateList.size() - vos.size();
+            if (diff > 0) {
+                for (int i = 0; i < diff; i++) {
+                    TableMonthResponseVo.WorkItemVo itemVo = new TableMonthResponseVo.WorkItemVo();
+                    LocalDate localDate = dateList.get(i);
+                    Date nowDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+                    itemVo.setSchedulingDate(nowDate);
+                    itemVo.setDay(ConstDateUtil.formatDate("MM月dd日", nowDate));
+                    itemVo.setWeek(handleNowWeek(nowDate));
+                    vos.add(itemVo);
+                }
+                vos.sort(Comparator.comparing(TableMonthResponseVo.WorkItemVo::getSchedulingDate));
+            }
+        }
+        return vos;
+    }
+
+    private String handleNowWeek(Date date) {
+        Calendar cal = Calendar.getInstance(); // 获得一个日历
+        cal.setTime(date);
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1; // 指示一个星期中的某天。
+        if (w < 0) {
+            w = 0;
+        }
+        return weekDays[w];
+    }
+
+    private String handleRangeTime(RuleAttendanceMain main) {
+        // 处理休息
+        if (FREE.getValue().equals(main.getWorkFlag())) {
+            return FREE.getDescription();
+        }
+        String rangeTime;
+        // 处理不分段
+        if (Objects.isNull(main.getSecondQuittingSignInTime())) {
+            rangeTime = handleFirstRangeTime(main);
+        } else {
+            rangeTime = handleFirstRangeTime(main) + ";" + handleSecondRangeTime(main);
+        }
+        return rangeTime;
+    }
+
+    private String handleSecondRangeTime(RuleAttendanceMain main) {
+        return ConstDateUtil.formatDate("MM月dd日HH:mm", main.getSecondWorkSignInTime()) + TOMORROW_NO_STRING + ConstDateUtil.formatDate("MM月dd日HH:mm", main.getSecondQuittingSignInTime());
+    }
+
+    private String handleFirstRangeTime(RuleAttendanceMain main) {
+        return ConstDateUtil.formatDate("MM月dd日HH:mm", main.getFirstWorkSignInTime()) + TOMORROW_NO_STRING + ConstDateUtil.formatDate("MM月dd日HH:mm", main.getFirstQuittingSignInTime());
+    }
+
+    private Map<String, List<RuleAttendanceMain>> transformMapByRuleAttendanceMain(List<RuleAttendanceMain> mainList) {
+        Map<String, List<RuleAttendanceMain>> map = new HashMap<>();
+        for (RuleAttendanceMain main : mainList) {
+            List<RuleAttendanceMain> mains = map.get(main.getJobCode());
+            if (CollectionUtil.isEmpty(mains)) {
+                map.put(main.getJobCode(), new ArrayList<>(Arrays.asList(main)));
+            } else {
+                mains.add(main);
+            }
+        }
+        return map;
     }
     private static void getRumSettingByDto(SchedulingDto dto, RuleNumSetting setting) {
@@ -16,20 +16,20 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 /**
-* @author 20412
-* @description 针对表【rule_attendance_main(考勤表)】的数据库操作Service实现
-* @createDate 2023-09-03 12:15:39
-*/
+ * @author 20412
+ * @description 针对表【rule_attendance_main(考勤表)】的数据库操作Service实现
+ * @createDate 2023-09-03 12:15:39
+ */
 @Service
 public class RuleAttendanceMainServiceImpl extends ServiceImpl<RuleAttendanceMainMapper, RuleAttendanceMain>
-    implements RuleAttendanceMainService {
+        implements RuleAttendanceMainService {
     @Autowired
     private RuleAttendanceMainHelpService helpService;
     @Override
     public void updateByJobCodeTotalQuantity(UpdateAttendanceVo vo, RuleAttendanceMain main) {
-        baseMapper.updateByIdTotalQuantity(vo,main);
+        baseMapper.updateByIdTotalQuantity(vo, main);
     }
     @Override
@@ -41,6 +41,11 @@ public class RuleAttendanceMainServiceImpl extends ServiceImpl&lt;RuleAttendanceMai
     public List<RuleAttendanceMainHelp> queryPeopleList(PeopleRequestVo vo) {
         return helpService.queryNowMonthPeople(vo);
     }
+
+    @Override
+    public List<RuleAttendanceMain> queryNowMonthDate(PeopleRequestVo vo, List<String> jobCodes) {
+        return baseMapper.queryNowMonthDate(vo, jobCodes);
+    }
 }
@@ -90,7 +90,6 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
             List<RuleNumDto> ruleNumDtoList = ruleNumSettingService.selectRuleNumBySettingId(settingList);
             // 处理规则
             List<RuleAttendanceMain> attendanceMains = handleAttendanceMain(peopleList, ruleList, ruleNumDtoList);
-            backCreatePeopleListLog(peopleList);
             attendanceMainService.saveBatch(attendanceMains);
             log.info("排班明细生成完毕");
         } catch (Exception e) {
@@ -99,13 +98,14 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
         }
     }
-    private void backCreatePeopleListLog(List<AttendanceDto> peopleList) {
+    private void backCreatePeopleListLog(List<AttendanceDto> peopleList, Map<Integer, RuleNumDto> ruleNumDtoList) {
         List<RuleAttendanceMainHelp> helpList = new ArrayList<>(peopleList.size());
         Date date = new Date();
         for (AttendanceDto dto : peopleList) {
             RuleAttendanceMainHelp help = new RuleAttendanceMainHelp();
             BeanUtils.copyProperties(dto, help);
             help.setDateFlag(date);
+            help.setRuleDictName(ruleNumDtoList.get(dto.getSettingId()).getRuleDictName());
             helpList.add(help);
         }
         helpService.saveBatch(helpList);
@@ -139,6 +139,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl&lt;RuleNumSettingMapper,
             }
             ruleAttendanceMainList.addAll(mainList);
         }
+        backCreatePeopleListLog(peopleList, ruleNumMap);
         return ruleAttendanceMainList;
     }
@@ -18,6 +18,10 @@ public class ConstDateUtil {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
         return simpleDateFormat.format(date);
     }
+    public static String formatDate(String pattern,LocalDate date){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
+        return simpleDateFormat.format(date);
+    }
     public static String formatDate(long time){
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
         return simpleDateFormat.format(new Date(time));
@@ -77,5 +81,20 @@ public class ConstDateUtil {
         return dateList;
     }
+    /**
+     * 获取指定月份所有日期
+     */
+    public static List<LocalDate> getAllDatesOfTheMonth(int year,int month){
+        YearMonth yearMonth = YearMonth.of(year, month);
+        int daysInMonth = yearMonth.lengthOfMonth();
+        List<LocalDate> dateList = new ArrayList<>(30);
+        for (int day = 1; day <= daysInMonth; day++) {
+            LocalDate date = LocalDate.of(year, month, day);
+            dateList.add(date);
+        }
+
+        return dateList;
+    }
+
 }
@@ -93,25 +93,25 @@ spring:
                 # 热部署开关
                 enabled: true
         # redis 配置
-        redis:
-            # 地址
+    redis:
+        # 地址
 #            host: 121.41.83.61
-            host: 127.0.0.1
-            database: 0
+        host: 127.0.0.1
+        database: 0
 #            password: "guzijian"
-            port: 6379
-            # 连接超时时间
-            timeout: 10s
-            lettuce:
-                pool:
-                    # 连接池中的最小空闲连接
-                    min-idle: 0
-                    # 连接池中的最大空闲连接
-                    max-idle: 8
-                    # 连接池的最大数据库连接数
-                    max-active: 8
-                    # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                    max-wait: -1ms
+        port: 6379
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
     # token配置
     token:
         # 令牌自定义标识
@@ -94,25 +94,25 @@ spring:
                 # 热部署开关
                 enabled: false
         # redis 配置
-        redis:
-            # 地址
+    redis:
+        # 地址
 #            host: 121.41.83.61
-            host: 127.0.0.1
-            database: 0
-            password: "@qpgj#redis"
-            port: 6379
-            # 连接超时时间
-            timeout: 10s
-            lettuce:
-                pool:
-                    # 连接池中的最小空闲连接
-                    min-idle: 0
-                    # 连接池中的最大空闲连接
-                    max-idle: 8
-                    # 连接池的最大数据库连接数
-                    max-active: 8
-                    # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                    max-wait: -1ms
+        host: 127.0.0.1
+        database: 0
+#        password: qpgjredis
+        port: 6379
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
     # token配置
     token:
         # 令牌自定义标识
@@ -94,25 +94,25 @@ spring:
         # 热部署开关
         enabled: true
     # redis 配置
-    redis:
-      # 地址
+  redis:
+    # 地址
 #      host: 1.14.107.94
-      host: 121.41.83.61
-      database: 0
-      password: "guzijian"
-      port: 6379
-      # 连接超时时间
-      timeout: 10s
-      lettuce:
-        pool:
-          # 连接池中的最小空闲连接
-          min-idle: 0
-          # 连接池中的最大空闲连接
-          max-idle: 8
-          # 连接池的最大数据库连接数
-          max-active: 8
-          # #连接池最大阻塞等待时间（使用负值表示没有限制）
-          max-wait: -1ms
+    host: 121.41.83.61
+    database: 0
+    password: "guzijian"
+    port: 6379
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
   # token配置
   token:
     # 令牌自定义标识
@@ -71,24 +71,24 @@ spring:
       # 热部署开关
       enabled: true
   # redis 配置
-#  redis:
-#    # 地址
-#    host: 127.0.0.1
-#    database: 0
-##    password: "guzijian"
-#    port: 6379
-#    # 连接超时时间
-#    timeout: 10s
-#    lettuce:
-#      pool:
-#        # 连接池中的最小空闲连接
-#        min-idle: 0
-#        # 连接池中的最大空闲连接
-#        max-idle: 8
-#        # 连接池的最大数据库连接数
-#        max-active: 8
-#        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-#        max-wait: -1ms
+  redis:
+    # 地址
+    host: 127.0.0.1
+    database: 0
+#    password: "guzijian"
+    port: 6379
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
 # token配置
 token:
@@ -11,6 +11,7 @@
             <result property="posts" column="posts" jdbcType="VARCHAR"/>
             <result property="dateFlag" column="dateFlag" jdbcType="DATE"/>
             <result property="fleetName" column="fleet_name" jdbcType="VARCHAR"/>
+            <result property="ruleDictName" column="rule_dict_name" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
@@ -18,7 +19,7 @@
         posts,date_flag,fleet_name
     </sql>
     <select id="queryNowMonthPeople" resultMap="BaseResultMap" resultType="com.ruoyi.domain.RuleAttendanceMainHelp">
-        SELECT * from rule_attendance_main_help WHERE DATE_FORMAT( date_flag, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+        SELECT * from rule_attendance_main_help WHERE DATE_FORMAT( date_flag, '%Y-%m' ) = #{date}
         <if test="jobCode != null and jobCode != ''">
             and job_code = #{jobCode}
         </if>
@@ -26,7 +26,7 @@
     </resultMap>
     <sql id="Base_Column_List">
-        id,name,job_code,
+        id,`name`,job_code,
         working_hour_plan,working_hour_type,first_work_sign_in_time,
         first_sign_in_working_range,first_quitting_sign_in_time,first_sign_in_quitting_range,
         sign_in_time_out_range,second_work_sign_in_time,second_sign_in_working_range,
@@ -62,4 +62,29 @@
                    and scheduling_date &gt;= #{startDate}
                    and scheduling_date &lt;= #{endDate}
     </delete>
+    <select id="queryNowMonthDate" resultType="com.ruoyi.domain.RuleAttendanceMain">
+        select job_code,name,posts,first_work_sign_in_time,first_quitting_sign_in_time,second_work_sign_in_time,second_quitting_sign_in_time,scheduling_date,work_flag
+        from rule_attendance_main
+        <where>
+            DATE_FORMAT(scheduling_date,'%Y-%m') = #{vo.date}
+            <if test="vo.jobCode != null and vo.jobCode != ''">
+                and job_code = #{vo.jobCode}
+            </if>
+            <if test="vo.name != null and vo.name != ''">
+                and `name` = #{vo.name}
+            </if>
+            <if test="vo.fleetName != null and vo.fleetName != ''">
+                and fleet_name = #{vo.fleetName}
+            </if>
+            <if test="vo.posts != null and vo.posts != ''">
+                and posts = #{vo.posts}
+            </if>
+            <if test="jobCodes!=null and jobCodes.size() > 0">
+                and job_code IN
+            <foreach collection="jobCodes" item="item" open="(" close=")" separator="," index="index">
+                #{item}
+            </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>
@@ -197,7 +197,7 @@
                posts,
                fleet_name
         FROM driver
-        WHERE driver.posts != "驾驶员" and driver.posts != "售票员"
+--         WHERE driver.posts != "驾驶员" and driver.posts != "售票员"
     </select>
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">