Browse Source

订单接口调整

zengtx 3 years ago
parent
commit
110ad2681d

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -102,6 +102,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		    queryWrapper.ge("t.documentDate",startTime);
 			queryWrapper.le("t.documentDate",endTime);
 		}
+		if(oConvertUtils.isNotEmpty(syShippingDetails.getPreCompletionDate())){
+			queryWrapper.ge("t.preCompletionDate",syShippingDetails.getPreCompletionDate());
+		}
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getPreDeliveryDate())){
 			queryWrapper.eq("t.preDeliveryDate",syShippingDetails.getPreDeliveryDate());
 		}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/MOMainController.java

@@ -178,7 +178,7 @@ public class MOMainController implements ApplicationContextAware {
                     //转JSON且赋值
                     Gson userGson = new GsonBuilder().create();
                     JSONObject jf = new JSONObject();
-                    jf.put("organizationId","32");
+                    jf.put("organizationId","36");
                     result.put("pathVariableMap",jf);
                     result.put("payload", userGson.toJson(JsonChangeUtils.toMoMainJson(map)));
                     log.info("查询到的数据:" + result);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/POPomainController.java

@@ -172,7 +172,7 @@ public class POPomainController implements ApplicationContextAware {
                     //转JSON且赋值
                     Gson userGson = new GsonBuilder().create();
                     JSONObject jf = new JSONObject();
-                    jf.put("organizationId","32");
+                    jf.put("organizationId","36");
                     result.put("pathVariableMap",jf);
                     result.put("payload", userGson.toJson(JsonChangeUtils.toPoMainJson(map)));