合并

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  updateDateName= userMapper.selectByIdUserName(e.getUpdateUser());
             //修改人
-            String updateDateName = userMapper.selectByIdUserName(e.getCreateUser());
+            String  createUserName= userMapper.selectByIdUserName(e.getCreateUser());
             announcementTable.setCreateUserName(createUserName);
             announcementTable.setUpdateDateName(updateDateName);
             return announcementTable;
@@ -150,6 +150,8 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
     public ResponseBean updateAnnouncement(String paramets,Integer communityId,Integer userId) {
                   ResponseBean response= new ResponseBean();
          TpAnnouncement tpAnnouncement = JSONObject.parseObject(paramets, TpAnnouncement.class);
+         int Status= Integer.parseInt(tpAnnouncement.getStatus());
+         if (0!=Status){
 //                        String announcementimg=tpAnnouncement.getAnnouncementCarouselImg();
 //                        tpAnnouncement.setAnnouncementCarouselImg( "".equals(announcementimg)?null:announcementimg);
                         tpAnnouncement.setCommunityId(communityId);
@@ -164,22 +166,23 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         Integer tdImagesUuid = parseObject.getInteger("id");
         String[] contentImgArray = contentImg.toArray(new String[]{});
         //修改图片时删除原来图片
-        if (contentImg.size()!=0){
-        QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TdImages::getUuid,tdImagesUuid);
-        queryWrapper.lambda().eq(TdImages::getType,"announcement");
-        imagesMapper.delete(queryWrapper);
-
-        for (String img:contentImgArray){
-            TdImages tdImages = new TdImages();
-            tdImages.setImageUrl(img);
-            tdImages.setType("announcement");
-            tdImages.setUuid(tpAnnouncement.getId());
-            tdImages.setCreateTime(LocalDateTime.now());
-            tdImages.setCreateUser(userId);
-            imagesMapper.insert(tdImages);
+        if (contentImg.size()!=0) {
+            QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(TdImages::getUuid, tdImagesUuid);
+            queryWrapper.lambda().eq(TdImages::getType, "announcement");
+            imagesMapper.delete(queryWrapper);
+
+            for (String img : contentImgArray) {
+                TdImages tdImages = new TdImages();
+                tdImages.setImageUrl(img);
+                tdImages.setType("announcement");
+                tdImages.setUuid(tpAnnouncement.getId());
+                tdImages.setCreateTime(LocalDateTime.now());
+                tdImages.setCreateUser(userId);
+                imagesMapper.insert(tdImages);
             }
         }
+        }
         return response;
     }
 

CODE/smart-community/property-api/src/main/resources/mapper/TpAnnouncementMapper.xml

@@ -15,7 +15,7 @@
       tp_announcement
       <where>
         <if test="record.id != null and record.id != ''" >
-          AND id =  #{record.id,jdbcType=INTEGER}
+          AND id like concat('%',#{record.id,jdbcType=INTEGER},'%')
         </if>
         <if test="record.announcementTitle != null and record.announcementTitle != ''" >
           AND announcement_title like concat('%',#{record.announcementTitle,jdbcType=VARCHAR},'%')

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

@@ -167,6 +167,11 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
+      if(this.ruleForm.activityCarouselImg<=0){
+            this.$message.error('轮播图未上传')
+            loading.close()
+            return    
+          }
       if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
         this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
         loading.close()

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

@@ -86,6 +86,10 @@ export default {
       })
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          if(this.ruleForm.announcementCarouselImg<=0){
+            this.$message.error('轮播图未上传')
+            return    
+          }
           if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
             return

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

@@ -52,7 +52,6 @@ export default {
         for (let i = 0; i < imgList.length; i++) {
           this.ruleForm.contentImg.push({ url: imgList[i].imageUrl })
         }
-        console.log('详情', resData)
         if (this.ruleForm.status === '0') {
           this.isEdi = false
         }

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

@@ -81,7 +81,6 @@ export default {
   },
   methods: {
     submitForm(formName,status) {
-      console.log(status)
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -156,9 +155,8 @@ export default {
     },
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value
-      console.log(value)
     },
-    getById(id) { // 页面初始化后调用此方法根据ID获取活动信息
+    getById(id) { // 页面初始化后调用此方法根据ID获取公告信息
       this.ruleForm.id=this.$route.params.id
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
       const resData = res.data

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

@@ -179,7 +179,20 @@ export default {
         this.$message.error('请选择一行数据进行修改!')
         return
       }
-      this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
+       let ide= this.deleteIds[0]
+       this.listQuery.id = ide 
+      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
+        const resData = res.data
+        const announcement = resData.tpAnnouncement
+        const imgList = resData.studentList
+        this.listQuery = announcement
+        console.log("1",this.listQuery.status)
+        if(this.listQuery.status == 0){
+          this.$message.error('已作废不可以修改')
+          return
+        }
+          this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
+      })
       },
     deleteAnnouncement(){
       const ids = this.deleteIds