优化保修功能，界面显示及编辑功能报错信息

Api/src/main/java/com/java110/api/listener/ownerRepair/UpdateOwnerRepairListener.java

@@ -32,6 +32,7 @@ public class UpdateOwnerRepairListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "roomId", "必填，请填写房屋ID");
         Assert.hasKeyAndValue(reqJson, "appointmentTime", "必填，请填写预约时间");
         Assert.hasKeyAndValue(reqJson, "context", "必填，请填写报修内容");
+        Assert.hasKeyAndValue(reqJson, "state", "必填，请填写报修状态");
 
     }
 

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

@@ -9,6 +9,7 @@ import com.java110.web.core.AbstractComponentSMO;
 import com.java110.web.smo.ownerRepair.IEditOwnerRepairSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -46,6 +47,24 @@ public class EditOwnerRepairSMOImpl extends AbstractComponentSMO implements IEdi
         ResponseEntity<String> responseEntity = null;
         super.validateStoreStaffCommunityRelationship(pd, restTemplate);
 
+        JSONObject newParamIn = new JSONObject();
+        newParamIn.put("communityId", paramIn.getString("communityId"));
+        newParamIn.put("repairId", paramIn.getString("repairId"));
+        newParamIn.put("page", 1);
+        newParamIn.put("row", 1);
+
+        //查询保修状态
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/ownerRepair.listOwnerRepairs" + mapToUrlParam(newParamIn);
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                apiUrl,
+                HttpMethod.GET);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return responseEntity;
+        }
+        JSONObject outRepairInfo = JSONObject.parseObject(responseEntity.getBody());
+        JSONObject repairObj = outRepairInfo.getJSONArray("ownerRepairs").getJSONObject(0);
+        paramIn.put("state", repairObj.getString("state"));
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/ownerRepair.updateOwnerRepair",
                 HttpMethod.POST);

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

@@ -148,6 +148,7 @@
                     repairName:'',
                     tel:'',
                     roomId:'',
+                    roomName:'',
                     appointmentTime:'',
                     context:'',
 

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

@@ -44,6 +44,14 @@
                                 <option value="10002">管道报修</option>
                                 <option value="10003">客厅报修</option>
                             </select></div>
+                        <div class="col-sm-4" v-if="ownerRepairManageInfo.moreCondition == true">
+                            <select class="custom-select" v-model="ownerRepairManageInfo.conditions.state">
+                                <option selected value="">请选择报修状态</option>
+                                <option value="1000">未派单</option>
+                                <option value="1100">处理中</option>
+                                <option value="1200">处理完成</option>
+                            </select>
+                        </div>
                     </div>
 
 
@@ -55,11 +63,11 @@
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>报修信息</h5>
+                    <h5><span v-text="ownerRepairManageInfo.conditions.roomName"></span>报修信息</h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOwnerRepairModal()" v-if:click="ownerRepairManageInfo.conditions.roomId != ''">
                             <i class="glyphicon glyphicon-plus"></i>
-                            报修登记
+                            登记
                         </button>
                     </div>
                 </div>
@@ -74,11 +82,9 @@
                             <th class="text-center">报修类型</th>
                             <th class="text-center">报修人</th>
                             <th class="text-center">联系方式</th>
-                            <th class="text-center">房屋ID</th>
                             <th class="text-center">预约时间</th>
+                            <th class="text-center">状态</th>
                             <th class="text-center">操作</th>
-
-
                         </tr>
                         </thead>
                         <tbody>
@@ -87,9 +93,14 @@
                             <td class="text-center">{{ownerRepair.repairType}}</td>
                             <td class="text-center">{{ownerRepair.repairName}}</td>
                             <td class="text-center">{{ownerRepair.tel}}</td>
-                            <td class="text-center">{{ownerRepair.roomId}}</td>
                             <td class="text-center">{{ownerRepair.appointmentTime}}</td>
+                            <td class="text-center">{{ownerRepair.stateName}}</td>
                             <td class="text-center">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDispatchRepair(ownerRepair)">派单
+                                    </button>
+                                </div>
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditOwnerRepairModel(ownerRepair)">修改

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

@@ -19,7 +19,8 @@
                     repairType:'',
                     roomId:'',
                     roomName:'',
-                    ownerId:''
+                    ownerId:'',
+                    state:''
                 }
             }
         },
@@ -122,6 +123,9 @@
             _queryOwnerRepairMethod:function(){
                 vc.component._listOwnerRepairs(DEFAULT_PAGE, DEFAULT_ROWS);
 
+            },
+            _openDispatchRepair:function(_ownerRepair){
+
             },
             _moreCondition:function(){
                 if(vc.component.ownerRepairManageInfo.moreCondition){

java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java

@@ -22,6 +22,7 @@ public class RepairDto extends PageDto implements Serializable {
     private String repairId;
     private String tel;
     private String state;
+    private String stateName;
     private String communityId;
     private String roomId;
 
@@ -119,4 +120,12 @@ public class RepairDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/ownerRepair/ApiOwnerRepairDataVo.java

@@ -6,55 +6,84 @@ import java.util.Date;
 public class ApiOwnerRepairDataVo implements Serializable {
 
     private String repairId;
-private String repairType;
-private String repairName;
-private String tel;
-private String roomId;
-private String appointmentTime;
-private String context;
-public String getRepairId() {
+    private String repairType;
+    private String repairName;
+    private String tel;
+    private String roomId;
+    private String appointmentTime;
+    private String context;
+    private String state;
+    private String stateName;
+
+    public String getRepairId() {
         return repairId;
     }
-public void setRepairId(String repairId) {
+
+    public void setRepairId(String repairId) {
         this.repairId = repairId;
     }
-public String getRepairType() {
+
+    public String getRepairType() {
         return repairType;
     }
-public void setRepairType(String repairType) {
+
+    public void setRepairType(String repairType) {
         this.repairType = repairType;
     }
-public String getRepairName() {
+
+    public String getRepairName() {
         return repairName;
     }
-public void setRepairName(String repairName) {
+
+    public void setRepairName(String repairName) {
         this.repairName = repairName;
     }
-public String getTel() {
+
+    public String getTel() {
         return tel;
     }
-public void setTel(String tel) {
+
+    public void setTel(String tel) {
         this.tel = tel;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
-public String getAppointmentTime() {
+
+    public String getAppointmentTime() {
         return appointmentTime;
     }
-public void setAppointmentTime(String appointmentTime) {
+
+    public void setAppointmentTime(String appointmentTime) {
         this.appointmentTime = appointmentTime;
     }
-public String getContext() {
+
+    public String getContext() {
         return context;
     }
-public void setContext(String context) {
+
+    public void setContext(String context) {
         this.context = context;
     }
 
+    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/repair/RepairServiceDaoImplMapper.xml

@@ -105,7 +105,15 @@
         select t.repair_name,t.repair_name repairName,t.appointment_time,t.appointment_time
         appointmentTime,t.repair_type,t.repair_type repairType,t.context,t.repair_id,t.repair_id
         repairId,t.tel,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id
-        bId,t.room_id,t.room_id roomId
+        bId,t.room_id,t.room_id roomId,
+        (CASE
+        WHEN t.`state` = '1000'
+        THEN '未派单'
+        WHEN t.state = '1100'
+        THEN '处理中'
+        ELSE
+        '处理完成'
+        END) stateName
         from r_repair_pool t
         where 1 =1
         <if test="repairName !=null and repairName != ''">