公告类型

src/main/java/net/mingsoft/tf/action/AnnouncementAction.java

@@ -90,6 +90,7 @@ public class AnnouncementAction extends net.mingsoft.tf.action.BaseAction{
     @Operation(summary = "查询公告管理列表接口")
     @Parameters({
         @Parameter(name = "announcementTitle", description = "公告标题", in = ParameterIn.QUERY),
+        @Parameter(name = "announcementType", description = "公告类型", in = ParameterIn.QUERY),
         @Parameter(name = "announcementTime", description = "发布时间", in = ParameterIn.QUERY),
         @Parameter(name = "announcementStatus", description = "发布状态", in = ParameterIn.QUERY),
         @Parameter(name = "announcementContent", description = "公告内容", in = ParameterIn.QUERY),
@@ -133,6 +134,7 @@ public class AnnouncementAction extends net.mingsoft.tf.action.BaseAction{
     @Operation(summary = "保存公告管理列表接口")
     @Parameters({
         @Parameter(name = "announcementTitle", description = "公告标题", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "announcementType", description = "公告类型", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "announcementTime", description = "发布时间", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "announcementStatus", description = "发布状态", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "announcementContent", description = "公告内容", required = false, in = ParameterIn.QUERY),
@@ -175,6 +177,7 @@ public class AnnouncementAction extends net.mingsoft.tf.action.BaseAction{
     @Parameters({
         @Parameter(name = "id", description = "主键ID", required =true,in = ParameterIn.QUERY),
         @Parameter(name = "announcementTitle", description = "公告标题", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "announcementType", description = "公告类型", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "announcementTime", description = "发布时间", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "announcementStatus", description = "发布状态", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "announcementContent", description = "公告内容", required = false, in = ParameterIn.QUERY),

src/main/java/net/mingsoft/tf/dao/IAnnouncementDao.xml

@@ -4,6 +4,7 @@
 
 	<resultMap id="resultMap" type="net.mingsoft.tf.entity.AnnouncementEntity">
 				<result column="ANNOUNCEMENT_TITLE" property="announcementTitle" /><!--公告标题 -->
+				<result column="ANNOUNCEMENT_TYPE" property="announcementType" /><!--公告类型 -->
 				<result column="ANNOUNCEMENT_TIME" property="announcementTime" /><!--发布时间 -->
 				<result column="ANNOUNCEMENT_STATUS" property="announcementStatus" /><!--发布状态 -->
 				<result column="ANNOUNCEMENT_CONTENT" property="announcementContent" /><!--公告内容 -->

src/main/java/net/mingsoft/tf/entity/AnnouncementEntity.java

@@ -31,6 +31,11 @@ private static final long serialVersionUID = 1765596155897L;
     @TableField(condition = SqlCondition.LIKE)
     private String announcementTitle;
     /**
+    * 公告类型
+    */
+    
+    private String announcementType;
+    /**
     * 发布时间
     */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -68,6 +73,19 @@ private static final long serialVersionUID = 1765596155897L;
         return this.announcementTitle;
     }
     /**
+    * 设置公告类型
+    */
+    public void setAnnouncementType(String announcementType) {
+        this.announcementType = announcementType;
+    }
+
+    /**
+    * 获取公告类型
+    */
+    public String getAnnouncementType() {
+        return this.announcementType;
+    }
+    /**
     * 设置发布时间
     */
     public void setAnnouncementTime(Date announcementTime) {

src/main/java/net/mingsoft/tf/resources/resources_en_US.properties

@@ -1,3 +1,9 @@
+announcement.title=announcement title
+announcement.type=announcement type
+announcement.time=announcement time
+announcement.status=announcement status
+announcement.content=announcement content
+announcement.img=announcement img
 booth.code=booth code
 booth.floor=booth floor
 booth.name=booth name
@@ -37,11 +43,6 @@ enterprise.entry.time=enterprise entry time
 enterprise.operating.status=enterprise operating status
 enterprise.introduction=enterprise introduction
 enterprise.logo=enterprise logo
-announcement.title=announcement title
-announcement.time=announcement time
-announcement.status=announcement status
-announcement.content=announcement content
-announcement.img=announcement img
 recruitment.name=recruitment name
 recruitment.location=recruitment location
 recruitment.salary=recruitment salary
@@ -103,4 +104,4 @@ records.enterprise.id=records enterprise id
 records.products=records products
 records.products.id=records products id
 records.design=records design
-records.design.id=records design id
+records.design.id=records design id

src/main/java/net/mingsoft/tf/resources/resources_zh_CN.properties

@@ -1,3 +1,9 @@
+announcement.title=\u516c\u544a\u6807\u9898
+announcement.type=\u516c\u544a\u7c7b\u578b
+announcement.time=\u53d1\u5e03\u65f6\u95f4
+announcement.status=\u53d1\u5e03\u72b6\u6001
+announcement.content=\u516c\u544a\u5185\u5bb9
+announcement.img=\u5c01\u9762\u56fe
 booth.code=\u7f16\u7801
 booth.floor=\u697c\u5c42
 booth.name=\u540d\u79f0
@@ -37,11 +43,6 @@ enterprise.entry.time=\u5165\u9a7b\u65f6\u95f4
 enterprise.operating.status=\u7ecf\u8425\u72b6\u6001
 enterprise.introduction=\u4f01\u4e1a\u7b80\u4ecb
 enterprise.logo=LOGO
-announcement.title=\u516c\u544a\u6807\u9898
-announcement.time=\u53d1\u5e03\u65f6\u95f4
-announcement.status=\u53d1\u5e03\u72b6\u6001
-announcement.content=\u516c\u544a\u5185\u5bb9
-announcement.img=\u5c01\u9762\u56fe
 recruitment.name=\u5c97\u4f4d\u540d\u79f0
 recruitment.location=\u5de5\u4f5c\u5730\u70b9
 recruitment.salary=\u85aa\u8d44\u8303\u56f4
@@ -103,4 +104,4 @@ records.enterprise.id=\u4f01\u4e1aID
 records.products=\u4ea7\u54c1
 records.products.id=\u4ea7\u54c1ID
 records.design=\u8bbe\u8ba1\u8c37
-records.design.id=\u8bbe\u8ba1\u8c37ID
+records.design.id=\u8bbe\u8ba1\u8c37ID

src/main/webapp/WEB-INF/manager/tf/announcement/form.ftl

@@ -16,6 +16,10 @@
         <el-main class="ms-container" v-loading="loading">
             <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right" size="default">
 
+                        <el-row
+                                :gutter="0"
+                                justify="start" align="top">
+                                <el-col :span=12>
             <!--公告标题-->
 
 	        <el-form-item  label="公告标题" prop="announcementTitle">
@@ -28,6 +32,23 @@
                         placeholder="请输入公告标题">
                 </el-input>
 	        </el-form-item>   
+                                </el-col>
+                                <el-col :span=12>
+<!--公告类型-->
+
+    <el-form-item  label="公告类型" prop="announcementType">
+                <ms-dict  v-model="form.announcementType"
+                       :style="{width: '100%'}"
+                       dict-type="公告管理-公告类型"
+                       :filterable="false"
+                       :disabled="false"
+                       :multiple="false" :clearable="true"
+                        placeholder="请选择公告类型">
+                </ms-dict>
+    </el-form-item>
+
+                                </el-col>
+                        </el-row>
                         <el-row
                                 :gutter="0"
                                 justify="start" align="top">
@@ -110,12 +131,16 @@ placeholder="请选择发布时间"                    :readonly="false"
             return {
                 loading:false,
                 saveDisabled: false,
+                // 公告类型
+                announcementTypeOptions:[],
                 // 发布状态
                 announcementStatusOptions:[],
                 //表单数据
                 form: {
                     // 公告标题
                     announcementTitle:'',
+                    				// 公告类型
+                    				announcementType:"",
                     //发布时间
                    announcementTime:"",
                     				// 发布状态
@@ -225,6 +250,31 @@ placeholder="请选择发布时间"                    :readonly="false"
                     }
                 });
             },
+    //公告类型  列表格式化
+    announcementTypeFormat:function(row, column, cellValue, index){
+        var value="";
+
+            if(cellValue){
+            var data = this.announcementTypeOptions.find(function(value){
+            return value.dictValue==cellValue;
+            })
+            if(data&&data.dictLabel){
+            value = data.dictLabel;
+            }
+            }
+
+        return value;
+    },
+
+//获取announcementType数据源
+    announcementTypeOptionsGet:function() {
+    var that = this;
+    ms.http.get(ms.base+'/mdiy/dict/list.do', {dictType:'公告管理-公告类型',pageSize:99999}).then(function (res) {
+    that.announcementTypeOptions = res.data.rows;
+    }).catch(function (err) {
+    console.log(err);
+    });
+    },
            //发布时间日期格式化
            announcementTimeFormat:function(row, column, cellValue, index){                
                 return ms.util.date.fmt(new Date(row.ANNOUNCEMENT_TIME),'YYYY-MM-DD');                
@@ -330,6 +380,9 @@ placeholder="请选择发布时间"                    :readonly="false"
         created:function() {
             var that = this;
            
+               //加载公告类型 数据
+                this.announcementTypeOptionsGet();
+           
                //加载发布状态 数据
                 this.announcementStatusOptionsGet();
 

src/main/webapp/WEB-INF/manager/tf/announcement/index.ftl

@@ -36,6 +36,21 @@
 	        </el-form-item>   
                                         </el-col>
                                         <el-col :span=8>
+<!--公告类型-->
+
+    <el-form-item  label="公告类型" prop="announcementType">
+                <ms-dict  v-model="form.announcementType"
+                       :style="{width: '100%'}"
+                       dict-type="公告管理-公告类型"
+                       :filterable="false"
+                       :disabled="false"
+                       :multiple="false" :clearable="true"
+                        placeholder="请选择公告类型">
+                </ms-dict>
+    </el-form-item>
+
+                                        </el-col>
+                                        <el-col :span=8>
 <!--发布状态-->
 
     <el-form-item  label="发布状态" prop="announcementStatus">
@@ -50,9 +65,11 @@
     </el-form-item>
 
                                         </el-col>
-                                <el-col :span=8 style="display: flex;justify-content: end;padding-right: 10px;">
+                        </el-row>
+                        <el-row>
+                                <el-col :span=24 style="display: flex;justify-content: end;padding-right: 10px;">
                                     <el-button type="primary" class="el-icon-search" size="default" @click="currentPage=1;list(true)">搜索</el-button>
-                                    <el-button @click="rest"  class="el-icon-refresh" size="default">重置</el-button>
+                                    <el-button @click="rest" class="el-icon-refresh" size="default">重置</el-button>
                                     <ms-search ref="search" @search="search" :search-json="searchJson" :search-key="historyKey"></ms-search>
                                 </el-col>
                         </el-row>
@@ -67,6 +84,8 @@
                     <el-table-column type="selection" width="40" :selectable="isChecked"></el-table-column>
                             <el-table-column label="公告标题"   align="left" prop="announcementTitle">
                             </el-table-column>
+                        <el-table-column label="公告类型"   align="left" prop="announcementType" :formatter="announcementTypeFormat">
+                        </el-table-column>
                 <el-table-column label="发布时间"   min-width="200" align="center" prop="announcementTime" >
                     </el-table-column>
                         <el-table-column label="发布状态"   align="left" prop="announcementStatus" :formatter="announcementStatusFormat">
@@ -138,7 +157,19 @@
     "name": "公告标题",
     "type": "input"
     },
-    {
+       {
+  "isSearch": "true",
+  "action": "and",
+  "field": "ANNOUNCEMENT_TYPE",
+  "el": "eq",
+  "model": "announcementType",
+  "name": "公告类型",
+  "key": "dictValue",
+  "title": "dictLabel",
+  "type": "select",
+  "multiple": "false"
+  
+},    {
     "action": "and",
     "field": "ANNOUNCEMENT_TIME",
     "model": "announcementTime",
@@ -177,6 +208,8 @@
                 manager: ms.manager,
                 loading: true,//加载状态
                 emptyText:'',//提示文字
+                // 公告类型
+                announcementTypeOptions:[],
                 // 发布状态
                 announcementStatusOptions:[],
                 //搜索表单
@@ -321,6 +354,31 @@
                 this.$refs.searchForm.resetFields();
                 this.list(true);
             },
+    //公告类型  列表格式化
+    announcementTypeFormat:function(row, column, cellValue, index){
+        var value="";
+
+            if(cellValue){
+            var data = this.announcementTypeOptions.find(function(value){
+            return value.dictValue==cellValue;
+            })
+            if(data&&data.dictLabel){
+            value = data.dictLabel;
+            }
+            }
+
+        return value;
+    },
+
+//获取announcementType数据源
+    announcementTypeOptionsGet:function() {
+    var that = this;
+    ms.http.get(ms.base+'/mdiy/dict/list.do', {dictType:'公告管理-公告类型',pageSize:99999}).then(function (res) {
+    that.announcementTypeOptions = res.data.rows;
+    }).catch(function (err) {
+    console.log(err);
+    });
+    },
            //发布时间日期格式化
            announcementTimeFormat:function(row, column, cellValue, index){                
                 return ms.util.date.fmt(new Date(row.ANNOUNCEMENT_TIME),'YYYY-MM-DD');                
@@ -441,6 +499,9 @@
 		created:function(){
 			var that = this;
            
+               //加载公告类型 数据
+                this.announcementTypeOptionsGet();
+           
                //加载发布状态 数据
                 this.announcementStatusOptionsGet();
         }

src/main/webapp/static/locale/lang/announcement/en_US.js

@@ -1,8 +1,8 @@
 var en_US ={
     form:{
-                announcementTitle:{
-            text:'公告标题',
-            placeholder:'请输入公告标题',
+                gridTqsln:{
+            text:'栅格布局',
+            placeholder:'',
             help:'',
         },
         gridGkdtm:{

src/main/webapp/static/locale/lang/announcement/zh_CN.js

@@ -1,9 +1,9 @@
 
 var zh_CN ={
     form:{
-                announcementTitle:{
-            text:'公告标题',
-            placeholder:'请输入公告标题',
+                gridTqsln:{
+            text:'栅格布局',
+            placeholder:'',
             help:'',
         },
         gridGkdtm:{