bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoardCat.java

@@ -39,19 +39,23 @@ public class ExhibitionBoardCat implements Serializable {
 
     @ApiModelProperty("展板分类名称")
     @TableField("name")
-        @NotBlank(message = "展板分类名称不能为空", groups = {Add.class, Update.class})
-        private String name;
-    
+    @NotBlank(message = "展板分类名称不能为空", groups = {Add.class, Update.class})
+    private String name;
+
     @ApiModelProperty("备注")
     @TableField("remarks")
     private String remarks;
-    
+
     @ApiModelProperty("创建日期")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
     private LocalDateTime createTime;
-    
+
     @ApiModelProperty("修改日期")
     @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
-    
+
+    @ApiModelProperty("版权方")
+    @TableField(exist = false)
+    private String copyrightOwnerNames;
+
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java

@@ -4,11 +4,16 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
+import cn.wisenergy.chnmuseum.party.model.CopyrightOwner;
+import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
 import cn.wisenergy.chnmuseum.party.model.ExhibitionBoardCat;
+import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
 import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardCatService;
+import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -24,6 +29,7 @@ import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <pre>
@@ -39,8 +45,12 @@ import java.util.Map;
 @Api(tags = {"展板分类操作接口"})
 public class ExhibitionBoardCatController extends BaseController {
 
+    @Resource
+    private ExhibitionBoardService exhibitionBoardService;
     @Resource
     private ExhibitionBoardCatService exhibitionBoardCatService;
+    @Resource
+    private CopyrightOwnerService copyrightOwnerService;
 
     @PostMapping("/batchSave")
     @RequiresPermissions("exhibition:board:cat:batch:save")
@@ -108,6 +118,7 @@ public class ExhibitionBoardCatController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteExhibitionBoardCat(@PathVariable("id") String id) {
+
         boolean result = exhibitionBoardCatService.removeById(id);
         if (result) {
             return getSuccessResult();
@@ -155,11 +166,12 @@ public class ExhibitionBoardCatController extends BaseController {
                 ExhibitionBoardCat::getUpdateTime);
         Page<ExhibitionBoardCat> page = this.exhibitionBoardCatService.page(getPage(), queryWrapper);
         for (ExhibitionBoardCat exhibitionBoardCat : page.getRecords()) {
-
-
-
-
-
+            LambdaQueryWrapper<ExhibitionBoard> lambdaQueryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().le(ExhibitionBoard::getExhibitionBoardCatId, exhibitionBoardCat.getId());
+            List<ExhibitionBoard> exhibitionBoardList = this.exhibitionBoardService.list(lambdaQueryWrapper);
+            List<String> boardCopyrightOwnerIdList = exhibitionBoardList.stream().map(ExhibitionBoard::getBoardCopyrightOwnerId).collect(Collectors.toList());
+            List<CopyrightOwner> copyrightOwnerList = this.copyrightOwnerService.listByIds(boardCopyrightOwnerIdList);
+            String copyrightOwnerNames = copyrightOwnerList.stream().map(CopyrightOwner::getName).collect(Collectors.joining("、"));
+            exhibitionBoardCat.setCopyrightOwnerNames(copyrightOwnerNames);
         }
         return getResult(page);
     }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -167,6 +167,10 @@ public class ExhibitionBoardController extends BaseController {
         Page<ExhibitionBoard> page = this.exhibitionBoardService.page(getPage(), queryWrapper);
         for (ExhibitionBoard exhibitionBoard : page.getRecords()) {
 
+
+
+
+
         }
         return getResult(page);
     }