我的承办

src/main/java/com/xjrsoft/module/job/OfficialDocumentReceivedHandleTask.java

@@ -0,0 +1,51 @@
+package com.xjrsoft.module.job;
+
+import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.common.enums.EnabledMark;
+import com.xjrsoft.module.oa.service.IOfficialDocumentReceivedHandleService;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsCalendarInfoDto;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsGraduationInfoDto;
+import com.xjrsoft.module.student.dto.EnrollmentStatisticsInfoDto;
+import com.xjrsoft.module.student.entity.EnrollmentStatisticsInfo;
+import com.xjrsoft.module.student.mapper.EnrollmentStatisticsInfoMapper;
+import com.xjrsoft.module.student.service.IPbCseFeeobjupdateService;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsCalendarInfoVo;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsGraduationInfoVo;
+import com.xjrsoft.module.student.vo.EnrollmentStatisticsInfoVo;
+import com.yomahub.liteflow.util.JsonUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.util.Date;
+
+/**
+ * 将招生计划数据固化
+ *
+ * @author dzx
+ * @date 2025年3月17日
+ */
+@Component
+@Slf4j
+public class OfficialDocumentReceivedHandleTask {
+
+
+    @Autowired
+    private IOfficialDocumentReceivedHandleService officialDocumentReceivedHandleService;
+
+    @Async
+    @Scheduled(cron = "00 0/30 * * * ?")
+    public void execute() {
+        doExecute();
+    }
+
+    void doExecute() {
+
+    }
+}

src/main/java/com/xjrsoft/module/oa/dto/NewsPageDto.java

@@ -17,10 +17,11 @@ import javax.validation.constraints.NotNull;
 public class NewsPageDto extends PageInput {
 
     @ApiModelProperty(value = "类型（1-新闻2-公告）")
-    @NotNull(message = "类型不能为空！")
-    @Min(value = 1, message = "类型必须大于0")
     private Integer type;
 
+    @ApiModelProperty(value = "类型（1-新闻2-公告）")
+    private Integer typeId;
+
     /**
      * 完整标题
      */

src/main/java/com/xjrsoft/module/oa/mapper/NewsMapper.java

@@ -22,9 +22,9 @@ import java.util.List;
  */
 @Mapper
 public interface NewsMapper extends MPJBaseMapper<News> {
-    IPage<NewsPageVo> manageBox(IPage<NewsPageDto> page, NewsPageDto dto);
+    IPage<NewsPageVo> manageBox(IPage<NewsPageVo> page, @Param("dto") NewsPageDto dto);
 
-    IPage<NewsPageVo> receiptBox(IPage<NewsPageDto> page, NewsPageDto dto);
+    IPage<NewsPageVo> receiptBox(IPage<NewsPageVo> page, NewsPageDto dto);
 
     List<DeptIdOrClassIdVo> getDeptIdOrClassId(@Param("personalIdList") List<Long> personalIdList);
 

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -9,6 +9,7 @@ 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.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.EnabledMark;
@@ -576,7 +577,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
     @Override
     public IPage<NewsPageVo> manageBox(NewsPageDto dto) {
         dto.setLoginId(StpUtil.getLoginIdAsLong());
-        IPage<NewsPageVo> page = newsMapper.manageBox(ConventPage.getPage(dto), dto);
+        IPage<NewsPageVo> page = newsMapper.manageBox(new Page<>(dto.getLimit(), dto.getSize()), dto);
         return page;
     }
 

src/main/resources/mapper/oa/NewsMapper.xml

@@ -9,9 +9,12 @@
         t.*
         from xjr_oa_news t
         where t.delete_mark = 0
-        <if test="dto.type != null and dto.type > 0">
+        <if test="dto.type != null">
             and t.type_id = #{dto.type}
         </if>
+        <if test="dto.typeId != null">
+            and t.type_id = #{dto.typeId}
+        </if>
         <if test="dto.type != null and dto.type = 1">
             and t.wf_status = 1
         </if>