公示公告 - 添加“公告时间”字段，用于替换首页轮播数据中的“创建时间”

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -55,7 +55,7 @@ public class SysNoticeController extends BaseController
             long difference = planTime - now;
             if (difference > 0 && difference < alarmTime && !(tBranchPlanItem.getItemStatus().equals("1"))) {
                 SysNotice sysNotice = new SysNotice();
-                sysNotice.setCreateTime(tBranchPlanItem.getPlanTime());
+                sysNotice.setReleaseTime(tBranchPlanItem.getPlanTime());
                 sysNotice.setNoticeTitle(tBranchPlanItem.getItemContent());
                 sysNotices.add(sysNotice);
             }

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

@@ -3,12 +3,15 @@ package com.ruoyi.system.domain;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
 
+import java.util.Date;
+
 /**
  * 通知公告表 sys_notice
  * 
@@ -42,6 +45,18 @@ public class SysNotice extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
+    /** 公告时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date releaseTime;
+
+    public Date getReleaseTime() {
+        return releaseTime;
+    }
+
+    public void setReleaseTime(Date releaseTime) {
+        this.releaseTime = releaseTime;
+    }
+
     public String getDelFlag() {
         return delFlag;
     }

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"         column="status"          />
         <result property="createBy"       column="create_by"       />
         <result property="createTime"     column="create_time"     />
+        <result property="releaseTime"     column="release_time"     />
         <result property="updateBy"       column="update_by"       />
         <result property="updateTime"     column="update_time"     />
         <result property="remark"         column="remark"          />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectNoticeVo">
-        select d.notice_id, d.notice_title, d.notice_type, d.notice_content, d.status, d.create_by, d.create_time, d.update_by, d.update_time, d.remark, d.is_pinned, d.dept_id
+        select d.notice_id, d.release_time, d.notice_title, d.notice_type, d.notice_content, d.status, d.create_by, d.create_time, d.update_by, d.update_time, d.remark, d.is_pinned, d.dept_id
 		from sys_notice d
     </sql>
 
@@ -67,6 +68,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>
+        <if test="releaseTime != null">release_time,</if>
         create_time
         )values(
         <if test="noticeId != null and noticeId != '' ">#{noticeId}, </if>
@@ -77,6 +79,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>
+        <if test="releaseTime != null">#{releaseTime},</if>
         sysdate
         )
     </insert>
@@ -91,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="isPinned != null and isPinned != ''">is_pinned = #{isPinned},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="releaseTime != null">release_time = #{releaseTime},</if>
  			update_time = sysdate
         </set>
         where notice_id = #{noticeId}

ruoyi-ui/src/views/dashboard/NoticeChart.vue

@@ -3,7 +3,7 @@
     <div class="text-container" :style="{height:height,width:width}">
       <ul class="allNotice">
         <li v-for="(item,index) in noticeList" class="info">
-          <span style="padding-left: 20px; display: inline-block; width: 20%">{{parseTime(item.createTime, '{yyyy}-{mm}-{dd}')}}</span>
+          <span style="padding-left: 20px; display: inline-block; width: 20%">{{parseTime(item.releaseTime, '{yyyy}-{mm}-{dd}')}}</span>
           <span style="padding-left: 20px; display: inline-block; width: 80%">{{item.noticeTitle}}</span>
         </li>
       </ul>

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

@@ -96,6 +96,11 @@
           <!--<dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>-->
         <!--</template>-->
       <!--</el-table-column>-->
+      <el-table-column label="公告时间" align="center" prop="releaseTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.releaseTime, '{y}-{m}-{d}') }}</span>
+        </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">
@@ -167,6 +172,16 @@
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
+          <el-col :span="24">
+            <el-form-item label="公告时间" prop="releaseTime">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.releaseTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择公告时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="公告标题" prop="noticeTitle">
               <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
@@ -217,9 +232,19 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="checkView" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
+            <el-form-item label="公告时间" prop="releaseTime">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.releaseTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择公告时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <el-form-item label="公告标题" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" v-bind:disabled="check"/>
+              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题"/>
             </el-form-item>
           </el-col>
           <!--<el-col :span="12">-->
@@ -385,7 +410,10 @@ export default {
         ],
         deptId: [
           { required: true, message: "归属类型不能为空", trigger: "change" }
-        ]
+        ],
+        releaseTime: [
+          { required: true, message: "公告时间不能为空", trigger: "change" }
+        ],
       }
     };
   },