Merge branch 'Feature/20220914-gxh' into 'master'

1.增加约面日历和非一面面访信息维护

See merge request !29

src/test/java/com/oto/cases/otoseller/Phone.java

@@ -379,18 +379,18 @@ public class Phone implements Authorization {
         scanCode(IdMakeUtil.encodingId((Long) scanCodeId),1047);
     }
 
-    @Test(description = "查询异常面访回填信息",priority = 29)
-    public void 查询异常面访回填信息(){
+    @Test(description = "查询失效面访回填信息",priority = 29)
+    public void 查询失效面访回填信息(){
         otoSellerTku();
         HashMap<String,Object> params = new HashMap<>();
         params.put("id", interviewIds.get(0));
         Response response = network.getResponse(params, BasicConfig.PHONE_custExtDetail);
-        String custAddress = response.jsonPath().getString("data.custAddress");
+        String interviewAddress = response.jsonPath().getString("data.interviewAddress");
         int commitPlanFlag = response.jsonPath().getInt("data.commitPlanFlag");
-        int giveProspectusFlag = response.jsonPath().getInt("data.giveProspectusFlag");
-        Assert.assertNotNull(custAddress,network.message(params,BasicConfig.PHONE_custExtDetail,"客户地址为空",response.body().asString()));
-        Assert.assertEquals(giveProspectusFlag,1,network.message(params,BasicConfig.PHONE_custExtDetail,"是否可送计划书不为是",response.body().asString()));
-        Assert.assertEquals(commitPlanFlag,1,network.message(params,BasicConfig.PHONE_custExtDetail,"是否已送计划书不为是",response.body().asString()));
+        String giveProspectusFlag = response.jsonPath().getString("data.giveProspectusFlag");
+        Assert.assertNotNull(interviewAddress,network.message(params,BasicConfig.PHONE_custExtDetail,"面访地址为空",response.body().asString()));
+        Assert.assertNull(giveProspectusFlag,network.message(params,BasicConfig.PHONE_custExtDetail,"是否可送计划书不为空",response.body().asString()));
+        Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.PHONE_custExtDetail,"是否已送计划书不为否",response.body().asString()));
     }
 
     @Test(description = "上传社区参观面访详情",priority = 30)
@@ -453,13 +453,13 @@ public class Phone implements Authorization {
     }
 
 
-    @Test(description = "创建送计划书面访",priority = 35)
+    @Test(description = "创建送计划书面访",priority = 34)
     public void 创建送计划书面访(){
         otoSellerTku();
         interviewIds.add(saveInterview(cust_id,2));
     }
 
-    @Test(description = "客户完成送计划书面访并扫码",priority = 36)
+    @Test(description = "客户完成送计划书面访并扫码",priority = 35)
     public void 客户完成送计划书面访并扫码() throws SQLException {
         agentTku();
         Map<String, Object> result = KjyLiveNormalDB.getInstance().findSimpleResult(UserSqlFactory.selectCodeIdByCustomerId, IdMakeUtil.decodingId(cust_id));
@@ -468,6 +468,18 @@ public class Phone implements Authorization {
         scanCode(IdMakeUtil.encodingId((Long) scanCodeId),1047);
     }
 
+    @Test(description = "查询异常通过面访回填信息",priority = 36)
+    public void 查询异常通过面访回填信息(){
+        otoSellerTku();
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("id", interviewIds.get(0));
+        Response response = network.getResponse(params, BasicConfig.PHONE_custExtDetail);
+        int commitPlanFlag = response.jsonPath().getInt("data.commitPlanFlag");
+        int giveProspectusFlag = response.jsonPath().getInt("data.giveProspectusFlag");
+        Assert.assertEquals(giveProspectusFlag,1,network.message(params,BasicConfig.PHONE_custExtDetail,"是否可送计划书不为空",response.body().asString()));
+        Assert.assertEquals(commitPlanFlag,1,network.message(params,BasicConfig.PHONE_custExtDetail,"是否已送计划书不为否",response.body().asString()));
+    }
+
 
     @Test(description = "二次正常扫码面访异常类型为空",priority = 37)
     public void 二次正常扫码面访异常类型为空(){