报价

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

@@ -51,7 +51,7 @@ public class ControllerInfoController extends BaseController{
     @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);
+        List<ControllerInfo> list = util.importExcel(file.getInputStream(),2,false);
         controllerInfoService.saveBatch(list);
         return Response.success();
     }

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

@@ -1,24 +1,22 @@
 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.*;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.engine.EngineInfoDTO;
 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 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;
+
 /**
  * 【报价】Controller
  *
@@ -42,9 +40,9 @@ public class EngineInfoController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<EngineInfo> list(@ModelAttribute EngineInfo engineInfo){
+    public ResponsePageInfo<EngineInfo> list(@ModelAttribute EngineInfoDTO engineInfoDTO){
         startPage();
-        List<EngineInfo> list = engineInfoService.selectEngineInfoList(engineInfo);
+        List<EngineInfo> list = engineInfoService.selectEngineInfoList2(engineInfoDTO);
         return toResponsePageInfo(list);
     }
 
@@ -70,7 +68,7 @@ public class EngineInfoController extends BaseController{
     @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);
+        List<EngineInfo> list = util.importExcel(file.getInputStream(),3,false);
         engineInfoService.saveBatch(list);
         return Response.success();
     }

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

@@ -0,0 +1,118 @@
+package com.miaxis.pc.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+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.*;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.fdj.domain.Fdj50hzInfo;
+import com.miaxis.fdj.service.IFdj50hzInfoService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 【发电机50hz报价】Controller
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@RestController
+@RequestMapping("/fdj50/info")
+@Api(tags={"【pc-发电机50hz报价】"})
+public class Fdj50hzInfoController extends BaseController{
+    @Autowired
+    private IFdj50hzInfoService fdj50hzInfoService;
+
+    /**
+     * 查询发电机50hz报价列表
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询发电机50hz报价列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<Fdj50hzInfo> list(@ModelAttribute Fdj50hzInfo fdj50hzInfo){
+        startPage();
+        List<Fdj50hzInfo> list = fdj50hzInfoService.selectFdj50hzInfoList(fdj50hzInfo);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出发电机50hz报价列表
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:export')")
+    @Log(title = "发电机50hz报价", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出发电机50hz报价列表Excel")
+    public Response<String> export(@ModelAttribute Fdj50hzInfo fdj50hzInfo){
+        List<Fdj50hzInfo> list = fdj50hzInfoService.selectFdj50hzInfoList(fdj50hzInfo);
+        ExcelUtil<Fdj50hzInfo> util = new ExcelUtil<Fdj50hzInfo>(Fdj50hzInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 获取发电机50hz报价详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取发电机50hz报价详细信息")
+    public Response<Fdj50hzInfo> getInfo(
+            @ApiParam(name = "id", value = "发电机50hz报价参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(fdj50hzInfoService.getById(id));
+    }
+    @Log(title = "报价", businessType = BusinessTypeEnum.IMPORT)
+    @PostMapping("/import")
+    @ApiOperation("导入报价列表Excel")
+    public Response<String> importPrice(@RequestPart("file") MultipartFile file) throws Exception {
+        ExcelUtil<Fdj50hzInfo> util = new ExcelUtil<Fdj50hzInfo>(Fdj50hzInfo.class);
+        List<Fdj50hzInfo> list = util.importExcel(file.getInputStream(),8,true);
+        fdj50hzInfoService.saveBatch(list);
+        return Response.success();
+    }
+    /**
+     * 新增发电机50hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:add')")
+    @Log(title = "发电机50hz报价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增发电机50hz报价")
+    public Response<Integer> add(@RequestBody Fdj50hzInfo fdj50hzInfo){
+        return toResponse(fdj50hzInfoService.save(fdj50hzInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改发电机50hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:edit')")
+    @Log(title = "发电机50hz报价", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改发电机50hz报价")
+    public Response<Integer> edit(@RequestBody Fdj50hzInfo fdj50hzInfo){
+        return toResponse(fdj50hzInfoService.updateById(fdj50hzInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除发电机50hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:remove')")
+    @Log(title = "发电机50hz报价", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除发电机50hz报价")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "发电机50hz报价ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(fdj50hzInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,120 @@
+package com.miaxis.pc.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+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.*;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
+import com.miaxis.fdj.service.IFdj60hzInfoService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 【发电机60hz报价】Controller
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@RestController
+@RequestMapping("/fdj60/info")
+@Api(tags={"【pc-发电机60hz报价】"})
+public class Fdj60hzInfoController extends BaseController{
+    @Autowired
+    private IFdj60hzInfoService fdj60hzInfoService;
+
+    /**
+     * 查询发电机60hz报价列表
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询发电机60hz报价列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<Fdj60hzInfo> list(@ModelAttribute Fdj60hzInfo fdj60hzInfo){
+        startPage();
+        List<Fdj60hzInfo> list = fdj60hzInfoService.selectFdj60hzInfoList(fdj60hzInfo);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出发电机60hz报价列表
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:export')")
+    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出发电机60hz报价列表Excel")
+    public Response<String> export(@ModelAttribute Fdj60hzInfo fdj60hzInfo){
+        List<Fdj60hzInfo> list = fdj60hzInfoService.selectFdj60hzInfoList(fdj60hzInfo);
+        ExcelUtil<Fdj60hzInfo> util = new ExcelUtil<Fdj60hzInfo>(Fdj60hzInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    @Log(title = "报价", businessType = BusinessTypeEnum.IMPORT)
+    @PostMapping("/import")
+    @ApiOperation("导入报价列表Excel")
+    public Response<String> importPrice(@RequestPart("file") MultipartFile file) throws Exception {
+        ExcelUtil<Fdj60hzInfo> util = new ExcelUtil<Fdj60hzInfo>(Fdj60hzInfo.class);
+        List<Fdj60hzInfo> list = util.importExcel(file.getInputStream(),8,true);
+        fdj60hzInfoService.saveBatch(list);
+        return Response.success();
+    }
+
+    /**
+     * 获取发电机60hz报价详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取发电机60hz报价详细信息")
+    public Response<Fdj60hzInfo> getInfo(
+            @ApiParam(name = "id", value = "发电机60hz报价参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(fdj60hzInfoService.getById(id));
+    }
+
+    /**
+     * 新增发电机60hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:add')")
+    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增发电机60hz报价")
+    public Response<Integer> add(@RequestBody Fdj60hzInfo fdj60hzInfo){
+        return toResponse(fdj60hzInfoService.save(fdj60hzInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改发电机60hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:edit')")
+    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改发电机60hz报价")
+    public Response<Integer> edit(@RequestBody Fdj60hzInfo fdj60hzInfo){
+        return toResponse(fdj60hzInfoService.updateById(fdj60hzInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除发电机60hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:remove')")
+    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除发电机60hz报价")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "发电机60hz报价ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(fdj60hzInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -76,7 +76,7 @@ public class FileInfoController extends BaseController{
     @PostMapping
     @ApiOperation("上传文件")
     public Response add(@RequestPart("file") MultipartFile file,@RequestParam Long id,
-                        @ApiParam(name = "type", value = "文件类型 1-总报价 2-动力报价 3-控制器报价 4-发电机报价",
+                        @ApiParam(name = "type", value = "文件类型 1-总报价 2-动力报价 3-控制器报价 4-发电机50hz报价 4-发电机60hz报价",
                                 required = true) @RequestParam Integer type){
         try
         {
@@ -95,7 +95,9 @@ public class FileInfoController extends BaseController{
             }else if (type ==3){
                 fileInfo.setControllerId(id);
             }else if (type ==4){
-                fileInfo.setFdjId(id);
+                fileInfo.setFdj50hzId(id);
+            }else if (type ==5){
+                fileInfo.setFdj60hzId(id);
             }else {
                 throw new CustomException("参数值有误");
             }

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(),2);
+        List<PriceInfo> list = util.importExcel(file.getInputStream(),2,false);
         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(),1);
+        List<SysUser> userList = util.importExcel(file.getInputStream(),1,true);
         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,int headRows) throws Exception
+    public List<T> importExcel(InputStream is,int headRows,Boolean acceptBlankLine) throws Exception
     {
-        return importExcel(StringUtils.EMPTY, is,headRows);
+        return importExcel(StringUtils.EMPTY, is,headRows,acceptBlankLine);
     }
 
     /**
@@ -127,7 +127,7 @@ public class ExcelUtil<T>
      * @param is 输入流
      * @return 转换后集合
      */
