公示公告台账

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -39,6 +39,17 @@ public class SysNotice extends BaseEntity
     /** 部门id */
     private Long deptId;
 
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
     public Long getDeptId() {
         return deptId;
     }

ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null and deptId != ''">
                 AND dept_id = #{deptId}
             </if>
+            and del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
@@ -66,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="remark != null and remark != ''">remark,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="deptId != null">dept_id,</if>
-        create_time,is_pinned
+        create_time
         )values(
         <if test="noticeId != null and noticeId != '' ">#{noticeId}, </if>
         <if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
@@ -76,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="deptId != null">#{deptId},</if>
-        sysdate,0
+        sysdate
         )
     </insert>
 
@@ -96,11 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteNoticeById" parameterType="Long">
-        delete from sys_notice where notice_id = #{noticeId}
+        update sys_notice set del_flag = 2 where notice_id = #{noticeId}
     </delete>
 
     <delete id="deleteNoticeByIds" parameterType="Long">
-        delete from sys_notice where notice_id in
+        update sys_notice set del_flag = 2 where notice_id in
         <foreach item="noticeId" collection="array" open="(" separator="," close=")">
             #{noticeId}
         </foreach>

ruoyi-ui/src/views/system/notice/index.vue

@@ -9,24 +9,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="操作人员" prop="createBy">
+      <el-form-item label="创建者" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
-          placeholder="请输入操作人员"
+          placeholder="请输入创建者"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型" prop="noticeType">
-        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_notice_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+      <!--<el-form-item label="类型" prop="noticeType">-->
+        <!--<el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>-->
+          <!--<el-option-->
+            <!--v-for="dict in dict.type.sys_notice_type"-->
+            <!--:key="dict.value"-->
+            <!--:label="dict.label"-->
+            <!--:value="dict.value"-->
+          <!--/>-->
+        <!--</el-select>-->
+      <!--</el-form-item>-->
       <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
         <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
       </el-form-item>
@@ -72,9 +72,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
+      <!--<el-table-column label="序号" align="center" prop="noticeId" width="100" />-->
       <el-table-column
         label="公告标题"
         align="center"
@@ -86,23 +86,23 @@
           {{scope.row.noticeTitle}}
         </template>
       </el-table-column>
-      <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <!--<el-table-column label="公告类型" align="center" prop="noticeType" width="100">-->
+        <!--<template slot-scope="scope">-->
+          <!--<dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
+      <!--<el-table-column label="状态" align="center" prop="status" width="100">-->
+        <!--<template slot-scope="scope">-->
+          <!--<dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
       <el-table-column label="创建者" align="center" prop="createBy" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -161,34 +161,34 @@
               <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="公告类型" prop="noticeType">
-              <el-select v-model="form.noticeType" placeholder="请选择公告类型">
-                <el-option
-                  v-for="dict in dict.type.sys_notice_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="公告类型" prop="noticeType">-->
+              <!--<el-select v-model="form.noticeType" placeholder="请选择公告类型">-->
+                <!--<el-option-->
+                  <!--v-for="dict in dict.type.sys_notice_type"-->
+                  <!--:key="dict.value"-->
+                  <!--:label="dict.label"-->
+                  <!--:value="dict.value"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_notice_status"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="状态">-->
+              <!--<el-radio-group v-model="form.status">-->
+                <!--<el-radio-->
+                  <!--v-for="dict in dict.type.sys_notice_status"-->
+                  <!--:key="dict.value"-->
+                  <!--:label="dict.value"-->
+                <!--&gt;{{dict.label}}</el-radio>-->
+              <!--</el-radio-group>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="24">
             <el-form-item label="内容">
               <editor v-model="form.noticeContent" :min-height="192"/>
@@ -211,30 +211,30 @@
               <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" v-bind:disabled="check"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="公告类型" prop="noticeType">
-              <el-select v-model="form.noticeType" placeholder="请选择公告类型" v-bind:disabled="check">
-                <el-option
-                  v-for="dict in typeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in statusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                  v-bind:disabled="check"
-                >{{dict.dictLabel}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="公告类型" prop="noticeType">-->
+              <!--<el-select v-model="form.noticeType" placeholder="请选择公告类型" v-bind:disabled="check">-->
+                <!--<el-option-->
+                  <!--v-for="dict in typeOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="24">-->
+            <!--<el-form-item label="状态">-->
+              <!--<el-radio-group v-model="form.status">-->
+                <!--<el-radio-->
+                  <!--v-for="dict in statusOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictValue"-->
+                  <!--v-bind:disabled="check"-->
+                <!--&gt;{{dict.dictLabel}}</el-radio>-->
+              <!--</el-radio-group>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="24" v-if="check">
             <el-form-item label="内容">
               <p v-html="form.noticeContent" />