优化登记功能

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

@@ -33,7 +33,7 @@ public class SaveComplaintListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "roomId", "必填，请选择房屋编号");
         Assert.hasKeyAndValue(reqJson, "complaintName", "必填，请填写投诉人");
         Assert.hasKeyAndValue(reqJson, "tel", "必填，请填写投诉电话");
-        Assert.hasKeyAndValue(reqJson, "state", "必填，请填写投诉状态");
+        //Assert.hasKeyAndValue(reqJson, "state", "必填，请填写投诉状态");
         Assert.hasKeyAndValue(reqJson, "context", "必填，请填写投诉内容");
 
     }
@@ -93,6 +93,7 @@ public class SaveComplaintListener extends AbstractServiceApiListener {
         JSONObject businessComplaint = new JSONObject();
         businessComplaint.putAll(paramInJson);
         businessComplaint.put("complaintId", "-1");
+        businessComplaint.put("state", "10001");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessComplaint", businessComplaint);
         return business;

WebService/src/main/java/com/java110/web/smo/complaint/impl/AddComplaintSMOImpl.java

@@ -3,6 +3,7 @@ package com.java110.web.smo.complaint.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
@@ -14,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 
-
 /**
  * 添加小区服务实现类
  * add by wuxw 2019-06-30
@@ -31,12 +31,12 @@ public class AddComplaintSMOImpl extends AbstractComponentSMO implements IAddCom
         //super.validatePageInfo(pd);
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
-        Assert.hasKeyAndValue(paramIn, "storeId", "必填，请填写商户ID");
+        // Assert.hasKeyAndValue(paramIn, "storeId", "必填，请填写商户ID");
         Assert.hasKeyAndValue(paramIn, "typeCd", "必填，请选择投诉类型");
         Assert.hasKeyAndValue(paramIn, "roomId", "必填，请选择房屋编号");
         Assert.hasKeyAndValue(paramIn, "complaintName", "必填，请填写投诉人");
         Assert.hasKeyAndValue(paramIn, "tel", "必填，请填写投诉电话");
-        Assert.hasKeyAndValue(paramIn, "state", "必填，请填写投诉状态");
+        //Assert.hasKeyAndValue(paramIn, "state", "必填，请填写投诉状态");
         Assert.hasKeyAndValue(paramIn, "context", "必填，请填写投诉内容");
 
 
@@ -47,8 +47,8 @@ public class AddComplaintSMOImpl extends AbstractComponentSMO implements IAddCom
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
-
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        paramIn.put("storeId", result.getStoreId());
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/complaint.saveComplaint",
                 HttpMethod.POST);

WebService/src/main/resources/components/complaintPackage/addComplaintStep/addComplaintStep.html

@@ -18,7 +18,7 @@
         ></vc:create>
     </div>
     <div v-if="addComplaintStepInfo.index == 2">
-        <vc:create name="addComplain"
+        <vc:create name="addComplainView"
                    callBackListener="addComplaintStep"
                    callBackFunction="notify"
         ></vc:create>

WebService/src/main/resources/components/complaintPackage/addComplaintStep/addComplaintStep.js

@@ -35,7 +35,7 @@
 
                 vc.emit('viewFloorInfo', 'onIndex', vc.component.addComplaintStepInfo.index);
                 vc.emit('sellRoomSelectRoom', 'onIndex', vc.component.addComplaintStepInfo.index);
-                vc.emit('addComplain', 'onIndex', vc.component.addComplaintStepInfo.index);
+                vc.emit('addComplainView', 'onIndex', vc.component.addComplaintStepInfo.index);
 
             },
             _nextStep: function () {
@@ -49,7 +49,7 @@
 
                 vc.emit('viewFloorInfo', 'onIndex', vc.component.addComplaintStepInfo.index);
                 vc.emit('sellRoomSelectRoom', 'onIndex', vc.component.addComplaintStepInfo.index);
-                vc.emit('addComplain', 'onIndex', vc.component.addComplaintStepInfo.index);
+                vc.emit('addComplainView', 'onIndex', vc.component.addComplaintStepInfo.index);
 
             },
             _finishStep: function () {
@@ -61,14 +61,15 @@
                     return;
                 }
 
-                var param = {
+                /*var param = {
                     data: vc.component.addComplaintStepInfo.infos
-                }
+                }*/
+                vc.component.addComplaintStepInfo.infos[2].roomId = vc.component.addComplaintStepInfo.infos[1].roomId;
 
                 vc.http.post(
                     'addComplaintStepBinding',
                     'binding',
-                    JSON.stringify(param),
+                    JSON.stringify(vc.component.addComplaintStepInfo.infos[2]),
                     {
                         emulateJSON: true
                     },