优化 小区入驻审核报错的问题和 公告错误问题

CommunityService/src/main/java/com/java110/community/listener/notice/AbstractNoticeBusinessServiceDataFlowListener.java

@@ -16,16 +16,16 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *
  * 通知 服务侦听 父类
  * Created by wuxw on 2018/7/4.
  */
-public abstract class AbstractNoticeBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener{
+public abstract class AbstractNoticeBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
     private static Logger logger = LoggerFactory.getLogger(AbstractNoticeBusinessServiceDataFlowListener.class);
 
 
     /**
      * 获取 DAO工具类
+     *
      * @return
      */
     public abstract INoticeServiceDao getNoticeServiceDaoImpl();
@@ -33,57 +33,58 @@ public abstract class AbstractNoticeBusinessServiceDataFlowListener extends Abst
     /**
      * 刷新 businessNoticeInfo 数据
      * 主要将 数据库 中字段和 接口传递字段建立关系
+     *
      * @param businessNoticeInfo
      */
-    protected void flushBusinessNoticeInfo(Map businessNoticeInfo,String statusCd){
+    protected void flushBusinessNoticeInfo(Map businessNoticeInfo, String statusCd) {
         businessNoticeInfo.put("newBId", businessNoticeInfo.get("b_id"));
-        businessNoticeInfo.put("operate",businessNoticeInfo.get("operate"));
-businessNoticeInfo.put("noticeTypeCd",businessNoticeInfo.get("notice_type_cd"));
-businessNoticeInfo.put("context",businessNoticeInfo.get("context"));
-businessNoticeInfo.put("startTime",businessNoticeInfo.get("start_time"));
-businessNoticeInfo.put("communityId",businessNoticeInfo.get("community_id"));
-businessNoticeInfo.put("title",businessNoticeInfo.get("title"));
-businessNoticeInfo.put("userId",businessNoticeInfo.get("user_id"));
-businessNoticeInfo.put("noticeId",businessNoticeInfo.get("notice_id"));
-businessNoticeInfo.remove("bId");
+        businessNoticeInfo.put("operate", businessNoticeInfo.get("operate"));
+        businessNoticeInfo.put("noticeTypeCd", businessNoticeInfo.get("notice_type_cd"));
+        businessNoticeInfo.put("context", businessNoticeInfo.get("context"));
+        businessNoticeInfo.put("startTime", businessNoticeInfo.get("start_time"));
+        businessNoticeInfo.put("endTime", businessNoticeInfo.get("end_time"));
+        businessNoticeInfo.put("communityId", businessNoticeInfo.get("community_id"));
+        businessNoticeInfo.put("title", businessNoticeInfo.get("title"));
+        businessNoticeInfo.put("userId", businessNoticeInfo.get("user_id"));
+        businessNoticeInfo.put("noticeId", businessNoticeInfo.get("notice_id"));
+        businessNoticeInfo.remove("bId");
         businessNoticeInfo.put("statusCd", statusCd);
     }
 
 
     /**
      * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
+     *
      * @param businessNotice 通知信息
      */
-    protected void autoSaveDelBusinessNotice(Business business, JSONObject businessNotice){
+    protected void autoSaveDelBusinessNotice(Business business, JSONObject businessNotice) {
 //自动插入DEL
         Map info = new HashMap();
-        info.put("noticeId",businessNotice.getString("noticeId"));
-        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
+        info.put("noticeId", businessNotice.getString("noticeId"));
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
         List<Map> currentNoticeInfos = getNoticeServiceDaoImpl().getNoticeInfo(info);
-        if(currentNoticeInfos == null || currentNoticeInfos.size() != 1){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"未找到需要修改数据信息，入参错误或数据有问题，请检查"+info);
+        if (currentNoticeInfos == null || currentNoticeInfos.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息，入参错误或数据有问题，请检查" + info);
         }
 
         Map currentNoticeInfo = currentNoticeInfos.get(0);
 
-        currentNoticeInfo.put("bId",business.getbId());
+        currentNoticeInfo.put("bId", business.getbId());
 
-        currentNoticeInfo.put("operate",currentNoticeInfo.get("operate"));
-currentNoticeInfo.put("noticeTypeCd",currentNoticeInfo.get("notice_type_cd"));
-currentNoticeInfo.put("context",currentNoticeInfo.get("context"));
-currentNoticeInfo.put("startTime",currentNoticeInfo.get("start_time"));
-currentNoticeInfo.put("communityId",currentNoticeInfo.get("community_id"));
-currentNoticeInfo.put("title",currentNoticeInfo.get("title"));
-currentNoticeInfo.put("userId",currentNoticeInfo.get("user_id"));
-currentNoticeInfo.put("noticeId",currentNoticeInfo.get("notice_id"));
+        currentNoticeInfo.put("operate", currentNoticeInfo.get("operate"));
+        currentNoticeInfo.put("noticeTypeCd", currentNoticeInfo.get("notice_type_cd"));
+        currentNoticeInfo.put("context", currentNoticeInfo.get("context"));
+        currentNoticeInfo.put("startTime", currentNoticeInfo.get("start_time"));
+        currentNoticeInfo.put("endTime", currentNoticeInfo.get("end_time"));
+        currentNoticeInfo.put("communityId", currentNoticeInfo.get("community_id"));
+        currentNoticeInfo.put("title", currentNoticeInfo.get("title"));
+        currentNoticeInfo.put("userId", currentNoticeInfo.get("user_id"));
+        currentNoticeInfo.put("noticeId", currentNoticeInfo.get("notice_id"));
 
 
-        currentNoticeInfo.put("operate",StatusConstant.OPERATE_DEL);
+        currentNoticeInfo.put("operate", StatusConstant.OPERATE_DEL);
         getNoticeServiceDaoImpl().saveBusinessNoticeInfo(currentNoticeInfo);
     }
 
 
-
-
-
 }

WebService/src/main/java/com/java110/web/components/community/AuditEnterCommunityManageComponent.java

@@ -6,6 +6,7 @@ import com.java110.common.constant.StateConstant;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.web.smo.community.IAuditCommunitySMO;
+import com.java110.web.smo.community.IAuditEnterCommunitySMO;
 import com.java110.web.smo.community.IListAuditEnterCommunitysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -26,7 +27,7 @@ public class AuditEnterCommunityManageComponent {
     private IListAuditEnterCommunitysSMO listAuditEnterCommunitysSMOImpl;
 
     @Autowired
-    private IAuditCommunitySMO auditCommunitySMOImpl;
+    private IAuditEnterCommunitySMO auditEnterCommunitySMOImpl;
 
     /**
      * 查询小区列表
@@ -52,16 +53,15 @@ public class AuditEnterCommunityManageComponent {
      * @return 返回 ResponseEntity 对象
      */
     public ResponseEntity<String> audit(IPageData pd) {
-        return auditCommunitySMOImpl.auditCommunity(pd);
+        return auditEnterCommunitySMOImpl.auditEnterCommunity(pd);
     }
 
-
-    public IAuditCommunitySMO getAuditCommunitySMOImpl() {
-        return auditCommunitySMOImpl;
+    public IAuditEnterCommunitySMO getAuditEnterCommunitySMOImpl() {
+        return auditEnterCommunitySMOImpl;
     }
 
-    public void setAuditCommunitySMOImpl(IAuditCommunitySMO auditCommunitySMOImpl) {
-        this.auditCommunitySMOImpl = auditCommunitySMOImpl;
+    public void setAuditEnterCommunitySMOImpl(IAuditEnterCommunitySMO auditEnterCommunitySMOImpl) {
+        this.auditEnterCommunitySMOImpl = auditEnterCommunitySMOImpl;
     }
 
     public IListAuditEnterCommunitysSMO getListAuditEnterCommunitysSMOImpl() {

WebService/src/main/java/com/java110/web/smo/community/impl/AuditEnterCommunitySMOImpl.java

@@ -34,7 +34,7 @@ public class AuditEnterCommunitySMOImpl extends AbstractComponentSMO implements
         Assert.hasKeyAndValue(paramIn, "remark", "必填，请填写小区审核原因");
 
 
-        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AUDIT_COMMUNITY);
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AUDIT_ENTER_COMMUNITY);
 
     }