值班日历导出

zlmy-modules/zlmy-boot/doc/v2.6.0/修改记录.md

@@ -147,4 +147,7 @@ COMMENT ON COLUMN t_hazard_condition_confirmation_details.consequence IS '可能
 
 # 添加现有控制措施字段
 ALTER TABLE t_hazard_condition_confirmation_details ADD COLUMN control_measures VARCHAR(500);
-COMMENT ON COLUMN t_hazard_condition_confirmation_details.control_measures IS '现有控制措施';
\ No newline at end of file
+COMMENT ON COLUMN t_hazard_condition_confirmation_details.control_measures IS '现有控制措施';
+
+# 值班日期类型修改
+ALTER TABLE t_sys_duty ALTER COLUMN duty_date TYPE varchar(255) USING duty_date::varchar;
\ No newline at end of file

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/duty/service/impl/DutyServiceImpl.java

@@ -1570,9 +1570,14 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D
         while (!currentDay.isAfter(lastDayOfMonth)) {
             List<ExportDutyPo> exportDutyPos = new ArrayList<>();
             //获取值班信息
-            List<TSysDuty> tSysDuties = this.list(new LambdaQueryWrapper<TSysDuty>()
+            /*List<TSysDuty> tSysDuties = this.list(new LambdaQueryWrapper<TSysDuty>()
                     .in(TSysDuty::getCompanyId, orgIds)
                     .like(TSysDuty::getDutyDate, currentDay).orderByAsc(TSysDuty::getCompanyId,TSysDuty::getClasses)
+            );*/
+
+            List<TSysDuty> tSysDuties = this.list(new LambdaQueryWrapper<TSysDuty>()
+                    .in(TSysDuty::getCompanyId, orgIds)
+                    .like(TSysDuty::getDutyDate, currentDay.toString()).orderByAsc(TSysDuty::getCompanyId,TSysDuty::getClasses)
             );
             int number = 1;
             for (TSysDuty tSysDuty : tSysDuties) {