From b09e1a8b036553d1e161d127aa738a504593490a Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:14:55 +0800
Subject: [PATCH] 优化巡检路线查询sql
---
java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java b/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java
index fa0ae14..ca02d65 100644
--- a/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java
+++ b/java110-core/src/main/java/com/java110/core/context/OrderDataFlow.java
@@ -2,13 +2,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.CommonConstant;
-import com.java110.common.util.Assert;
-import com.java110.common.util.DateUtil;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
import com.java110.entity.order.Business;
import com.java110.entity.order.BusinessAttrs;
import com.java110.entity.order.Orders;
import com.java110.entity.order.OrdersAttrs;
+import com.java110.utils.util.StringUtil;
import java.util.*;
@@ -136,6 +137,14 @@
Assert.jsonObjectHaveKey(tmpOrderJson,"orderTypeCd","璇锋眰鎶ユ枃閿欒锛屾湭鎵惧埌orderTypeCd鑺傜偣");
this.orders.setOrderTypeCd(tmpOrderJson.getString("orderTypeCd"));
+ if(tmpOrderJson.containsKey("orderProcess") && !StringUtil.isEmpty(tmpOrderJson.getString("orderProcess"))){
+ this.orders.setOrderProcess(tmpOrderJson.getString("orderProcess"));
+ }
+
+ if(tmpOrderJson.containsKey("oId") && !StringUtil.isEmpty(tmpOrderJson.getString("oId"))){
+ this.orders.setoId(tmpOrderJson.getString("oId"));
+ }
+
if(!tmpOrderJson.containsKey("attrs")){
return ;
}
@@ -163,6 +172,9 @@
private void builderBusiness() {
this.businessList = new ArrayList<Business>();
+ if(!this.getReqJson().containsKey("business")){
+ return;
+ }
JSONArray tmpBusiness = this.getReqJson().getJSONArray("business");
--
Gitblit v1.8.0