解决房屋信息

Api/src/main/java/com/java110/api/listener/complaint/ListComplaintsListener.java

@@ -8,6 +8,7 @@ import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
 import com.java110.dto.complaint.ComplaintDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeComplaintConstant;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.complaint.ApiComplaintDataVo;
 import com.java110.vo.api.complaint.ApiComplaintVo;
@@ -56,6 +57,7 @@ public class ListComplaintsListener extends AbstractServiceApiListener {
 
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "必填，请填写小区信息");
         super.validatePageInfo(reqJson);
     }
 

StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java

@@ -3,8 +3,12 @@ package com.java110.store.smo.impl;
 
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
+import com.java110.core.smo.room.IRoomInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.FeeDto;
 import com.java110.dto.PageDto;
+import com.java110.dto.RoomDto;
+import com.java110.dto.UserDto;
 import com.java110.dto.complaint.ComplaintDto;
 import com.java110.store.dao.IComplaintServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
@@ -12,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,6 +36,9 @@ public class ComplaintInnerServiceSMOImpl extends BaseServiceSMO implements ICom
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
+    @Autowired
+    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
     @Override
     public List<ComplaintDto> queryComplaints(@RequestBody ComplaintDto complaintDto) {
 
@@ -43,10 +51,40 @@ public class ComplaintInnerServiceSMOImpl extends BaseServiceSMO implements ICom
         }
 
         List<ComplaintDto> complaints = BeanConvertUtil.covertBeanList(complaintServiceDaoImpl.getComplaintInfo(BeanConvertUtil.beanCovertMap(complaintDto)), ComplaintDto.class);
+        RoomDto roomDto = new RoomDto();
+        roomDto.setRoomIds(getRoomIds(complaints));
+        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+        for (ComplaintDto tmpComplainDto : complaints) {
+            refreshRoomInfo(tmpComplainDto, roomDtos);
+        }
 
         return complaints;
     }
 
+    /**
+     * 从用户列表中查询用户，将用户中的信息 刷新到 floor对象中
+     *
+     * @param complainDto 小区费用信息
+     * @param roomDtos 用户列表
+     */
+    private void refreshRoomInfo(ComplaintDto complainDto, List<RoomDto> roomDtos) {
+        for (RoomDto room : roomDtos) {
+            if (room.getRoomId().equals(complainDto.getRoomId())) {
+                BeanConvertUtil.covertBean(room, complainDto);
+            }
+        }
+    }
+
+    private String[] getRoomIds(List<ComplaintDto> complaints) {
+        List<String> roomIds = new ArrayList<String>();
+        for (ComplaintDto complaint : complaints) {
+            roomIds.add(complaint.getRoomId());
+        }
+
+        return roomIds.toArray(new String[roomIds.size()]);
+    }
+
 
     @Override
     public int queryComplaintsCount(@RequestBody ComplaintDto complaintDto) {
@@ -68,4 +106,12 @@ public class ComplaintInnerServiceSMOImpl extends BaseServiceSMO implements ICom
     public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
         this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
     }
+
+    public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
+        return roomInnerServiceSMOImpl;
+    }
+
+    public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
+        this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
+    }
 }

WebService/src/main/java/com/java110/web/smo/complaint/impl/ListComplaintsSMOImpl.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.utils.util.BeanConvertUtil;
 import com.java110.web.smo.complaint.IListComplaintsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@ public class ListComplaintsSMOImpl extends AbstractComponentSMO implements IList
 
     @Override
     protected void validate(IPageData pd, JSONObject paramIn) {
+        Assert.hasKeyAndValue(paramIn, "communityId", "必填，请求报文中未包含小区信息");
+
 
         super.validatePageInfo(pd);
 

WebService/src/main/resources/components/complaintPackage/complaint-manage/complaintManage.html

@@ -85,7 +85,7 @@
                         <tr>
                             <th class="text-center">投诉ID</th>
                             <th class="text-center">投诉类型</th>
-                            <th class="text-center">房屋编号</th>
+                            <th class="text-center">房屋</th>
                             <th class="text-center">投诉人</th>
                             <th class="text-center">投诉电话</th>
                             <th class="text-center">投诉状态</th>
@@ -98,7 +98,9 @@
                         <tr v-for="complaint in complaintManageInfo.complaints">
                             <td class="text-center">{{complaint.complaintId}}</td>
                             <td class="text-center">{{complaint.typeCd}}</td>
-                            <td class="text-center">{{complaint.roomId}}</td>
+                            <td class="text-center">
+                                {{complaint.floorNum}}号楼{{complaint.unitNum}}单元{{complaint.roomNum}}室
+                            </td>
                             <td class="text-center">{{complaint.complaintName}}</td>
                             <td class="text-center">{{complaint.tel}}</td>
                             <td class="text-center">{{complaint.state}}</td>

WebService/src/main/resources/components/complaintPackage/complaint-manage/complaintManage.js

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

java110-bean/src/main/java/com/java110/dto/complaint/ComplaintDto.java

@@ -23,6 +23,10 @@ public class ComplaintDto extends PageDto implements Serializable {
     private String state;
     private String storeId;
     private String roomId;
+    private String roomNum;
+    private String unitNum;
+    private String floorNum;
+    private String communityId;
 
 
     private Date createTime;
@@ -110,4 +114,36 @@ public class ComplaintDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/complaint/ApiComplaintDataVo.java

@@ -6,62 +6,112 @@ import java.util.Date;
 public class ApiComplaintDataVo implements Serializable {
 
     private String complaintId;
-private String storeId;
-private String typeCd;
-private String roomId;
-private String complaintName;
-private String tel;
-private String state;
-private String context;
-public String getComplaintId() {
+    private String storeId;
+    private String typeCd;
+    private String roomId;
+    private String complaintName;
+    private String tel;
+    private String state;
+    private String context;
+    private String roomNum;
+    private String unitNum;
+    private String floorNum;
+    private String communityId;
+
+
+    public String getComplaintId() {
         return complaintId;
     }
-public void setComplaintId(String complaintId) {
+
+    public void setComplaintId(String complaintId) {
         this.complaintId = complaintId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getTypeCd() {
+
+    public String getTypeCd() {
         return typeCd;
     }
-public void setTypeCd(String typeCd) {
+
+    public void setTypeCd(String typeCd) {
         this.typeCd = typeCd;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
-public String getComplaintName() {
+
+    public String getComplaintName() {
         return complaintName;
     }
-public void setComplaintName(String complaintName) {
+
+    public void setComplaintName(String complaintName) {
         this.complaintName = complaintName;
     }
-public String getTel() {
+
+    public String getTel() {
         return tel;
     }
-public void setTel(String tel) {
+
+    public void setTel(String tel) {
         this.tel = tel;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getContext() {
+
+    public String getContext() {
         return context;
     }
-public void setContext(String context) {
+
+    public void setContext(String context) {
         this.context = context;
     }
 
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
 
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
 
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }