Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -584,8 +584,6 @@ public class SmartLogisticService {
|
||||
|
||||
private List<FileItem> doReturnInfo(List<EntityBase> respList) {
|
||||
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(CommonConstants.DATETIME_FORMAT_YMD);
|
||||
|
||||
List<FileItem> finalList = new ArrayList<FileItem>();
|
||||
for (EntityBase entityBase : respList) {
|
||||
if (entityBase instanceof MtbColt) {
|
||||
@@ -595,7 +593,7 @@ public class SmartLogisticService {
|
||||
Integer numOrd = 0;
|
||||
String dataVers = "";
|
||||
if (!UtilityString.isNullOrEmpty(collo.getDataOrd()))
|
||||
dataOrd = sdf.format(collo.getDataOrd());
|
||||
dataOrd = CommonConstants.DATETIME_YMD_DASHED_FORMATTER.format(collo.getDataOrd());
|
||||
if (!UtilityString.isNullOrEmpty(collo.getNumOrd()))
|
||||
numOrd = collo.getNumOrd();
|
||||
if (!UtilityString.isNullOrEmpty(collo.getDataVers()))
|
||||
|
||||
Reference in New Issue
Block a user