diff --git a/bonus-admin/src/main/java/com/bonus/web/core/config/CronExpressionGenerator.java b/bonus-admin/src/main/java/com/bonus/web/core/config/CronExpressionGenerator.java index 71c0d8f..587a9ae 100644 --- a/bonus-admin/src/main/java/com/bonus/web/core/config/CronExpressionGenerator.java +++ b/bonus-admin/src/main/java/com/bonus/web/core/config/CronExpressionGenerator.java @@ -44,10 +44,10 @@ public class CronExpressionGenerator { switch (cycle) { // 每天 - case "1": + case "daily": return String.format("%d %d %d * * ?", second, minute, hour); // 每周 - case "2": + case "weekly": if (weekOfDay == null || weekOfDay.trim().isEmpty()) return null; List days = Arrays.stream(weekOfDay.split(",")) .map(String::trim) @@ -58,7 +58,7 @@ public class CronExpressionGenerator { return joinedDays.isEmpty() ? null : String.format("%d %d %d ? * %s", second, minute, hour, joinedDays); // 每月 - case "3": + case "monthly": if (monthDay == null || monthDay.trim().isEmpty()) return null; List validDays = Arrays.stream(monthDay.split(",")) .map(String::trim) diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java index b2ac1b9..1cbdb9b 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java @@ -161,6 +161,7 @@ public class DaKyProFilesContentsDto { */ private String delFlag; private String keyWord; + private String uploadTime; private List children = new ArrayList<>(); } diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/ProjectDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/ProjectDto.java index 4957b78..25b28c2 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/ProjectDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/ProjectDto.java @@ -78,7 +78,7 @@ public class ProjectDto { /** * 当前档案上传数 */ - private Long fileUplaudNum; + private Integer fileUplaudNum; /** * 档案状态 0.未归档移交 1.已归档移交 diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java index cc28fcd..638b863 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java @@ -47,4 +47,6 @@ public interface FileManageMapper { DaKyProFilesContentsDto getFileManageById(DaKyProFilesContentsDto dto); DaKyProFilesContentsVo getFileById(Long id); + + Integer getFilesNum(String proId); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java index e918336..49880a7 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java @@ -7,6 +7,7 @@ import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.DaKyProFilesContentsDto; import com.bonus.web.domain.ProjectDto; import com.bonus.web.domain.SelectDto; +import com.bonus.web.mapper.FileManageMapper; import com.bonus.web.mapper.ProjectMapper; import com.bonus.web.service.ProjectService; import org.springframework.beans.factory.annotation.Autowired; @@ -27,9 +28,17 @@ public class ProjectServiceImpl implements ProjectService { @Autowired private ProjectMapper projectMapper; + @Autowired + private FileManageMapper fileManageMapper; + @Override public List list(ProjectDto dto) { - return projectMapper.list(dto); + List list = projectMapper.list(dto); + for (ProjectDto projectDto : list) { + Integer num = fileManageMapper.getFilesNum(projectDto.getId()); + projectDto.setFileUplaudNum(num); + } + return list; } @Override diff --git a/bonus-admin/src/main/resources/mapper/ArchivedSettingMapper.xml b/bonus-admin/src/main/resources/mapper/ArchivedSettingMapper.xml index 50a8b4d..2b36629 100644 --- a/bonus-admin/src/main/resources/mapper/ArchivedSettingMapper.xml +++ b/bonus-admin/src/main/resources/mapper/ArchivedSettingMapper.xml @@ -81,6 +81,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml index a5643f5..53d37c2 100644 --- a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml +++ b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml @@ -176,6 +176,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dkpfc.content_name like concat('%', #{contentName}, '%') + + and DATE(dkfs.create_time) = #{uploadTime} + order by dkpfc.create_time desc SELECT * from da_ky_sys_file_source where id = #{id} +