修改-大屏统计数据出错

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

@@ -44,7 +44,7 @@ public class ExhibitionBoard implements Serializable {
     @ApiModelProperty("展板内容名称")
     @TableField("name")
     @NotBlank(message = "展板名称不能为空", groups = {Add.class, Update.class})
-    @Length(max = 20, message = "展板名称字数不能超过20")
+    @Length(max = 30, message = "展板名称字数不能超过30")
     private String name;
 
     /**

src/main/java/cn/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -574,11 +574,11 @@ public class ChinaMobileRestApiController extends BaseController {
                                        @RequestParam(value = "audioLanguage", required = false) LanguageEnum audioLanguage) {
         ExhibitionBoard exhibitionBoard = exhibitionBoardService.getById(id);
         String boardCopyrightOwnerId = exhibitionBoard.getBoardCopyrightOwnerId();
-        if (boardCopyrightOwnerId != null) {
+        if (StringUtils.isNotEmpty(boardCopyrightOwnerId)) {
             exhibitionBoard.setBoardCopyrightOwnerName(this.copyrightOwnerService.getById(boardCopyrightOwnerId).getName());
         }
         String exhibitionBoardCatId = exhibitionBoard.getExhibitionBoardCatId();
-        if (exhibitionBoardCatId != null) {
+        if (StringUtils.isNotEmpty(exhibitionBoardCatId)) {
             exhibitionBoard.setExhibitionBoardCatName(this.exhibitionBoardCatService.getById(exhibitionBoardCatId).getName());
         }
 
@@ -586,7 +586,7 @@ public class ChinaMobileRestApiController extends BaseController {
             String name = this.copyrightOwnerService.getById(exhibitionBoard.getVideoContentCopyrightOwnerId()).getName();
             exhibitionBoard.setVideoContentCopyrightOwnerName(name);
         }
-        if (exhibitionBoard.getVideoContentId() != null) {
+        if (StringUtils.isNotEmpty(exhibitionBoard.getVideoContentId())) {
             String thumbnail = this.videoContentService.getById(exhibitionBoard.getVideoContentId()).getThumbnail();
             exhibitionBoard.setBoardVideoContentThumbnail(thumbnail);
         }
@@ -619,7 +619,7 @@ public class ChinaMobileRestApiController extends BaseController {
         exhibitionBoard.setDatumList(datumList);
 
         final String videoContentId = exhibitionBoard.getVideoContentId();
-        if (videoContentId != null) {
+        if (StringUtils.isNotEmpty(videoContentId)) {
             final VideoContent videoContent = this.videoContentService.getById(videoContentId);
             exhibitionBoard.setVideoContentName(videoContent.getName());
 

src/main/resources/mapper/TBoardStatisticMapper.xml

@@ -213,10 +213,10 @@
     <select id="getBoardTotal" resultType="java.lang.Integer">
         SELECT count( a.board_id )
             FROM
-                ( SELECT s.board_id
-                    FROM t_board_statistic s
+                ( SELECT e.id
+                    FROM exhibition_board e
+                    left join t_board_statistic s on e.id = s.board_id
                     left join t_organ o on o.id = s.organ_id
-                    left join exhibition_board e on e.id = s.board_id and e.is_deleted = 0
                     <where>
                         <if test="statisticDate != null and statisticDate.length() == 4">
                             left(s.play_date,4) = ${statisticDate}