去除协议添加字段

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseAgreement.java

@@ -137,12 +137,6 @@ public class TWarehouseAgreement extends BaseEntity {
     @Excel(name = "类型名称")
     private String fBilltypeName;
 
-    /**
-     * 仓储费计费类型(默认0实际入库日期，1最早入库日期)
-     */
-    @Excel(name = "仓储费计费类型")
-    private String fChargetype;
-
     public String getfBilltypeName() {
         return fBilltypeName;
     }
@@ -303,14 +297,6 @@ public class TWarehouseAgreement extends BaseEntity {
         this.fDc = fDc;
     }
 
-    public String getfChargetype() {
-        return fChargetype;
-    }
-
-    public void setfChargetype(String fChargetype) {
-        this.fChargetype = fChargetype;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseAgreementMapper.xml

@@ -30,13 +30,12 @@
         <result property="fDc" column="f_dc"/>
         <result property="fBilltype" column="f_billtype"/>
         <result property="fBilltypeName" column="f_billtype_name"/>
-        <result property="fChargetype" column="f_chargetype"/>
     </resultMap>
 
     <sql id="selectTWarehouseAgreementVo">
         select f_id, f_billno,f_contractno, f_deptid, f_corpid,f_goodsid, f_stltypeid, f_feetypeid, t_packages, f_trademodeid,
          f_freedays, f_begindate, f_enddate, f_billstatus,f_status, del_flag, create_by, create_time, update_by, update_time,
-          remark,f_task_type,f_dc,f_billtype,f_billtype_name, f_chargetype from t_warehouse_agreement
+          remark,f_task_type,f_dc,f_billtype,f_billtype_name from t_warehouse_agreement
     </sql>
 
     <select id="selectTWarehouseAgreementList" parameterType="TWarehouseAgreement"
@@ -54,7 +53,6 @@
             <if test="fTrademodeid != null ">and f_trademodeid = #{fTrademodeid}</if>
             <if test="fFreedays != null ">and f_freedays = #{fFreedays}</if>
             <if test="fBegindate != null ">and f_begindate = #{fBegindate}</if>
-            <if test="fChargetype != null ">and f_chargetype = #{fChargetype}</if>
             <if test="fEnddate != null ">and f_enddate = #{fEnddate}</if>
             <if test="fTaskType != null ">and f_task_type = #{fTaskType}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
@@ -80,8 +78,7 @@
                 agre.f_status AS fStatus,
                 agre.f_task_type AS fTaskType,
                 agre.f_dc AS fDc,
-                agre.f_chargetype AS fChargetype,
-                agre.f_billtype_name AS  fBilltypeName
+                agre.f_billtype_name AS fBilltypeName
             FROM
                 t_warehouse_agreement agre
                 LEFT JOIN t_corps corp ON corp.f_id = agre.f_corpid
@@ -141,7 +138,6 @@
             <if test="fDc != null">f_dc,</if>
             <if test="fBilltype != null">f_billtype,</if>
             <if test="fBilltypeName != null">f_billtype_name,</if>
-            <if test="fChargetype != null">f_chargetype,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null and fBillno != ''">#{fBillno},</if>
@@ -168,7 +164,6 @@
             <if test="fDc != null">#{fDc},</if>
             <if test="fBilltype != null">#{fBilltype},</if>
             <if test="fBilltypeName != null">#{fBilltypeName},</if>
-            <if test="fChargetype != null">#{fChargetype},</if>
         </trim>
     </insert>
 
@@ -199,7 +194,6 @@
             <if test="fDc != null">f_dc = #{fDc},</if>
             <if test="fBilltype != null">f_billtype = #{fBilltype},</if>
             <if test="fBilltypeName != null">f_billtype_name = #{fBilltypeName},</if>
-            <if test="fChargetype != null">f_chargetype = #{fChargetype},</if>
         </trim>
         where f_id = #{fId}
     </update>