cucu业绩目标逻辑优化

src/custom/restcontroller/webmanage/sale/salestarget_cucu/SQL/区域-查询可导入区域信息.sql

@@ -0,0 +1,4 @@
+SELECT t1.areaname,t1.sa_saleareaid,0 hrid,'' name,0 departmentid,'' depname
+FROM  sa_salearea t1
+WHERE t1.areaname IN $name$
+  AND t1.siteid = $siteid$

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

@@ -374,11 +374,11 @@ public class personnel extends Controller {
                 hrnameList.add(row.getString("name"));
             }
             //查询可导入的用户信息
-            SQLFactory sqlFactory = new SQLFactory(this, "人员-查询可导入员工信息");
+            SQLFactory sqlFactory = new SQLFactory(this, "区域-查询可导入区域信息");
             sqlFactory.addParameter("siteid", siteid);
             sqlFactory.addParameter_in("name", hrnameList);
             String sql = sqlFactory.getSQL();
-            RowsMap hrRowsMap = dbConnect.runSqlQuery(sql).toRowsMap("name");
+            RowsMap hrRowsMap = dbConnect.runSqlQuery(sql).toRowsMap("areaname");
             String[] types = {"年", "季", "月"};
             boolean iserr = false;
             Rows rowserr = new Rows();
@@ -391,7 +391,6 @@ public class personnel extends Controller {
                     row.put("msg", "错误信息:必填项名称不能为空");
                     rowserr.add(row);
                 } else {
-
                         if (hrRowsMap.containsKey(row.getString("name"))) {
                             for (String type : types) {
                                 int point;
@@ -435,12 +434,11 @@ public class personnel extends Controller {
                             }
                             if(StringUtils.isBlank(row.getString("msg"))){
                                 row.putAll(hrRowsMap.get(row.getString("name")).get(0));
-
                                 rowssuc.add(row);
                             }
                         } else {
                             iserr = true;
-                            row.put("msg", "错误信息:数据已导入或人员名称不在数据库中");
+                            row.put("msg", "错误信息:数据已导入或区域名称不在数据库中");
                             rowserr.add(row);
                         }
                 }

src/custom/restcontroller/webmanage/sale/salestarget_cucu/personnelexcel.java

@@ -87,7 +87,7 @@ public class personnelexcel {
 
         cell = row.createCell(0);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("人员名称");
+        cell.setCellValue("区域名称");
 
         cell = row.createCell(1);
         cell.setCellStyle(cellStyle2);
@@ -130,7 +130,7 @@ public class personnelexcel {
 
         cell = row.createCell(0);
         cell.setCellStyle(cellStyle3);
-        cell.setCellValue("人员名称");
+        cell.setCellValue("区域名称");
 
         for (int i = 1; i < 18; i++) {
             cell = row.createCell(i);
@@ -180,7 +180,7 @@ public class personnelexcel {
 
         cell = row.createCell(0);
         cell.setCellStyle(cellStyle2);
-        cell.setCellValue("姓名(必填)");
+        cell.setCellValue("区域名称(必填)");