|
@@ -533,7 +533,7 @@ public class enterprisetarget extends Controller {
|
|
|
String sql = sqlFactory.getSQL();
|
|
|
System.out.println(sql);
|
|
|
RowsMap agentRowsMap = dbConnect.runSqlQuery(sql).toRowsMap("agentnum");
|
|
|
-
|
|
|
+ String[] types = {"年", "季", "月"};
|
|
|
boolean iserr = false;
|
|
|
Rows rowserr = new Rows();
|
|
|
Rows rowssuc = new Rows();
|
|
@@ -545,8 +545,45 @@ public class enterprisetarget extends Controller {
|
|
|
} else {
|
|
|
Rows userRows = agentRowsMap.get(row.getString("name"));
|
|
|
if (userRows.isNotEmpty()) {
|
|
|
- row.putAll(userRows.get(0));
|
|
|
- rowssuc.add(row);
|
|
|
+ for (String type : types) {
|
|
|
+ int point;
|
|
|
+ if (type.equals("年")) {
|
|
|
+ point = 1;
|
|
|
+ } else if (type.equals("季")) {
|
|
|
+ point = 4;
|
|
|
+ } else if (type.equals("月")) {
|
|
|
+ point = 12;
|
|
|
+ } else {
|
|
|
+ point = 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ for (int i = 0; i < point; i++) {
|
|
|
+ double target_l = 0L;
|
|
|
+ double target_h = 0L;
|
|
|
+ if (type.equals("年")) {
|
|
|
+ if(!isNumeric(row.getString("y1l"))){
|
|
|
+ iserr = true;
|
|
|
+ row.put("msg", "年度目标不为数字格式,请检查");
|
|
|
+ rowserr.add(row);
|
|
|
+ }
|
|
|
+ }else if (type.equals("季")) {
|
|
|
+ if(!isNumeric(row.getString("s" + (i + 1) + "l"))){
|
|
|
+ iserr = true;
|
|
|
+ row.put("msg", "第"+(i + 1)+"季度目标不为数字格式,请检查");
|
|
|
+ rowserr.add(row);
|
|
|
+ }
|
|
|
+ }else if (type.equals("月")) {
|
|
|
+ if(!isNumeric(row.getString("m" + (i + 1) + "l"))){
|
|
|
+ iserr = true;
|
|
|
+ row.put("msg", "第"+(i + 1)+"月度目标不为数字格式,请检查");
|
|
|
+ rowserr.add(row);
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ row.putAll(userRows.get(0));
|
|
|
+ rowssuc.add(row);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
iserr = true;
|
|
|
row.put("msg", "错误信息:数据已导入或经销商不在数据库中");
|
|
@@ -557,7 +594,6 @@ public class enterprisetarget extends Controller {
|
|
|
|
|
|
}
|
|
|
|
|
|
- String[] types = {"年", "季", "月"};
|
|
|
|
|
|
long[] ids = createTableID("sa_salestarget", rowssuc.size() * 17);
|
|
|
int index = 1;
|
|
@@ -805,4 +841,11 @@ public class enterprisetarget extends Controller {
|
|
|
BigDecimal bigDecimal = new BigDecimal(c);
|
|
|
return bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
}
|
|
|
+
|
|
|
+ public static boolean isNumeric(String strNum) {
|
|
|
+ if (strNum == null) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ return strNum.matches("-?\\d+(\\.\\d+)?");
|
|
|
+ }
|
|
|
}
|