加入小区字段 查询 room 需要用communityId 分区

Api/src/main/java/com/java110/api/listener/auditOrder/ListAuditComplaintsListener.java

@@ -59,6 +59,7 @@ public class ListAuditComplaintsListener extends AbstractServiceApiListener {
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
         Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
+        Assert.hasKeyAndValue(reqJson, "communityId", "必填，请填写小区ID");
         Assert.hasKeyAndValue(reqJson, "row", "必填，请填写每页显示数");
         Assert.hasKeyAndValue(reqJson, "page", "必填，请填写页数");
 
@@ -71,6 +72,7 @@ public class ListAuditComplaintsListener extends AbstractServiceApiListener {
         AuditUser auditUser = new AuditUser();
         auditUser.setUserId(reqJson.getString("userId"));
         auditUser.setStoreId(reqJson.getString("storeId"));
+        auditUser.setCommunityId(reqJson.getString("communityId"));
         auditUser.setPage(reqJson.getInteger("page"));
         auditUser.setRow(reqJson.getInteger("row"));
 

CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java

@@ -131,6 +131,7 @@ public class ComplaintUserInnerServiceSMOImpl extends BaseServiceSMO implements
         //查询 投诉信息
         ComplaintDto complaintDto = new ComplaintDto();
         complaintDto.setStoreId(user.getStoreId());
+        complaintDto.setComplaintId(user.getCommunityId());
         complaintDto.setComplaintIds(complaintIds.toArray(new String[complaintIds.size()]));
         List<ComplaintDto> tmpComplaintDtos = complaintInnerServiceSMOImpl.queryComplaints(complaintDto);
         return tmpComplaintDtos;

WebService/src/main/java/com/java110/web/smo/auditUser/impl/ListAuditComplaintsSMOImpl.java

@@ -7,6 +7,7 @@ import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
 import com.java110.web.smo.auditUser.IListAuditComplaintsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -33,6 +34,9 @@ public class ListAuditComplaintsSMOImpl extends AbstractComponentSMO implements
 
         super.validatePageInfo(pd);
 
+        Assert.hasKeyAndValue(paramIn, "communityId", "必填，请填写小区信息");
+
+
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_AUDIT_COMPLAINT);
     }
 

WebService/src/main/resources/components/auditPackage/myAuditComplaint/myAuditComplaints.js

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

java110-bean/src/main/java/com/java110/entity/audit/AuditUser.java

@@ -17,6 +17,8 @@ public class AuditUser extends PageDto implements Serializable {
     //商户ID
     private String storeId;
 
+    private String communityId;
+
     private String userName;
 
     // 审核环节 如部门经理审核 ， 财务审核 ，采购人员采购
@@ -73,4 +75,12 @@ public class AuditUser extends PageDto implements Serializable {
     public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }