扩展通知 结束时间

Api/src/main/java/com/java110/api/listener/notice/SaveNoticeListener.java

@@ -15,8 +15,8 @@ import com.java110.common.constant.ServiceCodeConstant;
 import com.java110.common.constant.BusinessTypeConstant;
 
 
-
 import com.java110.core.annotation.Java110Listener;
+
 /**
  * 保存小区侦听
  * add by wuxw 2019-06-30
@@ -28,9 +28,11 @@ public class SaveNoticeListener extends AbstractServiceApiListener {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
         Assert.hasKeyAndValue(reqJson, "title", "必填，请填写标题");
-Assert.hasKeyAndValue(reqJson, "noticeTypeCd", "必填，请选择公告类型");
-Assert.hasKeyAndValue(reqJson, "context", "必填，请填写公告内容");
-Assert.hasKeyAndValue(reqJson, "startTime", "必选，请填写开始时间 2019-01-02");
+        Assert.hasKeyAndValue(reqJson, "noticeTypeCd", "必填，请选择公告类型");
+        Assert.hasKeyAndValue(reqJson, "context", "必填，请填写公告内容");
+        Assert.hasKeyAndValue(reqJson, "startTime", "必选，请填写开始时间 ");
+        Assert.hasKeyAndValue(reqJson, "endTime", "必选，请填写结束时间 ");
+
 
     }
 

WebService/src/main/java/com/java110/web/smo/notice/impl/AddNoticeSMOImpl.java

@@ -30,9 +30,10 @@ public class AddNoticeSMOImpl extends AbstractComponentSMO implements IAddNotice
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyAndValue(paramIn, "title", "必填，请填写标题");
-Assert.hasKeyAndValue(paramIn, "noticeTypeCd", "必填，请选择公告类型");
-Assert.hasKeyAndValue(paramIn, "context", "必填，请填写公告内容");
-Assert.hasKeyAndValue(paramIn, "startTime", "必选，请填写开始时间 2019-01-02");
+        Assert.hasKeyAndValue(paramIn, "noticeTypeCd", "必填，请选择公告类型");
+        Assert.hasKeyAndValue(paramIn, "context", "必填，请填写公告内容");
+        Assert.hasKeyAndValue(paramIn, "startTime", "必选，请填写开始时间 ");
+        Assert.hasKeyAndValue(paramIn, "endTime", "必选，请填写结束时间 ");
 
 
 

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

@@ -16,12 +16,13 @@ import java.util.Date;
 public class NoticeDto extends PageDto implements Serializable {
 
     private String noticeTypeCd;
-private String context;
-private String startTime;
-private String communityId;
-private String title;
-private String userId;
-private String noticeId;
+    private String context;
+    private String startTime;
+    private String endTime;
+    private String communityId;
+    private String title;
+    private String userId;
+    private String noticeId;
 
 
     private Date createTime;
@@ -32,43 +33,56 @@ private String noticeId;
     public String getNoticeTypeCd() {
         return noticeTypeCd;
     }
-public void setNoticeTypeCd(String noticeTypeCd) {
+
+    public void setNoticeTypeCd(String noticeTypeCd) {
         this.noticeTypeCd = noticeTypeCd;
     }
-public String getContext() {
+
+    public String getContext() {
         return context;
     }
-public void setContext(String context) {
+
+    public void setContext(String context) {
         this.context = context;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getTitle() {
+
+    public String getTitle() {
         return title;
     }
-public void setTitle(String title) {
+
+    public void setTitle(String title) {
         this.title = title;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getNoticeId() {
+
+    public String getNoticeId() {
         return noticeId;
     }
-public void setNoticeId(String noticeId) {
+
+    public void setNoticeId(String noticeId) {
         this.noticeId = noticeId;
     }
 
@@ -88,4 +102,12 @@ public void setNoticeId(String noticeId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

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

@@ -6,41 +6,67 @@ import java.util.Date;
 public class ApiNoticeDataVo implements Serializable {
 
     private String noticeId;
-private String title;
-private String noticeTypeCd;
-private String context;
-private String startTime;
-public String getNoticeId() {
+    private String title;
+    private String noticeTypeCd;
+    private String context;
+    private String startTime;
+    private String endTime;
+    private String createTime;
+
+
+    public String getNoticeId() {
         return noticeId;
     }
-public void setNoticeId(String noticeId) {
+
+    public void setNoticeId(String noticeId) {
         this.noticeId = noticeId;
     }
-public String getTitle() {
+
+    public String getTitle() {
         return title;
     }
-public void setTitle(String title) {
+
+    public void setTitle(String title) {
         this.title = title;
     }
-public String getNoticeTypeCd() {
+
+    public String getNoticeTypeCd() {
         return noticeTypeCd;
     }
-public void setNoticeTypeCd(String noticeTypeCd) {
+
+    public void setNoticeTypeCd(String noticeTypeCd) {
         this.noticeTypeCd = noticeTypeCd;
     }
-public String getContext() {
+
+    public String getContext() {
         return context;
     }
-public void setContext(String context) {
+
+    public void setContext(String context) {
         this.context = context;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
 
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
+    public String getCreateTime() {
+        return createTime;
+    }
 
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -7,17 +7,17 @@
     <!-- 保存通知信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessNoticeInfo" parameterType="Map">
         insert into business_notice(
-        operate,notice_type_cd,context,start_time,community_id,title,b_id,user_id,notice_id
+        operate,notice_type_cd,context,start_time,end_time,community_id,title,b_id,user_id,notice_id
         ) values (
-        #{operate},#{noticeTypeCd},#{context},#{startTime},#{communityId},#{title},#{bId},#{userId},#{noticeId}
+        #{operate},#{noticeTypeCd},#{context},#{startTime},#{endTime},#{communityId},#{title},#{bId},#{userId},#{noticeId}
         )
     </insert>
 
 
     <!-- 查询通知信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessNoticeInfo" parameterType="Map" resultType="Map">
-        select t.operate,t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.start_time
-        startTime,t.community_id,t.community_id communityId,t.title,t.b_id,t.b_id bId,t.user_id,t.user_id
+        select t.operate,t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.end_time,t.start_time
+        startTime,t.end_time endTime,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
         from business_notice t
         where 1 =1
@@ -33,6 +33,9 @@
         <if test="startTime !=null">
             and t.start_time= #{startTime}
         </if>
+        <if test="endTime !=null">
+            and t.end_time= #{endTime}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -55,8 +58,8 @@
     <!-- 保存通知信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveNoticeInfoInstance" parameterType="Map">
         insert into n_notice(
-        notice_type_cd,context,start_time,status_cd,community_id,title,b_id,user_id,notice_id
-        ) select t.notice_type_cd,t.context,t.start_time,'0',t.community_id,t.title,t.b_id,t.user_id,t.notice_id from
+        notice_type_cd,context,start_time,end_time,status_cd,community_id,title,b_id,user_id,notice_id
+        ) select t.notice_type_cd,t.context,t.start_time,t.end_time,'0',t.community_id,t.title,t.b_id,t.user_id,t.notice_id from
         business_notice t where 1=1
         and t.operate= 'ADD'
         <if test="noticeTypeCd !=null and noticeTypeCd != ''">
@@ -68,6 +71,9 @@
         <if test="startTime !=null">
             and t.start_time= #{startTime}
         </if>
+        <if test="endTime !=null">
+            and t.end_time= #{endTime}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -90,8 +96,8 @@
     <!-- 查询通知信息 add by wuxw 2018-07-03 -->
     <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.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
+        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
         from n_notice t
         where 1 =1
         <if test="noticeTypeCd !=null and noticeTypeCd != ''">
@@ -103,6 +109,9 @@
         <if test="startTime !=null">
             and t.start_time= #{startTime}
         </if>
+        <if test="endTime !=null">
+            and t.end_time= #{endTime}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -121,7 +130,7 @@
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
-        order by t.start_time desc
+        order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -144,6 +153,9 @@
         <if test="startTime !=null">
             , t.start_time= #{startTime}
         </if>
+        <if test="endTime !=null">
+            , t.end_time= #{endTime}
+        </if>
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
@@ -177,6 +189,9 @@
         <if test="startTime !=null">
             and t.start_time= #{startTime}
         </if>
+        <if test="endTime !=null">
+            and t.end_time= #{endTime}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>