添加 财务模块 字段

pom.xml

@@ -201,6 +201,13 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!-- 车队模块-->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-fleet</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

ruoyi-admin/pom.xml

@@ -102,6 +102,10 @@
             <artifactId>ruoyi-fleet</artifactId>
             <version>3.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-fleet</artifactId>
+        </dependency>
 
     </dependencies>
 

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TFee.java

@@ -34,14 +34,20 @@ public class TFee extends BaseEntity {
      * <p>
      * 发票 FP
      */
-    @Excel(name = "业务编号(唯一格式+YYYY+YY+NNN， 编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始 对账 DZ 收费 SF 付费 FF 发票 FP")
+    @Excel(name = "业务编号(唯一格式+YYYY+YY+NNN，编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。) 对账 DZ 收费 SF 付费 FF 发票 FP")
     private String fBillno;
 
     /**
+     * 活动号
+     */
+    @Excel(name = "活动号")
+    private Long fActId;
+
+    /**
      * 货权方
      */
     @Excel(name = "货权方")
-    private String  fCtrlcorpid;
+    private String fCtrlcorpid;
 
     /**
      * 结算单位(下拉模糊搜索)
@@ -50,6 +56,12 @@ public class TFee extends BaseEntity {
     private Long fCorpid;
 
     /**
+     * 业务员id
+     */
+    @Excel(name = "业务员id")
+    private Long fTransActId;
+
+    /**
      * 提单号
      */
     @Excel(name = "提单号")
@@ -86,6 +98,20 @@ public class TFee extends BaseEntity {
     private String fRemarks;
 
     /**
+     * 检索区间始
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检索区间始", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fFromDate;
+
+    /**
+     * 检索区间终
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检索区间终", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fToDate;
+
+    /**
      * 账单日期(审批流结束后更新)
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -93,6 +119,12 @@ public class TFee extends BaseEntity {
     private Date fAccbilldate;
 
     /**
+     * 参考号
+     */
+    @Excel(name = "参考号")
+    private String fRefNo;
+
+    /**
      * 删除状态
      */
     private String delFlag;
@@ -119,6 +151,14 @@ public class TFee extends BaseEntity {
         return fBillno;
     }
 
+    public void setfActId(Long fActId) {
+        this.fActId = fActId;
+    }
+
+    public Long getfActId() {
+        return fActId;
+    }
+
     public void setfCtrlcorpid(String fCtrlcorpid) {
         this.fCtrlcorpid = fCtrlcorpid;
     }
@@ -135,6 +175,14 @@ public class TFee extends BaseEntity {
         return fCorpid;
     }
 
+    public void setfTransActId(Long fTransActId) {
+        this.fTransActId = fTransActId;
+    }
+
+    public Long getfTransActId() {
+        return fTransActId;
+    }
+
     public void settMblno(String tMblno) {
         this.tMblno = tMblno;
     }
@@ -183,6 +231,22 @@ public class TFee extends BaseEntity {
         return fRemarks;
     }
 
+    public void setfFromDate(Date fFromDate) {
+        this.fFromDate = fFromDate;
+    }
+
+    public Date getfFromDate() {
+        return fFromDate;
+    }
+
+    public void setfToDate(Date fToDate) {
+        this.fToDate = fToDate;
+    }
+
+    public Date getfToDate() {
+        return fToDate;
+    }
+
     public void setfAccbilldate(Date fAccbilldate) {
         this.fAccbilldate = fAccbilldate;
     }
@@ -191,6 +255,14 @@ public class TFee extends BaseEntity {
         return fAccbilldate;
     }
 
+    public void setfRefNo(String fRefNo) {
+        this.fRefNo = fRefNo;
+    }
+
+    public String getfRefNo() {
+        return fRefNo;
+    }
+
     public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
@@ -212,15 +284,20 @@ public class TFee extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("fId", getfId())
                 .append("fBillno", getfBillno())
+                .append("fActId", getfActId())
                 .append("fCtrlcorpid", getfCtrlcorpid())
                 .append("fCorpid", getfCorpid())
+                .append("fTransActId", getfTransActId())
                 .append("tMblno", gettMblno())
                 .append("fAmtdr", getfAmtdr())
                 .append("fAmtcr", getfAmtcr())
                 .append("fBilltype", getfBilltype())
                 .append("fBillstatus", getfBillstatus())
                 .append("fRemarks", getfRemarks())
+                .append("fFromDate", getfFromDate())
+                .append("fToDate", getfToDate())
                 .append("fAccbilldate", getfAccbilldate())
+                .append("fRefNo", getfRefNo())
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())
                 .append("fDeptid", getfDeptid())
@@ -229,4 +306,4 @@ public class TFee extends BaseEntity {
                 .append("updateTime", getUpdateTime())
                 .toString();
     }
-}
+}

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TFeeDo.java

