|
@@ -581,6 +581,35 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
|
|
|
try {
|
|
|
//查询主表信息
|
|
|
SyLetterDeposit entity = syLetterDepositService.getById(id);
|
|
|
+ //判空
|
|
|
+ if(oConvertUtils.isEmpty(entity.getUnitInOperation())){
|
|
|
+ entity.setUnitInOperation(" ");
|
|
|
+ }
|
|
|
+
|
|
|
+ //海关
|
|
|
+ if(oConvertUtils.isEmpty(entity.getExportPort())){
|
|
|
+ entity.setExportPort(" ");
|
|
|
+ }
|
|
|
+ if(oConvertUtils.isEmpty(entity.getLatestDateOfShipment())){
|
|
|
+ entity.setLatestDateOfShipment(new Date());
|
|
|
+ }
|
|
|
+
|
|
|
+ if(oConvertUtils.isEmpty(entity.getTheFinalShippingDate())){
|
|
|
+ entity.setTheFinalShippingDate(new Date());
|
|
|
+ }
|
|
|
+
|
|
|
+ if(oConvertUtils.isEmpty(entity.getShippingOrderNumber())){
|
|
|
+ entity.setShippingOrderNumber(" ");
|
|
|
+ } if(oConvertUtils.isEmpty(entity.getTradeCountry())){
|
|
|
+ entity.setTradeCountry(" ");
|
|
|
+ }
|
|
|
+ if(oConvertUtils.isEmpty(entity.getArriveInCountry())){
|
|
|
+ entity.setArriveInCountry(" ");
|
|
|
+ }
|
|
|
+ if(oConvertUtils.isEmpty(entity.getDestinationPort())){
|
|
|
+ entity.setDestinationPort(" ");
|
|
|
+ }
|
|
|
+
|
|
|
entity.setTransDate(sdf1.format(entity.getShippingOrderDate()));
|
|
|
entity.setLastDate(sf.format(entity.getLatestDateOfShipment()));
|
|
|
entity.setTheDate(sf.format(entity.getTheFinalShippingDate()));
|
|
@@ -617,6 +646,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
|
|
|
//总体积
|
|
|
entity.setTotalVolume(tatolVolume);
|
|
|
|
|
|
+
|
|
|
//主表转map
|
|
|
Field[] fields = entity.getClass().getDeclaredFields();
|
|
|
for (Field field : fields) {
|