|
@@ -82,6 +82,8 @@ public class JsonChangeUtils implements ApplicationContextAware{
|
|
|
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(map.get("pkorg").equals("one")){
|
|
|
BigDecimal totalAmount = BigDecimal.ZERO; //总金额
|
|
@@ -203,6 +205,8 @@ public class JsonChangeUtils implements ApplicationContextAware{
|
|
|
jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
|
|
|
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");
|
|
|
//查询子表信息
|
|
|
if(map.get("pkorg").equals("one")){
|
|
|
BigDecimal totalAmount = BigDecimal.ZERO; //总金额
|
|
@@ -378,6 +382,8 @@ public class JsonChangeUtils implements ApplicationContextAware{
|
|
|
}
|
|
|
String supplierPromiseDate = sf.format(map.get("supplierPromiseDate"));
|
|
|
jf.put("supplierPromiseDate",supplierPromiseDate+" 00:00:00");
|
|
|
+ String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
|
|
|
+ jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
|
|
|
Set<String> keysCfree = mapCfree.keySet();
|
|
|
for (String key : keysCfree) {
|
|
|
jf.put("attributeCode"+ii, key);
|
|
@@ -446,6 +452,8 @@ public class JsonChangeUtils implements ApplicationContextAware{
|
|
|
}
|
|
|
String supplierPromiseDate = sf.format(map.get("supplierPromiseDate"));
|
|
|
jf.put("supplierPromiseDate",supplierPromiseDate+" 00:00:00");
|
|
|
+ String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
|
|
|
+ jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
|
|
|
//查询委外用料子表数据
|
|
|
if(map.get("pkorg").equals("one")){
|
|
|
|