[CODE]: 协议添加字段

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

@@ -131,6 +131,20 @@ public class TWarehouseAgreement extends BaseEntity {
      */
     private String fBilltype;
 
+    /**
+     * 费用类型
+     */
+    @Excel(name = "类型名称")
+    private String fBilltypeName;
+
+    public String getfBilltypeName() {
+        return fBilltypeName;
+    }
+
+    public void setfBilltypeName(String fBilltypeName) {
+        this.fBilltypeName = fBilltypeName;
+    }
+
     public String getfBilltype() {
         return fBilltype;
     }

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

@@ -29,10 +29,11 @@
         <result property="fTaskType" column="f_task_type"/>
         <result property="fDc" column="f_dc"/>
         <result property="fBilltype" column="f_billtype"/>
+        <result property="fBilltypeName" column="f_billtype_name"/>
     </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  from t_warehouse_agreement
+        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   from t_warehouse_agreement
     </sql>
 
     <select id="selectTWarehouseAgreementList" parameterType="TWarehouseAgreement"
@@ -55,6 +56,7 @@
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
             <if test="fBilltype != null  and fBilltype != ''">and f_billtype like concat('%', #{fBilltype}, '%')</if>
+            <if test="fBilltypeName != null  and fBilltypeName != ''">and f_billtype_name like concat('%', #{fBilltypeName}, '%')</if>
         </where>
     </select>
 
@@ -73,7 +75,8 @@
                 agre.f_billstatus AS fBillstatus,
                 agre.f_status AS fStatus,
                 agre.f_task_type AS fTaskType,
-                agre.f_dc AS fDc
+                agre.f_dc AS fDc,
+                agre.f_billtype_name AS  fBilltypeName
             FROM
                 t_warehouse_agreement agre
                 LEFT JOIN t_corps corp ON corp.f_id = agre.f_corpid
@@ -96,6 +99,7 @@
             <if test="fBillstatus != null  and fBillstatus != ''">and agre.f_billstatus = #{fBillstatus}</if>
             <if test="fStatus != null  and fStatus != ''">and agre.f_status = #{fStatus}</if>
             <if test="fBilltype != null  and fBilltype != ''">and agre.f_billtype like concat('%', #{fBilltype}, '%')</if>
+            <if test="fBilltypeName != null  and fBilltypeName != ''">and agre.f_billtype_name like concat('%', #{fBilltypeName}, '%')</if>
         </where>
     </select>
 
@@ -131,6 +135,7 @@
             <if test="fTaskType != null">f_task_type,</if>
             <if test="fDc != null">f_dc,</if>
             <if test="fBilltype != null">f_billtype,</if>
+            <if test="fBilltypeName != null">f_billtype_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null and fBillno != ''">#{fBillno},</if>
@@ -156,6 +161,7 @@
             <if test="fTaskType != null">#{fTaskType},</if>
             <if test="fDc != null">#{fDc},</if>
             <if test="fBilltype != null">#{fBilltype},</if>
+            <if test="fBilltypeName != null">#{fBilltypeName},</if>
         </trim>
     </insert>
 
@@ -185,6 +191,7 @@
             <if test="fTaskType != null">f_task_type = #{fTaskType},</if>
             <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>
         </trim>
         where f_id = #{fId}
     </update>