公告类型 编码转换为中文

WebService/src/main/resources/components/noticePackage/addNoticeView/addNoticeView.html

@@ -2,7 +2,7 @@
     <div class="col-lg-12">
         <div class="ibox">
             <div class="ibox-title">
-                <h5>公告信息</h5>
+                <h5>新公告</h5>
                 <div class="ibox-tools" style="top:10px;">
 
                 </div>
@@ -12,45 +12,52 @@
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label">标题</label>
                     <div class="col-sm-10">
-                        <input v-model="addNoticeViewInfo.title"                   type="text" placeholder="必填，请填写标题" class="form-control">
+                        <input v-model="addNoticeViewInfo.title" type="text" placeholder="必填，请填写标题"
+                               class="form-control">
                     </div>
                 </div>
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label">公告类型</label>
                     <div class="col-sm-10">
                         <select class="custom-select" v-model="addNoticeViewInfo.noticeTypeCd">
-                            <option selected  disabled value="">必填，请选择公告类型</option>
-                            <option  value="1000">业主通知</option>
-                            <option  value="1001">员工通知</option>
-                            <option  value="1002">小区通知</option>
+                            <option selected disabled value="">必填，请选择公告类型</option>
+                            <option value="1000">业主通知</option>
+                            <option value="1001">员工通知</option>
+                            <option value="1002">小区通知</option>
                         </select>
                     </div>
                 </div>
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label">开始时间</label>
                     <div class="col-sm-10">
-                        <input v-model="addNoticeViewInfo.startTime" readonly type="text" placeholder="必填，请填写开始时间" class="form-control noticeStartTime">
+                        <input v-model="addNoticeViewInfo.startTime" readonly type="text" placeholder="必填，请填写开始时间"
+                               class="form-control noticeStartTime">
                     </div>
                 </div>
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label">结束时间</label>
                     <div class="col-sm-10">
-                        <input v-model="addNoticeViewInfo.endTime" readonly type="text" placeholder="必填，请填写结束时间" class="form-control noticeEndTime">
+                        <input v-model="addNoticeViewInfo.endTime" readonly type="text" placeholder="必填，请填写结束时间"
+                               class="form-control noticeEndTime">
                     </div>
                 </div>
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label">公告内容</label>
                     <div class="col-sm-10 ">
                         <div class="ibox-content no-padding">
-                            <div class="summernote" ></div>
+                            <div class="summernote"></div>
                         </div>
                         <!--<textarea v-model="addNoticeViewInfo.context" cols="3"  type="text" placeholder="必填，请填写公告内容" class="form-control"></textarea>-->
                     </div>
                 </div>
 
                 <div class="ibox-content">
-                    <button class="btn btn-primary float-right" type="button" v-on:click="saveNoticeInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                    <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" v-on:click="closeNoticeInfo()">取消</button>
+                    <button class="btn btn-primary float-right" type="button" v-on:click="saveNoticeInfo()"><i
+                            class="fa fa-check"></i>&nbsp;提交
+                    </button>
+                    <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                            v-on:click="closeNoticeInfo()">取消
+                    </button>
                 </div>
 
             </div>

WebService/src/main/resources/components/noticePackage/notice-manage/noticeManage.html

@@ -1,4 +1,4 @@
-<div id="component" >
+<div id="component">
     <div class="row" v-if="noticeManageInfo.componentShow == 'noticeList'">
         <div class="col-lg-12">
             <div class="ibox">
@@ -25,24 +25,29 @@
                         </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="notice in noticeManageInfo.notices">
-                                                            <td>{{notice.noticeId}}</td>
+                        <tr v-for="notice in noticeManageInfo.notices">
+                            <td>{{notice.noticeId}}</td>
                             <td>{{notice.title}}</td>
-                            <td>{{notice.noticeTypeCd}}</td>
+                            <td>{{notice.noticeTypeCdName}}</td>
                             <td>{{notice.startTime}}</td>
                             <td>{{notice.endTime}}</td>
                             <td>
-                            <div class="btn-group">
-                                <button class="btn-white btn btn-xs" v-on:click="_openNoticeDetail(notice)">详情</button>
-                            </div>
-                            <div class="btn-group">
-                                <button class="btn-white btn btn-xs" v-on:click="_openEditNoticeModel(notice)">修改</button>
-                            </div>
-                            <div class="btn-group">
-                                <button class="btn-white btn btn-xs" v-on:click="_openDeleteNoticeModel(notice)">删除</button>
-                            </div></td>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openNoticeDetail(notice)">详情
+                                    </button>
+                                </div>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openEditNoticeModel(notice)">修改
+                                    </button>
+                                </div>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteNoticeModel(notice)">
+                                        删除
+                                    </button>
+                                </div>
+                            </td>
 
-                            </tr>
+                        </tr>
                         </tbody>
                         <tfoot>
                         <tr>
@@ -59,10 +64,10 @@
         </div>
     </div>
 
-    <div  v-bind:class="{no_display:noticeManageInfo.componentShow != 'addNoticeView'}">
+    <div v-bind:class="{no_display:noticeManageInfo.componentShow != 'addNoticeView'}">
         <vc:create name="addNoticeView"></vc:create>
     </div>
-    <div  v-bind:class="{no_display:noticeManageInfo.componentShow != 'editNoticeView'}">
+    <div v-bind:class="{no_display:noticeManageInfo.componentShow != 'editNoticeView'}">
         <vc:create name="editNoticeView"></vc:create>
     </div>
     <vc:create name="deleteNotice"></vc:create>

java110-bean/src/main/java/com/java110/dto/notice/NoticeDto.java

@@ -27,6 +27,8 @@ public class NoticeDto extends PageDto implements Serializable {
 
     private Date createTime;
 
+    private String noticeTypeCdName;
+
     private String statusCd = "0";
 
 
@@ -110,4 +112,12 @@ public class NoticeDto extends PageDto implements Serializable {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getNoticeTypeCdName() {
+        return noticeTypeCdName;
+    }
+
+    public void setNoticeTypeCdName(String noticeTypeCdName) {
+        this.noticeTypeCdName = noticeTypeCdName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/notice/ApiNoticeDataVo.java

@@ -12,7 +12,7 @@ public class ApiNoticeDataVo implements Serializable {
     private String startTime;
     private String endTime;
     private String createTime;
-
+    private String noticeTypeCdName;
 
     public String getNoticeId() {
         return noticeId;
@@ -69,4 +69,12 @@ public class ApiNoticeDataVo implements Serializable {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public String getNoticeTypeCdName() {
+        return noticeTypeCdName;
+    }
+
+    public void setNoticeTypeCdName(String noticeTypeCdName) {
+        this.noticeTypeCdName = noticeTypeCdName;
+    }
 }

java110-db/src/main/resources/mapper/notice/NoticeServiceDaoImplMapper.xml

@@ -97,7 +97,15 @@
     <select id="getNoticeInfo" parameterType="Map" resultType="Map">
         select t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.title,t.b_id,t.b_id
-        bId,t.user_id,t.user_id userId,t.notice_id,t.notice_id noticeId,t.create_time,t.create_time createTime
+        bId,t.user_id,t.user_id userId,t.notice_id,t.notice_id noticeId,t.create_time,t.create_time createTime,
+        (CASE
+        WHEN t.`notice_type_cd` = '1000'
+        THEN '业主通知'
+        WHEN t.notice_type_cd = '1001'
+        THEN '员工通知'
+        ELSE
+        '小区通知'
+        END) noticeTypeCdName
         from n_notice t
         where 1 =1
         <if test="noticeTypeCd !=null and noticeTypeCd != ''">