From c80c212572a2af735ac6a02ec96c98e36803a041 Mon Sep 17 00:00:00 2001
From: "rong.liu" <liurong@huorantech.cn>
Date: Wed, 22 Feb 2023 14:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huoran/iasf/common/shiro/ShiroConfig.java |  3 +--
 .../com/huoran/iasf/entity/SysContent.java    | 13 ++++++++++
 .../iasf/mapper/xml/SysContentMapper.xml      | 24 ++++++++++++++++++-
 .../service/impl/SysContentServiceImpl.java   |  8 +++++++
 .../huoran/iasf/vo/req/PageContentReqVO.java  | 12 +++++++++-
 .../iasf/vo/resp/PageContentRespVO.java       |  2 +-
 6 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java b/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java
index a8e4ea5..3379303 100644
--- a/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java
+++ b/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * @date 2022年7月28日*/
 
 
-@Configuration
+//@Configuration
 @EnableConfigurationProperties(FileUploadProperties.class)
 public class ShiroConfig {
 
@@ -180,6 +180,5 @@ public class ShiroConfig {
         return authorizationAttributeSourceAdvisor;
     }
 
-
 }
 
diff --git a/src/main/java/com/huoran/iasf/entity/SysContent.java b/src/main/java/com/huoran/iasf/entity/SysContent.java
index aaedd74..cb16f43 100644
--- a/src/main/java/com/huoran/iasf/entity/SysContent.java
+++ b/src/main/java/com/huoran/iasf/entity/SysContent.java
@@ -159,4 +159,17 @@ public class SysContent implements Serializable {
     @ApiModelProperty(value = "文章附件")
     @TableField(exist = false)
     List<SysContentFile> fileList;
+
+
+    @ApiModelProperty(value = "刊物名称")
+    private String periodicalName;
+
+    @ApiModelProperty(value = "卷")
+    private String reel;
+
+    @ApiModelProperty(value = "文献号")
+    private String documentNumber;
+
+    @ApiModelProperty(value = "文章关键字")
+    private String articleKeyWord;
 }
\ No newline at end of file
diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
index aa7c0eb..db96676 100644
--- a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
+++ b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
@@ -36,7 +36,29 @@
             CONCAT('%',#{req.column},'%')
         </if>
 
-        ORDER BY c.create_time desc
+
+        <if test="req.templateStatus ==1">
+           AND  c.template_status = #{req.templateStatus}
+        </if>
+
+
+        <if test="req.modifiedTimeSort ==0">
+            ORDER BY c.update_time desc
+        </if>
+
+        <if test="req.modifiedTimeSort ==1">
+            ORDER BY c.update_time asc
+        </if>
+
+        <if test="req.publicationTimeSort ==0">
+            ORDER BY c.release_time desc
+        </if>
+
+        <if test="req.publicationTimeSort ==1">
+            ORDER BY c.release_time asc
+        </if>
+
+
 
     </select>
 
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
index cb268d4..a8cf6d5 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
@@ -57,6 +57,14 @@ public class SysContentServiceImpl extends ServiceImpl<SysContentMapper, SysCont
     @Override
     public R articlePaginationList(PageContentReqVO reqVO) {
         Page<PageContentRespVO> page = new Page<PageContentRespVO>(reqVO.getPageNum(), reqVO.getPageSize());
+
+        if (reqVO.getModifiedTimeSort() == null && reqVO.getPublicationTimeSort() == null) {
+            reqVO.setPublicationTimeSort(0);
+        }
+        if (reqVO.getTemplateStatus() == null) {
+            //模板状态(0禁用；1启用)
+            reqVO.setTemplateStatus(0);
+        }
         IPage<PageContentRespVO> pageList = baseMapper.articlePaginationList(page, reqVO);
         return R.success(pageList);
     }
diff --git a/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java b/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java
index e99930b..53df03f 100644
--- a/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java
+++ b/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java
@@ -47,6 +47,16 @@ public class PageContentReqVO extends PageReqVO {
 
 
     @ApiModelProperty(value = "召开类型(1.即将召开 2.已经召开)")
-    private Integer  convokeType;
+    private Integer convokeType;
+
+    @ApiModelProperty(value = "修改时间排序(0默认倒序 1升序)")
+    private Integer modifiedTimeSort;
+
+    @ApiModelProperty(value = "发布时间排序(0默认倒序 1升序)")
+    private Integer publicationTimeSort;
+
+    @ApiModelProperty(value = "模板状态(0禁用；1启用)")
+    private Integer templateStatus;
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/huoran/iasf/vo/resp/PageContentRespVO.java b/src/main/java/com/huoran/iasf/vo/resp/PageContentRespVO.java
index 1d97458..0d3b244 100644
--- a/src/main/java/com/huoran/iasf/vo/resp/PageContentRespVO.java
+++ b/src/main/java/com/huoran/iasf/vo/resp/PageContentRespVO.java
@@ -96,7 +96,7 @@ public class PageContentRespVO {
     private Integer isDisable;
 
 
-    @ApiModelProperty(value = "是否禁用(0默认，0启用 1禁用)")
+    @ApiModelProperty(value = "标签名称")
     private String labelName;