[CODE]: 协议新增字段

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

@@ -126,6 +126,19 @@ public class TWarehouseAgreement extends BaseEntity {
     @Excel(name = "费用类型")
     private String fDc;
 
+    /**
+     * 费用类型
+     */
+    private String fBilltype;
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
     public String getfContractno() {
         return fContractno;
     }

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

@@ -28,10 +28,11 @@
         <result property="remark" column="remark"/>
         <result property="fTaskType" column="f_task_type"/>
         <result property="fDc" column="f_dc"/>
+        <result property="fBilltype" column="f_billtype"/>
     </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  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  from t_warehouse_agreement
     </sql>
 
     <select id="selectTWarehouseAgreementList" parameterType="TWarehouseAgreement"
@@ -53,6 +54,7 @@
             <if test="fTaskType != null ">and f_task_type = #{fTaskType}</if>
             <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>
         </where>
     </select>
 
@@ -93,6 +95,7 @@
             <if test="fEnddate != null ">and agre.f_enddate = #{fEnddate}</if>
             <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>
         </where>
     </select>
 
@@ -127,6 +130,7 @@
             <if test="remark != null">remark,</if>
             <if test="fTaskType != null">f_task_type,</if>
             <if test="fDc != null">f_dc,</if>
+            <if test="fBilltype != null">f_billtype,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null and fBillno != ''">#{fBillno},</if>
@@ -151,6 +155,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="fTaskType != null">#{fTaskType},</if>
             <if test="fDc != null">#{fDc},</if>
+            <if test="fBilltype != null">#{fBilltype},</if>
         </trim>
     </insert>
 
@@ -179,6 +184,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <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>
         </trim>
         where f_id = #{fId}
     </update>

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

@@ -172,6 +172,9 @@
             <if test="fTaskType != null  and fTaskType != ''">
                 and agre.f_task_type = #{fTaskType}
             </if>
+            <if test="fBilltype != null  and fBilltype != ''">
+                and agre.f_billtype  like concat('%', #{fBilltype}, '%')
+            </if>
             and agre.f_billstatus = 6
             and agre.f_status = 0
             and agre.f_feetypeid = 1