diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java index 246f16ad27f53201bc19121d4a83e732e8f6cd26..36298da39c1e33518ddd029d774ffb15948e77dc 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java @@ -9,6 +9,7 @@ import com.unlcn.ils.sales.backend.bo.OrderToKyleBO; import com.unlcn.ils.sales.backend.bo.PriceBO; import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum; +import com.unlcn.ils.sales.backend.util.DateUtils; import com.unlcn.ils.sales.base.mapper.SaleOrderAuditMapper; import com.unlcn.ils.sales.base.mapper.SaleOrderViewMapper; import com.unlcn.ils.sales.base.model.OrderViewDAO; @@ -154,7 +155,7 @@ public class OrderAuditServiceImpl implements OrderAuditService { bo.setDestRegionName(val.getDestRegionName()); bo.setDestContact(val.getDestContact()); bo.setDestPhone(val.getDestPhone()); - bo.setPickDate(val.getPickDate().toString()); + bo.setPickDate(DateUtils.getStringFromDate(val.getPickDate(), "yyyy-MM-dd")); bo.setBrands(val.getBrands()); bo.setSeriesAmt(val.getSeriesAmt()); bo.setDistance(val.getDistance().toString()); diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml index c1ca3ba8b5da2615db63fa18860ed038a04dd82e..deb6ee5b26472c5b1a7b1885a5b9a5a484cfb89d 100644 --- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml +++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml @@ -40,7 +40,7 @@ + javaType="ArrayList" select="saleOrderSkus"/> @@ -202,8 +202,7 @@ + +