Explorar el Código

[合同管理][修改][实体]

release_toaliyun_real
gongbiao hace 7 años
padre
commit
f403809a01
Se han modificado 2 ficheros con 2 adiciones y 13 borrados
  1. +1
    -10
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +1
    -3
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 1
- 10
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Ver fichero

@@ -84,9 +84,7 @@ public class WxRentContract implements Serializable {
/*押金**/ /*押金**/
@io.swagger.annotations.ApiModelProperty(value="押金",name="deposit") @io.swagger.annotations.ApiModelProperty(value="押金",name="deposit")
private String deposit; private String deposit;
/*首期款缴款日期**/
@io.swagger.annotations.ApiModelProperty(value="首期款缴款日期",name="firstPayDate")
private Date firstPayDate;

/*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/ /*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/
@io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate") @io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate")
private Integer payDate; private Integer payDate;
@@ -184,12 +182,6 @@ public class WxRentContract implements Serializable {
public void setDeposit(String _deposit) { public void setDeposit(String _deposit) {
deposit = _deposit; deposit = _deposit;
} }
public Date getFirstPayDate() {
return firstPayDate;
}
public void setFirstPayDate(Date _firstPayDate) {
firstPayDate = _firstPayDate;
}
public Integer getPayDate() { public Integer getPayDate() {
return payDate; return payDate;
} }
@@ -269,7 +261,6 @@ public class WxRentContract implements Serializable {
,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
,ContractNumber_ASC("`contract_number` ASC"),ContractNumber_DESC("`contract_number` DESC") ,ContractNumber_ASC("`contract_number` ASC"),ContractNumber_DESC("`contract_number` DESC")
,Deposit_ASC("`deposit` ASC"),Deposit_DESC("`deposit` DESC") ,Deposit_ASC("`deposit` ASC"),Deposit_DESC("`deposit` DESC")
,FirstPayDate_ASC("`first_pay_date` ASC"),FirstPayDate_DESC("`first_pay_date` DESC")
,PayDate_ASC("`pay_date` ASC"),PayDate_DESC("`pay_date` DESC") ,PayDate_ASC("`pay_date` ASC"),PayDate_DESC("`pay_date` DESC")
,IsDel_ASC("`is_del` ASC"),IsDel_DESC("`is_del` DESC") ,IsDel_ASC("`is_del` ASC"),IsDel_DESC("`is_del` DESC")
,MerchantName_ASC("`merchant_name` ASC"),MerchantName_DESC("`merchant_name` DESC") ,MerchantName_ASC("`merchant_name` ASC"),MerchantName_DESC("`merchant_name` DESC")


+ 1
- 3
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Ver fichero

@@ -14,7 +14,6 @@
<result column="status" jdbcType="INTEGER" property="status"/> <result column="status" jdbcType="INTEGER" property="status"/>
<result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/> <result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/>
<result column="deposit" jdbcType="VARCHAR" property="deposit"/> <result column="deposit" jdbcType="VARCHAR" property="deposit"/>
<result column="first_pay_date" jdbcType="TIMESTAMP" property="firstPayDate"/>
<result column="pay_date" jdbcType="Integer" property="payDate"/> <result column="pay_date" jdbcType="Integer" property="payDate"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/> <result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/> <result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/>
@@ -27,7 +26,7 @@
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`first_pay_date`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`shop_type`,`shop_id`,`updatetime`,`createtime`
`id`,`merchant_id`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`tenant_id`,`filepath`,`status`,`contract_number`,`deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`shop_type`,`shop_id`,`updatetime`,`createtime`
</sql> </sql>
<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -44,7 +43,6 @@
<if test=" null != status ">and `status` = #{status}</if> <if test=" null != status ">and `status` = #{status}</if>
<if test=" null != contractNumber ">and `contract_number` = #{contractNumber}</if> <if test=" null != contractNumber ">and `contract_number` = #{contractNumber}</if>
<if test=" null != deposit ">and `deposit` = #{deposit}</if> <if test=" null != deposit ">and `deposit` = #{deposit}</if>
<if test=" null != firstPayDate ">and `first_pay_date` = #{firstPayDate}</if>
<if test=" null != payDate ">and `pay_date` = #{payDate}</if> <if test=" null != payDate ">and `pay_date` = #{payDate}</if>
<if test=" null != isDel ">and `is_del` = #{isDel}</if> <if test=" null != isDel ">and `is_del` = #{isDel}</if>
<if test=" null != merchantName ">and `merchant_name` = #{merchantName}</if> <if test=" null != merchantName ">and `merchant_name` = #{merchantName}</if>


Cargando…
Cancelar
Guardar