fix order issue
This commit is contained in:
1539530615@qq.com
parent
ba81f6e0a4
commit
fcf70cc8b1
|
|
@ -2,6 +2,8 @@ package com.bonus.zlpt.order.domain;
|
|||
|
||||
import com.bonus.sgzb.common.core.annotation.Excel;
|
||||
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
|
|
@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
|
|||
* @author xsheng
|
||||
* @date 2023-12-01
|
||||
*/
|
||||
@Data
|
||||
@ToString
|
||||
public class OrderDetails extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
|
@ -97,221 +101,4 @@ public class OrderDetails extends BaseEntity
|
|||
/** 进场附件 */
|
||||
@Excel(name = "进场附件")
|
||||
private String entryAttachment;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setOrderId(Long orderId)
|
||||
{
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public Long getOrderId()
|
||||
{
|
||||
return orderId;
|
||||
}
|
||||
public void setNeedCompany(String needCompany)
|
||||
{
|
||||
this.needCompany = needCompany;
|
||||
}
|
||||
|
||||
public String getNeedCompany()
|
||||
{
|
||||
return needCompany;
|
||||
}
|
||||
public void setPlanStartTime(String planStartTime)
|
||||
{
|
||||
this.planStartTime = planStartTime;
|
||||
}
|
||||
|
||||
public String getPlanStartTime()
|
||||
{
|
||||
return planStartTime;
|
||||
}
|
||||
public void setIsMachinist(String isMachinist)
|
||||
{
|
||||
this.isMachinist = isMachinist;
|
||||
}
|
||||
|
||||
public String getIsMachinist()
|
||||
{
|
||||
return isMachinist;
|
||||
}
|
||||
public void setAddress(String address)
|
||||
{
|
||||
this.address = address;
|
||||
}
|
||||
|
||||
public String getAddress()
|
||||
{
|
||||
return address;
|
||||
}
|
||||
public void setDuration(String duration)
|
||||
{
|
||||
this.duration = duration;
|
||||
}
|
||||
|
||||
public String getDuration()
|
||||
{
|
||||
return duration;
|
||||
}
|
||||
public void setInvoiceType(String invoiceType)
|
||||
{
|
||||
this.invoiceType = invoiceType;
|
||||
}
|
||||
|
||||
public String getInvoiceType()
|
||||
{
|
||||
return invoiceType;
|
||||
}
|
||||
public void setDescription(String description)
|
||||
{
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getDescription()
|
||||
{
|
||||
return description;
|
||||
}
|
||||
public void setMaId(Long maId)
|
||||
{
|
||||
this.maId = maId;
|
||||
}
|
||||
|
||||
public Long getMaId()
|
||||
{
|
||||
return maId;
|
||||
}
|
||||
public void setLeaseType(Long leaseType)
|
||||
{
|
||||
this.leaseType = leaseType;
|
||||
}
|
||||
|
||||
public Long getLeaseType()
|
||||
{
|
||||
return leaseType;
|
||||
}
|
||||
public void setLeasePrice(String leasePrice)
|
||||
{
|
||||
this.leasePrice = leasePrice;
|
||||
}
|
||||
|
||||
public String getLeasePrice()
|
||||
{
|
||||
return leasePrice;
|
||||
}
|
||||
public void setMachinistPrice(String machinistPrice)
|
||||
{
|
||||
this.machinistPrice = machinistPrice;
|
||||
}
|
||||
|
||||
public String getMachinistPrice()
|
||||
{
|
||||
return machinistPrice;
|
||||
}
|
||||
public void setOrderContract(String orderContract)
|
||||
{
|
||||
this.orderContract = orderContract;
|
||||
}
|
||||
|
||||
public String getOrderContract()
|
||||
{
|
||||
return orderContract;
|
||||
}
|
||||
public void setMachinistName(String machinistName)
|
||||
{
|
||||
this.machinistName = machinistName;
|
||||
}
|
||||
|
||||
public String getMachinistName()
|
||||
{
|
||||
return machinistName;
|
||||
}
|
||||
public void setPhone(String phone)
|
||||
{
|
||||
this.phone = phone;
|
||||
}
|
||||
|
||||
public String getPhone()
|
||||
{
|
||||
return phone;
|
||||
}
|
||||
public void setLogisticsPhone(String logisticsPhone)
|
||||
{
|
||||
this.logisticsPhone = logisticsPhone;
|
||||
}
|
||||
|
||||
public String getLogisticsPhone()
|
||||
{
|
||||
return logisticsPhone;
|
||||
}
|
||||
public void setRealStartTime(String realStartTime)
|
||||
{
|
||||
this.realStartTime = realStartTime;
|
||||
}
|
||||
|
||||
public String getRealStartTime()
|
||||
{
|
||||
return realStartTime;
|
||||
}
|
||||
public void setRentalName(String rentalName)
|
||||
{
|
||||
this.rentalName = rentalName;
|
||||
}
|
||||
|
||||
public String getRentalName()
|
||||
{
|
||||
return rentalName;
|
||||
}
|
||||
public void setTenantName(String tenantName)
|
||||
{
|
||||
this.tenantName = tenantName;
|
||||
}
|
||||
|
||||
public String getTenantName()
|
||||
{
|
||||
return tenantName;
|
||||
}
|
||||
public void setEntryAttachment(String entryAttachment)
|
||||
{
|
||||
this.entryAttachment = entryAttachment;
|
||||
}
|
||||
|
||||
public String getEntryAttachment()
|
||||
{
|
||||
return entryAttachment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("orderId", getOrderId())
|
||||
.append("needCompany", getNeedCompany())
|
||||
.append("planStartTime", getPlanStartTime())
|
||||
.append("isMachinist", getIsMachinist())
|
||||
.append("address", getAddress())
|
||||
.append("duration", getDuration())
|
||||
.append("invoiceType", getInvoiceType())
|
||||
.append("description", getDescription())
|
||||
.append("maId", getMaId())
|
||||
.append("leaseType", getLeaseType())
|
||||
.append("leasePrice", getLeasePrice())
|
||||
.append("machinistPrice", getMachinistPrice())
|
||||
.append("orderContract", getOrderContract())
|
||||
.append("machinistName", getMachinistName())
|
||||
.append("phone", getPhone())
|
||||
.append("logisticsPhone", getLogisticsPhone())
|
||||
.append("realStartTime", getRealStartTime())
|
||||
.append("rentalName", getRentalName())
|
||||
.append("tenantName", getTenantName())
|
||||
.append("entryAttachment", getEntryAttachment())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
package com.bonus.zlpt.order.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import com.bonus.sgzb.common.core.annotation.Excel;
|
||||
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
|
||||
/**
|
||||
* 订单信息对象 ma_order_info
|
||||
|
|
@ -13,6 +12,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
|
|||
* @author xsheng
|
||||
* @date 2023-12-01
|
||||
*/
|
||||
@Data
|
||||
@ToString
|
||||
public class OrderInfo extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
|
@ -39,7 +40,7 @@ public class OrderInfo extends BaseEntity
|
|||
|
||||
/** 订单金额 */
|
||||
@Excel(name = "订单金额")
|
||||
private BigDecimal money;
|
||||
private BigDecimal cost;
|
||||
|
||||
/** 结算周期 */
|
||||
@Excel(name = "结算周期")
|
||||
|
|
@ -60,121 +61,4 @@ public class OrderInfo extends BaseEntity
|
|||
/** 下单企业 */
|
||||
@Excel(name = "下单企业")
|
||||
private String orderCompany;
|
||||
|
||||
public void setOrderId(Long orderId)
|
||||
{
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public Long getOrderId()
|
||||
{
|
||||
return orderId;
|
||||
}
|
||||
public void setpId(Long pId)
|
||||
{
|
||||
this.pId = pId;
|
||||
}
|
||||
|
||||
public Long getpId()
|
||||
{
|
||||
return pId;
|
||||
}
|
||||
public void setCode(String code)
|
||||
{
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getCode()
|
||||
{
|
||||
return code;
|
||||
}
|
||||
public void setTime(String time)
|
||||
{
|
||||
this.time = time;
|
||||
}
|
||||
|
||||
public String getTime()
|
||||
{
|
||||
return time;
|
||||
}
|
||||
public void setDeposit(BigDecimal deposit)
|
||||
{
|
||||
this.deposit = deposit;
|
||||
}
|
||||
|
||||
public BigDecimal getDeposit()
|
||||
{
|
||||
return deposit;
|
||||
}
|
||||
public void setMoney(BigDecimal money)
|
||||
{
|
||||
this.money = money;
|
||||
}
|
||||
|
||||
public BigDecimal getMoney()
|
||||
{
|
||||
return money;
|
||||
}
|
||||
public void setPayType(String payType)
|
||||
{
|
||||
this.payType = payType;
|
||||
}
|
||||
|
||||
public String getPayType()
|
||||
{
|
||||
return payType;
|
||||
}
|
||||
public void setSupplier(String supplier)
|
||||
{
|
||||
this.supplier = supplier;
|
||||
}
|
||||
|
||||
public String getSupplier()
|
||||
{
|
||||
return supplier;
|
||||
}
|
||||
public void setOrderStatus(String orderStatus)
|
||||
{
|
||||
this.orderStatus = orderStatus;
|
||||
}
|
||||
|
||||
public String getOrderStatus()
|
||||
{
|
||||
return orderStatus;
|
||||
}
|
||||
public void setOrderUser(Long orderUser)
|
||||
{
|
||||
this.orderUser = orderUser;
|
||||
}
|
||||
|
||||
public Long getOrderUser()
|
||||
{
|
||||
return orderUser;
|
||||
}
|
||||
public void setOrderCompany(String orderCompany)
|
||||
{
|
||||
this.orderCompany = orderCompany;
|
||||
}
|
||||
|
||||
public String getOrderCompany()
|
||||
{
|
||||
return orderCompany;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("orderId", getOrderId())
|
||||
.append("pId", getpId())
|
||||
.append("code", getCode())
|
||||
.append("time", getTime())
|
||||
.append("deposit", getDeposit())
|
||||
.append("money", getMoney())
|
||||
.append("payType", getPayType())
|
||||
.append("supplier", getSupplier())
|
||||
.append("orderStatus", getOrderStatus())
|
||||
.append("orderUser", getOrderUser())
|
||||
.append("orderCompany", getOrderCompany())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="code" column="code" />
|
||||
<result property="time" column="time" />
|
||||
<result property="deposit" column="deposit" />
|
||||
<result property="money" column="money" />
|
||||
<result property="cost" column="cost" />
|
||||
<result property="payType" column="pay_type" />
|
||||
<result property="supplier" column="supplier" />
|
||||
<result property="orderStatus" column="order_status" />
|
||||
|
|
@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectOrderInfoVo">
|
||||
select order_id, p_id, code, time, deposit, money, pay_type, supplier, order_status, order_user, order_company from ma_order_info
|
||||
select order_id, p_id, code, time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info
|
||||
</sql>
|
||||
|
||||
<select id="selectOrderInfoList" parameterType="OrderInfo" resultMap="OrderInfoResult">
|
||||
|
|
@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="code != null and code != ''"> and code = #{code}</if>
|
||||
<if test="time != null and time != ''"> and time = #{time}</if>
|
||||
<if test="deposit != null "> and deposit = #{deposit}</if>
|
||||
<if test="money != null "> and money = #{money}</if>
|
||||
<if test="cost != null "> and cost = #{cost}</if>
|
||||
<if test="payType != null and payType != ''"> and pay_type = #{payType}</if>
|
||||
<if test="supplier != null and supplier != ''"> and supplier = #{supplier}</if>
|
||||
<if test="orderStatus != null and orderStatus != ''"> and order_status = #{orderStatus}</if>
|
||||
|
|
@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="code != null">code,</if>
|
||||
<if test="time != null">time,</if>
|
||||
<if test="deposit != null">deposit,</if>
|
||||
<if test="money != null">money,</if>
|
||||
<if test="cost != null">cost,</if>
|
||||
<if test="payType != null">pay_type,</if>
|
||||
<if test="supplier != null">supplier,</if>
|
||||
<if test="orderStatus != null">order_status,</if>
|
||||
|
|
@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="code != null">#{code},</if>
|
||||
<if test="time != null">#{time},</if>
|
||||
<if test="deposit != null">#{deposit},</if>
|
||||
<if test="money != null">#{money},</if>
|
||||
<if test="cost != null">#{cost},</if>
|
||||
<if test="payType != null">#{payType},</if>
|
||||
<if test="supplier != null">#{supplier},</if>
|
||||
<if test="orderStatus != null">#{orderStatus},</if>
|
||||
|
|
@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="code != null">code = #{code},</if>
|
||||
<if test="time != null">time = #{time},</if>
|
||||
<if test="deposit != null">deposit = #{deposit},</if>
|
||||
<if test="money != null">money = #{money},</if>
|
||||
<if test="cost != null">cost = #{cost},</if>
|
||||
<if test="payType != null">pay_type = #{payType},</if>
|
||||
<if test="supplier != null">supplier = #{supplier},</if>
|
||||
<if test="orderStatus != null">order_status = #{orderStatus},</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue