合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java

@@ -74,9 +74,9 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             AnnouncementTable announcementTable = new AnnouncementTable();
             BeanUtils.copyProperties(e, announcementTable);
             //创建人
-            String createUserName = userMapper.selectByIdUserName(e.getUpdateUser());
+            String createUserName = userMapper.selectByIdCreateUserName(e.getUpdateUser());
             //修改人
-            String updateDateName = userMapper.selectByIdUserName(e.getCreateUser());
+            String updateDateName = userMapper.selectByIdCreateUserName(e.getCreateUser());
             announcementTable.setCreateUserName(createUserName);
             announcementTable.setUpdateDateName(updateDateName);
             return announcementTable;

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -41,9 +41,9 @@
       <el-table-column label="所在户" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.building!==null&&scope.row.unit!==null&&scope.row.level!==null&&scope.row.roomNo!==null&&scope.row.phase!==null">
-          {{ scope.row.phase+scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo }}
+            {{ scope.row.phase+scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo }}
           </span>
-          </template>
+        </template>
       </el-table-column>
       <!-- <el-table-column prop="createDate" label="创建时间" width="540" align="center" /> -->
       <el-table-column label="创建时间" align="center">
@@ -159,8 +159,8 @@ export default {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 10
       this.listQuery.ownerName = ''
-      this.listQuery.ownerTel =''
-	  this.listQuery.verifyStatus=''
+      this.listQuery.ownerTel = ''
+	    this.listQuery.verifyStatus = ''
       this.dataQuery()
     },
     open3(ownerTel, verifyStatus) {

VUECODE/smart-property-manage/src/views/social/announcement/details.vue

@@ -6,23 +6,10 @@
       {{ ruleForm.announcementContent }}
     </div>
     <div>
-        <template v-for="site in ruleForm.contentImg">
-               <img :src="site.url" width="500" height="500" > 
-        </template>
-     
-        <!-- <img :src="item" width="500" height="500" > -->
+      <template v-for="site in ruleForm.contentImg">
+        <img :src="site.url" width="500" height="500" >
+      </template>
     </div>
-    <!-- <div class="progress">
-      <div class="text-progress">
-        <span class="people-number">已报名人数 {{ ruleForm.signUpCount }}</span>
-        <div class="outer-layer"/>
-        <div class="inner-layer"/>
-      </div>
-      <div class="circular"/>
-      <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
-      <el-button type="primary" style="float: left;">查看报名名单</el-button>
-    </div> -->
-    <!-- <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span> -->
     <div class="bom-button">
       <el-button type="primary" style="width: 150px;" @click="edi">修改</el-button>
     </div>
@@ -50,21 +37,18 @@ export default {
   },
   mounted() {
     this.getById(this.$route.params.id)
-    console.log("id",this.id)
   },
   methods: {
     getById(id) { // 根据ID获取活动信息
-    console.log(123)
-    console.log(id)
-       this.ruleForm.id=this.$route.params.id
+      this.ruleForm.id = this.$route.params.id
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
-      const resData = res.data
-      this.ruleForm.announcementTitle=resData.tpAnnouncement.announcementTitle// 标题
-      this.ruleForm.announcementContent=resData.tpAnnouncement.announcementContent// 内容
-      this.ruleForm.announcementCarouselImg=resData.tpAnnouncement.announcementCarouselImg // 轮播图
-      this.sort=resData.tpAnnouncement.sort// 权重
-        //多张图片进行遍历
-        for (let i = 0; i <resData.studentList.length; i++) {
+        const resData = res.data
+        this.ruleForm.announcementTitle = resData.tpAnnouncement.announcementTitle // 标题
+        this.ruleForm.announcementContent = resData.tpAnnouncement.announcementContent // 内容
+        this.ruleForm.announcementCarouselImg = resData.tpAnnouncement.announcementCarouselImg // 轮播图
+        this.sort = resData.tpAnnouncement.sort
+        // 多张图片进行遍历
+        for (let i = 0; i < resData.studentList.length; i++) {
           this.ruleForm.contentImg.push({ url: resData.studentList[i].imageUrl })
         }
       })
@@ -81,10 +65,7 @@ export default {
       return year + '-' + month + '-' + day
     },
     edi() { // 修改活动
-        this.$router.push({ name: 'announcement-edit' , params: { id: this.ruleForm.id }})
-        console.log("123")
-        //   this.$router.push({ name: 'announcement-edit', params: { id: this.ruleForm.id }})
-      
+      this.$router.push({ name: 'announcement-edit', params: { id: this.ruleForm.id }})
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/announcement/edit.vue

@@ -145,7 +145,7 @@ export default {
       }
       console.log(file, fileList)
     },
-    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) { // 点击公告配图文件列表中已上传的文件时的钩子
       this.dialogImageUrl = file.url
       this.dialogVisible = true
     },

VUECODE/smart-property-manage/src/views/social/announcement/index.vue

@@ -31,7 +31,7 @@
         width="55"/>
       <el-table-column prop="id" label="编号" align="center"/>
       <el-table-column prop="announcementTitle" label="标题" align="center" >
-        <template slot-scope="scope"><a><span @click="clickTitle(scope.row.id)" style="text-decoration: underline; color: blue ">{{ scope.row.announcementTitle }}</span></a></template>
+        <template slot-scope="scope"><a><span style="text-decoration: underline; color: blue" @click="clickTitle(scope.row.id)">{{ scope.row.announcementTitle }}</span></a></template>
       </el-table-column>
       <el-table-column prop="viewCount" label="查看数量" align="center"/>
       <el-table-column prop="sort" label="权重" align="center"/>
@@ -40,9 +40,9 @@
           <span v-if="scope.row.status==0">{{ '已作废' }}</span>
           <span v-if="scope.row.status==1">{{ '已发布' }}</span>
           <span v-if="scope.row.status==2">{{ '草稿' }}</span>
-          <span v-if="scope.row.status==3">{{ '已修改' }}</span>
+          <span v-if="scope.row.createDate < scope.row.updateDate">{{ '已修改' }}</span>
         </template>
-      </el-table-column>   
+      </el-table-column>
       <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
       <el-table-column prop="createUserName" label="发布人" align="center"/>
       <el-table-column prop="updateDate" label="修改时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
@@ -127,7 +127,7 @@ export default {
       })
     },
     handleSelectionChange(data) {
-       // 设置为 空
+      // 设置为 空
       this.deleteIds = []
       for (let i = 0; i < data.length; i++) {
         this.deleteIds.push(data[i].id)
@@ -140,12 +140,13 @@ export default {
     handleFilter() {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 10
-      this.listQuery.ownerName = ''
-      this.listQuery.announcementNumber= ''
-      this.listQuery.announcementTitle= ''
+      this.listQuery.ownerName =''
+      this.listQuery.announcementNumber=''
+      this.listQuery.announcementTitle=''
       this.dataQuery()
     },
-    add() { // 添加公告
+    // 添加公告
+    add() {
       this.$router.push({ name: 'announcement-add' })
     },
     edit(){// 编辑公告
@@ -159,22 +160,21 @@ export default {
         return
       }
       this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
-     },
-     deleteAnnouncement(){
+      },
+    deleteAnnouncement(){
       const ids = this.deleteIds
       this.listLoading = true
       console.log(ids)
-      this.$store.dispatch('DeleteAnnouncement',ids).then((res) => {
+      this.$store.dispatch('DeleteAnnouncement', ids).then((res) => {
         this.listLoading = false
         this.dataQuery()
       }).catch(() => {
         this.listLoading = false
         console.log('error DeleteAnnouncement')
       })
-     },
-    clickTitle(id){
-      console.log("id:",id)
-      this.$router.push({ name: 'contentParticulars-details' , params: { id: id }})
+    },
+    clickTitle(id) {
+      this.$router.push({ name: 'contentParticulars-details' ,params: { id: id }})
     },
     formatDate(val) {
       var value = new Date(val)