调整发电机报价字段

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

@@ -1,17 +1,16 @@
 package com.miaxis.pc.controller;
 
-import com.miaxis.common.constant.Constants;
 import java.util.List;
 import java.util.Arrays;
+
+import com.miaxis.fdj.domain.Fdj60hzInfo;
 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;

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

@@ -52,13 +52,13 @@ public class Fdj50hzInfo extends BaseBusinessEntity{
     @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;
+    private String 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;
+    private String fdjPowerKva;
 
     /** 含税出厂价（单支点） */
     @Excel(name = "含税出厂价（单支点）", sort = 6)
@@ -92,127 +92,23 @@ public class Fdj50hzInfo extends BaseBusinessEntity{
 
     /** 包装尺寸
 （长宽高） */
-    @Excel(name = "包装尺寸（长宽高）", sort = 11)
+    @Excel(name = "单支点木箱包装尺寸包装尺寸（长宽高）", sort = 11)
     @TableField("open_parms")
     @ApiModelProperty(value = "包装尺寸（长宽高）")
     private String openParms;
 
+    /** 包装尺寸
+     （长宽高） */
+    @Excel(name = "双支点木箱包装尺寸包装尺寸（长宽高）", sort = 12)
+    @TableField("open_parms_double")
+    @ApiModelProperty(value = "包装尺寸（长宽高）")
+    private String openParmsDouble;
+
     /** 净重/毛重（KG） */
-    @Excel(name = "净重/毛重（KG）", sort = 12)
+    @Excel(name = "净重/毛重（KG）", sort = 13)
     @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

@@ -1,27 +1,23 @@
 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.TableField;
 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.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 /**
- * 发电机60hz报价对象 fdj_60hz_info
+ * 发电机50hz报价对象 fdj_50hz_info
  *
  * @author miaxis
  * @date 2023-02-09
  */
 @Data
 @TableName("fdj_60hz_info")
-@ApiModel(value = "Fdj60hzInfo", description = "发电机60hz报价对象 fdj_60hz_info")
+@ApiModel(value = "Fdj60hzInfo", description = "发电机50hz报价对象 fdj_60hz_info")
 public class Fdj60hzInfo extends BaseBusinessEntity{
     private static final long serialVersionUID = 1L;
 
@@ -52,13 +48,13 @@ public class Fdj60hzInfo extends BaseBusinessEntity{
     @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;
+    private String 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;
+    private String fdjPowerKva;
 
     /** 含税出厂价（单支点） */
     @Excel(name = "含税出厂价（单支点）", sort = 6)
@@ -73,7 +69,7 @@ public class Fdj60hzInfo extends BaseBusinessEntity{
     private String doubleFulcrumPrice;
 
     /** 含税出厂价（包装箱价格） */
-    @Excel(name = "含税出厂价（包装箱价格）", sort = 8)
+    @Excel(name = "含税出厂价（包装箱价格）",sort = 8)
     @TableField("packing_box_price")
     @ApiModelProperty(value = "含税出厂价（包装箱价格）")
     private String packingBoxPrice;
@@ -91,128 +87,24 @@ public class Fdj60hzInfo extends BaseBusinessEntity{
     private String airSwitchPrice;
 
     /** 包装尺寸
-     （长宽高） */
-    @Excel(name = "包装尺寸（长宽高）",sort = 11)
+（长宽高） */
+    @Excel(name = "单支点木箱包装尺寸包装尺寸（长宽高）", sort = 11)
     @TableField("open_parms")
     @ApiModelProperty(value = "包装尺寸（长宽高）")
     private String openParms;
 
+    /** 包装尺寸
+     （长宽高） */
+    @Excel(name = "双支点木箱包装尺寸包装尺寸（长宽高）", sort = 12)
+    @TableField("open_parms_double")
+    @ApiModelProperty(value = "包装尺寸（长宽高）")
+    private String openParmsDouble;
+
     /** 净重/毛重（KG） */
-    @Excel(name = "净重/毛重（KG）",sort = 12)
+    @Excel(name = "净重/毛重（KG）", sort = 13)
     @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/service/IFdj60hzInfoService.java

@@ -1,8 +1,9 @@
 package com.miaxis.fdj.service;
 
 import java.util.List;
-import com.miaxis.fdj.domain.Fdj60hzInfo;
+
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.fdj.domain.Fdj60hzInfo;
 
 /**
  * 发电机60hz报价Service接口

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

@@ -2,14 +2,10 @@ 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 com.miaxis.fdj.domain.Fdj60hzInfo;
 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;
 
 /**

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

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="instrumentBoxPrice"    column="instrument_box_price"    />
         <result property="airSwitchPrice"    column="air_switch_price"    />
         <result property="openParms"    column="open_parms"    />
+        <result property="openParmsDouble"    column="open_parms_double"    />
         <result property="weight"    column="weight"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createTime"    column="create_time"    />
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="openParmsDouble != null  and openParmsDouble != ''"> and open_parms_double = #{openParmsDouble}</if>
             <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
         </where>
     </select>

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

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="instrumentBoxPrice"    column="instrument_box_price"    />
         <result property="airSwitchPrice"    column="air_switch_price"    />
         <result property="openParms"    column="open_parms"    />
+        <result property="openParmsDouble"    column="open_parms_double"    />
         <result property="weight"    column="weight"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createTime"    column="create_time"    />
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="openParmsDouble != null  and openParmsDouble != ''"> and open_parms_double = #{openParmsDouble}</if>
             <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
         </where>
     </select>