作者：张哲

时间：2023/03/02
类型：优化
描述：里程碑(2)bug修复

src/main/java/com/redxun/knowledge/album/entity/dao/AlbumApprove.java

@@ -71,7 +71,7 @@ public class AlbumApprove  extends BaseExtEntity<String> {
     @TableField(value = "IS_FINAL")
     private Integer isFinal;
     //IS_DEL
-    //@TableLogic
+    @TableLogic
     @TableField(value = "IS_DEL")
     private Integer isDel;
 

src/main/java/com/redxun/knowledge/album/entity/enums/AlbumVersionEnum.java

@@ -14,7 +14,8 @@ public enum AlbumVersionEnum {
     APPROVE_PROGRESS(1,"审核中"),
     FORCE_PROGRESS(2,"生效中"),
     NO_FORCE(3,"未生效"),
-    REJECT(4,"驳回");
+    REJECT(4,"已驳回"),
+    PUBLISHING(5,"已发布");
 
 
     private Integer code;

src/main/java/com/redxun/knowledge/album/service/AlbumCatalogueServiceImpl.java

@@ -69,6 +69,9 @@ public class AlbumCatalogueServiceImpl extends SuperServiceImpl<AlbumCatalogueMa
             //查询版本对应信息(生效中 可移除知识)
             String  versionId = (String) queryFilter.getParams().get("versionId");
             AlbumVersion albumVersion = albumVersionMapper.selectById(versionId);
+            //判断该专辑是否有审核中的版本
+            // TODO: 2023/3/2
+            albumVersion.getAlbumId();
             List<AlbumCatalogueVo> albumCatalogueVoList = (List<AlbumCatalogueVo>) page.getRecords().parallelStream().map(e -> {
                 AlbumCatalogueVo albumCatalogueVo = new AlbumCatalogueVo();
                 BeanUtils.copyProperties(e, albumCatalogueVo);

src/main/java/com/redxun/knowledge/album/service/AlbumInfoServiceImpl.java

@@ -182,6 +182,11 @@ public class AlbumInfoServiceImpl extends SuperServiceImpl<AlbumInfoMapper, Albu
                     IPage page3 = albumInfoMapper.findAllAlbumInfoYelpByUserId(queryFilter.getPage(), queryFilter.getParams(), params);
                     List<AlbumInfo> result = page3.getRecords();
                     List<AlbumInfoVo> albumInfoVoList3 = pageInfo(result);
+                    //不是我创建的专辑(状态设置为2 已发布)
+                    albumInfoVoList3.stream().filter(e -> !e.getOwnerId().equals(userId)).forEach(h -> {
+                        h.setVersionState(2);
+                        h.setVersionStateName(AlbumVersionEnum.getMessage(2));
+                    });
                     page3.setRecords(albumInfoVoList3);
                     return page3;
             }
@@ -343,7 +348,9 @@ public class AlbumInfoServiceImpl extends SuperServiceImpl<AlbumInfoMapper, Albu
         albumInfoDetailVo.setVersionState(albumVersions.get(0).getState());
         if (albumVersions.get(0).getState() == 3){
             albumInfoDetailVo.setVersionStateName("");
-        } else {
+        } else if (albumVersions.get(0).getState() == 2){
+            albumInfoDetailVo.setVersionStateName(AlbumVersionEnum.getMessage(5));
+        } else{
             albumInfoDetailVo.setVersionStateName(AlbumVersionEnum.getMessage(albumVersions.get(0).getState()));
         }
         //专辑版本集合

src/main/java/com/redxun/knowledge/album/service/AlbumYelpApproveServiceImpl.java

@@ -245,7 +245,7 @@ public class AlbumYelpApproveServiceImpl extends SuperServiceImpl<AlbumYelpAppro
                 //发送站内信
                 AlbumInfo albumInfo = albumInfoMapper.selectById(albumYelpApproveList.get(0).getAlbumId());
                 AlbumYelp albumYelpById = albumYelpMapper.selectById(albumYelpApproveList.get(0).getYelpId());
-                sendMessage(albumInfo.getCreateBy(),albumInfo.getName(),albumYelpById.getContent(),albumApprovalRemarkDto.getRemark());
+                sendMessage(albumYelpById.getCreateBy(),albumInfo.getName(),albumYelpById.getContent(),albumApprovalRemarkDto.getRemark());
             }
             //如果审核节点是终审节点且专辑审核未通过,修改点评状态为最终驳回
             if (albumYelpApproveList.get(0).getIsFinal() == 1 && albumApprovalRemarkDto.getResult() == 0) {
@@ -257,7 +257,7 @@ public class AlbumYelpApproveServiceImpl extends SuperServiceImpl<AlbumYelpAppro
                 //发送站内信
                 AlbumInfo albumInfo = albumInfoMapper.selectById(albumYelpApproveList.get(0).getAlbumId());
                 AlbumYelp albumYelpById = albumYelpMapper.selectById(albumYelpApproveList.get(0).getYelpId());
-                sendMessage(albumInfo.getCreateBy(),albumInfo.getName(),albumYelpById.getContent(),albumApprovalRemarkDto.getRemark());
+                sendMessage(albumYelpById.getCreateBy(),albumInfo.getName(),albumYelpById.getContent(),albumApprovalRemarkDto.getRemark());
             }
             //如果审核节点是终审节点且专辑审核通过,修改点评状态为最终通过(即审核完成)
             if (albumYelpApproveList.get(0).getIsFinal() == 1 && albumApprovalRemarkDto.getResult() == 1){

src/main/resources/mapper/knowledge/album/AlbumInfoMapper.xml

@@ -180,7 +180,7 @@
                 START WITH c.PK_ID = #{params.categoryId} CONNECT BY PRIOR c.PK_ID = c.PARENT and c.IS_DEL = 0
                 )
             </if>
-            and ay.CREATE_BY_ = #{params.userId} and ay.STATE != 2
+            and ay.CREATE_BY_ = #{params.userId} and ay.STATE != 2 and ay.IS_DEL = 0
             and ai.IS_DEL = 0 and ai.state = 1
         </where>
         ORDER BY ai.CREATE_TIME_ DESC