评分统计

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

@@ -1,5 +1,6 @@
 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 org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -74,6 +75,7 @@ public class ScoreController {
     @GetMapping("/getStatus")
     @Operation(summary = "获得作品状态")
     @PreAuthorize("@ss.hasPermission('work:score:query')")
+    @DataPermission(enable = false)
     public CommonResult<ScoreStatusDO> getStatus() {
         ScoreStatusDO scoreStatus = scoreService.getScoreStatus();
         System.out.println(scoreStatus+"============================");

yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/work/vo/workPageReqVO.java → yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/work/vo/WorkPageReqVO.java

@@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class workPageReqVO extends PageParam {
+public class WorkPageReqVO extends PageParam {
 
     @Schema(description = "作品类别", example = "5247")
     private String workId;

yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/work/workController.java

@@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.work.service.type.TypeService;
 import com.alibaba.fastjson.JSON;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.bytedeco.javacv.FFmpegFrameGrabber;
-import org.mapstruct.ap.shaded.freemarker.template.utility.SecurityUtilities;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -24,7 +23,6 @@ import jakarta.validation.*;
 import jakarta.servlet.http.*;
 
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.util.*;
 import java.io.IOException;
 
@@ -41,14 +39,13 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_IS_EMPTY;
 
 import cn.iocoder.yudao.module.work.controller.admin.work.vo.*;
-import cn.iocoder.yudao.module.work.dal.dataobject.work.workDO;
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
 import cn.iocoder.yudao.module.work.dal.dataobject.work.participantDO;
 import cn.iocoder.yudao.module.work.dal.dataobject.work.SelectionDO;
-import cn.iocoder.yudao.module.work.service.work.workService;
+import cn.iocoder.yudao.module.work.service.work.WorkService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
@@ -60,7 +57,7 @@ import javax.imageio.ImageIO;
 public class workController {
 
     @Resource
-    private workService workService;
+    private WorkService workService;
     @Resource
     private TypeService typeService;
     @Resource
@@ -109,7 +106,7 @@ public class workController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('work:work:query')")
     public CommonResult<workRespVO> getwork(@RequestParam("id") Integer id) {
-        workDO work = workService.getwork(id);
+        WorkDO work = workService.getwork(id);
         try {
             TypeDO type = typeService.getType(Long.parseLong(work.getCategoryId()));
             work.setTypeName(type.getTypeName());
@@ -123,10 +120,10 @@ public class workController {
     @GetMapping("/page")
     @Operation(summary = "获得作品列分页")
     @PreAuthorize("@ss.hasPermission('work:work:query')")
-    public CommonResult<PageResult<workRespVO>> getworkPage(@Valid workPageReqVO pageReqVO) {
-        PageResult<workDO> pageResult = workService.getworkPage(pageReqVO);
-        List<workDO> list = pageResult.getList();
-        for (workDO workDO : list) {
+    public CommonResult<PageResult<workRespVO>> getworkPage(@Valid WorkPageReqVO pageReqVO) {
+        PageResult<WorkDO> pageResult = workService.getworkPage(pageReqVO);
+        List<WorkDO> list = pageResult.getList();
+        for (WorkDO workDO : list) {
             try {
                 TypeDO type = typeService.getType(Long.parseLong(workDO.getCategoryId()));
                 workDO.setTypeName(type.getTypeName());
@@ -143,9 +140,9 @@ public class workController {
     @Operation(summary = "获得作品list")
     @PreAuthorize("@ss.hasPermission('work:work:queryList')")
     @DataPermission(enable = false)
-    public CommonResult<PageResult<workRespVO>> getWorkList(@Valid workPageReqVO pageReqVO) {
-        List<workDO> list = workService.getworkList(pageReqVO);
-        PageResult<workDO> pageResult = new PageResult<>();
+    public CommonResult<PageResult<workRespVO>> getWorkList(@Valid WorkPageReqVO pageReqVO) {
+        List<WorkDO> list = workService.getworkList(pageReqVO);
+        PageResult<WorkDO> pageResult = new PageResult<>();
         pageResult.setList(list);
         return success(BeanUtils.toBean(pageResult, workRespVO.class));
     }
@@ -154,10 +151,10 @@ public class workController {
     @Operation(summary = "导出作品列 Excel")
     @PreAuthorize("@ss.hasPermission('work:work:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportworkExcel(@Valid workPageReqVO pageReqVO,
+    public void exportworkExcel(@Valid WorkPageReqVO pageReqVO,
                                 HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<workDO> list = workService.getworkPage(pageReqVO).getList();
+        List<WorkDO> list = workService.getworkPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "作品列.xls", "数据", workRespVO.class,
                 BeanUtils.toBean(list, workRespVO.class));

yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/dal/dataobject/work/workDO.java → yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/dal/dataobject/work/WorkDO.java

@@ -23,7 +23,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class workDO extends BaseDO {
+public class WorkDO extends BaseDO {
 
     /**
      * 主键

yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/dal/mysql/work/WorkMapper.java

@@ -5,7 +5,8 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.work.dal.dataobject.work.workDO;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.work.controller.admin.work.vo.*;
 
@@ -15,31 +16,43 @@ import cn.iocoder.yudao.module.work.controller.admin.work.vo.*;
  * @author 芋道源码
  */
 @Mapper
-public interface WorkMapper extends BaseMapperX<workDO> {
+public interface WorkMapper extends BaseMapperX<WorkDO> {
 
-    default PageResult<workDO> selectPage(workPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<workDO>()
-                .eqIfPresent(workDO::getCategoryId, reqVO.getCategoryId())
-                .eqIfPresent(workDO::getFormat, reqVO.getFormat())
-                .likeIfPresent(workDO::getWorkName, reqVO.getWorkName())
-                .eqIfPresent(workDO::getTeacher, reqVO.getTeacher())
-                .eqIfPresent(workDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(workDO::getAward, reqVO.getAward())
-                .eqIfPresent(workDO::getCover, reqVO.getCover())
-                .eqIfPresent(workDO::getWorkUrl, reqVO.getWorkUrl())
-                .eqIfPresent(workDO::getNumberOfExhibitors, reqVO.getNumberOfExhibitors())
-                .eqIfPresent(workDO::getSchool, reqVO.getSchool())
-                .betweenIfPresent(workDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(workDO::getGroupAndTopic, reqVO.getGroupAndTopic())
-                .eqIfPresent(workDO::getSizeAndDuration, reqVO.getSizeAndDuration())
-                .eqIfPresent(workDO::getManuscriptAndMaterial, reqVO.getManuscriptAndMaterial())
-                .orderByDesc(workDO::getWorkId));
+    default PageResult<WorkDO> selectPage(WorkPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<WorkDO>()
+                .eqIfPresent(WorkDO::getCategoryId, reqVO.getCategoryId())
+                .eqIfPresent(WorkDO::getFormat, reqVO.getFormat())
+                .likeIfPresent(WorkDO::getWorkName, reqVO.getWorkName())
+                .eqIfPresent(WorkDO::getTeacher, reqVO.getTeacher())
+                .eqIfPresent(WorkDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(WorkDO::getAward, reqVO.getAward())
+                .eqIfPresent(WorkDO::getCover, reqVO.getCover())
+                .eqIfPresent(WorkDO::getWorkUrl, reqVO.getWorkUrl())
+                .eqIfPresent(WorkDO::getNumberOfExhibitors, reqVO.getNumberOfExhibitors())
+                .eqIfPresent(WorkDO::getSchool, reqVO.getSchool())
+                .betweenIfPresent(WorkDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(WorkDO::getGroupAndTopic, reqVO.getGroupAndTopic())
+                .eqIfPresent(WorkDO::getSizeAndDuration, reqVO.getSizeAndDuration())
+                .eqIfPresent(WorkDO::getManuscriptAndMaterial, reqVO.getManuscriptAndMaterial())
+                .orderByDesc(WorkDO::getWorkId));
     }
 
-    default List<workDO> selectList(workPageReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<workDO>()
-                .eqIfPresent(workDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(workDO::getCategoryId, reqVO.getCategoryId()));
+    default List<WorkDO> selectList(WorkPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<WorkDO>()
+                .eqIfPresent(WorkDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(WorkDO::getCategoryId, reqVO.getCategoryId()));
+    }
+    default List<WorkDO> selectList(WorkDO reqVO) {
+        Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        System.out.println(loginUserDeptId);
+        System.out.println("================================");
+        List<WorkDO> x = selectList();
+        System.out.println(x);
+        System.out.println("================================");
+        return selectList(new LambdaQueryWrapperX<WorkDO>()
+                .eqIfPresent(WorkDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(WorkDO::getCategoryId, reqVO.getCategoryId()));
+
     }
 
 }

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

@@ -60,7 +60,11 @@ public interface ScoreService {
      * @return 作品评分分页
      */
     PageResult<ScoreDO> getScorePage(ScorePageReqVO pageReqVO);
-
+    /**
+     * 评分状态统计
+     *
+     * @return 作品评分分页
+     */
     ScoreStatusDO getScoreStatus();
 
 }

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

@@ -6,16 +6,14 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.work.controller.admin.score.vo.ScorePageReqVO;
 import cn.iocoder.yudao.module.work.controller.admin.score.vo.ScoreSaveReqVO;
-import cn.iocoder.yudao.module.work.controller.admin.work.vo.workPageReqVO;
+import cn.iocoder.yudao.module.work.controller.admin.work.vo.WorkPageReqVO;
 import cn.iocoder.yudao.module.work.dal.dataobject.score.ScoreDO;
 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.dal.dataobject.work.WorkDO;
 import cn.iocoder.yudao.module.work.dal.mysql.score.ScoreMapper;
-import cn.iocoder.yudao.module.work.dal.mysql.type.TypeMapper;
-import cn.iocoder.yudao.module.work.dal.mysql.work.WorkMapper;
 import cn.iocoder.yudao.module.work.service.type.TypeService;
-import cn.iocoder.yudao.module.work.service.work.workService;
+import cn.iocoder.yudao.module.work.service.work.WorkService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -41,7 +39,7 @@ public class ScoreServiceImpl implements ScoreService {
     @Resource
     private TypeService typeService;
     @Resource
-    private workService workService;
+    private WorkService workService;
 
     @Override
     public Integer createScore(ScoreSaveReqVO createReqVO) {
@@ -81,16 +79,16 @@ public class ScoreServiceImpl implements ScoreService {
     }
 
     @Override
-    public Map<String,String> updateScoreStatus(ScoreSaveReqVO updateReqVO) {
+    public Map<String, String> updateScoreStatus(ScoreSaveReqVO updateReqVO) {
         HashMap<String, String> hashMap = new HashMap<>();
         List<ScoreDO> scoreDOS = scoreMapper.selectList(new LambdaQueryWrapperX<ScoreDO>()
                 .eqIfPresent(ScoreDO::getCreator, SecurityFrameworkUtils.getLoginUserId()));
-        for (ScoreDO scoreDO: scoreDOS){
+        for (ScoreDO scoreDO : scoreDOS) {
             scoreDO.setStatus("1");
             scoreDO.setUrl(updateReqVO.getUrl());
         }
         scoreMapper.updateById(scoreDOS);
-        hashMap.put("size",scoreDOS.size()+"");
+        hashMap.put("size", scoreDOS.size() + "");
         return hashMap;
     }
 
@@ -98,32 +96,34 @@ public class ScoreServiceImpl implements ScoreService {
     public PageResult<ScoreDO> getScorePage(ScorePageReqVO pageReqVO) {
         return scoreMapper.selectPage(pageReqVO);
     }
+
     @Override
     public ScoreStatusDO getScoreStatus() {
         //所有
-        int all=0;
+        int all = 0;
         //完成
-        int finish=0;
+        int finish = 0;
         //剩余
-        int remain=0;
+        int remain = 0;
         List<TypeDO> scoreTreeList = typeService.getScoreTreeList();
-        for (TypeDO typeDO:scoreTreeList){
-            workPageReqVO pageReqVO = new workPageReqVO();
+        for (TypeDO typeDO : scoreTreeList) {
+
+            WorkPageReqVO pageReqVO = new WorkPageReqVO();
             pageReqVO.setStatus("1");
             pageReqVO.setCategoryId(String.valueOf(typeDO.getId()));
-            List<workDO> list = workService.getworkList(pageReqVO);
-            all+=list.size();
-            for (workDO workDO:list){
-                if (workDO.getScoreDO().getScore()==null){
+            List<WorkDO> list = workService.getworkList(pageReqVO);
+            all += list.size();
+            for (WorkDO workDO : list) {
+                if (workDO.getScoreDO().getScore() == null) {
                     remain++;
-                }else {
+                } else {
                     finish++;
                 }
             }
         }
 
 
-        return new ScoreStatusDO(String.valueOf(all),String.valueOf(finish),String.valueOf(remain));
+        return new ScoreStatusDO(String.valueOf(all), String.valueOf(finish), String.valueOf(remain));
     }
 
 }

yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/service/work/workService.java → yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/service/work/WorkService.java

@@ -3,18 +3,17 @@ package cn.iocoder.yudao.module.work.service.work;
 import java.util.*;
 import jakarta.validation.*;
 import cn.iocoder.yudao.module.work.controller.admin.work.vo.*;
-import cn.iocoder.yudao.module.work.dal.dataobject.work.workDO;
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
 import cn.iocoder.yudao.module.work.dal.dataobject.work.participantDO;
 import cn.iocoder.yudao.module.work.dal.dataobject.work.SelectionDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
 /**
  * 作品列 Service 接口
  *
  * @author 芋道源码
  */
-public interface workService {
+public interface WorkService {
 
     /**
      * 创建作品列
@@ -46,7 +45,7 @@ public interface workService {
      * @param id 编号
      * @return 作品列
      */
-    workDO getwork(Integer id);
+    WorkDO getwork(Integer id);
 
     /**
      * 获得作品列分页
@@ -54,8 +53,10 @@ public interface workService {
      * @param pageReqVO 分页查询
      * @return 作品列分页
      */
-    PageResult<workDO> getworkPage(workPageReqVO pageReqVO);
-    List<workDO> getworkList(workPageReqVO pageReqVO);
+    PageResult<WorkDO> getworkPage(WorkPageReqVO pageReqVO);
+    List<WorkDO> getworkList(WorkPageReqVO pageReqVO);
+
+
 
     // ==================== 子表（参演人员） ====================
 

yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/service/work/workServiceImpl.java

@@ -5,14 +5,13 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.module.work.controller.admin.work.vo.workPageReqVO;
+import cn.iocoder.yudao.module.work.controller.admin.work.vo.WorkPageReqVO;
 import cn.iocoder.yudao.module.work.controller.admin.work.vo.workSaveOneReqVO;
 import cn.iocoder.yudao.module.work.controller.admin.work.vo.workSaveReqVO;
-import cn.iocoder.yudao.module.work.dal.dataobject.allocation.AllocationDO;
 import cn.iocoder.yudao.module.work.dal.dataobject.score.ScoreDO;
 import cn.iocoder.yudao.module.work.dal.dataobject.work.participantDO;
 import cn.iocoder.yudao.module.work.dal.dataobject.work.SelectionDO;
-import cn.iocoder.yudao.module.work.dal.dataobject.work.workDO;
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
 import cn.iocoder.yudao.module.work.dal.mysql.allocation.AllocationMapper;
 import cn.iocoder.yudao.module.work.dal.mysql.score.ScoreMapper;
 import cn.iocoder.yudao.module.work.dal.mysql.work.ParticipantMapper;
@@ -23,10 +22,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
-import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.work.enums.ErrorCodeConstants.WORK_NOT_EXISTS;
@@ -38,7 +35,7 @@ import static cn.iocoder.yudao.module.work.enums.ErrorCodeConstants.WORK_NOT_EXI
  */
 @Service
 @Validated
-public class workServiceImpl implements workService {
+public class workServiceImpl implements WorkService {
 
     @Resource
     private WorkMapper workMapper;
@@ -57,7 +54,7 @@ public class workServiceImpl implements workService {
         List<participantDO> participants = createReqVO.getParticipants();
         createReqVO.setNumberOfExhibitors(participants.size());
         // 插入
-        workDO work = BeanUtils.toBean(createReqVO, workDO.class);
+        WorkDO work = BeanUtils.toBean(createReqVO, WorkDO.class);
         workMapper.insert(work);
 
         // 插入子表
@@ -75,7 +72,7 @@ public class workServiceImpl implements workService {
         // 校验存在
         validateworkExists(updateReqVO.getWorkId());
         // 更新
-        workDO updateObj = BeanUtils.toBean(updateReqVO, workDO.class);
+        WorkDO updateObj = BeanUtils.toBean(updateReqVO, WorkDO.class);
         workMapper.updateById(updateObj);
 
         // 更新子表
@@ -88,7 +85,7 @@ public class workServiceImpl implements workService {
         // 校验存在
         validateworkExists(updateReqVO.getWorkId());
         // 更新
-        workDO updateObj = BeanUtils.toBean(updateReqVO, workDO.class);
+        WorkDO updateObj = BeanUtils.toBean(updateReqVO, WorkDO.class);
         workMapper.updateById(updateObj);
     }
 
@@ -112,21 +109,21 @@ public class workServiceImpl implements workService {
     }
 
     @Override
-    public workDO getwork(Integer id) {
+    public WorkDO getwork(Integer id) {
         return workMapper.selectById(id);
     }
 
     @Override
-    public PageResult<workDO> getworkPage(workPageReqVO pageReqVO) {
+    public PageResult<WorkDO> getworkPage(WorkPageReqVO pageReqVO) {
         return workMapper.selectPage(pageReqVO);
     }
 
     @Override
-    public List<workDO> getworkList(workPageReqVO pageReqVO) {
-        List<workDO> list = workMapper.selectList(pageReqVO);
-        List<workDO> lists = new ArrayList<>();
+    public List<WorkDO> getworkList(WorkPageReqVO pageReqVO) {
+        List<WorkDO> list = workMapper.selectList(pageReqVO);
+        List<WorkDO> lists = new ArrayList<>();
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        for (workDO workDO:list){
+        for (WorkDO workDO:list){
             List<ScoreDO> scoreDOS = scoreMapper.selectList(new LambdaQueryWrapperX<ScoreDO>()
                     .eqIfPresent(ScoreDO::getWorkId, workDO.getWorkId())
                     .eqIfPresent(ScoreDO::getCreator, loginUser.getId())

yudao-module-work/yudao-module-work-biz/src/test/java/cn/iocoder/yudao/module/work/service/work/workServiceImplTest.java

@@ -8,7 +8,7 @@ import jakarta.annotation.Resource;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 
 import cn.iocoder.yudao.module.work.controller.admin.work.vo.*;
-import cn.iocoder.yudao.module.work.dal.dataobject.work.workDO;
+import cn.iocoder.yudao.module.work.dal.dataobject.work.WorkDO;
 import cn.iocoder.yudao.module.work.dal.mysql.work.WorkMapper;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
@@ -45,14 +45,14 @@ public class workServiceImplTest extends BaseDbUnitTest {
         // 断言
         assertNotNull(workId);
         // 校验记录的属性是否正确
-        workDO work = workMapper.selectById(workId);
+        WorkDO work = workMapper.selectById(workId);
         assertPojoEquals(createReqVO, work, "id");
     }
 
     @Test
     public void testUpdatework_success() {
         // mock 数据
-        workDO dbwork = randomPojo(workDO.class);
+        WorkDO dbwork = randomPojo(WorkDO.class);
         workMapper.insert(dbwork);// @Sql: 先插入出一条存在的数据
         // 准备参数
         workSaveReqVO updateReqVO = randomPojo(workSaveReqVO.class, o -> {
@@ -62,7 +62,7 @@ public class workServiceImplTest extends BaseDbUnitTest {
         // 调用
         workService.updateWork(updateReqVO);
         // 校验是否更新正确
-        workDO work = workMapper.selectById(updateReqVO.getWorkId()); // 获取最新的
+        WorkDO work = workMapper.selectById(updateReqVO.getWorkId()); // 获取最新的
         assertPojoEquals(updateReqVO, work);
     }
 
@@ -78,7 +78,7 @@ public class workServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testDeletework_success() {
         // mock 数据
-        workDO dbwork = randomPojo(workDO.class);
+        WorkDO dbwork = randomPojo(WorkDO.class);
         workMapper.insert(dbwork);// @Sql: 先插入出一条存在的数据
         // 准备参数
         Integer id = dbwork.getWorkId();
@@ -102,7 +102,7 @@ public class workServiceImplTest extends BaseDbUnitTest {
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetworkPage() {
        // mock 数据
-       workDO dbwork = randomPojo(workDO.class, o -> { // 等会查询到
+       WorkDO dbwork = randomPojo(WorkDO.class, o -> { // 等会查询到
            o.setCategoryId(null);
            o.setFormat(null);
            o.setWorkName(null);
@@ -148,7 +148,7 @@ public class workServiceImplTest extends BaseDbUnitTest {
        // 测试 manuscriptAndMaterial 不匹配
        workMapper.insert(cloneIgnoreId(dbwork, o -> o.setManuscriptAndMaterial(null)));
        // 准备参数
-       workPageReqVO reqVO = new workPageReqVO();
+       WorkPageReqVO reqVO = new WorkPageReqVO();
        reqVO.setCategoryId(null);
        reqVO.setFormat(null);
        reqVO.setWorkName(null);
@@ -165,7 +165,7 @@ public class workServiceImplTest extends BaseDbUnitTest {
        reqVO.setManuscriptAndMaterial(null);
 
        // 调用
-       PageResult<workDO> pageResult = workService.getworkPage(reqVO);
+       PageResult<WorkDO> pageResult = workService.getworkPage(reqVO);
        // 断言
        assertEquals(1, pageResult.getTotal());
        assertEquals(1, pageResult.getList().size());