Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/weekly/controller/WeeklyDutyScheduleController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;

src/main/java/com/xjrsoft/module/weekly/mapper/WeeklyDutyScheduleMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.weekly.entity.WeeklyDutySchedule;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 
 /**
 * @title: 值周排班
@@ -13,5 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface WeeklyDutyScheduleMapper extends MPJBaseMapper<WeeklyDutySchedule> {
-
+    //清空指定表
+    @Update("truncate table weekly_duty_schedule")
+    void deleteAll();
 }

src/main/java/com/xjrsoft/module/weekly/service/impl/WeeklyDutyScheduleServiceImpl.java

@@ -34,9 +34,10 @@ public class WeeklyDutyScheduleServiceImpl extends MPJBaseServiceImpl<WeeklyDuty
     private final WeeklyDutyScheduleMapper weeklyDutyScheduleMapper;
     @Override
     public void deleteAll() {
-        weeklyDutyScheduleMapper.delete(
-            Wrappers.<WeeklyDutySchedule>query().lambda().gt(WeeklyDutySchedule::getCreateDate, new Date())
-        );
+//        weeklyDutyScheduleMapper.delete(
+//            Wrappers.<WeeklyDutySchedule>query().lambda().gt(WeeklyDutySchedule::getCreateDate, new Date())
+//        );
+        weeklyDutyScheduleMapper.deleteAll();
     }
 
     @Override

src/main/java/com/xjrsoft/module/weekly/vo/WeeklyDutyScheduleListVo.java

@@ -22,14 +22,14 @@ public class WeeklyDutyScheduleListVo {
     /**
     * 学号/工号
     */
-    @ContentStyle(dataFormat = 49)
+    @ContentStyle(dataFormat = 60)
     @ExcelProperty("工号")
     @ApiModelProperty("工号")
     private String userNumber;
     /**
     * 姓名
     */
-    @ContentStyle(dataFormat = 49)
+    @ContentStyle(dataFormat = 60)
     @ExcelProperty("姓名")
     @ApiModelProperty("姓名")
     private String name;
@@ -40,10 +40,16 @@ public class WeeklyDutyScheduleListVo {
     @ExcelProperty("性别")
     @ApiModelProperty("性别")
     private String gender;
+    /**
+     * 出生日期
+     */
+    @ApiModelProperty("出生日期")
+    @ExcelProperty("出生日期")
+    private String dateBirth;
     /**
     * 证件号码
     */
-    @ContentStyle(dataFormat = 49)
+    @ContentStyle(dataFormat = 200)
     @ExcelProperty("证件号码")
     @ApiModelProperty("证件号码")
     private String credentialNumber;
@@ -61,12 +67,4 @@ public class WeeklyDutyScheduleListVo {
     @ExcelProperty("值周情况")
     @ApiModelProperty("值周情况")
     private String remark;
-
-    /**
-     * 出生日期
-     */
-    @ApiModelProperty("出生日期")
-    @ExcelProperty("出生日期")
-    private String dateBirth;
-
 }