소스 검색

评分查询/导出表格

lvmax 9 달 전
부모
커밋
da2122449a

+ 1 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/config/DataPermissionConfiguration.java

@@ -25,6 +25,7 @@ public class DataPermissionConfiguration  {
             rule.addUserColumn(AdminUserDO.class, "id");
             rule.addDeptColumn("work", "dept_id");//作品上传部门权限 2024年10月9日18:39:09
             rule.addUserColumn("work", "creator");//作品上传用户权限 2024年10月9日18:39:09
+            rule.addUserColumn("work_score", "creator");//作品上传用户权限 2024年10月9日18:39:09
         };
     }
 

+ 11 - 0
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/score/ScoreController.java

@@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.work.controller.admin.score;
 
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.yudao.module.work.dal.dataobject.score.ScoreStatusDO;
+import cn.iocoder.yudao.module.work.dal.dataobject.type.TypeDO;
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
+import cn.iocoder.yudao.module.work.service.work.WorkService;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +41,8 @@ public class ScoreController {
 
     @Resource
     private ScoreService scoreService;
+    @Resource
+    private WorkService workService;
 
     @PostMapping("/create")
     @Operation(summary = "创建作品评分")
@@ -108,6 +113,12 @@ public class ScoreController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<ScoreDO> list = scoreService.getScorePage(pageReqVO).getList();
+
+        for (ScoreDO scoreDO : list) {
+            WorkDO workDO = workService.getwork(Integer.parseInt(scoreDO.getWorkId()));
+            scoreDO.setId(Integer.valueOf(scoreDO.getWorkId()));
+            scoreDO.setWorkId(workDO.getWorkName());
+        }
         // 导出 Excel
         ExcelUtils.write(response, "作品评分.xls", "数据", ScoreRespVO.class,
                         BeanUtils.toBean(list, ScoreRespVO.class));

+ 5 - 0
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/score/vo/ScorePageReqVO.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.work.controller.admin.score.vo;
 
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -23,6 +25,9 @@ public class ScorePageReqVO extends PageParam {
     @Schema(description = "签字")
     private String url;
 
+    @TableField(exist = false,select = false)
+    private WorkDO workDO;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

+ 8 - 3
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/score/vo/ScoreRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.work.controller.admin.score.vo;
 
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -16,9 +17,13 @@ public class ScoreRespVO {
     @ExcelProperty("id")
     private Integer id;
 
-    @Schema(description = "作品id", example = "3102")
-    @ExcelProperty("作品id")
-    private Integer workId;
+    @Schema(description = "作品", example = "3102")
+    @ExcelProperty("作品")
+    private String workId;
+
+    @Schema(description = "作品")
+    private WorkDO workDO;
+
 
     @Schema(description = "评分状态(0未提交)(1已提交)", example = "2")
     @ExcelProperty("评分状态(0未提交)(1已提交)")

+ 4 - 1
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/dal/dataobject/score/ScoreDO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.work.dal.dataobject.score;
 
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -30,7 +31,7 @@ public class ScoreDO extends BaseDO {
     /**
      * 作品id
      */
-    private Integer workId;
+    private String workId;
     /**
      * 评分状态(0未提交)(1已提交)
      */
@@ -44,6 +45,8 @@ public class ScoreDO extends BaseDO {
      */
     private String url;
 
+    @TableField(exist = false,select = false)
+    private WorkDO workDO;
     //适配联通云证书 2024年10月16日10:17:45
     public void setUrl(String url) {
         url= url.replace("https","http");

+ 3 - 0
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/service/score/ScoreService.java

@@ -4,6 +4,8 @@ import java.util.*;
 
 
 import cn.iocoder.yudao.module.work.dal.dataobject.score.ScoreStatusDO;
+import cn.iocoder.yudao.module.work.dal.dataobject.type.TypeDO;
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
 import jakarta.validation.*;
 import cn.iocoder.yudao.module.work.controller.admin.score.vo.*;
 import cn.iocoder.yudao.module.work.dal.dataobject.score.ScoreDO;
@@ -59,6 +61,7 @@ public interface ScoreService {
      * @param pageReqVO 分页查询
      * @return 作品评分分页
      */
+
     PageResult<ScoreDO> getScorePage(ScorePageReqVO pageReqVO);
     /**
      * 评分状态统计

+ 10 - 1
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/service/score/ScoreServiceImpl.java

@@ -94,7 +94,15 @@ public class ScoreServiceImpl implements ScoreService {
 
     @Override
     public PageResult<ScoreDO> getScorePage(ScorePageReqVO pageReqVO) {
-        return scoreMapper.selectPage(pageReqVO);
+        PageResult<ScoreDO> scoreDOPageResult = scoreMapper.selectPage(pageReqVO);
+        List<ScoreDO> list = scoreDOPageResult.getList();
+        for (ScoreDO scoreDO : list) {
+            WorkDO workDO = workService.getwork(Integer.valueOf(scoreDO.getWorkId()));
+            scoreDO.setWorkDO(workDO);
+        }
+        scoreDOPageResult.setList(list);
+
+        return scoreDOPageResult;
     }
 
     @Override
@@ -126,4 +134,5 @@ public class ScoreServiceImpl implements ScoreService {
         return new ScoreStatusDO(String.valueOf(all), String.valueOf(finish), String.valueOf(remain));
     }
 
+
 }

+ 3 - 0
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/service/work/WorkService.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.work.service.work;
 
 import java.util.*;
+
+import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import jakarta.validation.*;
 import cn.iocoder.yudao.module.work.controller.admin.work.vo.*;
 import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
@@ -45,6 +47,7 @@ public interface WorkService {
      * @param id 编号
      * @return 作品列
      */
+    @DataPermission(enable = false)
     WorkDO getwork(Integer id);
 
     /**