优化 业主报修功能

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

@@ -29,6 +29,7 @@ public class AddNoticeSMOImpl extends AbstractComponentSMO implements IAddNotice
         //super.validatePageInfo(pd);
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
+        Assert.hasKeyAndValue(paramIn, "communityId", "请求报文中未包含小区ID");
         Assert.hasKeyAndValue(paramIn, "title", "必填，请填写标题");
         Assert.hasKeyAndValue(paramIn, "noticeTypeCd", "必填，请选择公告类型");
         Assert.hasKeyAndValue(paramIn, "context", "必填，请填写公告内容");

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

@@ -30,6 +30,7 @@ public class DeleteNoticeSMOImpl extends AbstractComponentSMO implements IDelete
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyAndValue(paramIn, "noticeId", "公告ID不能为空");
+        Assert.hasKeyAndValue(paramIn, "communityId", "请求报文中未包含小区ID");
 
 
 

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

@@ -29,11 +29,11 @@ public class EditNoticeSMOImpl extends AbstractComponentSMO implements IEditNoti
         //super.validatePageInfo(pd);
 
         Assert.hasKeyAndValue(paramIn, "noticeId", "公告ID不能为空");
-Assert.hasKeyAndValue(paramIn, "title", "必填，请填写标题");
-Assert.hasKeyAndValue(paramIn, "noticeTypeCd", "必填，请选择公告类型");
-Assert.hasKeyAndValue(paramIn, "context", "必填，请填写公告内容");
-Assert.hasKeyAndValue(paramIn, "startTime", "必选，请填写开始时间 2019-01-02");
-
+        Assert.hasKeyAndValue(paramIn, "title", "必填，请填写标题");
+        Assert.hasKeyAndValue(paramIn, "noticeTypeCd", "必填，请选择公告类型");
+        Assert.hasKeyAndValue(paramIn, "context", "必填，请填写公告内容");
+        Assert.hasKeyAndValue(paramIn, "startTime", "必选，请填写开始时间 2019-01-02");
+        Assert.hasKeyAndValue(paramIn, "communityId", "请求报文中未包含小区ID");
 
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.HAS_LIST_NOTICE);

WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/AddOwnerRepairSMOImpl.java

@@ -1,7 +1,6 @@
 package com.java110.web.smo.ownerRepair.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.core.client.RestTemplate;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
@@ -12,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * 添加小区服务实现类
@@ -29,6 +29,7 @@ public class AddOwnerRepairSMOImpl extends AbstractComponentSMO implements IAddO
         //super.validatePageInfo(pd);
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
+        Assert.hasKeyAndValue(paramIn, "communityId", "请求报文中未包含小区ID");
         Assert.hasKeyAndValue(paramIn, "repairType", "必填，请选择报修类型");
         Assert.hasKeyAndValue(paramIn, "repairName", "必填，请填写报修人名称");
         Assert.hasKeyAndValue(paramIn, "tel", "必填，请填写报修人手机号");

WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/DeleteOwnerRepairSMOImpl.java

@@ -1,7 +1,7 @@
 package com.java110.web.smo.ownerRepair.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.core.client.RestTemplate;
+import org.springframework.web.client.RestTemplate;
 import com.java110.core.context.IPageData;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
@@ -32,6 +32,7 @@ public class DeleteOwnerRepairSMOImpl extends AbstractComponentSMO implements ID
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyAndValue(paramIn, "repairId", "报修ID不能为空");
+        Assert.hasKeyAndValue(paramIn, "communityId", "请求报文中未包含小区ID");
 
 
 

WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/EditOwnerRepairSMOImpl.java

@@ -27,7 +27,7 @@ public class EditOwnerRepairSMOImpl extends AbstractComponentSMO implements IEdi
     protected void validate(IPageData pd, JSONObject paramIn) {
 
         //super.validatePageInfo(pd);
-
+        Assert.hasKeyAndValue(paramIn, "communityId", "请求报文中未包含小区ID");
         Assert.hasKeyAndValue(paramIn, "repairId", "报修ID不能为空");
         Assert.hasKeyAndValue(paramIn, "repairType", "必填，请选择报修类型");
         Assert.hasKeyAndValue(paramIn, "repairName", "必填，请填写报修人名称");

WebService/src/main/java/com/java110/web/smo/ownerRepair/impl/ListOwnerRepairsSMOImpl.java

@@ -1,7 +1,8 @@
 package com.java110.web.smo.ownerRepair.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.core.client.RestTemplate;
+import com.java110.utils.util.Assert;
+import org.springframework.web.client.RestTemplate;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.PrivilegeCodeConstant;
@@ -35,6 +36,8 @@ public class ListOwnerRepairsSMOImpl extends AbstractComponentSMO implements ILi
     protected void validate(IPageData pd, JSONObject paramIn) {
 
         super.validatePageInfo(pd);
+        Assert.hasKeyAndValue(paramIn, "communityId", "请求报文中未包含小区ID");
+
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.LIST_OWNERREPAIR);
     }

WebService/src/main/resources/components/ownerRepairPackage/edit-ownerRepair/editOwnerRepair.js

@@ -115,6 +115,7 @@ context:'',
                     vc.message(vc.validate.errInfo);
                     return ;
                 }
+                vc.component.editOwnerRepairInfo.communityId = vc.getCurrentCommunity().communityId;
 
                 vc.http.post(
                     'editOwnerRepair',

WebService/src/main/resources/components/ownerRepairPackage/ownerRepair-manage/ownerRepairManage.js

@@ -38,6 +38,7 @@ repairType:'',
 
                 vc.component.ownerRepairManageInfo.conditions.page = _page;
                 vc.component.ownerRepairManageInfo.conditions.row = _rows;
+                vc.component.ownerRepairManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
                 var param = {
                     params:vc.component.ownerRepairManageInfo.conditions
                };