Merge branch 'Feature/formSubmit' into 'master'

1.增加客户资料配置的测试用例

See merge request !77

src/test/java/com/oto/bean/Answer.java

+package com.oto.bean;
+
+import lombok.Data;
+
+@Data
+public class Answer {
+    public String code;
+    public String text;
+
+    public Answer(String code, String text) {
+        this.code = code;
+        this.text = text;
+    }
+}

src/test/java/com/oto/bean/FormQuestion.java

+package com.oto.bean;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+@Data
+public class FormQuestion {
+    public int groupId;
+    public int id;
+    public String code;
+    public String type;
+    public String title;
+    public Object date;
+    public Object multi;
+    public ArrayList<Option> options;
+    public ArrayList<Answer> answers;
+
+    public FormQuestion(int groupId, int id, String code, String type, String title, Object date, Object multi, ArrayList<Option> options, ArrayList<Answer> answers) {
+        this.groupId = groupId;
+        this.id = id;
+        this.code = code;
+        this.type = type;
+        this.title = title;
+        this.date = date;
+        this.multi = multi;
+        this.options = options;
+        this.answers = answers;
+    }
+}

src/test/java/com/oto/bean/GroupData.java

+package com.oto.bean;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+@Data
+public class GroupData {
+    public int id;
+    public String title;
+    public ArrayList<FormQuestion> formQuestions;
+}

src/test/java/com/oto/bean/Option.java

+package com.oto.bean;
+
+import lombok.Data;
+
+@Data
+public class Option {
+    public int questionId;
+    public String code;
+    public String type;
+    public String title;
+
+    public Option(int questionId, String code, String type, String title) {
+        this.questionId = questionId;
+        this.code = code;
+        this.type = type;
+        this.title = title;
+    }
+}

src/test/java/com/oto/bean/QuestionParam.java

+package com.oto.bean;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+@Data
+public class QuestionParam {
+    public int id;
+    public ArrayList answers;
+
+    public QuestionParam(int id, ArrayList answers) {
+        this.id = id;
+        this.answers = answers;
+    }
+}

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

@@ -266,13 +266,11 @@ public class Phone implements Authorization {
     public void 上传第一次社区参观面访详情(){
         HashMap<String,Object> params = new HashMap<>();
         int[] unusualTypes = {1,2};
-        int[] coreMakers={2,3};
         ArrayList unusualProofs = new ArrayList();
         unusualProofs.add("https://yun.dui88.com/kjy/image/20220506/ecf1d585e2e040ad97ec7996ce5bf2a3.jpg");
         unusualProofs.add("https://yun.dui88.com/kjy/image/20220505/62cc0df86ed7430ea67d5015ee3fcc2b.jpg");
         params.put("id", interviewIds.get(0));
         params.put("interviewRemark", "第一次社区参观");
-        params.put("coreMakers", coreMakers);
         params.put("birthdayTime", "1960-01-03");
         params.put("custAddress", "杭州市文新地铁站");
         params.put("followWeight", 3);
@@ -416,13 +414,11 @@ public class Phone implements Authorization {
         otoTakerTku();
         HashMap<String,Object> params = new HashMap<>();
         int[] unusualTypes = {2};
-        int[] coreMakers = {2,4};
         ArrayList unusualProofs = new ArrayList();
         unusualProofs.add("https://yun.dui88.com/kjy/image/20220506/ecf1d585e2e040ad97ec7996ce5bf2a3.jpg");
         params.put("id", interviewIds.get(1));
         params.put("custPhase", 1);
         params.put("interviewRemark", "第二次的社区参观");
-        params.put("coreMakers", coreMakers);
         params.put("birthdayTime", "1960-01-03");
         params.put("custAddress", "杭州市文新地铁站");
         params.put("followWeight", 2);
@@ -562,10 +558,8 @@ public class Phone implements Authorization {
     @Test(description = "上传送计划书面访",priority = 41)
     public void 上传送计划书面访() {
         HashMap<String, Object> params = new HashMap<>();
-        int[] coreMakers = {2,4};
         params.put("id", interviewIds.get(2));
         params.put("interviewRemark", "送客户最终版计划书");
-        params.put("coreMakers", coreMakers);
         params.put("birthdayTime", "1960-01-03");
         params.put("custAddress", "杭州市文新地铁站");
         params.put("followWeight", 1);

src/test/java/com/oto/config/BasicConfig.java

@@ -259,6 +259,16 @@ public class BasicConfig {
   public static final String WORK_deptDel= WORK_HOST + "/kjy/oto/manager/dept/delete";
   public static final String WORK_batchAddSeller= WORK_HOST + "/kjy/oto/manager/dept/batchAddSeller";
 
+  //**************************资料配置***************************
+  public static final String WORK_formList= WORK_HOST + "/kjy/oto/customer/form/list";
+  public static final String WORK_formSave= WORK_HOST + "/kjy/oto/customer/form/saveForm";
+  public static final String WORK_formStatus= WORK_HOST + "/kjy/oto/customer/form/formStatus";
+  public static final String WORK_saveFormDetail= WORK_HOST + "/kjy/oto/customer/form/saveFormDetail";
+  public static final String WORK_formSubmit = WORK_HOST + "/kjy/oto/customer/form/submit";
+  public static final String WORK_formDetail= WORK_HOST + "/kjy/oto/customer/form/detail";
+  public static final String WORK_custDetail= WORK_HOST + "/kjy/oto/customer/form/custDetail";
+  public static final String WORK_formOrder= WORK_HOST + "/kjy/oto/customer/form/order";
+
   //**************************客户管理***************************
   public static final String WORK_MNG_custSourceList = WORK_HOST  + "/kjy/oto/mng/common/custFromSourceList";
   public static final String WORK_MNG_customerList = WORK_HOST  + "/kjy/oto/mng/pub/form/customer/list/v2";

src/test/java/com/oto/utils/BaseUtils.java

@@ -214,4 +214,14 @@ public class BaseUtils {
         System.out.println("久久保cookie中的key："+JJBManagerCookieKey +"，values："+JJBManagerCookieValue);
     }
 
+    public static String randomCode() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0;i < 4;i++){
+            sb.append((char) (Math.random()*26+97));
+        }
+        String code = sb.toString();
+        System.out.println("随机码 ："+code);
+        return code;
+    }
+
 }

src/test/workTestNG.xml

@@ -19,6 +19,12 @@
         </classes>
     </test>
 
+    <test preserve-order="true" name="PC_客户资料配置">
+        <classes>
+            <class name="com.oto.cases.otoseller.FormSubmit"/>
+        </classes>
+    </test>
+
     <test preserve-order="true" name="PC_邀约承诺">
         <classes>
             <class name="com.oto.cases.otoseller.Invite"/>
@@ -37,11 +43,11 @@
         </classes>
     </test>
 
-<!--    <test preserve-order="true" name="久久保人管系统">-->
-<!--        <classes>-->
-<!--            <class name="com.oto.cases.otoseller.JiuJiuBao"/>-->
-<!--        </classes>-->
-<!--    </test>-->
+    <test preserve-order="true" name="久久保人管系统">
+        <classes>
+            <class name="com.oto.cases.otoseller.JiuJiuBao"/>
+        </classes>
+    </test>
 
 </suite>
         <!-- Suite -->