-    public List<T> importExcel(String sheetName, InputStream is,int headRows) throws Exception
+    public List<T> importExcel(String sheetName, InputStream is,int headRows,Boolean acceptBlankLine) throws Exception
     {
         this.type = Type.IMPORT;
         this.wb = WorkbookFactory.create(is);
@@ -208,7 +208,7 @@ public class ExcelUtil<T>
                     {
                         String s = Convert.toStr(val);
                         //如果第一个字段是空的，那么直接返回list
-                        if(entry.getKey() ==0 &&StringUtils.isEmpty(s)){
+                        if(entry.getKey() ==0 &&StringUtils.isEmpty(s)&&!acceptBlankLine){
                             return list;
                         }
                         if (StringUtils.endsWith(s, ".0"))

xxgl-service/main/java/com/miaxis/fdj/controller/Fdj60hzInfoController.java

@@ -0,0 +1,117 @@
+package com.miaxis.fdj.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+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 com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
+import com.miaxis.fdj.service.IFdj60hzInfoService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【发电机60hz报价】Controller
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@RestController
+@RequestMapping("/fdj/info")
+@Api(tags={"【小程序-发电机60hz报价】"})
+public class Fdj60hzInfoController extends BaseController{
+    @Autowired
+    private IFdj60hzInfoService fdj60hzInfoService;
+
+    /**
+     * 查询发电机60hz报价列表
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询发电机60hz报价列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<Fdj60hzInfo> list(@ModelAttribute Fdj60hzInfo fdj60hzInfo){
+        startPage();
+        List<Fdj60hzInfo> list = fdj60hzInfoService.selectFdj60hzInfoList(fdj60hzInfo);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出发电机60hz报价列表
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:export')")
+    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出发电机60hz报价列表Excel")
+    public Response<String> export(@ModelAttribute Fdj60hzInfo fdj60hzInfo){
+        List<Fdj60hzInfo> list = fdj60hzInfoService.selectFdj60hzInfoList(fdj60hzInfo);
+        ExcelUtil<Fdj60hzInfo> util = new ExcelUtil<Fdj60hzInfo>(Fdj60hzInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 获取发电机60hz报价详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取发电机60hz报价详细信息")
+    public Response<Fdj60hzInfo> getInfo(
+            @ApiParam(name = "id", value = "发电机60hz报价参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(fdj60hzInfoService.getById(id));
+    }
+
+    /**
+     * 新增发电机60hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:add')")
+    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增发电机60hz报价")
+    public Response<Integer> add(@RequestBody Fdj60hzInfo fdj60hzInfo){
+        return toResponse(fdj60hzInfoService.save(fdj60hzInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改发电机60hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:edit')")
+    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改发电机60hz报价")
+    public Response<Integer> edit(@RequestBody Fdj60hzInfo fdj60hzInfo){
+        return toResponse(fdj60hzInfoService.updateById(fdj60hzInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除发电机60hz报价
+     */
+    @PreAuthorize("@ss.hasPermi('fdj:info:remove')")
+    @Log(title = "发电机60hz报价", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除发电机60hz报价")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "发电机60hz报价ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(fdj60hzInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

xxgl-service/main/java/com/miaxis/fdj/domain/Fdj60hzInfo.java

@@ -0,0 +1,220 @@
+package com.miaxis.fdj.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 发电机60hz报价对象 fdj_60hz_info
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@Data
+@TableName("fdj_60hz_info")
+@ApiModel(value = "Fdj60hzInfo", description = "发电机60hz报价对象 fdj_60hz_info")
+public class Fdj60hzInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 型号规格 */
+    @Excel(name = "型号规格")
+    @TableField("fdj_model")
+    @ApiModelProperty(value = "型号规格")
+    private String fdjModel;
+
+    /** 标准止口 */
+    @Excel(name = "标准止口")
+    @TableField("standard_seam")
+    @ApiModelProperty(value = "标准止口")
+    private String standardSeam;
+
+    /** 频率(Hz) */
+    @Excel(name = "频率(Hz)")
+    @TableField("rate")
+    @ApiModelProperty(value = "频率(Hz)")
+    private Integer rate;
+
+    /** 功率 3-ph/50Hz/380-440V(kw) */
+    @Excel(name = "功率 3-ph/50Hz/380-440V(kw)")
+    @TableField("fdj_power_kw")
+    @ApiModelProperty(value = "功率 3-ph/50Hz/380-440V(kw)")
+    private BigDecimal fdjPowerKw;
+
+    /** 功率 3-ph/50Hz/380-440V(kva) */
+    @Excel(name = "功率 3-ph/50Hz/380-440V(kva)")
+    @TableField("fdj_power_kva")
+    @ApiModelProperty(value = "功率 3-ph/50Hz/380-440V(kva)")
+    private BigDecimal fdjPowerKva;
+
+    /** 含税出厂价（单支点） */
+    @Excel(name = "含税出厂价（单支点）", readConverterExp = "单=支点")
+    @TableField("single_fulcrum_price")
+    @ApiModelProperty(value = "含税出厂价（单支点）")
+    private String singleFulcrumPrice;
+
+    /** 含税出厂价（双支点） */
+    @Excel(name = "含税出厂价（双支点）", readConverterExp = "双=支点")
+    @TableField("double_fulcrum_price")
+    @ApiModelProperty(value = "含税出厂价（双支点）")
+    private String doubleFulcrumPrice;
+
+    /** 含税出厂价（包装箱价格） */
+    @Excel(name = "含税出厂价（包装箱价格）", readConverterExp = "包=装箱价格")
+    @TableField("packing_box_price")
+    @ApiModelProperty(value = "含税出厂价（包装箱价格）")
+    private String packingBoxPrice;
+
+    /** 含税出厂价（仪表箱） */
+    @Excel(name = "含税出厂价（仪表箱）", readConverterExp = "仪=表箱")
+    @TableField("instrument_box_price")
+    @ApiModelProperty(value = "含税出厂价（仪表箱）")
+    private String instrumentBoxPrice;
+
+    /** 含税出厂价（空开） */
+    @Excel(name = "含税出厂价（空开）", readConverterExp = "空=开")
+    @TableField("air_switch_price")
+    @ApiModelProperty(value = "含税出厂价（空开）")
+    private String airSwitchPrice;
+
+    /** 包装尺寸
+（长宽高） */
+    @Excel(name = "包装尺寸
+（长宽高）", readConverterExp = "长=宽高")
+    @TableField("open_parms")
+    @ApiModelProperty(value = "包装尺寸
+（长宽高）")
+    private String openParms;
+
+    /** 净重/毛重（KG） */
+    @Excel(name = "净重/毛重（KG）", readConverterExp = "K=G")
+    @TableField("weight")
+    @ApiModelProperty(value = "净重/毛重（KG）")
+    private String weight;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setFdjModel(String fdjModel){
+        this.fdjModel = fdjModel;
+    }
+
+    public String getFdjModel(){
+        return fdjModel;
+    }
+    public void setStandardSeam(String standardSeam){
+        this.standardSeam = standardSeam;
+    }
+
+    public String getStandardSeam(){
+        return standardSeam;
+    }
+    public void setRate(Integer rate){
+        this.rate = rate;
+    }
+
+    public Integer getRate(){
+        return rate;
+    }
+    public void setFdjPowerKw(BigDecimal fdjPowerKw){
+        this.fdjPowerKw = fdjPowerKw;
+    }
+
+    public BigDecimal getFdjPowerKw(){
+        return fdjPowerKw;
+    }
+    public void setFdjPowerKva(BigDecimal fdjPowerKva){
+        this.fdjPowerKva = fdjPowerKva;
+    }
+
+    public BigDecimal getFdjPowerKva(){
+        return fdjPowerKva;
+    }
+    public void setSingleFulcrumPrice(String singleFulcrumPrice){
+        this.singleFulcrumPrice = singleFulcrumPrice;
+    }
+
+    public String getSingleFulcrumPrice(){
+        return singleFulcrumPrice;
+    }
+    public void setDoubleFulcrumPrice(String doubleFulcrumPrice){
+        this.doubleFulcrumPrice = doubleFulcrumPrice;
+    }
+
+    public String getDoubleFulcrumPrice(){
+        return doubleFulcrumPrice;
+    }
+    public void setPackingBoxPrice(String packingBoxPrice){
+        this.packingBoxPrice = packingBoxPrice;
+    }
+
+    public String getPackingBoxPrice(){
+        return packingBoxPrice;
+    }
+    public void setInstrumentBoxPrice(String instrumentBoxPrice){
+        this.instrumentBoxPrice = instrumentBoxPrice;
+    }
+
+    public String getInstrumentBoxPrice(){
+        return instrumentBoxPrice;
+    }
+    public void setAirSwitchPrice(String airSwitchPrice){
+        this.airSwitchPrice = airSwitchPrice;
+    }
+
+    public String getAirSwitchPrice(){
+        return airSwitchPrice;
+    }
+    public void setOpenParms(String openParms){
+        this.openParms = openParms;
+    }
+
+    public String getOpenParms(){
+        return openParms;
+    }
+    public void setWeight(String weight){
+        this.weight = weight;
+    }
+
+    public String getWeight(){
+        return weight;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("fdjModel", getFdjModel())
+            .append("standardSeam", getStandardSeam())
+            .append("rate", getRate())
+            .append("fdjPowerKw", getFdjPowerKw())
+            .append("fdjPowerKva", getFdjPowerKva())
+            .append("singleFulcrumPrice", getSingleFulcrumPrice())
+            .append("doubleFulcrumPrice", getDoubleFulcrumPrice())
+            .append("packingBoxPrice", getPackingBoxPrice())
+            .append("instrumentBoxPrice", getInstrumentBoxPrice())
+            .append("airSwitchPrice", getAirSwitchPrice())
+            .append("openParms", getOpenParms())
+            .append("weight", getWeight())
+            .append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

xxgl-service/main/java/com/miaxis/fdj/mapper/Fdj60hzInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.fdj.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
+
+/**
+ * 发电机60hz报价Mapper接口
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+public interface Fdj60hzInfoMapper extends BaseMapper<Fdj60hzInfo> {
+    /**
+     * 查询发电机60hz报价列表
+     *
+     * @param fdj60hzInfo 发电机60hz报价
+     * @return 发电机60hz报价集合
+     */
+    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo);
+
+}

xxgl-service/main/java/com/miaxis/fdj/service/IFdj60hzInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.fdj.service;
+
+import java.util.List;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 发电机60hz报价Service接口
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+public interface IFdj60hzInfoService extends IService<Fdj60hzInfo>{
+    /**
+     * 查询发电机60hz报价列表
+     *
+     * @param fdj60hzInfo 发电机60hz报价
+     * @return 发电机60hz报价集合
+     */
+    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo);
+}

xxgl-service/main/java/com/miaxis/fdj/service/impl/Fdj60hzInfoServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.fdj.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.fdj.mapper.Fdj60hzInfoMapper;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
+import com.miaxis.fdj.service.IFdj60hzInfoService;
+
+/**
+ * 发电机60hz报价Service业务层处理
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@Service
+public class Fdj60hzInfoServiceImpl extends ServiceImpl<Fdj60hzInfoMapper, Fdj60hzInfo> implements IFdj60hzInfoService {
+    @Autowired
+    private Fdj60hzInfoMapper fdj60hzInfoMapper;
+
+    /**
+     * 查询发电机60hz报价列表
+     *
+     * @param fdj60hzInfo 发电机60hz报价
+     * @return 发电机60hz报价
+     */
+    @Override
+    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo){
+        return fdj60hzInfoMapper.selectFdj60hzInfoList(fdj60hzInfo);
+    }
+}

xxgl-service/main/resources/mapper/fdj/Fdj60hzInfoMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.fdj.mapper.Fdj60hzInfoMapper">
+
+    <resultMap type="Fdj60hzInfo" id="Fdj60hzInfoResult">
+        <result property="id"    column="id"    />
+        <result property="fdjModel"    column="fdj_model"    />
+        <result property="standardSeam"    column="standard_seam"    />
+        <result property="rate"    column="rate"    />
+        <result property="fdjPowerKw"    column="fdj_power_kw"    />
+        <result property="fdjPowerKva"    column="fdj_power_kva"    />
+        <result property="singleFulcrumPrice"    column="single_fulcrum_price"    />
+        <result property="doubleFulcrumPrice"    column="double_fulcrum_price"    />
+        <result property="packingBoxPrice"    column="packing_box_price"    />
+        <result property="instrumentBoxPrice"    column="instrument_box_price"    />
+        <result property="airSwitchPrice"    column="air_switch_price"    />
+        <result property="openParms"    column="open_parms"    />
+        <result property="weight"    column="weight"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectFdj60hzInfoVo">
+        select * from fdj_60hz_info
+    </sql>
+
+    <select id="selectFdj60hzInfoList" parameterType="Fdj60hzInfo" resultMap="Fdj60hzInfoResult">
+        <include refid="selectFdj60hzInfoVo"/>
+        <where>
+            <if test="fdjModel != null  and fdjModel != ''"> and fdj_model = #{fdjModel}</if>
+            <if test="standardSeam != null  and standardSeam != ''"> and standard_seam = #{standardSeam}</if>
+            <if test="rate != null "> and rate = #{rate}</if>
+            <if test="fdjPowerKw != null "> and fdj_power_kw = #{fdjPowerKw}</if>
+            <if test="fdjPowerKva != null "> and fdj_power_kva = #{fdjPowerKva}</if>
+            <if test="singleFulcrumPrice != null  and singleFulcrumPrice != ''"> and single_fulcrum_price = #{singleFulcrumPrice}</if>
+            <if test="doubleFulcrumPrice != null  and doubleFulcrumPrice != ''"> and double_fulcrum_price = #{doubleFulcrumPrice}</if>
+            <if test="packingBoxPrice != null  and packingBoxPrice != ''"> and packing_box_price = #{packingBoxPrice}</if>
+            <if test="instrumentBoxPrice != null  and instrumentBoxPrice != ''"> and instrument_box_price = #{instrumentBoxPrice}</if>
+            <if test="airSwitchPrice != null  and airSwitchPrice != ''"> and air_switch_price = #{airSwitchPrice}</if>
+            <if test="openParms != null  and openParms != ''"> and open_parms = #{openParms}</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+        </where>
+    </select>
+
+</mapper>

xxgl-service/src/main/java/com/miaxis/engine/EngineInfoDTO.java

@@ -0,0 +1,30 @@
+package com.miaxis.engine;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class EngineInfoDTO {
+
+
+
+    /** 动力品牌 */
+    @Excel(name = "动力品牌",sort=1)
+    @TableField("brand")
+    @ApiModelProperty(value = "动力品牌")
+    private String brand;
+    /** 机组功率(kw) */
+    @Excel(name = "最小功率(kw)")
+    @ApiModelProperty(value = "最小功率(kw)")
+    private BigDecimal powerKwMin;
+
+    /** 机组功率(kw) */
+    @Excel(name = "最大功率(kw)")
+    @ApiModelProperty(value = "最大功率(kw)")
+    private BigDecimal powerKwMax;
+
+}

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

@@ -1,20 +1,23 @@
 package com.miaxis.engine.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
+import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * 报价对象 engine_info
  *
  * @author miaxis
- * @date 2023-01-29
+ * @date 2023-02-08
  */
 @Data
 @TableName("engine_info")
@@ -28,327 +31,186 @@ public class EngineInfo extends BaseBusinessEntity{
     private Long id;
 
     /** 动力品牌 */
-    @Excel(name = "动力品牌",sort =1)
+    @Excel(name = "动力品牌",sort=1)
     @TableField("brand")
     @ApiModelProperty(value = "动力品牌")
     private String brand;
 
     /** 型号 */
-    @Excel(name = "型号",sort =2)
+    @Excel(name = "型号",sort=2)
     @TableField("model")
     @ApiModelProperty(value = "型号")
     private String model;
 
     /** 发动机主要功率(1500RPM  50HZ) */
-    @Excel(name = "发动机主要功率(1500RPM  50HZ)",sort =3)
+    @Excel(name = "发动机主要功率(1500RPM  50HZ)",sort=3)
     @TableField("engine_power_major_1500RPM")
     @ApiModelProperty(value = "发动机主要功率(1500RPM  50HZ)")
     private Long enginePowerMajor1500rpm;
 
     /** 发动机备用功率(1500RPM  50HZ) */
-    @Excel(name = "发动机备用功率(1500RPM  50HZ)",sort =4)
+    @Excel(name = "发动机备用功率(1500RPM  50HZ)",sort=4)
     @TableField("engine_power_minor_1500RPM")
     @ApiModelProperty(value = "发动机备用功率(1500RPM  50HZ)")
     private Long enginePowerMinor1500rpm;
 
     /** 推荐机组主要功率(1500RPM  50HZ) */
-    @Excel(name = "推荐机组主要功率(1500RPM  50HZ)",sort =5)
+    @Excel(name = "推荐机组主要功率(1500RPM  50HZ)",sort=5)
     @TableField("unit_power_major_1500RPM")
     @ApiModelProperty(value = "推荐机组主要功率(1500RPM  50HZ)")
     private Long unitPowerMajor1500rpm;
 
     /** 推荐机组备用功率(1500RPM  50HZ) */
-    @Excel(name = "推荐机组备用功率(1500RPM  50HZ)",sort =6)
+    @Excel(name = "推荐机组备用功率(1500RPM  50HZ)",sort=6)
     @TableField("unit_power_minor_1500RPM")
     @ApiModelProperty(value = "推荐机组备用功率(1500RPM  50HZ)")
     private Long unitPowerMinor1500rpm;
 
     /** 发动机主要功率(1800RPM  60HZ) */
-    @Excel(name = "发动机主要功率(1800RPM  60HZ)",sort =7)
+    @Excel(name = "发动机主要功率(1800RPM  60HZ)",sort=7)
     @TableField("engine_power_major_1800RPM")
     @ApiModelProperty(value = "发动机主要功率(1800RPM  60HZ)")
     private Long enginePowerMajor1800rpm;
 
     /** 发动机备用功率(1800RPM  60HZ) */
-    @Excel(name = "发动机备用功率(1800RPM  60HZ)",sort =8)
+    @Excel(name = "发动机备用功率(1800RPM  60HZ)",sort=8)
     @TableField("engine_power_minor_1800RPM")
     @ApiModelProperty(value = "发动机备用功率(1800RPM  60HZ)")
     private Long enginePowerMinor1800rpm;
 
     /** 推荐机组主要功率(1800RPM  60HZ) */
-    @Excel(name = "推荐机组主要功率(1800RPM  60HZ)",sort =9)
+    @Excel(name = "推荐机组主要功率(1800RPM  60HZ)",sort=9)
     @TableField("unit_power_major_1800RPM")
     @ApiModelProperty(value = "推荐机组主要功率(1800RPM  60HZ)")
     private Long unitPowerMajor1800rpm;
 
     /** 推荐机组备用功率(1800RPM  60HZ) */
-    @Excel(name = "推荐机组备用功率(1800RPM  60HZ)",sort =10)
+    @Excel(name = "推荐机组备用功率(1800RPM  60HZ)",sort=10)
     @TableField("unit_power_minor_1800RPM")
     @ApiModelProperty(value = "推荐机组备用功率(1800RPM  60HZ)")
     private Long unitPowerMinor1800rpm;
 
     /** 油泵形式 */
-    @Excel(name = "油泵形式",sort =11)
+    @Excel(name = "油泵形式",sort=11)
     @TableField("oil_form")
     @ApiModelProperty(value = "油泵形式")
     private String oilForm;
 
     /** 进气方式 */
-    @Excel(name = "进气方式",sort =12)
+    @Excel(name = "进气方式",sort=12)
     @TableField("air_intake_mode")
     @ApiModelProperty(value = "进气方式")
     private String airIntakeMode;
 
-    /** 电压 */
-    @Excel(name = "电压",sort =13)
+    /** 起动机的电压 */
+    @Excel(name = "起动机的电压",sort=13)
     @TableField("voltage")
-    @ApiModelProperty(value = "电压")
+    @ApiModelProperty(value = "起动机的电压")
     private String voltage;
 
     /** 排量 （L） */
-    @Excel(name = "排量 （L）", sort =14)
+    @Excel(name = "排量 （L）",sort=14)
     @TableField("displacement")
     @ApiModelProperty(value = "排量 （L）")
     private String displacement;
 
     /** 油耗（g/kw.h) */
-    @Excel(name = "油耗（g/kw.h)", sort =15)
+    @Excel(name = "油耗（g/kw.h)",sort=15)
     @TableField("oil_consumption")
     @ApiModelProperty(value = "油耗（g/kw.h)")
     private String oilConsumption;
 
-    /** 水箱重量(Kg) */
-    @Excel(name = "水箱重量(Kg)",sort =16)
-    @TableField("tank_weight")
-    @ApiModelProperty(value = "水箱重量(Kg)")
-    private Long tankWeight;
+    /** 排放标准 */
+    @Excel(name = "排放标准",sort=16)
+    @TableField("emission_standard")
+    @ApiModelProperty(value = "排放标准")
+    private String emissionStandard;
+
+    /** 动力价格 */
+    @Excel(name = "动力价格",sort=17)
+    @TableField("engine_price")
+    @ApiModelProperty(value = "动力价格")
+    private BigDecimal enginePrice;
+
+    /** 动力重量 */
+    @Excel(name = "动力重量",sort=18)
+    @TableField("engine_weight")
+    @ApiModelProperty(value = "动力重量")
+    private Long engineWeight;
 
     /** 动力尺寸L*W*H(mm) */
-    @Excel(name = "动力尺寸L*W*H(mm)",sort =17)
+    @Excel(name = "动力尺寸L*W*H(mm)",sort=19)
     @TableField("power_size")
     @ApiModelProperty(value = "动力尺寸L*W*H(mm)")
     private String powerSize;
 
+    /** 水箱40度铝价格 */
+    @Excel(name = "水箱40度铝价格",sort=20)
+    @TableField("tank_40_lv_price")
+    @ApiModelProperty(value = "水箱40度铝价格")
+    private BigDecimal tank40LvPrice;
+
+    /** 水箱40度铜价格 */
+    @Excel(name = "水箱40度铜价格",sort=21)
+    @TableField("tank_40_tong_price")
+    @ApiModelProperty(value = "水箱40度铜价格")
+    private BigDecimal tank40TongPrice;
+
+    /** 水箱50度铝价格 */
+    @Excel(name = "水箱50度铝价格",sort=22)
+    @TableField("tank_50_lv_price")
+    @ApiModelProperty(value = "水箱50度铝价格")
+    private BigDecimal tank50LvPrice;
+
+    /** 水箱50度铜价格 */
+    @Excel(name = "水箱50度铜价格",sort=23)
+    @TableField("tank_50_tong_price")
+    @ApiModelProperty(value = "水箱50度铜价格")
+    private BigDecimal tank50TongPrice;
+
+    /** 水箱40度铝重量 */
+    @Excel(name = "水箱40度铝重量",sort=24)
+    @TableField("tank_40_lv_weight")
+    @ApiModelProperty(value = "水箱40度铝重量")
+    private BigDecimal tank40LvWeight;
+
+    /** 水箱40度铜重量 */
+    @Excel(name = "水箱40度铜重量",sort=25)
+    @TableField("tank_40_tong_weight")
+    @ApiModelProperty(value = "水箱40度铜重量")
+    private BigDecimal tank40TongWeight;
+
+    /** 水箱50度铝重量 */
+    @Excel(name = "水箱50度铝重量",sort=26)
+    @TableField("tank_50_lv_weight")
+    @ApiModelProperty(value = "水箱50度铝重量")
+    private BigDecimal tank50LvWeight;
+
+    /** 水箱50度铜重量 */
+    @Excel(name = "水箱50度铜重量",sort=27)
+    @TableField("tank_50_tong_weight")
+    @ApiModelProperty(value = "水箱50度铜重量")
+    private BigDecimal tank50TongWeight;
+
     /** 水箱尺寸L*W*H(mm) */
-    @Excel(name = "水箱尺寸L*W*H(mm)",sort =18)
+    @Excel(name = "水箱尺寸L*W*H(mm)",sort=28)
     @TableField("tank_size")
     @ApiModelProperty(value = "水箱尺寸L*W*H(mm)")
     private String tankSize;
 
-    /** 排放标准 */
-    @Excel(name = "排放标准",sort =19)
-    @TableField("emission_standard")
-    @ApiModelProperty(value = "排放标准")
-    private String emissionStandard;
-
     /** 配置说明 */
-    @Excel(name = "配置说明",sort =20)
+    @Excel(name = "配置说明",sort=29)
     @TableField("configuration_description")
     @ApiModelProperty(value = "配置说明")
     private String configurationDescription;
 
-    /** 价格 */
-    @Excel(name = "价格",sort =21)
-    @TableField("price")
-    @ApiModelProperty(value = "价格")
-    private Long price;
+
 
     /** 水箱价格 */
-    @Excel(name = "水箱价格",sort =22)
+    @Excel(name = "水箱价格",sort=30)
     @TableField("tank_price")
     @ApiModelProperty(value = "水箱价格")
     private Long tankPrice;
 
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setBrand(String brand){
-        this.brand = brand;
-    }
-
-    public String getBrand(){
-        return brand;
-    }
-    public void setModel(String model){
-        this.model = model;
-    }
-
-    public String getModel(){
-        return model;
-    }
-    public void setEnginePowerMajor1500rpm(Long enginePowerMajor1500rpm){
-        this.enginePowerMajor1500rpm = enginePowerMajor1500rpm;
-    }
-
-    public Long getEnginePowerMajor1500rpm(){
-        return enginePowerMajor1500rpm;
-    }
-    public void setEnginePowerMinor1500rpm(Long enginePowerMinor1500rpm){
-        this.enginePowerMinor1500rpm = enginePowerMinor1500rpm;
-    }
-
-    public Long getEnginePowerMinor1500rpm(){
-        return enginePowerMinor1500rpm;
-    }
-    public void setUnitPowerMajor1500rpm(Long unitPowerMajor1500rpm){
-        this.unitPowerMajor1500rpm = unitPowerMajor1500rpm;
-    }
-
-    public Long getUnitPowerMajor1500rpm(){
-        return unitPowerMajor1500rpm;
-    }
-    public void setUnitPowerMinor1500rpm(Long unitPowerMinor1500rpm){
-        this.unitPowerMinor1500rpm = unitPowerMinor1500rpm;
-    }
-
-    public Long getUnitPowerMinor1500rpm(){
-        return unitPowerMinor1500rpm;
-    }
-    public void setEnginePowerMajor1800rpm(Long enginePowerMajor1800rpm){
-        this.enginePowerMajor1800rpm = enginePowerMajor1800rpm;
-    }
-
-    public Long getEnginePowerMajor1800rpm(){
-        return enginePowerMajor1800rpm;
-    }
-    public void setEnginePowerMinor1800rpm(Long enginePowerMinor1800rpm){
-        this.enginePowerMinor1800rpm = enginePowerMinor1800rpm;
-    }
-
-    public Long getEnginePowerMinor1800rpm(){
-        return enginePowerMinor1800rpm;
-    }
-    public void setUnitPowerMajor1800rpm(Long unitPowerMajor1800rpm){
-        this.unitPowerMajor1800rpm = unitPowerMajor1800rpm;
-    }
-
-    public Long getUnitPowerMajor1800rpm(){
-        return unitPowerMajor1800rpm;
-    }
-    public void setUnitPowerMinor1800rpm(Long unitPowerMinor1800rpm){
-        this.unitPowerMinor1800rpm = unitPowerMinor1800rpm;
-    }
-
-    public Long getUnitPowerMinor1800rpm(){
-        return unitPowerMinor1800rpm;
-    }
-    public void setOilForm(String oilForm){
-        this.oilForm = oilForm;
-    }
-
-    public String getOilForm(){
-        return oilForm;
-    }
-    public void setAirIntakeMode(String airIntakeMode){
-        this.airIntakeMode = airIntakeMode;
-    }
-
-    public String getAirIntakeMode(){
-        return airIntakeMode;
-    }
-    public void setVoltage(String voltage){
-        this.voltage = voltage;
-    }
-
-    public String getVoltage(){
-        return voltage;
-    }
-    public void setDisplacement(String displacement){
-        this.displacement = displacement;
-    }
-
-    public String getDisplacement(){
-        return displacement;
-    }
-    public void setOilConsumption(String oilConsumption){
-        this.oilConsumption = oilConsumption;
-    }
-
-    public String getOilConsumption(){
-        return oilConsumption;
-    }
-    public void setTankWeight(Long tankWeight){
-        this.tankWeight = tankWeight;
-    }
-
-    public Long getTankWeight(){
-        return tankWeight;
-    }
-    public void setPowerSize(String powerSize){
-        this.powerSize = powerSize;
-    }
-
-    public String getPowerSize(){
-        return powerSize;
-    }
-    public void setTankSize(String tankSize){
-        this.tankSize = tankSize;
-    }
-
-    public String getTankSize(){
-        return tankSize;
-    }
-    public void setEmissionStandard(String emissionStandard){
-        this.emissionStandard = emissionStandard;
-    }
-
-    public String getEmissionStandard(){
-        return emissionStandard;
-    }
-    public void setConfigurationDescription(String configurationDescription){
-        this.configurationDescription = configurationDescription;
-    }
-
-    public String getConfigurationDescription(){
-        return configurationDescription;
-    }
-    public void setPrice(Long price){
-        this.price = price;
-    }
-
-    public Long getPrice(){
-        return price;
-    }
-    public void setTankPrice(Long tankPrice){
-        this.tankPrice = tankPrice;
-    }
-
-    public Long getTankPrice(){
-        return tankPrice;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("brand", getBrand())
-            .append("model", getModel())
-            .append("enginePowerMajor1500rpm", getEnginePowerMajor1500rpm())
-            .append("enginePowerMinor1500rpm", getEnginePowerMinor1500rpm())
-            .append("unitPowerMajor1500rpm", getUnitPowerMajor1500rpm())
-            .append("unitPowerMinor1500rpm", getUnitPowerMinor1500rpm())
-            .append("enginePowerMajor1800rpm", getEnginePowerMajor1800rpm())
-            .append("enginePowerMinor1800rpm", getEnginePowerMinor1800rpm())
-            .append("unitPowerMajor1800rpm", getUnitPowerMajor1800rpm())
-            .append("unitPowerMinor1800rpm", getUnitPowerMinor1800rpm())
-            .append("oilForm", getOilForm())
-            .append("airIntakeMode", getAirIntakeMode())
-            .append("voltage", getVoltage())
-            .append("displacement", getDisplacement())
-            .append("oilConsumption", getOilConsumption())
-            .append("tankWeight", getTankWeight())
-            .append("powerSize", getPowerSize())
-            .append("tankSize", getTankSize())
-            .append(" emissionStandard", getEmissionStandard())
-            .append("configurationDescription", getConfigurationDescription())
-            .append("price", getPrice())
-            .append("tankPrice", getTankPrice())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+
 }

xxgl-service/src/main/java/com/miaxis/engine/mapper/EngineInfoMapper.java

@@ -2,13 +2,14 @@ package com.miaxis.engine.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.engine.EngineInfoDTO;
 import com.miaxis.engine.domain.EngineInfo;
 
 /**
  * 报价Mapper接口
  *
  * @author miaxis
- * @date 2023-01-29
+ * @date 2023-02-08
  */
 public interface EngineInfoMapper extends BaseMapper<EngineInfo> {
     /**
@@ -20,4 +21,6 @@ public interface EngineInfoMapper extends BaseMapper<EngineInfo> {
     public List<EngineInfo> selectEngineInfoList(EngineInfo engineInfo);
 
     List<String> getListByFieldName(String name);
+
+    List<EngineInfo> selectEngineInfoList2(EngineInfoDTO engineInfoDTO);
 }

xxgl-service/src/main/java/com/miaxis/engine/service/IEngineInfoService.java

@@ -1,6 +1,8 @@
 package com.miaxis.engine.service;
 
 import java.util.List;
+
+import com.miaxis.engine.EngineInfoDTO;
 import com.miaxis.engine.domain.EngineInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -8,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 报价Service接口
  *
  * @author miaxis
- * @date 2023-01-29
+ * @date 2023-02-08
  */
 public interface IEngineInfoService extends IService<EngineInfo>{
     /**
@@ -19,5 +21,7 @@ public interface IEngineInfoService extends IService<EngineInfo>{
      */
     public List<EngineInfo> selectEngineInfoList(EngineInfo engineInfo);
 
-    List<String> getListByFieldName(java.lang.String name);
+    List<String> getListByFieldName(String name);
+
+    List<EngineInfo> selectEngineInfoList2(EngineInfoDTO engineInfoDTO);
 }

xxgl-service/src/main/java/com/miaxis/engine/service/impl/EngineInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.miaxis.common.utils.DateUtils;
+import com.miaxis.engine.EngineInfoDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -16,7 +17,7 @@ import com.miaxis.engine.service.IEngineInfoService;
  * 报价Service业务层处理
  *
  * @author miaxis
- * @date 2023-01-29
+ * @date 2023-02-08
  */
 @Service
 public class EngineInfoServiceImpl extends ServiceImpl<EngineInfoMapper, EngineInfo> implements IEngineInfoService {
@@ -38,4 +39,9 @@ public class EngineInfoServiceImpl extends ServiceImpl<EngineInfoMapper, EngineI
     public List<String> getListByFieldName(String name) {
         return engineInfoMapper.getListByFieldName(name);
     }
+
+    @Override
+    public List<EngineInfo> selectEngineInfoList2(EngineInfoDTO engineInfoDTO) {
+        return engineInfoMapper.selectEngineInfoList2(engineInfoDTO);
+    }
 }

xxgl-service/src/main/java/com/miaxis/fdj/domain/Fdj50hzInfo.java

@@ -0,0 +1,218 @@
+package com.miaxis.fdj.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 发电机50hz报价对象 fdj_50hz_info
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@Data
+@TableName("fdj_50hz_info")
+@ApiModel(value = "Fdj50hzInfo", description = "发电机50hz报价对象 fdj_50hz_info")
+public class Fdj50hzInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 型号规格 */
+    @Excel(name = "型号规格",sort = 1)
+    @TableField("fdj_model")
+    @ApiModelProperty(value = "型号规格")
+    private String fdjModel;
+
+    /** 标准止口 */
+    @Excel(name = "标准止口",sort = 2)
+    @TableField("standard_seam")
+    @ApiModelProperty(value = "标准止口")
+    private String standardSeam;
+
+    /** 频率(Hz) */
+    @Excel(name = "频率(Hz)",sort = 3)
+    @TableField("rate")
+    @ApiModelProperty(value = "频率(Hz)")
+    private Integer rate;
+
+    /** 功率 3-ph/50Hz/380-440V(kw) */
+    @Excel(name = "功率 3-ph/50Hz/380-440V(kw)",sort = 4)
+    @TableField("fdj_power_kw")
+    @ApiModelProperty(value = "功率 3-ph/50Hz/380-440V(kw)")
+    private BigDecimal fdjPowerKw;
+
+    /** 功率 3-ph/50Hz/380-440V(kva) */
+    @Excel(name = "功率 3-ph/50Hz/380-440V(kva)",sort = 5)
+    @TableField("fdj_power_kva")
+    @ApiModelProperty(value = "功率 3-ph/50Hz/380-440V(kva)")
+    private BigDecimal fdjPowerKva;
+
+    /** 含税出厂价（单支点） */
+    @Excel(name = "含税出厂价（单支点）", sort = 6)
+    @TableField("single_fulcrum_price")
+    @ApiModelProperty(value = "含税出厂价（单支点）")
+    private String singleFulcrumPrice;
+
+    /** 含税出厂价（双支点） */
+    @Excel(name = "含税出厂价（双支点）", sort = 7)
+    @TableField("double_fulcrum_price")
+    @ApiModelProperty(value = "含税出厂价（双支点）")
+    private String doubleFulcrumPrice;
+
+    /** 含税出厂价（包装箱价格） */
+    @Excel(name = "含税出厂价（包装箱价格）",sort = 8)
+    @TableField("packing_box_price")
+    @ApiModelProperty(value = "含税出厂价（包装箱价格）")
+    private String packingBoxPrice;
+
+    /** 含税出厂价（仪表箱） */
+    @Excel(name = "含税出厂价（仪表箱）", sort = 9)
+    @TableField("instrument_box_price")
+    @ApiModelProperty(value = "含税出厂价（仪表箱）")
+    private String instrumentBoxPrice;
+
+    /** 含税出厂价（空开） */
+    @Excel(name = "含税出厂价（空开）", sort = 10)
+    @TableField("air_switch_price")
+    @ApiModelProperty(value = "含税出厂价（空开）")
+    private String airSwitchPrice;
+
+    /** 包装尺寸
+（长宽高） */
+    @Excel(name = "包装尺寸（长宽高）", sort = 11)
+    @TableField("open_parms")
+    @ApiModelProperty(value = "包装尺寸（长宽高）")
+    private String openParms;
+
+    /** 净重/毛重（KG） */
+    @Excel(name = "净重/毛重（KG）", sort = 12)
+    @TableField("weight")
+    @ApiModelProperty(value = "净重/毛重（KG）")
+    private String weight;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setFdjModel(String fdjModel){
+        this.fdjModel = fdjModel;
+    }
+
+    public String getFdjModel(){
+        return fdjModel;
+    }
+    public void setStandardSeam(String standardSeam){
+        this.standardSeam = standardSeam;
+    }
+
+    public String getStandardSeam(){
+        return standardSeam;
+    }
+    public void setRate(Integer rate){
+        this.rate = rate;
+    }
+
+    public Integer getRate(){
+        return rate;
+    }
+    public void setFdjPowerKw(BigDecimal fdjPowerKw){
+        this.fdjPowerKw = fdjPowerKw;
+    }
+
+    public BigDecimal getFdjPowerKw(){
+        return fdjPowerKw;
+    }
+    public void setFdjPowerKva(BigDecimal fdjPowerKva){
+        this.fdjPowerKva = fdjPowerKva;
+    }
+
+    public BigDecimal getFdjPowerKva(){
+        return fdjPowerKva;
+    }
+    public void setSingleFulcrumPrice(String singleFulcrumPrice){
+        this.singleFulcrumPrice = singleFulcrumPrice;
+    }
+
+    public String getSingleFulcrumPrice(){
+        return singleFulcrumPrice;
+    }
+    public void setDoubleFulcrumPrice(String doubleFulcrumPrice){
+        this.doubleFulcrumPrice = doubleFulcrumPrice;
+    }
+
+    public String getDoubleFulcrumPrice(){
+        return doubleFulcrumPrice;
+    }
+    public void setPackingBoxPrice(String packingBoxPrice){
+        this.packingBoxPrice = packingBoxPrice;
+    }
+
+    public String getPackingBoxPrice(){
+        return packingBoxPrice;
+    }
+    public void setInstrumentBoxPrice(String instrumentBoxPrice){
+        this.instrumentBoxPrice = instrumentBoxPrice;
+    }
+
+    public String getInstrumentBoxPrice(){
+        return instrumentBoxPrice;
+    }
+    public void setAirSwitchPrice(String airSwitchPrice){
+        this.airSwitchPrice = airSwitchPrice;
+    }
+
+    public String getAirSwitchPrice(){
+        return airSwitchPrice;
+    }
+    public void setOpenParms(String openParms){
+        this.openParms = openParms;
+    }
+
+    public String getOpenParms(){
+        return openParms;
+    }
+    public void setWeight(String weight){
+        this.weight = weight;
+    }
+
+    public String getWeight(){
+        return weight;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("fdjModel", getFdjModel())
+            .append("standardSeam", getStandardSeam())
+            .append("rate", getRate())
+            .append("fdjPowerKw", getFdjPowerKw())
+            .append("fdjPowerKva", getFdjPowerKva())
+            .append("singleFulcrumPrice", getSingleFulcrumPrice())
+            .append("doubleFulcrumPrice", getDoubleFulcrumPrice())
+            .append("packingBoxPrice", getPackingBoxPrice())
+            .append("instrumentBoxPrice", getInstrumentBoxPrice())
+            .append("airSwitchPrice", getAirSwitchPrice())
+            .append("openParms", getOpenParms())
+            .append("weight", getWeight())
+            .append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

xxgl-service/src/main/java/com/miaxis/fdj/domain/Fdj60hzInfo.java

@@ -0,0 +1,218 @@
+package com.miaxis.fdj.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 发电机60hz报价对象 fdj_60hz_info
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@Data
+@TableName("fdj_60hz_info")
+@ApiModel(value = "Fdj60hzInfo", description = "发电机60hz报价对象 fdj_60hz_info")
+public class Fdj60hzInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 型号规格 */
+    @Excel(name = "型号规格",sort = 1)
+    @TableField("fdj_model")
+    @ApiModelProperty(value = "型号规格")
+    private String fdjModel;
+
+    /** 标准止口 */
+    @Excel(name = "标准止口",sort = 2)
+    @TableField("standard_seam")
+    @ApiModelProperty(value = "标准止口")
+    private String standardSeam;
+
+    /** 频率(Hz) */
+    @Excel(name = "频率(Hz)",sort = 3)
+    @TableField("rate")
+    @ApiModelProperty(value = "频率(Hz)")
+    private Integer rate;
+
+    /** 功率 3-ph/50Hz/380-440V(kw) */
+    @Excel(name = "功率 3-ph/50Hz/380-440V(kw)",sort = 4)
+    @TableField("fdj_power_kw")
+    @ApiModelProperty(value = "功率 3-ph/50Hz/380-440V(kw)")
+    private BigDecimal fdjPowerKw;
+
+    /** 功率 3-ph/50Hz/380-440V(kva) */
+    @Excel(name = "功率 3-ph/50Hz/380-440V(kva)",sort = 5)
+    @TableField("fdj_power_kva")
+    @ApiModelProperty(value = "功率 3-ph/50Hz/380-440V(kva)")
+    private BigDecimal fdjPowerKva;
+
+    /** 含税出厂价（单支点） */
+    @Excel(name = "含税出厂价（单支点）", sort = 6)
+    @TableField("single_fulcrum_price")
+    @ApiModelProperty(value = "含税出厂价（单支点）")
+    private String singleFulcrumPrice;
+
+    /** 含税出厂价（双支点） */
+    @Excel(name = "含税出厂价（双支点）", sort = 7)
+    @TableField("double_fulcrum_price")
+    @ApiModelProperty(value = "含税出厂价（双支点）")
+    private String doubleFulcrumPrice;
+
+    /** 含税出厂价（包装箱价格） */
+    @Excel(name = "含税出厂价（包装箱价格）", sort = 8)
+    @TableField("packing_box_price")
+    @ApiModelProperty(value = "含税出厂价（包装箱价格）")
+    private String packingBoxPrice;
+
+    /** 含税出厂价（仪表箱） */
+    @Excel(name = "含税出厂价（仪表箱）", sort = 9)
+    @TableField("instrument_box_price")
+    @ApiModelProperty(value = "含税出厂价（仪表箱）")
+    private String instrumentBoxPrice;
+
+    /** 含税出厂价（空开） */
+    @Excel(name = "含税出厂价（空开）", sort = 10)
+    @TableField("air_switch_price")
+    @ApiModelProperty(value = "含税出厂价（空开）")
+    private String airSwitchPrice;
+
+    /** 包装尺寸
+     （长宽高） */
+    @Excel(name = "包装尺寸（长宽高）",sort = 11)
+    @TableField("open_parms")
+    @ApiModelProperty(value = "包装尺寸（长宽高）")
+    private String openParms;
+
+    /** 净重/毛重（KG） */
+    @Excel(name = "净重/毛重（KG）",sort = 12)
+    @TableField("weight")
+    @ApiModelProperty(value = "净重/毛重（KG）")
+    private String weight;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setFdjModel(String fdjModel){
+        this.fdjModel = fdjModel;
+    }
+
+    public String getFdjModel(){
+        return fdjModel;
+    }
+    public void setStandardSeam(String standardSeam){
+        this.standardSeam = standardSeam;
+    }
+
+    public String getStandardSeam(){
+        return standardSeam;
+    }
+    public void setRate(Integer rate){
+        this.rate = rate;
+    }
+
+    public Integer getRate(){
+        return rate;
+    }
+    public void setFdjPowerKw(BigDecimal fdjPowerKw){
+        this.fdjPowerKw = fdjPowerKw;
+    }
+
+    public BigDecimal getFdjPowerKw(){
+        return fdjPowerKw;
+    }
+    public void setFdjPowerKva(BigDecimal fdjPowerKva){
+        this.fdjPowerKva = fdjPowerKva;
+    }
+
+    public BigDecimal getFdjPowerKva(){
+        return fdjPowerKva;
+    }
+    public void setSingleFulcrumPrice(String singleFulcrumPrice){
+        this.singleFulcrumPrice = singleFulcrumPrice;
+    }
+
+    public String getSingleFulcrumPrice(){
+        return singleFulcrumPrice;
+    }
+    public void setDoubleFulcrumPrice(String doubleFulcrumPrice){
+        this.doubleFulcrumPrice = doubleFulcrumPrice;
+    }
+
+    public String getDoubleFulcrumPrice(){
+        return doubleFulcrumPrice;
+    }
+    public void setPackingBoxPrice(String packingBoxPrice){
+        this.packingBoxPrice = packingBoxPrice;
+    }
+
+    public String getPackingBoxPrice(){
+        return packingBoxPrice;
+    }
+    public void setInstrumentBoxPrice(String instrumentBoxPrice){
+        this.instrumentBoxPrice = instrumentBoxPrice;
+    }
+
+    public String getInstrumentBoxPrice(){
+        return instrumentBoxPrice;
+    }
+    public void setAirSwitchPrice(String airSwitchPrice){
+        this.airSwitchPrice = airSwitchPrice;
+    }
+
+    public String getAirSwitchPrice(){
+        return airSwitchPrice;
+    }
+    public void setOpenParms(String openParms){
+        this.openParms = openParms;
+    }
+
+    public String getOpenParms(){
+        return openParms;
+    }
+    public void setWeight(String weight){
+        this.weight = weight;
+    }
+
+    public String getWeight(){
+        return weight;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("fdjModel", getFdjModel())
+            .append("standardSeam", getStandardSeam())
+            .append("rate", getRate())
+            .append("fdjPowerKw", getFdjPowerKw())
+            .append("fdjPowerKva", getFdjPowerKva())
+            .append("singleFulcrumPrice", getSingleFulcrumPrice())
+            .append("doubleFulcrumPrice", getDoubleFulcrumPrice())
+            .append("packingBoxPrice", getPackingBoxPrice())
+            .append("instrumentBoxPrice", getInstrumentBoxPrice())
+            .append("airSwitchPrice", getAirSwitchPrice())
+            .append("openParms", getOpenParms())
+            .append("weight", getWeight())
+            .append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

xxgl-service/src/main/java/com/miaxis/fdj/mapper/Fdj50hzInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.fdj.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.fdj.domain.Fdj50hzInfo;
+
+/**
+ * 发电机50hz报价Mapper接口
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+public interface Fdj50hzInfoMapper extends BaseMapper<Fdj50hzInfo> {
+    /**
+     * 查询发电机50hz报价列表
+     *
+     * @param fdj50hzInfo 发电机50hz报价
+     * @return 发电机50hz报价集合
+     */
+    public List<Fdj50hzInfo> selectFdj50hzInfoList(Fdj50hzInfo fdj50hzInfo);
+
+}

xxgl-service/src/main/java/com/miaxis/fdj/mapper/Fdj60hzInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.fdj.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
+
+/**
+ * 发电机60hz报价Mapper接口
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+public interface Fdj60hzInfoMapper extends BaseMapper<Fdj60hzInfo> {
+    /**
+     * 查询发电机60hz报价列表
+     *
+     * @param fdj60hzInfo 发电机60hz报价
+     * @return 发电机60hz报价集合
+     */
+    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo);
+
+}

xxgl-service/src/main/java/com/miaxis/fdj/service/IFdj50hzInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.fdj.service;
+
+import java.util.List;
+import com.miaxis.fdj.domain.Fdj50hzInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 发电机50hz报价Service接口
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+public interface IFdj50hzInfoService extends IService<Fdj50hzInfo>{
+    /**
+     * 查询发电机50hz报价列表
+     *
+     * @param fdj50hzInfo 发电机50hz报价
+     * @return 发电机50hz报价集合
+     */
+    public List<Fdj50hzInfo> selectFdj50hzInfoList(Fdj50hzInfo fdj50hzInfo);
+}

xxgl-service/src/main/java/com/miaxis/fdj/service/IFdj60hzInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.fdj.service;
+
+import java.util.List;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 发电机60hz报价Service接口
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+public interface IFdj60hzInfoService extends IService<Fdj60hzInfo>{
+    /**
+     * 查询发电机60hz报价列表
+     *
+     * @param fdj60hzInfo 发电机60hz报价
+     * @return 发电机60hz报价集合
+     */
+    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo);
+}

xxgl-service/src/main/java/com/miaxis/fdj/service/impl/Fdj50hzInfoServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.fdj.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.fdj.mapper.Fdj50hzInfoMapper;
+import com.miaxis.fdj.domain.Fdj50hzInfo;
+import com.miaxis.fdj.service.IFdj50hzInfoService;
+
+/**
+ * 发电机50hz报价Service业务层处理
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@Service
+public class Fdj50hzInfoServiceImpl extends ServiceImpl<Fdj50hzInfoMapper, Fdj50hzInfo> implements IFdj50hzInfoService {
+    @Autowired
+    private Fdj50hzInfoMapper fdj50hzInfoMapper;
+
+    /**
+     * 查询发电机50hz报价列表
+     *
+     * @param fdj50hzInfo 发电机50hz报价
+     * @return 发电机50hz报价
+     */
+    @Override
+    public List<Fdj50hzInfo> selectFdj50hzInfoList(Fdj50hzInfo fdj50hzInfo){
+        return fdj50hzInfoMapper.selectFdj50hzInfoList(fdj50hzInfo);
+    }
+}

xxgl-service/src/main/java/com/miaxis/fdj/service/impl/Fdj60hzInfoServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.fdj.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.fdj.mapper.Fdj60hzInfoMapper;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
+import com.miaxis.fdj.service.IFdj60hzInfoService;
+
+/**
+ * 发电机60hz报价Service业务层处理
+ *
+ * @author miaxis
+ * @date 2023-02-09
+ */
+@Service
+public class Fdj60hzInfoServiceImpl extends ServiceImpl<Fdj60hzInfoMapper, Fdj60hzInfo> implements IFdj60hzInfoService {
+    @Autowired
+    private Fdj60hzInfoMapper fdj60hzInfoMapper;
+
+    /**
+     * 查询发电机60hz报价列表
+     *
+     * @param fdj60hzInfo 发电机60hz报价
+     * @return 发电机60hz报价
+     */
+    @Override
+    public List<Fdj60hzInfo> selectFdj60hzInfoList(Fdj60hzInfo fdj60hzInfo){
+        return fdj60hzInfoMapper.selectFdj60hzInfoList(fdj60hzInfo);
+    }
+}

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

@@ -48,10 +48,17 @@ public class FileInfo extends BaseBusinessEntity{
     private Long engineId;
 
     /** 报价id */
-    @Excel(name = "发动机id")
-    @TableField("fdj_id")
-    @ApiModelProperty(value = "发动机id")
-    private Long fdjId;
+    @Excel(name = "发动机50hzid")
+    @TableField("fdj_50hz_id")
+    @ApiModelProperty(value = "发动机50hzid")
+    private Long fdj50hzId;
+
+    /** 报价id */
+    @Excel(name = "发动机60hzid")
+    @TableField("fdj_60hz_id")
+    @ApiModelProperty(value = "发动机60hzid")
+    private Long fdj60hzId;
+
 
     /** 顺序 */
     @Excel(name = "顺序")

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

@@ -225,4 +225,11 @@ public class PriceInfo extends BaseBusinessEntity{
     @TableField("open_parms")
     @ApiModelProperty(value = "静音尺寸（长/宽/高/重量）")
     private String openParms;
+
+
+    /** 静音尺寸（长/宽/高/重量） */
+    @Excel(name = "备注", sort=29)
+    @TableField("remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

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

@@ -21,10 +21,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="voltage"    column="voltage"    />
         <result property="displacement"    column="displacement"    />
         <result property="oilConsumption"    column="oil_consumption"    />
-        <result property="tankWeight"    column="tank_weight"    />
+        <result property="emissionStandard"    column="emission_standard"    />
+        <result property="enginePrice"    column="engine_price"    />
+        <result property="engineWeight"    column="engine_weight"    />
         <result property="powerSize"    column="power_size"    />
+        <result property="tank40LvPrice"    column="tank_40_lv_price"    />
+        <result property="tank40TongPrice"    column="tank_40_tong_price"    />
+        <result property="tank50LvPrice"    column="tank_50_lv_price"    />
+        <result property="tank50TongPrice"    column="tank_50_tong_price"    />
+        <result property="tank40LvWeight"    column="tank_40_lv_weight"    />
+        <result property="tank40TongWeight"    column="tank_40_tong_weight"    />
+        <result property="tank50LvWeight"    column="tank_50_lv_weight"    />
+        <result property="tank50TongWeight"    column="tank_50_tong_weight"    />
         <result property="tankSize"    column="tank_size"    />
-        <result property="emissionStandard"    column="emission_standard"    />
         <result property="configurationDescription"    column="configuration_description"    />
         <result property="price"    column="price"    />
         <result property="tankPrice"    column="tank_price"    />
@@ -54,19 +63,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
             <if test="displacement != null  and displacement != ''"> and displacement = #{displacement}</if>
             <if test="oilConsumption != null  and oilConsumption != ''"> and oil_consumption = #{oilConsumption}</if>
-            <if test="tankWeight != null "> and tank_weight = #{tankWeight}</if>
+            <if test="emissionStandard != null  and emissionStandard != ''"> and emission_standard = #{emissionStandard}</if>
+            <if test="enginePrice != null "> and engine_price = #{enginePrice}</if>
+            <if test="engineWeight != null "> and engine_weight = #{engineWeight}</if>
             <if test="powerSize != null  and powerSize != ''"> and power_size = #{powerSize}</if>
+            <if test="tank40LvPrice != null "> and tank_40_lv_price = #{tank40LvPrice}</if>
+            <if test="tank40TongPrice != null "> and tank_40_tong_price = #{tank40TongPrice}</if>
+            <if test="tank50LvPrice != null "> and tank_50_lv_price = #{tank50LvPrice}</if>
+            <if test="tank50TongPrice != null "> and tank_50_tong_price = #{tank50TongPrice}</if>
+            <if test="tank40LvWeight != null "> and tank_40_lv_weight = #{tank40LvWeight}</if>
+            <if test="tank40TongWeight != null "> and tank_40_tong_weight = #{tank40TongWeight}</if>
+            <if test="tank50LvWeight != null "> and tank_50_lv_weight = #{tank50LvWeight}</if>
+            <if test="tank50TongWeight != null "> and tank_50_tong_weight = #{tank50TongWeight}</if>
             <if test="tankSize != null  and tankSize != ''"> and tank_size = #{tankSize}</if>
-            <if test="emissionStandard != null  and emissionStandard != ''"> andemission_standard = #{emissionStandard}</if>
             <if test="configurationDescription != null  and configurationDescription != ''"> and configuration_description = #{configurationDescription}</if>
             <if test="price != null "> and price = #{price}</if>
             <if test="tankPrice != null "> and tank_price = #{tankPrice}</if>
         </where>
     </select>
-
     <select id="getListByFieldName" resultType="string">
-        select distinct (${fieldName}) as vals from engine_info order by ${fieldName}
+        select distinct (${fieldName}) as vals from price_info order by ${fieldName}
+
+    </select>
 
+    <select id="selectEngineInfoList2"  resultMap="EngineInfoResult">
+        <include refid="selectEngineInfoVo"/>
+        <where>
+            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
+            <if test="powerKwMin != null "> and engine_power_major_1500RPM <![CDATA[>=]]> #{powerKwMin}</if>
+            <if test="powerKwMax != null "> and engine_power_major_1500RPM <![CDATA[<=]]> #{powerKwMax}</if>
+        </where>
     </select>
 
 </mapper>

xxgl-service/src/main/resources/mapper/fdj/Fdj50hzInfoMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.fdj.mapper.Fdj50hzInfoMapper">
+
+    <resultMap type="Fdj50hzInfo" id="Fdj50hzInfoResult">
+        <result property="id"    column="id"    />
+        <result property="fdjModel"    column="fdj_model"    />
+        <result property="standardSeam"    column="standard_seam"    />
+        <result property="rate"    column="rate"    />
+        <result property="fdjPowerKw"    column="fdj_power_kw"    />
+        <result property="fdjPowerKva"    column="fdj_power_kva"    />
+        <result property="singleFulcrumPrice"    column="single_fulcrum_price"    />
+        <result property="doubleFulcrumPrice"    column="double_fulcrum_price"    />
+        <result property="packingBoxPrice"    column="packing_box_price"    />
+        <result property="instrumentBoxPrice"    column="instrument_box_price"    />
+        <result property="airSwitchPrice"    column="air_switch_price"    />
+        <result property="openParms"    column="open_parms"    />
+        <result property="weight"    column="weight"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectFdj50hzInfoVo">
+        select * from fdj_50hz_info
+    </sql>
+
+    <select id="selectFdj50hzInfoList" parameterType="Fdj50hzInfo" resultMap="Fdj50hzInfoResult">
+        <include refid="selectFdj50hzInfoVo"/>
+        <where>
+            <if test="fdjModel != null  and fdjModel != ''"> and fdj_model = #{fdjModel}</if>
+            <if test="standardSeam != null  and standardSeam != ''"> and standard_seam = #{standardSeam}</if>
+            <if test="rate != null "> and rate = #{rate}</if>
+            <if test="fdjPowerKw != null "> and fdj_power_kw = #{fdjPowerKw}</if>
+            <if test="fdjPowerKva != null "> and fdj_power_kva = #{fdjPowerKva}</if>
+            <if test="singleFulcrumPrice != null  and singleFulcrumPrice != ''"> and single_fulcrum_price = #{singleFulcrumPrice}</if>
+            <if test="doubleFulcrumPrice != null  and doubleFulcrumPrice != ''"> and double_fulcrum_price = #{doubleFulcrumPrice}</if>
+            <if test="packingBoxPrice != null  and packingBoxPrice != ''"> and packing_box_price = #{packingBoxPrice}</if>
+            <if test="instrumentBoxPrice != null  and instrumentBoxPrice != ''"> and instrument_box_price = #{instrumentBoxPrice}</if>
+            <if test="airSwitchPrice != null  and airSwitchPrice != ''"> and air_switch_price = #{airSwitchPrice}</if>
+            <if test="openParms != null  and openParms != ''"> and open_parms = #{openParms}</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+        </where>
+    </select>
+
+</mapper>

xxgl-service/src/main/resources/mapper/fdj/Fdj60hzInfoMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.fdj.mapper.Fdj60hzInfoMapper">
+
+    <resultMap type="Fdj60hzInfo" id="Fdj60hzInfoResult">
+        <result property="id"    column="id"    />
+        <result property="fdjModel"    column="fdj_model"    />
+        <result property="standardSeam"    column="standard_seam"    />
+        <result property="rate"    column="rate"    />
+        <result property="fdjPowerKw"    column="fdj_power_kw"    />
+        <result property="fdjPowerKva"    column="fdj_power_kva"    />
+        <result property="singleFulcrumPrice"    column="single_fulcrum_price"    />
+        <result property="doubleFulcrumPrice"    column="double_fulcrum_price"    />
+        <result property="packingBoxPrice"    column="packing_box_price"    />
+        <result property="instrumentBoxPrice"    column="instrument_box_price"    />
+        <result property="airSwitchPrice"    column="air_switch_price"    />
+        <result property="openParms"    column="open_parms"    />
+        <result property="weight"    column="weight"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectFdj60hzInfoVo">
+        select * from fdj_60hz_info
+    </sql>
+
+    <select id="selectFdj60hzInfoList" parameterType="Fdj60hzInfo" resultMap="Fdj60hzInfoResult">
+        <include refid="selectFdj60hzInfoVo"/>
+        <where>
+            <if test="fdjModel != null  and fdjModel != ''"> and fdj_model = #{fdjModel}</if>
+            <if test="standardSeam != null  and standardSeam != ''"> and standard_seam = #{standardSeam}</if>
+            <if test="rate != null "> and rate = #{rate}</if>
+            <if test="fdjPowerKw != null "> and fdj_power_kw = #{fdjPowerKw}</if>
+            <if test="fdjPowerKva != null "> and fdj_power_kva = #{fdjPowerKva}</if>
+            <if test="singleFulcrumPrice != null  and singleFulcrumPrice != ''"> and single_fulcrum_price = #{singleFulcrumPrice}</if>
+            <if test="doubleFulcrumPrice != null  and doubleFulcrumPrice != ''"> and double_fulcrum_price = #{doubleFulcrumPrice}</if>
+            <if test="packingBoxPrice != null  and packingBoxPrice != ''"> and packing_box_price = #{packingBoxPrice}</if>
+            <if test="instrumentBoxPrice != null  and instrumentBoxPrice != ''"> and instrument_box_price = #{instrumentBoxPrice}</if>
+            <if test="airSwitchPrice != null  and airSwitchPrice != ''"> and air_switch_price = #{airSwitchPrice}</if>
+            <if test="openParms != null  and openParms != ''"> and open_parms = #{openParms}</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -8,7 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="fdj50hzId"    column="fdj_50hz_id"    />
+        <result property="fdj60hzId"    column="fdj_60hz_id"    />
         <result property="controllerId"    column="controller_id"    />
         <result property="seq"    column="seq"    />
         <result property="fileUrl"    column="file_url"    />
@@ -28,7 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="priceId != null "> and price_id = #{priceId}</if>
             <if test="controllerId != null "> and controller_id = #{controllerId}</if>
             <if test="engineId != null "> and engine_id = #{engineId}</if>
-            <if test="fdjId != null "> and fdj_id = #{fdjId}</if>
+            <if test="fdj50hzId != null "> and fdj_50hz_id = #{fdj50hzId}</if>
+            <if test="fdj60hzId != null "> and fdj_60hz_id = #{fdj60hzId}</if>
             <if test="seq != null "> and seq = #{seq}</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
             <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>

xxgl-service/src/main/resources/mapper/price/PriceInfoMapper.xml

@@ -31,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="atsPrice"    column="ats_price"    />
         <result property="batteryModel"    column="battery_model"    />
         <result property="batteryPrice"    column="battery_price"    />
-
         <result property="muteParms"    column="mute_parms"    />
         <result property="openParms"    column="open_parms"    />
         <result property="updateTime"    column="update_time"    />
@@ -76,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="muteParms != null  and muteParms != ''"> and mute_parms = #{muteParms}</if>
             <if test="openParms != null  and openParms != ''"> and open_parms = #{openParms}</if>
+
         </where>
     </select>