目标导入导不进去bug修复

src/custom/restcontroller/webmanage/sale/salestarget/enterprisetarget.java

@@ -545,6 +545,7 @@ public class enterprisetarget extends Controller {
                 } else {
                     Rows userRows = agentRowsMap.get(row.getString("name"));
                     if (userRows.isNotEmpty()) {
+                        System.out.println(userRows.get(0).getString("agentnum"));
                         for (String type : types) {
                             int point;
                             if (type.equals("年")) {
@@ -558,32 +559,42 @@ public class enterprisetarget extends Controller {
                             }
 
                             for (int i = 0; i < point; i++) {
+                                System.out.println(1111111);
                                 double target_l = 0L;
                                 double target_h = 0L;
                                 if (type.equals("年")) {
                                     if(!isNumeric(row.getString("y1l"))){
+                                        System.out.println("y1l");
                                         iserr = true;
                                         row.put("msg", "年度目标不为数字格式，请检查");
                                         rowserr.add(row);
+                                        break;
                                     }
-                                }else if (type.equals("季")) {
+                                }
+                                if (type.equals("季")) {
                                     if(!isNumeric(row.getString("s" + (i + 1) + "l"))){
+                                        System.out.println("季");
                                         iserr = true;
                                         row.put("msg", "第"+(i + 1)+"季度目标不为数字格式，请检查");
                                         rowserr.add(row);
+                                        break;
                                     }
-                                }else if (type.equals("月")) {
+                                }
+                                if (type.equals("月")) {
                                     if(!isNumeric(row.getString("m" + (i + 1) + "l"))){
+                                        System.out.println("月");
                                         iserr = true;
                                         row.put("msg", "第"+(i + 1)+"月度目标不为数字格式，请检查");
                                         rowserr.add(row);
+                                        break;
                                     }
-                                }else{
-                                    row.putAll(userRows.get(0));
-                                    rowssuc.add(row);
                                 }
                             }
                         }
+                        if(StringUtils.isBlank(row.getString("msg"))){
+                            row.putAll(userRows.get(0));
+                            rowssuc.add(row);
+                        }
                     } else {
                         iserr = true;
                         row.put("msg", "错误信息:数据已导入或经销商不在数据库中");

src/custom/restcontroller/webmanage/sale/salestarget/personnel.java

@@ -514,20 +514,26 @@ public class personnel extends Controller {
                                             iserr = true;
                                             row.put("msg", "年度目标不为数字格式，请检查");
                                             rowserr.add(row);
+                                            break;
                                         }
-                                    }else if (type.equals("季")) {
+                                    }
+                                    if (type.equals("季")) {
                                         if(!isNumeric(row.getString("s" + (i + 1) + "l"))){
                                             iserr = true;
                                             row.put("msg", "第"+(i + 1)+"季度目标不为数字格式，请检查");
                                             rowserr.add(row);
+                                            break;
                                         }
-                                    }else if (type.equals("月")) {
+                                    }
+                                    if (type.equals("月")) {
                                         if(!isNumeric(row.getString("m" + (i + 1) + "l"))){
                                             iserr = true;
                                             row.put("msg", "第"+(i + 1)+"月度目标不为数字格式，请检查");
                                             rowserr.add(row);
+                                            break;
                                         }
-                                    }else{
+                                    }
+                                    if(StringUtils.isBlank(row.getString("msg"))){
                                         row.putAll(userRows.get(0));
                                         rowssuc.add(row);
                                     }