bug fixed

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

@@ -158,4 +158,8 @@ public class ExhibitionBoard implements Serializable {
     @TableField(exist = false)
     private List<Asset> datumList;
 
+    @ApiModelProperty("审核意见记录")
+    @TableField(exist = false)
+    private List<Audit> auditHistoryList;
+
 }

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

@@ -133,4 +133,8 @@ public class LearningContent implements Serializable {
     @TableField(exist = false)
     private String copyrightOwnerNames;
 
+    @ApiModelProperty("审核意见记录")
+    @TableField(exist = false)
+    private List<Audit> auditHistoryList;
+
 }

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

@@ -93,4 +93,8 @@ public class VideoContent implements Serializable {
     @TableField(exist = false)
     private List<Asset> videoFileList;
 
+    @ApiModelProperty("审核意见记录")
+    @TableField(exist = false)
+    private List<Audit> auditHistoryList;
+
 }

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

@@ -321,6 +321,19 @@ public class ExhibitionBoardController extends BaseController {
         final List<Asset> datumList = this.assetService.list(assetQueryWrapper);
         exhibitionBoard.setDatumList(datumList);
 
+        final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
+        auditQueryWrapper.select(Audit::getContent);
+        auditQueryWrapper.select(Audit::getType);
+        auditQueryWrapper.select(Audit::getOperation);
+        auditQueryWrapper.select(Audit::getStatus);
+        auditQueryWrapper.select(Audit::getFirstTime);
+        auditQueryWrapper.select(Audit::getFirstRemarks);
+        auditQueryWrapper.select(Audit::getSecondTime);
+        auditQueryWrapper.select(Audit::getSecondTime);
+        auditQueryWrapper.select(Audit::getLevel);
+        final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
+        exhibitionBoard.setAuditHistoryList(auditList);
+
         final String videoContentId = exhibitionBoard.getVideoContentId();
         if (videoContentId != null) {
             final VideoContent videoContent = this.videoContentService.getById(videoContentId);

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

@@ -323,6 +323,19 @@ public class LearningContentController extends BaseController {
         learningContent.setExhibitionBoardIdList(exhibitionBoardList.stream().map(ExhibitionBoard::getId).collect(Collectors.toList()));
         learningContent.setExhibitionBoardNameList(exhibitionBoardList.stream().map(ExhibitionBoard::getName).collect(Collectors.toList()));
 
+        final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
+        auditQueryWrapper.select(Audit::getContent);
+        auditQueryWrapper.select(Audit::getType);
+        auditQueryWrapper.select(Audit::getOperation);
+        auditQueryWrapper.select(Audit::getStatus);
+        auditQueryWrapper.select(Audit::getFirstTime);
+        auditQueryWrapper.select(Audit::getFirstRemarks);
+        auditQueryWrapper.select(Audit::getSecondTime);
+        auditQueryWrapper.select(Audit::getSecondTime);
+        auditQueryWrapper.select(Audit::getLevel);
+        final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
+        learningContent.setAuditHistoryList(auditList);
+
         for (ExhibitionBoard exhibitionBoard : exhibitionBoardList) {
             String exhibitionBoardCatId = exhibitionBoard.getExhibitionBoardCatId();
             if (exhibitionBoardCatId != null) {

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

@@ -4,14 +4,14 @@ import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
 import cn.wisenergy.chnmuseum.party.common.util.NetWorkUtil;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
-import cn.wisenergy.chnmuseum.party.model.*;
+import cn.wisenergy.chnmuseum.party.model.RunLog;
+import cn.wisenergy.chnmuseum.party.model.SysLog;
+import cn.wisenergy.chnmuseum.party.model.TOperationLog;
 import cn.wisenergy.chnmuseum.party.service.TOperationLogService;
 import cn.wisenergy.chnmuseum.party.service.impl.RunLogServiceImpl;
 import cn.wisenergy.chnmuseum.party.service.impl.SysLogServiceImpl;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,8 +19,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -259,6 +259,19 @@ public class VideoContentController extends BaseController {
         final List<Asset> videoFileList = this.assetService.list(assetQueryWrapper);
         videoContent.setVideoFileList(videoFileList);
 
+        final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
+        auditQueryWrapper.select(Audit::getContent);
+        auditQueryWrapper.select(Audit::getType);
+        auditQueryWrapper.select(Audit::getOperation);
+        auditQueryWrapper.select(Audit::getStatus);
+        auditQueryWrapper.select(Audit::getFirstTime);
+        auditQueryWrapper.select(Audit::getFirstRemarks);
+        auditQueryWrapper.select(Audit::getSecondTime);
+        auditQueryWrapper.select(Audit::getSecondTime);
+        auditQueryWrapper.select(Audit::getLevel);
+        final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
+        videoContent.setAuditHistoryList(auditList);
+
         return getResult(videoContent);
     }