配件申请单管理，虚拟字段 添加搜索功能及订货订单 提交后自动审核 审核人：“自动审核”

src/custom/restcontroller/webmanage/sale/accessoryorder/accessoryorder.java

@@ -124,6 +124,16 @@ public class accessoryorder extends Controller {
 //                    where.append(" and 1=1");
 //                }
 //            }
+            if (content_where.containsKey("tablefilter")) {
+                if(content_where.getJSONObject("tablefilter").containsKey("areaname")){
+                    if(StringUtils.isNotBlank(content_where.getJSONObject("tablefilter").getStringValue("areaname"))){
+                        where.append(" and(");
+                        where.append(" t7.areaname like '%").append(content_where.getJSONObject("tablefilter").getStringValue("areaname")).append("%' ");
+                        where.append(")");
+                    }
+                }
+            }
+
         }
 
         QuerySQL querySQL = queryListManage(where.toString());
@@ -151,11 +161,11 @@ public class accessoryorder extends Controller {
         Rows expressformrows = expressformQuery.query();
         RowsMap expressformrowsMap = expressformrows.toRowsMap("sa_orderid");
         //查询区域信息
-        QuerySQL areaQuery = SQLFactory.createQuerySQL(this, "sa_salearea", "areanum","areaname","areafullname").setTableAlias("t1");
-        areaQuery.addJoinTable(JOINTYPE.inner, "sys_enterprise_tradefield ", "t2", "t2.sa_saleareaid = t1.sa_saleareaid","sys_enterpriseid");
-        areaQuery.setWhere("t2.sys_enterpriseid", rows.toArrayList("sys_enterpriseid"));
-        Rows arearows = areaQuery.query();
-        RowsMap arearowsrowsMap = arearows.toRowsMap("sys_enterpriseid");
+//        QuerySQL areaQuery = SQLFactory.createQuerySQL(this, "sa_salearea", "areanum","areaname","areafullname").setTableAlias("t1");
+//        areaQuery.addJoinTable(JOINTYPE.inner, "sys_enterprise_tradefield ", "t2", "t2.sa_saleareaid = t1.sa_saleareaid","sys_enterpriseid");
+//        areaQuery.setWhere("t2.sys_enterpriseid", rows.toArrayList("sys_enterpriseid"));
+//        Rows arearows = areaQuery.query();
+//        RowsMap arearowsrowsMap = arearows.toRowsMap("sys_enterpriseid");
 
 
 
@@ -209,15 +219,15 @@ public class accessoryorder extends Controller {
             if(expressformrowsMap.containsKey(row.getString("sa_orderid"))){
                 row.put("expressform",expressformrowsMap.get(row.getString("sa_orderid")).get(0));
             }
-            if(arearowsrowsMap.containsKey(row.getString("sys_enterpriseid"))){
-                row.put("areaname",arearowsrowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areaname"));
-                row.put("areanum",arearowsrowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areanum"));
-                row.put("areafullname",arearowsrowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areafullname"));
-            }else{
-                row.put("areaname","");
-                row.put("areanum","");
-                row.put("areafullname","");
-            }
+//            if(arearowsrowsMap.containsKey(row.getString("sys_enterpriseid"))){
+//                row.put("areaname",arearowsrowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areaname"));
+//                row.put("areanum",arearowsrowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areanum"));
+//                row.put("areafullname",arearowsrowsMap.get(row.getString("sys_enterpriseid")).get(0).getString("areafullname"));
+//            }else{
+//                row.put("areaname","");
+//                row.put("areanum","");
+//                row.put("areafullname","");
+//            }
         }
         return getSucReturnObject().setData(rows).toString();
     }
@@ -394,6 +404,8 @@ public class accessoryorder extends Controller {
                 "enterprisename","abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t6.sys_enterpriseid=t1.sys_enterpriseid and t6.siteid = t1.siteid",
                 "agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "(select GROUP_CONCAT(t1.areanum) areanum,GROUP_CONCAT(t1.areaname) areaname,GROUP_CONCAT(t1.areafullname) areafullname,t2.sys_enterpriseid from sa_salearea t1 inner join sys_enterprise_tradefield t2 on t1.sa_saleareaid=t2.sa_saleareaid group by t2.sys_enterpriseid)", "t7", "t7.sys_enterpriseid=t1.sys_enterpriseid and t7.siteid = t1.siteid",
+                "areanum","areaname","areafullname");
         querySQL.addQueryFields("amount", "CAST(0 AS CHAR(20))");
         querySQL.addQueryFields("qty", "CAST(0 AS CHAR(20))");
         querySQL.setWhere("t1.siteid", siteid);

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -2666,6 +2666,7 @@ public class Order extends Controller {
                 if(amount.compareTo(BigDecimal.ZERO)>0){
                     if(orderRows.isEmpty() && orderdetailsRows.isEmpty()){
                         check();
+                        dbConnect.runSqlUpdate("update sa_order set checkby='自动审核' where sa_orderid="+sa_orderid);
                     }
                 }