文章审核优化

fs-admin/src/main/java/com/fs/his/controller/FsArticleAuditController.java

@@ -1,9 +1,11 @@
 package com.fs.his.controller;
+import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.enums.BusinessType;
 import com.fs.his.domain.FsArticle;
 import com.fs.his.param.FsArticleAuditParam;
 import com.fs.his.service.IFsArticleService;
@@ -60,7 +62,8 @@ public class FsArticleAuditController extends BaseController
      * **/
     @PreAuthorize("@ss.hasPermi('his:articleAudit:articleAudit')")
     @PostMapping("/audit")
-    public R audit(FsArticleAuditParam param){
+    @Log(title = "文章审核", businessType = BusinessType.GRANT, logParam = {"文章", "审核文章"})
+    public R audit(@RequestBody FsArticleAuditParam param){
         if(param.getArticleId() == null){
             return R.error("文章ID不能为空");
         }

fs-service/src/main/java/com/fs/his/service/impl/FsArticleServiceImpl.java

@@ -134,7 +134,7 @@ public class FsArticleServiceImpl implements IFsArticleService
         }
 
 
-        if(fsArticle.getAuditStatus() < -1 && param.getAuditStatus() > 2){
+        if(param.getAuditStatus() < -1 && param.getAuditStatus() > 2){
             return R.error("操作失败，审核状态异常！");
         }
 
@@ -148,6 +148,8 @@ public class FsArticleServiceImpl implements IFsArticleService
 
         //插入日志信息
         storeAuditLogUtil.addAudit(param.getArticleId(), param.getReason(), param.getAttachImage());
-        return R.ok("操作成功");
+        StringBuilder auditLog = new StringBuilder();
+        auditLog.append("文章审核标题：").append(fsArticle.getTitle()).append("，审核状态：").append(param.getAuditStatus() == -1 ? "驳回" : "审核通过").append("，审核结果：").append(param.getReason());
+        return R.ok(auditLog);
     }
 }

fs-service/src/main/resources/mapper/his/FsArticleMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsArticleVo">
-        select article_id, cate_id, title, image_url, is_tui, is_news, contents, views, sort, create_time, update_time, publish_time from fs_article
+        select article_id, cate_id, title, image_url, is_tui, is_news, contents, views, sort, create_time, update_time, publish_time, audit_status from fs_article
     </sql>
 
     <select id="selectFsArticleList" parameterType="FsArticle" resultMap="FsArticleResult">