委外订单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/JsonChangeUtils.java

@@ -78,12 +78,16 @@ public class JsonChangeUtils implements ApplicationContextAware{
 
                 }
             }
-            String customerDemandDate = sf.format(map.get("customerDemandDate"));
-            jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
-            String publishDate = sf.format(map.get("publishDate"));
-            jf.put("publishDate",publishDate+" 00:00:00");
-//            String dVerifyDate = sf.format(map.get("dVerifyDate"));
-//            jf.put("dVerifyDate",dVerifyDate+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("customerDemandDate"))){
+                String customerDemandDate = sf.format(map.get("customerDemandDate"));
+                jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
+            }
+            if(oConvertUtils.isNotEmpty(map.get("publishDate"))){
+                String publishDate = sf.format(map.get("publishDate"));
+                jf.put("publishDate",publishDate+" 00:00:00");
+
+            }
+
             //查询子表信息
             if(map.get("pkorg").equals("one")){
                 BigDecimal totalAmount = BigDecimal.ZERO; //总金额
@@ -202,10 +206,15 @@ public class JsonChangeUtils implements ApplicationContextAware{
                     jf.put(key, map.get(key));
                 }
             }
-            String customerDemandDate = sf.format(map.get("customerDemandDate"));
-            jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
-            String publishDate = sf.format(map.get("publishDate"));
-            jf.put("publishDate",publishDate+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("customerDemandDate"))){
+                String customerDemandDate = sf.format(map.get("customerDemandDate"));
+                jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
+            }
+            if(oConvertUtils.isNotEmpty(map.get("publishDate"))){
+                String publishDate = sf.format(map.get("publishDate"));
+                jf.put("publishDate",publishDate+" 00:00:00");
+
+            }
 //            String cAuditDate = sf.format(map.get("cAuditDate"));
 //            jf.put("cAuditDate",cAuditDate+" 00:00:00");
             //查询子表信息
@@ -317,10 +326,15 @@ public class JsonChangeUtils implements ApplicationContextAware{
                     jf.put(key, map.get(key));
                 }
             }
-            String customerDemandDate = sf.format(map.get("customerDemandDate"));
-            jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
-            String publishDate = sf.format(map.get("publishDate"));
-            jf.put("publishDate",publishDate+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("customerDemandDate"))){
+                String customerDemandDate = sf.format(map.get("customerDemandDate"));
+                jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
+            }
+            if(oConvertUtils.isNotEmpty(map.get("publishDate"))){
+                String publishDate = sf.format(map.get("publishDate"));
+                jf.put("publishDate",publishDate+" 00:00:00");
+
+            }
             //查询子表信息
             if(map.get("accId").equals("903")){
                 String sql = "select '903' as cAccId,'' as '发货单号',AutoID as '发货单行ID',ID as '发货单ID', irowno as '发货单行号'," +
@@ -383,8 +397,11 @@ public class JsonChangeUtils implements ApplicationContextAware{
                     jf.put(key, map.get(key));
                 }
             }
-            String customerDemandDate = sf.format(map.get("customerDemandDate"));
-            jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("customerDemandDate"))){
+                String customerDemandDate = sf.format(map.get("customerDemandDate"));
+                jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
+            }
+
             if(oConvertUtils.isNotEmpty(map.get("lineAttributeDatetime1"))){
                 String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
                 jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
@@ -456,8 +473,10 @@ public class JsonChangeUtils implements ApplicationContextAware{
                     jf.put(key, map.get(key));
                 }
             }
-            String customerDemandDate = sf.format(map.get("customerDemandDate"));
-            jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("customerDemandDate"))){
+                String customerDemandDate = sf.format(map.get("customerDemandDate"));
+                jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
+            }
             if(oConvertUtils.isNotEmpty(map.get("lineAttributeDatetime1"))){
                 String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
                 jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");