上传图片或者视频

xxgl-admin/src/main/java/com/miaxis/pc/controller/ControllerInfoController.java

@@ -8,9 +8,11 @@ import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.controller.domain.ControllerInfo;
 import com.miaxis.controller.service.IControllerInfoService;
+import com.miaxis.engine.domain.EngineInfo;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
 import java.util.List;
@@ -44,6 +46,16 @@ public class ControllerInfoController extends BaseController{
         return toResponsePageInfo(list);
     }
 
+    @Log(title = "报价", businessType = BusinessTypeEnum.IMPORT)
+    @PostMapping("/import")
+    @ApiOperation("导入报价列表Excel")
+    public Response<String> importEngineInfo(@RequestPart("file") MultipartFile file) throws Exception {
+        ExcelUtil<ControllerInfo> util = new ExcelUtil<ControllerInfo>(ControllerInfo.class);
+        List<ControllerInfo> list = util.importExcel(file.getInputStream(),2);
+        controllerInfoService.saveBatch(list);
+        return Response.success();
+    }
+
     /**
      * 导出控制器报价列表
      */

xxgl-admin/src/main/java/com/miaxis/pc/controller/EngineInfoController.java

@@ -3,19 +3,13 @@ package com.miaxis.pc.controller;
 import com.miaxis.common.constant.Constants;
 import java.util.List;
 import java.util.Arrays;
+
+import com.miaxis.price.domain.PriceInfo;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.*;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.enums.BusinessTypeEnum;
@@ -23,6 +17,7 @@ import com.miaxis.engine.domain.EngineInfo;
 import com.miaxis.engine.service.IEngineInfoService;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.common.core.page.ResponsePageInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 【报价】Controller
@@ -66,6 +61,20 @@ public class EngineInfoController extends BaseController{
         return util.exportExcel(list, "info");
     }
 
+    /**
+     * 导入报价列表
+     */
+//    @PreAuthorize("@ss.hasPermi('price:info:import')")
+    @Log(title = "报价", businessType = BusinessTypeEnum.IMPORT)
+    @PostMapping("/import")
+    @ApiOperation("导入报价列表Excel")
+    public Response<String> importEngineInfo(@RequestPart("file") MultipartFile file) throws Exception {
+        ExcelUtil<EngineInfo> util = new ExcelUtil<EngineInfo>(EngineInfo.class);
+        List<EngineInfo> list = util.importExcel(file.getInputStream(),3);
+        engineInfoService.saveBatch(list);
+        return Response.success();
+    }
+
     /**
      * 获取报价详细信息
      */

xxgl-admin/src/main/java/com/miaxis/pc/controller/FileInfoController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Arrays;
 
 import com.miaxis.common.config.MiaxisConfig;
+import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.file.FileUploadUtils;
 import com.miaxis.framework.config.ServerConfig;
 import com.miaxis.system.dto.common.UploadFileDTO;
