liyg 1 year ago
parent
commit
786bff49da

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/SystemFileController.java

@@ -372,7 +372,7 @@ public class SystemFileController extends BaseRESTfulController {
                 //}
             }
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("/yyyy/MM/dd");
-            String filePath = simpleDateFormat.format(new Date()) + "/" + fileType;
+            String filePath = "/" + fileType  + simpleDateFormat.format(new Date());
             boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
             inputStream.close();
             if (result) {

+ 2 - 1
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -572,7 +572,8 @@
             RCT.CAPACITY_TYPE_NAME "text",
             RCT .CAPACITY_MAX_LOAD "capacityMaxLoad",
             '[' || listagg (RCFT .FUEL_TYPE_ID, ',') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) || ']'  "fuelTypeIds",
-            listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID)  "fuelTypes"
+            listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID)  "fuelTypes",
+            'capacityTypeName' "prop"
             from RMS_CAPACITY_TYPE RCT
             LEFT JOIN RMS_CAPACITY_FUEL_TYPE RCFT ON RCFT.CAPACITY_TYPE_ID = RCT .CAPACITY_TYPE_ID
             LEFT JOIN RMS_FUEL_TYPE RFT ON RFT .FUEL_TYPE_ID = RCFT.FUEL_TYPE_ID