- 文件夹权限待重写

- JDK降级到Java17

pom.xml

@@ -13,7 +13,7 @@
         <spring-boot.version>3.5.7</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
         <mybatis.version>3.5.16</mybatis.version>
         <springdoc.version>2.8.13</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>

ruoyi-admin/src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
     threads:
         # 开启虚拟线程 仅jdk21可用
         virtual:
-            enabled: true
+            enabled: false
     task:
         execution:
             # 从 springboot 3.5 开始 spring自带线程池

ruoyi-modules/ruoyi-system/src/main/java/com/yingpaipay/system/domain/SysUserFolder.java

@@ -12,6 +12,6 @@ public class SysUserFolder {
     @TableId(type = IdType.INPUT)
     private Long userId;
 
-    private Long folderId;
+    private String folders;
 
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/controller/DocumentController.java

@@ -2,6 +2,7 @@ package com.yingpaipay.business.controller;
 
 import java.util.List;
 
+import com.yingpaipay.business.domain.bo.DocumentMarkBo;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -102,4 +103,11 @@ public class DocumentController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(documentService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    @SaCheckPermission("document:document:mark")
+    @Log(title = "文档", businessType = BusinessType.UPDATE)
+    @PutMapping("/mark")
+    public R<Void> mark(@RequestBody DocumentMarkBo bo) {
+        return toAjax(documentService.mark(bo));
+    }
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/controller/ProjectController.java

@@ -147,13 +147,13 @@ public class ProjectController extends BaseController {
         return folderService.queryCenterInfo(bo, pageQuery);
     }
 
-    @SaCheckPermission("project:management:queryCenterInfoInviteMember")
-    @Log(title = "项目管理", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping("/queryCenterInfoInviteMember")
-    public R<Void> inviteCenterMember(@RequestBody ProjectInviteCenterMemberBo bo) {
-        return toAjax(projectService.inviteCenterMember(bo));
-    }
+//    @SaCheckPermission("project:management:queryCenterInfoInviteMember")
+//    @Log(title = "项目管理", businessType = BusinessType.INSERT)
+//    @RepeatSubmit()
+//    @PostMapping("/queryCenterInfoInviteMember")
+//    public R<Void> inviteCenterMember(@RequestBody ProjectInviteCenterMemberBo bo) {
+//        return toAjax(projectService.inviteCenterMember(bo));
+//    }
 
     @SaCheckPermission("project:management:queryCenterMember")
     @GetMapping("/queryCenterMember")

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/domain/bo/DocumentMarkBo.java

@@ -0,0 +1,12 @@
+package com.yingpaipay.business.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class DocumentMarkBo {
+
+    private Long id;
+
+    private String type;
+
+}

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/domain/vo/ProjectInDashboardWorkbenchVo.java

@@ -2,6 +2,8 @@ package com.yingpaipay.business.domain.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class ProjectInDashboardWorkbenchVo {
 
@@ -17,4 +19,18 @@ public class ProjectInDashboardWorkbenchVo {
 
     private Double submissionProgress;
 
+    private String pdGpd;
+
+    private String pmGpm;
+
+    private String ctaGcta;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Date startTime;
+
+    private Date endTime;
+
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/IDocumentService.java

@@ -1,5 +1,6 @@
 package com.yingpaipay.business.service;
 
+import com.yingpaipay.business.domain.bo.DocumentMarkBo;
 import com.yingpaipay.business.domain.vo.DocumentVo;
 import com.yingpaipay.business.domain.bo.DocumentBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -65,4 +66,6 @@ public interface IDocumentService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    boolean mark(DocumentMarkBo bo);
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/IProjectService.java

@@ -76,7 +76,7 @@ public interface IProjectService {
 
     TableDataInfo<ProjectOnDocumentVo> listOnDocument(ProjectOnDocumentBo bo, PageQuery pageQuery);
 
-    boolean inviteCenterMember(ProjectInviteCenterMemberBo bo);
+//    boolean inviteCenterMember(ProjectInviteCenterMemberBo bo);
 
     TableDataInfo<ProjectMemberNotInCenterVo> queryMemberNotInCenter(Long projectId, Long folderId, String name, PageQuery pageQuery);
 

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/DocumentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yingpaipay.business.service.impl;
 
 import com.yingpaipay.business.constant.DictTypeConst;
+import com.yingpaipay.business.domain.bo.DocumentMarkBo;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -180,4 +181,13 @@ public class DocumentServiceImpl implements IDocumentService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public boolean mark(DocumentMarkBo bo) {
+        return baseMapper.update(
+            Wrappers.lambdaUpdate(Document.class)
+                .eq(Document::getId, bo.getId())
+                .set(Document::getType, bo.getType())
+        ) > 0;
+    }
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/ProjectServiceImpl.java

@@ -289,17 +289,17 @@ public class ProjectServiceImpl implements IProjectService {
         }));
     }
 
-    @Override
-    public boolean inviteCenterMember(ProjectInviteCenterMemberBo bo) {
-        List<SysUserFolder> userFolder = new ArrayList<>();
-        bo.getUserIds().forEach(e -> {
-            SysUserFolder entity = new SysUserFolder();
-            entity.setUserId(e);
-            entity.setFolderId(bo.getFolderId());
-            userFolder.add(entity);
-        });
-        return userFolderMapper.insertBatch(userFolder);
-    }
+//    @Override
+//    public boolean inviteCenterMember(ProjectInviteCenterMemberBo bo) {
+//        List<SysUserFolder> userFolder = new ArrayList<>();
+//        bo.getUserIds().forEach(e -> {
+//            SysUserFolder entity = new SysUserFolder();
+//            entity.setUserId(e);
+//            entity.setFolderId(bo.getFolderId());
+//            userFolder.add(entity);
+//        });
+//        return userFolderMapper.insertBatch(userFolder);
+//    }
 
     @Override
     public TableDataInfo<ProjectMemberNotInCenterVo> queryMemberNotInCenter(Long projectId, Long folderId, String name, PageQuery pageQuery) {
@@ -346,7 +346,37 @@ public class ProjectServiceImpl implements IProjectService {
 
     @Override
     public TableDataInfo<ProjectInDashboardWorkbenchVo> queryPageListOnDashboardWorkbench(ProjectListOnDashboardWorkbenchBo bo, PageQuery pageQuery) {
-        return TableDataInfo.build();
+        IPage<Project> page = baseMapper.selectPage(
+            pageQuery.build(),
+            Wrappers.lambdaQuery(Project.class)
+                .like(StringUtils.isNotBlank(bo.getContent()), Project::getCode, bo.getContent())
+                .or()
+                .like(StringUtils.isNotBlank(bo.getContent()), Project::getName, bo.getContent())
+                .or()
+                .like(StringUtils.isNotBlank(bo.getContent()), Project::getPdGpd, bo.getContent())
+                .or()
+                .like(StringUtils.isNotBlank(bo.getContent()), Project::getPmGpm, bo.getContent())
+                .or()
+                .like(StringUtils.isNotBlank(bo.getContent()), Project::getCtaGcta, bo.getContent())
+                .orderByDesc(Project::getId)
+        );
+        return TableDataInfo.build(page.convert(e -> {
+            ProjectInDashboardWorkbenchVo vo = new ProjectInDashboardWorkbenchVo();
+            vo.setId(e.getId());
+            vo.setCode(e.getCode());
+            vo.setName(e.getName());
+            vo.setOnTimeSubmissionRate(0.00D);
+            vo.setLateSubmissionCount(0);
+            vo.setSubmissionProgress(0.00D);
+            vo.setPdGpd(e.getPdGpd());
+            vo.setPmGpm(e.getPmGpm());
+            vo.setCtaGcta(e.getCtaGcta());
+            vo.setCreateTime(e.getCreateTime());
+            vo.setUpdateTime(e.getUpdateTime());
+            vo.setStartTime(e.getStartTime());
+            vo.setEndTime(e.getEndTime());
+            return vo;
+        }));
     }
 
     private LambdaQueryWrapper<Folder> buildQueryProjectCenterWrapper(ProjectCenterListBo bo) {