@@ -74,7 +75,9 @@ public class FileInfoController extends BaseController{
     @Log(title = "上传文件", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("上传文件")
-    public Response add(@RequestPart("file") MultipartFile file,Long priceId){
+    public Response add(@RequestPart("file") MultipartFile file,@RequestParam Long id,
+                        @ApiParam(name = "type", value = "文件类型 1-总报价 2-动力报价 3-控制器报价 4-发电机报价",
+                                required = true) @RequestParam Integer type){
         try
         {
             // 上传文件路径
@@ -85,7 +88,18 @@ public class FileInfoController extends BaseController{
             FileInfo fileInfo = new FileInfo();
             fileInfo.setFilePath(fileName);
             fileInfo.setFileUrl(url);
-            fileInfo.setPriceId(priceId);
+            if (type ==1 ){
+                fileInfo.setPriceId(id);
+            }else if (type ==2){
+                fileInfo.setEngineId(id);
+            }else if (type ==3){
+                fileInfo.setControllerId(id);
+            }else if (type ==4){
+                fileInfo.setFdjId(id);
+            }else {
+                throw new CustomException("参数值有误");
+            }
+
             fileInfoService.save(fileInfo);
             return Response.success();
         }

xxgl-admin/src/main/java/com/miaxis/pc/controller/PriceInfoController.java

@@ -56,7 +56,7 @@ public class PriceInfoController extends BaseController{
     @ApiOperation("导入报价列表Excel")
     public Response<String> importPrice(@RequestPart("file")MultipartFile file) throws Exception {
         ExcelUtil<PriceInfo> util = new ExcelUtil<PriceInfo>(PriceInfo.class);
-        List<PriceInfo> list = util.importExcel(file.getInputStream());
+        List<PriceInfo> list = util.importExcel(file.getInputStream(),2);
         priceInfoService.saveBatch(list);
         return Response.success();
     }

xxgl-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java

@@ -90,7 +90,7 @@ public class SysUserController extends BaseController
             @RequestBody boolean updateSupport
     ) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        List<SysUser> userList = util.importExcel(file.getInputStream());
+        List<SysUser> userList = util.importExcel(file.getInputStream(),1);
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String operName = loginUser.getUsername();
         String message = userService.importUser(userList, updateSupport, operName);

xxgl-common/src/main/java/com/miaxis/common/utils/poi/ExcelUtil.java

@@ -115,9 +115,9 @@ public class ExcelUtil<T>
      * @param is 输入流
      * @return 转换后集合
      */
-    public List<T> importExcel(InputStream is) throws Exception
+    public List<T> importExcel(InputStream is,int headRows) throws Exception
     {
-        return importExcel(StringUtils.EMPTY, is);
+        return importExcel(StringUtils.EMPTY, is,headRows);
     }
 
     /**
@@ -127,7 +127,7 @@ public class ExcelUtil<T>
      * @param is 输入流
      * @return 转换后集合
      */
-    public List<T> importExcel(String sheetName, InputStream is) throws Exception
+    public List<T> importExcel(String sheetName, InputStream is,int headRows) throws Exception
     {
         this.type = Type.IMPORT;
         this.wb = WorkbookFactory.create(is);
@@ -189,7 +189,7 @@ public class ExcelUtil<T>
                     }
                 }
             }
-            for (int i = 2; i < rows; i++)
+            for (int i = headRows; i < rows; i++)
             {
                 // 从第2行开始取数据,默认第一行是表头.
                 Row row = sheet.getRow(i);

xxgl-service/src/main/java/com/miaxis/controller/domain/ControllerInfo.java

@@ -31,19 +31,19 @@ public class ControllerInfo extends BaseBusinessEntity{
     private Long id;
 
     /** 品牌 */
-    @Excel(name = "品牌")
+    @Excel(name = "品牌",sort=1)
     @TableField("brand")
     @ApiModelProperty(value = "品牌")
     private String brand;
 
     /** 控制器型号 */
-    @Excel(name = "控制器型号")
+    @Excel(name = "控制器型号",sort=2)
     @TableField("controller_model")
     @ApiModelProperty(value = "控制器型号")
     private String controllerModel;
 
     /** 控制器价格 */
-    @Excel(name = "控制器价格")
+    @Excel(name = "控制器价格",sort=3)
     @TableField("controller_price")
     @ApiModelProperty(value = "控制器价格")
     private BigDecimal controllerPrice;

xxgl-service/src/main/java/com/miaxis/engine/domain/EngineInfo.java

@@ -28,133 +28,133 @@ public class EngineInfo extends BaseBusinessEntity{
     private Long id;
 
     /** 动力品牌 */
-    @Excel(name = "动力品牌")
+    @Excel(name = "动力品牌",sort =1)
     @TableField("brand")
     @ApiModelProperty(value = "动力品牌")
     private String brand;
 
     /** 型号 */
-    @Excel(name = "型号")
+    @Excel(name = "型号",sort =2)
     @TableField("model")
     @ApiModelProperty(value = "型号")
     private String model;
 
     /** 发动机主要功率(1500RPM  50HZ) */
-    @Excel(name = "发动机主要功率(1500RPM  50HZ)")
+    @Excel(name = "发动机主要功率(1500RPM  50HZ)",sort =3)
     @TableField("engine_power_major_1500RPM")
     @ApiModelProperty(value = "发动机主要功率(1500RPM  50HZ)")
     private Long enginePowerMajor1500rpm;
 
     /** 发动机备用功率(1500RPM  50HZ) */
-    @Excel(name = "发动机备用功率(1500RPM  50HZ)")
+    @Excel(name = "发动机备用功率(1500RPM  50HZ)",sort =4)
     @TableField("engine_power_minor_1500RPM")
     @ApiModelProperty(value = "发动机备用功率(1500RPM  50HZ)")
     private Long enginePowerMinor1500rpm;
 
     /** 推荐机组主要功率(1500RPM  50HZ) */
-    @Excel(name = "推荐机组主要功率(1500RPM  50HZ)")
+    @Excel(name = "推荐机组主要功率(1500RPM  50HZ)",sort =5)
     @TableField("unit_power_major_1500RPM")
     @ApiModelProperty(value = "推荐机组主要功率(1500RPM  50HZ)")
     private Long unitPowerMajor1500rpm;
 
     /** 推荐机组备用功率(1500RPM  50HZ) */
-    @Excel(name = "推荐机组备用功率(1500RPM  50HZ)")
+    @Excel(name = "推荐机组备用功率(1500RPM  50HZ)",sort =6)
     @TableField("unit_power_minor_1500RPM")
     @ApiModelProperty(value = "推荐机组备用功率(1500RPM  50HZ)")
     private Long unitPowerMinor1500rpm;
 
     /** 发动机主要功率(1800RPM  60HZ) */
-    @Excel(name = "发动机主要功率(1800RPM  60HZ)")
+    @Excel(name = "发动机主要功率(1800RPM  60HZ)",sort =7)
     @TableField("engine_power_major_1800RPM")
     @ApiModelProperty(value = "发动机主要功率(1800RPM  60HZ)")
     private Long enginePowerMajor1800rpm;
 
     /** 发动机备用功率(1800RPM  60HZ) */
-    @Excel(name = "发动机备用功率(1800RPM  60HZ)")
+    @Excel(name = "发动机备用功率(1800RPM  60HZ)",sort =8)
     @TableField("engine_power_minor_1800RPM")
     @ApiModelProperty(value = "发动机备用功率(1800RPM  60HZ)")
     private Long enginePowerMinor1800rpm;
 
     /** 推荐机组主要功率(1800RPM  60HZ) */
-    @Excel(name = "推荐机组主要功率(1800RPM  60HZ)")
+    @Excel(name = "推荐机组主要功率(1800RPM  60HZ)",sort =9)
     @TableField("unit_power_major_1800RPM")
     @ApiModelProperty(value = "推荐机组主要功率(1800RPM  60HZ)")
     private Long unitPowerMajor1800rpm;
 
     /** 推荐机组备用功率(1800RPM  60HZ) */
-    @Excel(name = "推荐机组备用功率(1800RPM  60HZ)")
+    @Excel(name = "推荐机组备用功率(1800RPM  60HZ)",sort =10)
     @TableField("unit_power_minor_1800RPM")
     @ApiModelProperty(value = "推荐机组备用功率(1800RPM  60HZ)")
     private Long unitPowerMinor1800rpm;
 
     /** 油泵形式 */
-    @Excel(name = "油泵形式")
+    @Excel(name = "油泵形式",sort =11)
     @TableField("oil_form")
     @ApiModelProperty(value = "油泵形式")
     private String oilForm;
 
     /** 进气方式 */
-    @Excel(name = "进气方式")
+    @Excel(name = "进气方式",sort =12)
     @TableField("air_intake_mode")
     @ApiModelProperty(value = "进气方式")
     private String airIntakeMode;
 
     /** 电压 */
-    @Excel(name = "电压")
+    @Excel(name = "电压",sort =13)
     @TableField("voltage")
     @ApiModelProperty(value = "电压")
     private String voltage;
 
     /** 排量 （L） */
-    @Excel(name = "排量 （L）", readConverterExp = "L=")
+    @Excel(name = "排量 （L）", sort =14)
     @TableField("displacement")
     @ApiModelProperty(value = "排量 （L）")
     private String displacement;
 
     /** 油耗（g/kw.h) */
-    @Excel(name = "油耗（g/kw.h)", readConverterExp = "油耗（g/kw.h)")
+    @Excel(name = "油耗（g/kw.h)", sort =15)
     @TableField("oil_consumption")
     @ApiModelProperty(value = "油耗（g/kw.h)")
     private String oilConsumption;
 
     /** 水箱重量(Kg) */
-    @Excel(name = "水箱重量(Kg)")
+    @Excel(name = "水箱重量(Kg)",sort =16)
     @TableField("tank_weight")
     @ApiModelProperty(value = "水箱重量(Kg)")
     private Long tankWeight;
 
     /** 动力尺寸L*W*H(mm) */
-    @Excel(name = "动力尺寸L*W*H(mm)")
+    @Excel(name = "动力尺寸L*W*H(mm)",sort =17)
     @TableField("power_size")
     @ApiModelProperty(value = "动力尺寸L*W*H(mm)")
     private String powerSize;
 
     /** 水箱尺寸L*W*H(mm) */
-    @Excel(name = "水箱尺寸L*W*H(mm)")
+    @Excel(name = "水箱尺寸L*W*H(mm)",sort =18)
     @TableField("tank_size")
     @ApiModelProperty(value = "水箱尺寸L*W*H(mm)")
     private String tankSize;
 
     /** 排放标准 */
-    @Excel(name = "排放标准")
-    @TableField(" emission_standard")
+    @Excel(name = "排放标准",sort =19)
+    @TableField("emission_standard")
     @ApiModelProperty(value = "排放标准")
     private String emissionStandard;
 
     /** 配置说明 */
-    @Excel(name = "配置说明")
+    @Excel(name = "配置说明",sort =20)
     @TableField("configuration_description")
     @ApiModelProperty(value = "配置说明")
     private String configurationDescription;
 
     /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "价格",sort =21)
     @TableField("price")
     @ApiModelProperty(value = "价格")
     private Long price;
 
     /** 水箱价格 */
-    @Excel(name = "水箱价格")
+    @Excel(name = "水箱价格",sort =22)
     @TableField("tank_price")
     @ApiModelProperty(value = "水箱价格")
     private Long tankPrice;
@@ -292,11 +292,11 @@ public class EngineInfo extends BaseBusinessEntity{
     public String getTankSize(){
         return tankSize;
     }
-    public void setemissionStandard(String emissionStandard){
+    public void setEmissionStandard(String emissionStandard){
         this.emissionStandard = emissionStandard;
     }
 
-    public String getemissionStandard(){
+    public String getEmissionStandard(){
         return emissionStandard;
     }
     public void setConfigurationDescription(String configurationDescription){
@@ -343,7 +343,7 @@ public class EngineInfo extends BaseBusinessEntity{
             .append("tankWeight", getTankWeight())
             .append("powerSize", getPowerSize())
             .append("tankSize", getTankSize())
-            .append(" emissionStandard", getemissionStandard())
+            .append(" emissionStandard", getEmissionStandard())
             .append("configurationDescription", getConfigurationDescription())
             .append("price", getPrice())
             .append("tankPrice", getTankPrice())

xxgl-service/src/main/java/com/miaxis/file/domain/FileInfo.java

@@ -35,6 +35,24 @@ public class FileInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "报价id")
     private Long priceId;
 
+    /** 报价id */
+    @Excel(name = "控制器id")
+    @TableField("controller_id")
+    @ApiModelProperty(value = "控制器id")
+    private Long controllerId;
+
+    /** 报价id */
+    @Excel(name = "动力id")
+    @TableField("engine_id")
+    @ApiModelProperty(value = "动力id")
+    private Long engineId;
+
+    /** 报价id */
+    @Excel(name = "发动机id")
+    @TableField("fdj_id")
+    @ApiModelProperty(value = "发动机id")
+    private Long fdjId;
+
     /** 顺序 */
     @Excel(name = "顺序")
     @TableField("seq")
@@ -53,41 +71,5 @@ public class FileInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "文件路径")
     private String filePath;
 
-    public void setFileId(Long fileId){
-        this.fileId = fileId;
-    }
-
-    public Long getFileId(){
-        return fileId;
-    }
-    public void setPriceId(Long priceId){
-        this.priceId = priceId;
-    }
-
-    public Long getPriceId(){
-        return priceId;
-    }
-    public void setSeq(Long seq){
-        this.seq = seq;
-    }
-
-    public Long getSeq(){
-        return seq;
-    }
-    public void setFileUrl(String fileUrl){
-        this.fileUrl = fileUrl;
-    }
-
-    public String getFileUrl(){
-        return fileUrl;
-    }
-    public void setFilePath(String filePath){
-        this.filePath = filePath;
-    }
-
-    public String getFilePath(){
-        return filePath;
-    }
-
 
 }

xxgl-service/src/main/java/com/miaxis/price/domain/PriceInfo.java

@@ -28,217 +28,217 @@ public class PriceInfo extends BaseBusinessEntity{
     private Long id;
 
     /** 机组型号 */
-    @Excel(name = "机组型号")
+    @Excel(name = "机组型号", sort=1)
     @TableField("unit_model")
     @ApiModelProperty(value = "机组型号")
     private String unitModel;
 
     /** 机组功率(kw) */
-    @Excel(name = "机组功率(kw)")
+    @Excel(name = "机组功率(kw)", sort=2)
     @TableField("unit_power_kw")
     @ApiModelProperty(value = "机组功率(kw)")
     private BigDecimal unitPowerKw;
 
     /** 机组功率(kva) */
-    @Excel(name = "机组功率(kva)")
+    @Excel(name = "机组功率(kva)", sort=3)
     @TableField("unit_power_kva")
     @ApiModelProperty(value = "机组功率(kva)")
     private BigDecimal unitPowerKva;
 
     /** 频率(Hz) */
-    @Excel(name = "频率(Hz)")
+    @Excel(name = "频率(Hz)", sort=4)
     @TableField("rate")
     @ApiModelProperty(value = "频率(Hz)")
     private Integer rate;
 
     /** 动力品牌 */
-    @Excel(name = "动力品牌")
+    @Excel(name = "动力品牌", sort=5)
     @TableField("brand")
     @ApiModelProperty(value = "动力品牌")
     private String brand;
 
     /** 柴油机型号 */
-    @Excel(name = "柴油机型号")
+    @Excel(name = "柴油机型号", sort=6)
     @TableField("diesel_engine_model")
     @ApiModelProperty(value = "柴油机型号")
     private String dieselEngineModel;
 
     /** 转速 */
-    @Excel(name = "转速")
+    @Excel(name = "转速", sort=7)
     @TableField("speed")
     @ApiModelProperty(value = "转速")
     private Integer speed;
 
     /** 动力价格 */
-    @Excel(name = "动力价格")
+    @Excel(name = "动力价格", sort=8)
     @TableField("power_price")
     @ApiModelProperty(value = "动力价格")
     private BigDecimal powerPrice;
 
     /** 发电机型号(仿斯坦福) */
-    @Excel(name = "发电机型号(仿斯坦福)")
+    @Excel(name = "发电机型号(仿斯坦福)", sort=9)
     @TableField("generator_model_fstf")
     @ApiModelProperty(value = "发电机型号(仿斯坦福)")
     private String generatorModelFstf;
 
     /** 发电机价格(仿斯坦福) */
-    @Excel(name = "发电机价格(仿斯坦福)")
+    @Excel(name = "发电机价格(仿斯坦福)", sort=10)
     @TableField("generator_price_fstf")
     @ApiModelProperty(value = "发电机价格(仿斯坦福)")
     private BigDecimal generatorPriceFstf;
 
     /** 发电机型号(斯坦福) */
-    @Excel(name = "发电机型号(斯坦福)")
+    @Excel(name = "发电机型号(斯坦福)", sort=11)
     @TableField("generator_model_stf")
     @ApiModelProperty(value = "发电机型号(斯坦福)")
     private String generatorModelStf;
 
     /** 发电机价格(斯坦福) */
-    @Excel(name = "发电机价格(斯坦福)")
+    @Excel(name = "发电机价格(斯坦福)", sort=12)
     @TableField("generator_price_stf")
     @ApiModelProperty(value = "发电机价格(斯坦福)")
     private BigDecimal generatorPriceStf;
 
     /** 发电机型号(利来森马) */
-    @Excel(name = "发电机型号(利来森马)")
+    @Excel(name = "发电机型号(利来森马)", sort=13)
     @TableField("generator_model_llsm")
     @ApiModelProperty(value = "发电机型号(利来森马)")
     private String generatorModelLlsm;
 
     /** 发电机价格(利来森马) */
-    @Excel(name = "发电机价格(利来森马)")
+    @Excel(name = "发电机价格(利来森马)", sort=14)
     @TableField("generator_price_llsm")
     @ApiModelProperty(value = "发电机价格(利来森马)")
     private BigDecimal generatorPriceLlsm;
 
     /** 发电机型号(马拉松) */
-    @Excel(name = "发电机型号(马拉松)")
+    @Excel(name = "发电机型号(马拉松)", sort=15)
     @TableField("generator_model_mls")
     @ApiModelProperty(value = "发电机型号(马拉松)")
     private String generatorModelMls;
 
     /** 发电机价格(马拉松) */
-    @Excel(name = "发电机价格(马拉松)")
+    @Excel(name = "发电机价格(马拉松)", sort=16)
     @TableField("generator_price_mls")
     @ApiModelProperty(value = "发电机价格(马拉松)")
     private BigDecimal generatorPriceMls;
 
     /** 发电机型号(美迪奥) */
-    @Excel(name = "发电机型号(美迪奥)")
+    @Excel(name = "发电机型号(美迪奥)", sort=17)
     @TableField("generator_model_mda")
     @ApiModelProperty(value = "发电机型号(美迪奥)")
     private String generatorModelMda;
 
     /** 发电机价格(美迪奥) */
-    @Excel(name = "发电机价格(美迪奥)")
+    @Excel(name = "发电机价格(美迪奥)", sort=18)
     @TableField("generator_price_mda")
     @ApiModelProperty(value = "发电机价格(美迪奥)")
     private BigDecimal generatorPriceMda;
 
     /** 静音机壳价格 */
-    @Excel(name = "静音机壳价格")
+    @Excel(name = "静音机壳价格", sort=19)
     @TableField("mute_price")
     @ApiModelProperty(value = "静音机壳价格")
     private BigDecimal mutePrice;
 
     /** 开架价格 */
-    @Excel(name = "开架价格")
+    @Excel(name = "开架价格", sort=20)
     @TableField("open_price")
     @ApiModelProperty(value = "开架价格")
     private BigDecimal openPrice;
 
     /** ATS型号 */
-    @Excel(name = "ATS型号")
+    @Excel(name = "ATS型号", sort=21)
     @TableField("ats_model")
     @ApiModelProperty(value = "ATS型号")
     private String atsModel;
 
     /** ATS价格 */
-    @Excel(name = "ATS价格")
+    @Excel(name = "ATS价格", sort=22)
     @TableField("ats_price")
     @ApiModelProperty(value = "ATS价格")
     private BigDecimal atsPrice;
 
     /** 电瓶型号 */
-    @Excel(name = "电瓶型号")
+    @Excel(name = "电瓶型号", sort=23)
     @TableField("battery_model")
     @ApiModelProperty(value = "电瓶型号")
     private String batteryModel;
 
     /** 电瓶价格 */
-    @Excel(name = "电瓶价格")
+    @Excel(name = "电瓶价格", sort=24)
     @TableField("battery_price")
     @ApiModelProperty(value = "电瓶价格")
     private BigDecimal batteryPrice;
 
     /** 合计含税成本(静音配仿斯坦福) */
-    @Excel(name = "合计含税成本(静音配仿斯坦福)")
+    @Excel(name = "合计含税成本(静音配仿斯坦福)", sort=25)
     @TableField("total_cost_mute_fstf")
     @ApiModelProperty(value = "合计含税成本(静音配仿斯坦福)")
     private BigDecimal totalCostMuteFstf;
 
     /** 合计含税成本(开架配仿斯坦福) */
-    @Excel(name = "合计含税成本(开架配仿斯坦福)")
+    @Excel(name = "合计含税成本(开架配仿斯坦福)", sort=26)
     @TableField("total_cost_open_fstf")
     @ApiModelProperty(value = "合计含税成本(开架配仿斯坦福)")
     private BigDecimal totalCostOpenFstf;
 
     /** 合计含税成本(静音配斯坦福) */
-    @Excel(name = "合计含税成本(静音配斯坦福)")
+    @Excel(name = "合计含税成本(静音配斯坦福)", sort=27)
     @TableField("total_cost_mute_stf")
     @ApiModelProperty(value = "合计含税成本(静音配斯坦福)")
     private BigDecimal totalCostMuteStf;
 
     /** 合计含税成本(开架配斯坦福) */
-    @Excel(name = "合计含税成本(开架配斯坦福)")
+    @Excel(name = "合计含税成本(开架配斯坦福)", sort=28)
     @TableField("total_cost_open_stf")
     @ApiModelProperty(value = "合计含税成本(开架配斯坦福)")
     private BigDecimal totalCostOpenStf;
 
     /** 合计含税成本(静音配利来森马) */
-    @Excel(name = "合计含税成本(静音配利来森马)")
+    @Excel(name = "合计含税成本(静音配利来森马)", sort=29)
     @TableField("total_cost_mute_llsm")
     @ApiModelProperty(value = "合计含税成本(静音配利来森马)")
     private BigDecimal totalCostMuteLlsm;
 
     /** 合计含税成本(开架配利来森马) */
-    @Excel(name = "合计含税成本(开架配利来森马)")
+    @Excel(name = "合计含税成本(开架配利来森马)", sort=30)
     @TableField("total_cost_open_llsm")
     @ApiModelProperty(value = "合计含税成本(开架配利来森马)")
     private BigDecimal totalCostOpenLlsm;
 
     /** 合计含税成本(静音配马拉松) */
-    @Excel(name = "合计含税成本(静音配马拉松)")
+    @Excel(name = "合计含税成本(静音配马拉松)", sort=31)
     @TableField("total_cost_mute_mls")
     @ApiModelProperty(value = "合计含税成本(静音配马拉松)")
     private BigDecimal totalCostMuteMls;
 
     /** 合计含税成本(开架配马拉松) */
-    @Excel(name = "合计含税成本(开架配马拉松)")
+    @Excel(name = "合计含税成本(开架配马拉松)", sort=32)
     @TableField("total_cost_open_mls")
     @ApiModelProperty(value = "合计含税成本(开架配马拉松)")
     private BigDecimal totalCostOpenMls;
 
     /** 合计含税成本(静音配美迪奥) */
-    @Excel(name = "合计含税成本(静音配美迪奥)")
+    @Excel(name = "合计含税成本(静音配美迪奥)", sort=33)
     @TableField("total_cost_mute_mda")
     @ApiModelProperty(value = "合计含税成本(静音配美迪奥)")
     private BigDecimal totalCostMuteMda;
 
     /** 合计含税成本(开架配美迪奥) */
-    @Excel(name = "合计含税成本(开架配美迪奥)")
+    @Excel(name = "合计含税成本(开架配美迪奥)", sort=34)
     @TableField("total_cost_open_mda")
     @ApiModelProperty(value = "合计含税成本(开架配美迪奥)")
     private BigDecimal totalCostOpenMda;
 
     /** 静音尺寸（长/宽/高/重量） */
-    @Excel(name = "静音尺寸（长/宽/高/重量）", readConverterExp = "长=/宽/高/重量")
+    @Excel(name = "静音尺寸（长/宽/高/重量）", sort=35)
     @TableField("mute_parms")
     @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
     private String muteParms;
 
     /** 静音尺寸（长/宽/高/重量） */
-    @Excel(name = "静音尺寸（长/宽/高/重量）", readConverterExp = "长=/宽/高/重量")
+    @Excel(name = "静音尺寸（长/宽/高/重量）", sort=36)
     @TableField("open_parms")
     @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
     private String openParms;

xxgl-service/src/main/resources/mapper/engine/EngineInfoMapper.xml

@@ -24,9 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tankWeight"    column="tank_weight"    />
         <result property="powerSize"    column="power_size"    />
         <result property="tankSize"    column="tank_size"    />
-        <result property="
-emissionStandard"    column="
-emission_standard"    />
+        <result property="emissionStandard"    column="emission_standard"    />
         <result property="configurationDescription"    column="configuration_description"    />
         <result property="price"    column="price"    />
         <result property="tankPrice"    column="tank_price"    />
@@ -60,7 +58,7 @@ emission_standard"    />
             <if test="powerSize != null  and powerSize != ''"> and power_size = #{powerSize}</if>
             <if test="tankSize != null  and tankSize != ''"> and tank_size = #{tankSize}</if>
             <if test="
-emissionStandard != null  and emissionStandard != ''"> and 
+emissionStandard != null  and emissionStandard != ''"> and
 emission_standard = #{
 emissionStandard}</if>
             <if test="configurationDescription != null  and configurationDescription != ''"> and configuration_description = #{configurationDescription}</if>

xxgl-service/src/main/resources/mapper/file/FileInfoMapper.xml

@@ -7,6 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="FileInfo" id="FileInfoResult">
         <result property="fileId"    column="file_id"    />
         <result property="priceId"    column="price_id"    />
+        <result property="engineId"    column="engine_id"    />
+        <result property="fdjId"    column="fdj_id"    />
+        <result property="controllerId"    column="controller_id"    />
         <result property="seq"    column="seq"    />
         <result property="fileUrl"    column="file_url"    />
         <result property="remark"    column="remark"    />