@@ -28,6 +28,12 @@ public class TFeeDo extends BaseEntity {
     private Long fPid;
 
     /**
+     * 活动号
+     */
+    @Excel(name = "活动号")
+    private Long fActId;
+
+    /**
      * 行号
      */
     @Excel(name = "行号")
@@ -40,18 +46,18 @@ public class TFeeDo extends BaseEntity {
     private Long fSrcid;
 
     /**
-     * 来源id
-     */
-    @Excel(name = "来源id")
-    private Long fSrcpid;
-
-    /**
      * 来源行号
      */
     @Excel(name = "来源行号")
     private Long fSrclineno;
 
     /**
+     * 来源id
+     */
+    @Excel(name = "来源id")
+    private Long fSrcpid;
+
+    /**
      * 收、付
      */
     @Excel(name = "收、付")
@@ -76,12 +82,6 @@ public class TFeeDo extends BaseEntity {
     private BigDecimal fAmt;
 
     /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String fRemarks;
-
-    /**
      * 状态(默认 T ,正常T 停用F 下拉选择)
      */
     @Excel(name = "状态(默认 T ,正常T 停用F 下拉选择)")
@@ -92,6 +92,24 @@ public class TFeeDo extends BaseEntity {
      */
     private String delFlag;
 
+    /**
+     * 已处理金额
+     */
+    @Excel(name = "已处理金额")
+    private BigDecimal fAmtStl;
+
+    /**
+     * 剩余金额
+     */
+    @Excel(name = "剩余金额")
+    private BigDecimal fAmtBlc;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String fRemarks;
+
     public void setfId(Long fId) {
         this.fId = fId;
     }
@@ -108,6 +126,14 @@ public class TFeeDo extends BaseEntity {
         return fPid;
     }
 
+    public void setfActId(Long fActId) {
+        this.fActId = fActId;
+    }
+
+    public Long getfActId() {
+        return fActId;
+    }
+
     public void setfLineno(Long fLineno) {
         this.fLineno = fLineno;
     }
@@ -132,6 +158,14 @@ public class TFeeDo extends BaseEntity {
         return fSrclineno;
     }
 
+    public void setfSrcpid(Long fSrcpid) {
+        this.fSrcpid = fSrcpid;
+    }
+
+    public Long getfSrcpid() {
+        return fSrcpid;
+    }
+
     public void setfSrcdc(String fSrcdc) {
         this.fSrcdc = fSrcdc;
     }
@@ -180,42 +214,53 @@ public class TFeeDo extends BaseEntity {
         return delFlag;
     }
 
-    public Long getfSrcpid() {
-        return fSrcpid;
+    public void setfAmtStl(BigDecimal fAmtStl) {
+        this.fAmtStl = fAmtStl;
     }
 
-    public void setfSrcpid(Long fSrcpid) {
-        this.fSrcpid = fSrcpid;
+    public BigDecimal getfAmtStl() {
+        return fAmtStl;
     }
 
-    public String getfRemarks() {
-        return fRemarks;
+    public void setfAmtBlc(BigDecimal fAmtBlc) {
+        this.fAmtBlc = fAmtBlc;
+    }
+
+    public BigDecimal getfAmtBlc() {
+        return fAmtBlc;
     }
 
     public void setfRemarks(String fRemarks) {
         this.fRemarks = fRemarks;
     }
 
+    public String getfRemarks() {
+        return fRemarks;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("fId", getfId())
                 .append("fPid", getfPid())
+                .append("fActId", getfActId())
                 .append("fLineno", getfLineno())
                 .append("fSrcid", getfSrcid())
-                .append("fSrcpid", getfSrcpid())
                 .append("fSrclineno", getfSrclineno())
+                .append("fSrcpid", getfSrcpid())
                 .append("fSrcdc", getfSrcdc())
                 .append("fFeeid", getfFeeid())
                 .append("fAmtdr", getfAmtdr())
                 .append("fAmt", getfAmt())
-                .append("fRemarks", getfRemarks())
                 .append("fStatus", getfStatus())
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())
+                .append("fAmtStl", getfAmtStl())
                 .append("createTime", getCreateTime())
+                .append("fAmtBlc", getfAmtBlc())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
+                .append("fRemarks", getfRemarks())
                 .toString();
     }
 }

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeDoMapper.xml

@@ -7,40 +7,47 @@
     <resultMap type="TFeeDo" id="TFeeDoResult">
         <result property="fId" column="f_id"/>
         <result property="fPid" column="f_pid"/>
+        <result property="fActId" column="f_act_id"/>
         <result property="fLineno" column="f_lineno"/>
         <result property="fSrcid" column="f_srcid"/>
-        <result property="fSrcpid" column="f_srcpid"/>
         <result property="fSrclineno" column="f_srclineno"/>
+        <result property="fSrcpid" column="f_srcpid"/>
         <result property="fSrcdc" column="f_srcdc"/>
         <result property="fFeeid" column="f_feeid"/>
         <result property="fAmtdr" column="f_amtdr"/>
         <result property="fAmt" column="f_amt"/>
         <result property="fStatus" column="f_status"/>
-        <result property="fRemarks" column="f_remarks"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
+        <result property="fAmtStl" column="f_amt_stl"/>
         <result property="createTime" column="create_time"/>
+        <result property="fAmtBlc" column="f_amt_blc"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="fRemarks" column="f_remarks"/>
     </resultMap>
 
     <sql id="selectTFeeDoVo">
-        select f_id, f_pid, f_lineno, f_srcid, f_srcpid, f_srclineno, f_srcdc, f_feeid, f_amtdr, f_amt, f_status, f_remarks, del_flag, create_by, create_time, update_by, update_time from t_fee_do
+        select f_id, f_pid, f_act_id, f_lineno, f_srcid, f_srclineno, f_srcpid, f_srcdc, f_feeid, f_amtdr, f_amt, f_status, del_flag, create_by, f_amt_stl, create_time, f_amt_blc, update_by, update_time, f_remarks from t_fee_do
     </sql>
 
     <select id="selectTFeeDoList" parameterType="TFeeDo" resultMap="TFeeDoResult">
         <include refid="selectTFeeDoVo"/>
         <where>
             <if test="fPid != null ">and f_pid = #{fPid}</if>
+            <if test="fActId != null ">and f_act_id = #{fActId}</if>
             <if test="fLineno != null ">and f_lineno = #{fLineno}</if>
             <if test="fSrcid != null ">and f_srcid = #{fSrcid}</if>
-            <if test="fSrcpid != null ">and f_srcpid = #{fSrcpid}</if>
             <if test="fSrclineno != null ">and f_srclineno = #{fSrclineno}</if>
+            <if test="fSrcpid != null ">and f_srcpid = #{fSrcpid}</if>
             <if test="fSrcdc != null  and fSrcdc != ''">and f_srcdc = #{fSrcdc}</if>
             <if test="fFeeid != null ">and f_feeid = #{fFeeid}</if>
             <if test="fAmtdr != null ">and f_amtdr = #{fAmtdr}</if>
             <if test="fAmt != null ">and f_amt = #{fAmt}</if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
+            <if test="fAmtStl != null ">and f_amt_stl = #{fAmtStl}</if>
+            <if test="fAmtBlc != null ">and f_amt_blc = #{fAmtBlc}</if>
+            <if test="fRemarks != null  and fRemarks != ''">and f_remarks = #{fRemarks}</if>
         </where>
     </select>
 
@@ -52,40 +59,48 @@
     <insert id="insertTFeeDo" parameterType="TFeeDo" useGeneratedKeys="true" keyProperty="fId">
         insert into t_fee_do
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fId != null">f_id,</if>
             <if test="fPid != null">f_pid,</if>
+            <if test="fActId != null">f_act_id,</if>
             <if test="fLineno != null">f_lineno,</if>
             <if test="fSrcid != null">f_srcid,</if>
-            <if test="fSrcpid != null">f_srcpid,</if>
             <if test="fSrclineno != null">f_srclineno,</if>
+            <if test="fSrcpid != null">f_srcpid,</if>
             <if test="fSrcdc != null">f_srcdc,</if>
             <if test="fFeeid != null">f_feeid,</if>
             <if test="fAmtdr != null">f_amtdr,</if>
             <if test="fAmt != null">f_amt,</if>
             <if test="fStatus != null">f_status,</if>
-            <if test="fRemarks != null">f_remarks,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
+            <if test="fAmtStl != null">f_amt_stl,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="fAmtBlc != null">f_amt_blc,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="fRemarks != null">f_remarks,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fId != null">#{fId},</if>
             <if test="fPid != null">#{fPid},</if>
+            <if test="fActId != null">#{fActId},</if>
             <if test="fLineno != null">#{fLineno},</if>
             <if test="fSrcid != null">#{fSrcid},</if>
-            <if test="fSrcpid != null">#{fSrcpid},</if>
             <if test="fSrclineno != null">#{fSrclineno},</if>
+            <if test="fSrcpid != null">#{fSrcpid},</if>
             <if test="fSrcdc != null">#{fSrcdc},</if>
             <if test="fFeeid != null">#{fFeeid},</if>
             <if test="fAmtdr != null">#{fAmtdr},</if>
             <if test="fAmt != null">#{fAmt},</if>
             <if test="fStatus != null">#{fStatus},</if>
-            <if test="fRemarks != null">#{fRemarks},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
+            <if test="fAmtStl != null">#{fAmtStl},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="fAmtBlc != null">#{fAmtBlc},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="fRemarks != null">#{fRemarks},</if>
         </trim>
     </insert>
 
@@ -93,21 +108,24 @@
         update t_fee_do
         <trim prefix="SET" suffixOverrides=",">
             <if test="fPid != null">f_pid = #{fPid},</if>
+            <if test="fActId != null">f_act_id = #{fActId},</if>
             <if test="fLineno != null">f_lineno = #{fLineno},</if>
             <if test="fSrcid != null">f_srcid = #{fSrcid},</if>
-            <if test="fSrcpid != null">f_srcpid = #{fSrcpid},</if>
             <if test="fSrclineno != null">f_srclineno = #{fSrclineno},</if>
+            <if test="fSrcpid != null">f_srcpid = #{fSrcpid},</if>
             <if test="fSrcdc != null">f_srcdc = #{fSrcdc},</if>
             <if test="fFeeid != null">f_feeid = #{fFeeid},</if>
             <if test="fAmtdr != null">f_amtdr = #{fAmtdr},</if>
             <if test="fAmt != null">f_amt = #{fAmt},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
-            <if test="fRemarks != null">f_remarks = #{fRemarks},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="fAmtStl != null">f_amt_stl = #{fAmtStl},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="fAmtBlc != null">f_amt_blc = #{fAmtBlc},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="fRemarks != null">f_remarks = #{fRemarks},</if>
         </trim>
         where f_id = #{fId}
     </update>

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -8,14 +8,19 @@
         <result property="fId" column="f_id"/>
         <result property="fBillno" column="f_billno"/>
         <result property="fCtrlcorpid" column="f_ctrlcorpid"/>
+        <result property="fActId" column="f_act_id"/>
         <result property="fCorpid" column="f_corpid"/>
+        <result property="fTransActId" column="f_trans_act_id"/>
         <result property="tMblno" column="t_mblno"/>
         <result property="fAmtdr" column="f_amtdr"/>
         <result property="fAmtcr" column="f_amtcr"/>
         <result property="fBilltype" column="f_billtype"/>
         <result property="fBillstatus" column="f_billstatus"/>
         <result property="fRemarks" column="f_remarks"/>
+        <result property="fFromDate" column="f_from_date"/>
         <result property="fAccbilldate" column="f_accbilldate"/>
+        <result property="fToDate" column="f_to_date"/>
+        <result property="fRefNo" column="f_ref_no"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="fDeptid" column="f_deptid"/>
@@ -25,43 +30,48 @@
     </resultMap>
 
     <sql id="selectTFeeVo">
-        select f_id, f_billno, f_ctrlcorpid, f_corpid, t_mblno, f_amtdr, f_amtcr, f_billtype, f_billstatus, f_remarks, f_accbilldate, del_flag, create_by, f_deptid, create_time, update_by, update_time from t_fee
-    </sql>
+        select f_id, f_billno, f_ctrlcorpid, f_act_id, f_corpid, f_trans_act_id, t_mblno, f_amtdr, f_amtcr, f_billtype, f_billstatus, f_remarks, f_from_date, f_accbilldate, f_to_date, f_ref_no, del_flag, create_by, f_deptid, create_time, update_by, update_time from t_fee
+     </sql>
 
     <select id="selectTFeeList" parameterType="TFee" resultMap="TFeeResult">
         <include refid="selectTFeeVo"/>
         <where>
             <if test="fBillno != null  and fBillno != ''">and f_billno = #{fBillno}</if>
             <if test="fCtrlcorpid != null ">and f_ctrlcorpid = #{fCtrlcorpid}</if>
+            <if test="fActId != null ">and f_act_id = #{fActId}</if>
             <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
+            <if test="fTransActId != null ">and f_trans_act_id = #{fTransActId}</if>
             <if test="tMblno != null  and tMblno != ''">and t_mblno = #{tMblno}</if>
             <if test="fAmtdr != null ">and f_amtdr = #{fAmtdr}</if>
             <if test="fAmtcr != null ">and f_amtcr = #{fAmtcr}</if>
             <if test="fBilltype != null  and fBilltype != ''">and f_billtype = #{fBilltype}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
             <if test="fRemarks != null  and fRemarks != ''">and f_remarks = #{fRemarks}</if>
+            <if test="fFromDate != null ">and f_from_date = #{fFromDate}</if>
             <if test="fAccbilldate != null ">and f_accbilldate = #{fAccbilldate}</if>
+            <if test="fToDate != null ">and f_to_date = #{fToDate}</if>
+            <if test="fRefNo != null  and fRefNo != ''">and f_ref_no = #{fRefNo}</if>
             <if test="fDeptid != null ">and f_deptid = #{fDeptid}</if>
         </where>
     </select>
 
     <select id="selectTFeeList1" parameterType="TFee" resultType="Map">
         SELECT
-        f.f_id AS fId,
-        f.f_billno AS fBillno,
-        f.f_ctrlcorpid AS fCtrlcorpid,
-        f.f_corpid AS fCorpid,
-        c.f_name AS fCorpidName,
-        f.f_accbilldate AS fAccbilldate,
-        f.t_mblno AS tMblno,
-        f.f_amtdr AS fAmtdr,
-        f.f_amtcr AS fAmtcr,
-        f.f_billtype AS fBilltype,
-        f.f_billstatus AS fBillstatus,
-        f.f_remarks AS fRemarks,
-        f.create_by AS createBy
+            f.f_id AS fId,
+            f.f_billno AS fBillno,
+            f.f_ctrlcorpid AS fCtrlcorpid,
+            f.f_corpid AS fCorpid,
+            c.f_name AS fCorpidName,
+            f.f_accbilldate AS fAccbilldate,
+            f.t_mblno AS tMblno,
+            f.f_amtdr AS fAmtdr,
+            f.f_amtcr AS fAmtcr,
+            f.f_billtype AS fBilltype,
+            f.f_billstatus AS fBillstatus,
+            f.f_remarks AS fRemarks,
+            f.create_by AS createBy
         FROM
-        t_fee AS f
+            t_fee AS f
         LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
         <where>
             <if test="fBillno != null  and fBillno != ''">and f.f_billno = #{fBillno}</if>
@@ -86,16 +96,22 @@
     <insert id="insertTFee" parameterType="TFee" useGeneratedKeys="true" keyProperty="fId">
         insert into t_fee
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fId != null">f_id,</if>
             <if test="fBillno != null">f_billno,</if>
             <if test="fCtrlcorpid != null">f_ctrlcorpid,</if>
+            <if test="fActId != null">f_act_id,</if>
             <if test="fCorpid != null">f_corpid,</if>
+            <if test="fTransActId != null">f_trans_act_id,</if>
             <if test="tMblno != null">t_mblno,</if>
             <if test="fAmtdr != null">f_amtdr,</if>
             <if test="fAmtcr != null">f_amtcr,</if>
             <if test="fBilltype != null and fBilltype != ''">f_billtype,</if>
             <if test="fBillstatus != null and fBillstatus != ''">f_billstatus,</if>
             <if test="fRemarks != null">f_remarks,</if>
+            <if test="fFromDate != null">f_from_date,</if>
             <if test="fAccbilldate != null">f_accbilldate,</if>
+            <if test="fToDate != null">f_to_date,</if>
+            <if test="fRefNo != null">f_ref_no,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="fDeptid != null">f_deptid,</if>
@@ -104,16 +120,22 @@
             <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fId != null">#{fId},</if>
             <if test="fBillno != null">#{fBillno},</if>
             <if test="fCtrlcorpid != null">#{fCtrlcorpid},</if>
+            <if test="fActId != null">#{fActId},</if>
             <if test="fCorpid != null">#{fCorpid},</if>
+            <if test="fTransActId != null">#{fTransActId},</if>
             <if test="tMblno != null">#{tMblno},</if>
             <if test="fAmtdr != null">#{fAmtdr},</if>
             <if test="fAmtcr != null">#{fAmtcr},</if>
             <if test="fBilltype != null and fBilltype != ''">#{fBilltype},</if>
             <if test="fBillstatus != null and fBillstatus != ''">#{fBillstatus},</if>
             <if test="fRemarks != null">#{fRemarks},</if>
+            <if test="fFromDate != null">#{fFromDate},</if>
             <if test="fAccbilldate != null">#{fAccbilldate},</if>
+            <if test="fToDate != null">#{fToDate},</if>
+            <if test="fRefNo != null">#{fRefNo},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="fDeptid != null">#{fDeptid},</if>
@@ -128,14 +150,19 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="fBillno != null">f_billno = #{fBillno},</if>
             <if test="fCtrlcorpid != null">f_ctrlcorpid = #{fCtrlcorpid},</if>
+            <if test="fActId != null">f_act_id = #{fActId},</if>
             <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
+            <if test="fTransActId != null">f_trans_act_id = #{fTransActId},</if>
             <if test="tMblno != null">t_mblno = #{tMblno},</if>
             <if test="fAmtdr != null">f_amtdr = #{fAmtdr},</if>
             <if test="fAmtcr != null">f_amtcr = #{fAmtcr},</if>
             <if test="fBilltype != null and fBilltype != ''">f_billtype = #{fBilltype},</if>
             <if test="fBillstatus != null and fBillstatus != ''">f_billstatus = #{fBillstatus},</if>
             <if test="fRemarks != null">f_remarks = #{fRemarks},</if>
+            <if test="fFromDate != null">f_from_date = #{fFromDate},</if>
             <if test="fAccbilldate != null">f_accbilldate = #{fAccbilldate},</if>
+            <if test="fToDate != null">f_to_date = #{fToDate},</if>
+            <if test="fRefNo != null">f_ref_no = #{fRefNo},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="fDeptid != null">f_deptid = #{fDeptid},</if>
@@ -152,11 +179,11 @@
 
     <delete id="deleteTFeeByIds" parameterType="String">
         delete
-        f.*,
-        fd.*
+            f.*,
+            fd.*
         from
              t_fee  f
-        LEFT JOIN t_fee_do fd ON fd.f_pid = f.f_id
+            LEFT JOIN t_fee_do fd ON fd.f_pid = f.f_id
         where f.f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}