From 06596e7def7c4a3826b9bea94c3fc1f53a734e7f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 09 十一月 2022 17:58:46 +0800
Subject: [PATCH] 普达纠纷管理,物业公司接口处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java |    4 +++-
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml                       |    2 +-
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java |    2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
index 3b3623b..26cdb62 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.common.model.vos.community;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -28,6 +29,7 @@
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     /**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java
index e102f09..afba36e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
 import com.panzhihua.common.model.vos.community.ComPropertyVO;
 import com.panzhihua.common.model.vos.community.StatisticsCommVO;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
 import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
 import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
+import com.panzhihua.service_community.entity.ComActAnnouncement;
 import org.apache.ibatis.annotations.Mapper;
 import com.panzhihua.service_community.entity.ComProperty;
 import org.apache.ibatis.annotations.Param;
@@ -105,5 +107,5 @@
      */
     List<ComPropertyEquipmentVO> getAlarmPointMapData(@Param("communityId") Long communityId);
 
-    IPage<ComPropertyVO> noticeList(Page page, @Param("propertyId") Long propertyId);
+    IPage<ComActAnnouncementVO> noticeList(Page page, @Param("propertyId") Long propertyId);
 }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml
index b580163..71a7a5b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml
@@ -243,7 +243,7 @@
         )
     </select>
 
-    <select id="noticeList" resultType="com.panzhihua.common.model.vos.community.ComPropertyVO">
+    <select id="noticeList" resultType="com.panzhihua.common.model.vos.community.ComActAnnouncementVO">
         select * from com_act_announcement where property_id=#{propertyId}
     </select>
 

--
Gitblit v1.7.1