forked from integrated_whb/integrated_whb
BUG优化
parent
bce5400d80
commit
da3bde1492
|
@ -104,6 +104,10 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
|
||||||
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
|
pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间
|
||||||
pd.put("ISDELETE", "0");
|
pd.put("ISDELETE", "0");
|
||||||
|
|
||||||
|
if("".equals(pd.getString("TRUCKCART")) || "undefinedpd".equals(pd.getString("TRUCKCART")) || StringUtils.isEmpty(pd.getString("TRUCKCART"))) {
|
||||||
|
pd.put("TRUCKCART","");
|
||||||
|
}
|
||||||
|
|
||||||
Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE"));
|
Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE"));
|
||||||
if (shippingDate != null && shippingDate.after(new Date())) {
|
if (shippingDate != null && shippingDate.after(new Date())) {
|
||||||
pd.put("WAYBILLSTATUS", "1");
|
pd.put("WAYBILLSTATUS", "1");
|
||||||
|
@ -177,6 +181,9 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController
|
||||||
PageData pd = new PageData();
|
PageData pd = new PageData();
|
||||||
pd = this.getPageData();
|
pd = this.getPageData();
|
||||||
pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读
|
pd = trafficSecurityWaybillRegistrationService.findById(pd);//根据ID读
|
||||||
|
if("".equals(pd.getString("TRUCKCART")) || "undefined".equals(pd.getString("TRUCKCART")) || StringUtils.isEmpty(pd.getString("TRUCKCART"))) {
|
||||||
|
pd.put("TRUCKCART","");
|
||||||
|
}
|
||||||
String[] dispatchers = pd.getString("DISPATCHER").split(",");
|
String[] dispatchers = pd.getString("DISPATCHER").split(",");
|
||||||
List<PageData> names = new ArrayList<>();
|
List<PageData> names = new ArrayList<>();
|
||||||
for (String dispatcher : dispatchers) {
|
for (String dispatcher : dispatchers) {
|
||||||
|
|
Loading…
Reference in New Issue