优化公告信息

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

@@ -15,6 +15,10 @@ import java.util.Date;
  **/
 public class NoticeDto extends PageDto implements Serializable {
 
+    public static final String STATE_WAIT = "1000";// 等待房屋
+    public static final String STATE_DOING = "2000";//处理中
+    public static final String STATE_FINISH = "3000";//处理完成
+
     private String noticeTypeCd;
     private String context;
     private String startTime;
@@ -23,6 +27,10 @@ public class NoticeDto extends PageDto implements Serializable {
     private String title;
     private String userId;
     private String noticeId;
+    private String objType;
+    private String objId;
+    private String state;
+    private String stateName;
 
 
     private Date createTime;
@@ -120,4 +128,36 @@ public class NoticeDto extends PageDto implements Serializable {
     public void setNoticeTypeCdName(String noticeTypeCdName) {
         this.noticeTypeCdName = noticeTypeCdName;
     }
+
+    public String getObjType() {
+        return objType;
+    }
+
+    public void setObjType(String objType) {
+        this.objType = objType;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/smallWechatAttr/SmallWechatAttrDto.java

@@ -17,6 +17,7 @@ public class SmallWechatAttrDto extends PageDto implements Serializable {
 
     public static final String SPEC_CD_TOKEN = "33001";//token
     public static final String SPEC_CD_OWE_FEE_TEMPLATE = "33002";//欠费推送模板
+    public static final String SPEC_CD_WECHAT_TEMPLATE = "33003";//欠费推送模板
 
     private String attrId;
     private String wechatId;

java110-bean/src/main/java/com/java110/po/notice/NoticePo.java

@@ -21,6 +21,11 @@ public class NoticePo implements Serializable {
     private String startTime;
 
     private String endTime;
+    private String objType;
+    private String objId;
+
+    private String state;
+    private String stateName;
 
 
     public String getNoticeId() {
@@ -86,4 +91,36 @@ public class NoticePo implements Serializable {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getObjType() {
+        return objType;
+    }
+
+    public void setObjType(String objType) {
+        this.objType = objType;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

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

@@ -13,6 +13,8 @@ public class ApiNoticeDataVo implements Serializable {
     private String endTime;
     private String createTime;
     private String noticeTypeCdName;
+    private String state;
+    private String stateName;
 
     public String getNoticeId() {
         return noticeId;
@@ -77,4 +79,20 @@ public class ApiNoticeDataVo implements Serializable {
     public void setNoticeTypeCdName(String noticeTypeCdName) {
         this.noticeTypeCdName = noticeTypeCdName;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

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

@@ -7,9 +7,10 @@
     <!-- 保存通知信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessNoticeInfo" parameterType="Map">
         insert into business_notice(
-        operate,notice_type_cd,context,start_time,end_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,obj_type,obj_id,state
         ) values (
-        #{operate},#{noticeTypeCd},#{context},#{startTime},#{endTime},#{communityId},#{title},#{bId},#{userId},#{noticeId}
+        #{operate},#{noticeTypeCd},#{context},#{startTime},#{endTime},#{communityId},#{title},#{bId},#{userId},#{noticeId},
+        #{objType},#{objId},#{state}
         )
     </insert>
 
@@ -18,7 +19,7 @@
     <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.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
+        userId,t.notice_id,t.notice_id noticeId,t.obj_type,t.obj_id,t.obj_type objType,t.obj_id objId,t.state
         from business_notice t
         where 1 =1
         <if test="operate !=null and operate != ''">
@@ -52,14 +53,17 @@
             and t.notice_id= #{noticeId}
         </if>
 
+
     </select>
 
 
     <!-- 保存通知信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveNoticeInfoInstance" parameterType="Map">
         insert into n_notice(
-        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
+        notice_type_cd,context,start_time,end_time,status_cd,community_id,title,b_id,user_id,notice_id,obj_type,obj_id,state
+        ) 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,
+        t.obj_type,t.obj_id,t.state
+        from
         business_notice t where 1=1
         and t.operate= 'ADD'
         <if test="noticeTypeCd !=null and noticeTypeCd != ''">
@@ -98,15 +102,11 @@
         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,
-        (CASE
-        WHEN t.`notice_type_cd` = '1000'
-        THEN '业主通知'
-        WHEN t.notice_type_cd = '1001'
-        THEN '员工通知'
-        ELSE
-        '小区通知'
-        END) noticeTypeCdName
+        d.`name` noticeTypeCdName,
+        t.obj_type,t.obj_id,t.obj_type objType,t.obj_id objId,t.state,d1.name stateName
         from n_notice t
+        left join t_dict d on d.table_name = 'n_notice' and d.table_columns = 'notice_type_cd' and t.notice_type_cd = d.status_cd
+        left join t_dict d1 on d1.table_name = 'n_notice' and d1.table_columns = 'state' and t.state = d1.status_cd
         where 1 =1
         <if test="noticeTypeCd !=null and noticeTypeCd != ''">
             and t.notice_type_cd= #{noticeTypeCd}
@@ -170,8 +170,8 @@
         <if test="title !=null and title != ''">
             , t.title= #{title}
         </if>
-        <if test="userId !=null and userId != ''">
-            , t.user_id= #{userId}
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
         </if>
         where 1=1
         <if test="bId !=null and bId != ''">
@@ -218,8 +218,6 @@
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
-
-
     </select>
 
 </mapper>

service-api/src/main/java/com/java110/api/bmo/notice/impl/NoticeBMOImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.notice.INoticeBMO;
 import com.java110.core.context.DataFlowContext;
+import com.java110.dto.notice.NoticeDto;
 import com.java110.po.notice.NoticePo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.BeanConvertUtil;
@@ -46,6 +47,9 @@ public class NoticeBMOImpl extends ApiBaseBMO implements INoticeBMO {
         JSONObject businessNotice = new JSONObject();
         businessNotice.putAll(paramInJson);
         businessNotice.put("noticeId", "-1");
+        if (!paramInJson.containsKey("state")) {
+            businessNotice.put("state", NoticeDto.STATE_FINISH);
+        }
         NoticePo noticePo = BeanConvertUtil.covertBean(businessNotice, NoticePo.class);
         super.insert(dataFlowContext, noticePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_NOTICE);
     }

service-api/src/main/java/com/java110/api/listener/smallWeChat/SaveSmallWeChatListener.java

@@ -60,7 +60,16 @@ public class SaveSmallWeChatListener extends AbstractServiceApiPlusListener {
             smallWechatAttrPo.setAttrId("-2");
             smallWechatAttrPo.setCommunityId(reqJson.getString("objId"));
             smallWechatAttrPo.setSpecCd(SmallWechatAttrDto.SPEC_CD_OWE_FEE_TEMPLATE);
-            smallWechatAttrPo.setValue("test");
+            smallWechatAttrPo.setValue("这里请填写物业缴费通知模板ID");
+            smallWechatAttrPo.setWechatId(wechatId);
+            super.insert(context, smallWechatAttrPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_SMALL_WECHAT_ATTR);
+
+            //模板ID
+            smallWechatAttrPo = new SmallWechatAttrPo();
+            smallWechatAttrPo.setAttrId("-3");
+            smallWechatAttrPo.setCommunityId(reqJson.getString("objId"));
+            smallWechatAttrPo.setSpecCd(SmallWechatAttrDto.SPEC_CD_WECHAT_TEMPLATE);
+            smallWechatAttrPo.setValue("这里请填写物业管理通知模板ID");
             smallWechatAttrPo.setWechatId(wechatId);
             super.insert(context, smallWechatAttrPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_SMALL_WECHAT_ATTR);
 

service-community/src/main/java/com/java110/community/listener/notice/AbstractNoticeBusinessServiceDataFlowListener.java

@@ -46,6 +46,8 @@ public abstract class AbstractNoticeBusinessServiceDataFlowListener extends Abst
         businessNoticeInfo.put("title", businessNoticeInfo.get("title"));
         businessNoticeInfo.put("userId", businessNoticeInfo.get("user_id"));
         businessNoticeInfo.put("noticeId", businessNoticeInfo.get("notice_id"));
+        businessNoticeInfo.put("objType", businessNoticeInfo.get("obj_type"));
+        businessNoticeInfo.put("objId", businessNoticeInfo.get("obj_id"));
         businessNoticeInfo.remove("bId");
         businessNoticeInfo.put("statusCd", statusCd);
     }
@@ -79,7 +81,8 @@ public abstract class AbstractNoticeBusinessServiceDataFlowListener extends Abst
         currentNoticeInfo.put("title", currentNoticeInfo.get("title"));
         currentNoticeInfo.put("userId", currentNoticeInfo.get("user_id"));
         currentNoticeInfo.put("noticeId", currentNoticeInfo.get("notice_id"));
-
+        currentNoticeInfo.put("objType", currentNoticeInfo.get("obj_type"));
+        currentNoticeInfo.put("objId", currentNoticeInfo.get("obj_id"));
 
         currentNoticeInfo.put("operate", StatusConstant.OPERATE_DEL);
         getNoticeServiceDaoImpl().saveBusinessNoticeInfo(currentNoticeInfo);