Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -168,9 +168,13 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
             audit.setFirstRemarks("");
         }
         audit.setSecondRemarks("");
-        //初审驳回时，不做状态修改
+        //通过与不通过时 都修改
+        boolean updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
         int update = auditMapper.updateById(audit);
-        return update >= 1;
+        return updateRefItemByRefItemId && update >= 1;
+        //初审驳回时，不做状态修改
+//        int update = auditMapper.updateById(audit);
+//        return update >= 1;
     }
 
     /**
@@ -187,13 +191,14 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
         }
         audit.setFirstRemarks("");
         //复审通过时，
-        boolean updateRefItemByRefItemId = true;
-        if (AuditStatusEnum.APPROVED_FINAL.equals(auditStatusEnum)) {
-            //修改对应审核项中的信息
-            updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
-        }
+//        boolean updateRefItemByRefItemId = true;
+//        if (AuditStatusEnum.APPROVED_FINAL.equals(auditStatusEnum)) {
+//            //修改对应审核项中的信息
+//            updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
+//        }
 
-        //复审不通过时，不做状态修改
+        //通过与不通过时 都修改
+        boolean updateRefItemByRefItemId = updateRefItemByRefItemId(audit);
         int update = auditMapper.updateById(audit);
         return updateRefItemByRefItemId && update >= 1;
     }
@@ -239,6 +244,12 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
         VideoContent videoContent = new VideoContent();
         videoContent.setId(audit.getRefItemId());
         videoContent.setAuditStatus(audit.getStatus());
+        //当审核级别为复审，审核状态为通过是，会修改审核项其它表中的 发布与删除字段，不是此情况下是直接修改审核状态
+        boolean continueFill = AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) &&
+                AuditStatusEnum.TBCA.name().equals(audit.getLevel());
+        if (!continueFill) {
+            return videoContent;
+        }
         //
         String operation = audit.getOperation();
         AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
@@ -275,6 +286,12 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
         ExhibitionBoard exhibitionBoard = new ExhibitionBoard();
         exhibitionBoard.setId(audit.getRefItemId());
         exhibitionBoard.setAuditStatus(audit.getStatus());
+        //当审核级别为复审，审核状态为通过是，会修改审核项其它表中的 发布与删除字段，不是此情况下是直接修改审核状态
+        boolean continueFill = AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) &&
+                AuditStatusEnum.TBCA.name().equals(audit.getLevel());
+        if (!continueFill) {
+            return exhibitionBoard;
+        }
         //
         String operation = audit.getOperation();
         AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);
@@ -311,6 +328,12 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
         LearningContent learningContent = new LearningContent();
         learningContent.setAuditStatus(audit.getStatus());
         learningContent.setId(audit.getRefItemId());
+        //当审核级别为复审，审核状态为通过是，会修改审核项其它表中的 发布与删除字段，不是此情况下是直接修改审核状态
+        boolean continueFill = AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) &&
+                AuditStatusEnum.TBCA.name().equals(audit.getLevel());
+        if (!continueFill) {
+            return learningContent;
+        }
         //
         String operation = audit.getOperation();
         AuditOperationEnum auditOperationEnum = AuditOperationEnum.valueOf(operation);

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

@@ -206,6 +206,10 @@ public class AuditController extends BaseController {
     @ApiOperation(value = "获取禁用审核详情", notes = "获取禁用审核详情")
     @GetMapping("/getById")
     @RequiresPermissions("/audit/getById")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "视频内容：VIDEO_CONTENT,展板内容：EXHIBITION_BOARD,学习内容：LEARNING_CONTENT", paramType = "query", dataType = "String", allowableValues = "VIDEO_CONTENT,EXHIBITION_BOARD,LEARNING_CONTENT,ACCOUNT", required = true)
+    })
     @MethodLog(operModule = OperModule.CHECKVIDEO,operType = OperType.DETAILS)
     public Map<String, Object> getById(String id, String type) {
         HashMap<String, Object> resultMap = new HashMap<>();

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

@@ -70,6 +70,7 @@ public class ExhibitionBoardController extends BaseController {
         }
         exhibitionBoard.setAuditStatus(AuditStatusEnum.TBC.name());
         exhibitionBoard.setPublished(false);
+        exhibitionBoard.setDeleted(false);
         // 保存业务节点信息
         boolean result = exhibitionBoardService.save(exhibitionBoard);
         // 返回操作结果