线索导入，取消手机格式验证

src/custom/restcontroller/webmanage/saletool/orderclue/orderclue.java

@@ -106,22 +106,13 @@ public class orderclue extends Controller {
             boolean iserr = false;
             Rows rowserr = new Rows();
             Rows rowssuc = new Rows();
-            String regex = "1[3-9][0-9]\\d{8}";// 手机号码的格式：第一位只能为1，第二位可以是3，4，5，7，8，第三位到第十一位可以为0-9中任意一个数字
             for (Row row : rows) {
-                if (StringUtils.isEmpty(row.getString("phonenumber")) || StringUtils.isEmpty(row.getString("province"))
-                        || StringUtils.isEmpty(row.getString("city")) || StringUtils.isEmpty(row.getString("county"))
-                        || StringUtils.isEmpty(row.getString("cluesource"))) {
+                if (StringUtils.isEmpty(row.getString("phonenumber")) || StringUtils.isEmpty(row.getString("province")) || StringUtils.isEmpty(row.getString("city")) || StringUtils.isEmpty(row.getString("county")) || StringUtils.isEmpty(row.getString("cluesource"))) {
                     iserr = true;
                     row.put("msg", "错误信息:手机号，省市县及来源不能为空");
                     rowserr.add(row);
                 } else {
-                    if (!row.getString("phonenumber").matches(regex)) {
-                        iserr = true;
-                        row.put("msg", "错误信息:手机号格式不正确");
-                        rowserr.add(row);
-                    } else {
-                        rowssuc.add(row);
-                    }
+                    rowssuc.add(row);
                 }
             }
             if (!rowssuc.isEmpty()) {
@@ -253,8 +244,7 @@ public class orderclue extends Controller {
                     }
                 }
 
-                if (StringUtils.isBlank(row.getString("phonenumber")) || StringUtils.isBlank(row.getString("addressinfo"))
-                        || StringUtils.isBlank(row.getString("cluesource"))) {
+                if (StringUtils.isBlank(row.getString("phonenumber")) || StringUtils.isBlank(row.getString("addressinfo")) || StringUtils.isBlank(row.getString("cluesource"))) {
                     iserr = true;
                     row.put("msg", "错误信息:手机号，省市县信息及来源不能为空");
                     rowserr.add(row);
@@ -476,9 +466,7 @@ public class orderclue extends Controller {
             return getErrReturnObject().setErrMsg("待审核的销售线索导入单无法反审核").toString();
         }
         if (!ischeck) {
-            Rows rowscount = dbConnect.runSqlQuery(
-                    "select count(1) statuscount from sat_orderclueuploadbillmx t1 inner join sat_orderclue t2 on t1.sat_orderclueid=t2.sat_orderclueid and t1.siteid=t2.siteid  where t1.sat_orderclueuploadbillid="
-                            + sat_orderclueuploadbillid + " and  t2.status <>'待分配'");
+            Rows rowscount = dbConnect.runSqlQuery("select count(1) statuscount from sat_orderclueuploadbillmx t1 inner join sat_orderclue t2 on t1.sat_orderclueid=t2.sat_orderclueid and t1.siteid=t2.siteid  where t1.sat_orderclueuploadbillid=" + sat_orderclueuploadbillid + " and  t2.status <>'待分配'");
             if (rowscount.get(0).getLong("statuscount") > 0) {
                 return getErrReturnObject().setErrMsg("关联的销售线索池中存在非待分配的线索，无法反审核").toString();
             }
@@ -507,8 +495,7 @@ public class orderclue extends Controller {
         String notes = content.getString("notes");
         String cluesource = content.getString("cluesource");
 
-        Rows rowscount = dbConnect.runSqlQuery("select status from sat_orderclueuploadbill where sat_orderclueuploadbillid="
-                + sat_orderclueuploadbillid);
+        Rows rowscount = dbConnect.runSqlQuery("select status from sat_orderclueuploadbill where sat_orderclueuploadbillid=" + sat_orderclueuploadbillid);
         if (rowscount.isEmpty()) {
             return getErrReturnObject().setErrMsg("此销售线索导入单不存在").toString();
         }
@@ -516,9 +503,7 @@ public class orderclue extends Controller {
             return getErrReturnObject().setErrMsg("已审核状态的销售线索导入单无法新增或更新明细内容").toString();
         }
 
-        if (sat_orderclueuploadbillmxid <= 0 || dbConnect.runSqlQuery(
-                "select sat_orderclueuploadbillmxid from sat_orderclueuploadbillmx where sat_orderclueuploadbillmxid="
-                        + sat_orderclueuploadbillmxid).isEmpty()) {
+        if (sat_orderclueuploadbillmxid <= 0 || dbConnect.runSqlQuery("select sat_orderclueuploadbillmxid from sat_orderclueuploadbillmx where sat_orderclueuploadbillmxid=" + sat_orderclueuploadbillmxid).isEmpty()) {
             sat_orderclueuploadbillmxid = createTableID("sat_orderclueuploadbillmx");
             InsertSQL orderclueuploadbillmxInsert = SQLFactory.createInsertSQL(this, "sat_orderclueuploadbillmx");
             orderclueuploadbillmxInsert.setValue("sat_orderclueuploadbillmxid", sat_orderclueuploadbillmxid);
@@ -597,8 +582,7 @@ public class orderclue extends Controller {
         return sqlDump;
     }
 
-    public XSSFSheet addSheet(ExcelFactory excelFactory, String sheetname, Rows datarows,
-                              HashMap<String, String> titlemap) {
+    public XSSFSheet addSheet(ExcelFactory excelFactory, String sheetname, Rows datarows, HashMap<String, String> titlemap) {
         ArrayList<String> keylist = datarows.getFieldList();
         XSSFSheet sheet = excelFactory.getXssfWorkbook().createSheet(sheetname);
         XSSFWorkbook xssfFWorkbook = excelFactory.getXssfWorkbook();
@@ -640,8 +624,7 @@ public class orderclue extends Controller {
         return sheet;
     }
 
-    public XSSFSheet addSheet1(ExcelFactory excelFactory, String sheetname, Rows datarows,
-                               HashMap<String, String> titlemap) {
+    public XSSFSheet addSheet1(ExcelFactory excelFactory, String sheetname, Rows datarows, HashMap<String, String> titlemap) {
         ArrayList<String> keylist = datarows.getFieldList();
         XSSFSheet sheet = excelFactory.getXssfWorkbook().createSheet(sheetname);
         XSSFWorkbook xssfFWorkbook = excelFactory.getXssfWorkbook();