[CODE]: 财务从表添加备注字段

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -223,6 +223,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             return AjaxResult.success(mapList);
         } else if (auditItems.getActId() >= 210 && auditItems.getActId() <= 230) {
             // 财务审批
+            List<Map<String, Object>> mapList = auditItemsMapper.selectWarehouseApprover(auditItems);
+            return AjaxResult.success(mapList);
+        } else if (auditItems.getActId() >= 310 && auditItems.getActId() <= 320) {
+            // 协议审批
+            List<Map<String, Object>> mapList = auditItemsMapper.selectWarehouseApprover(auditItems);
+            return AjaxResult.success(mapList);
         }
         return AjaxResult.success();
     }

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

@@ -76,6 +76,12 @@ public class TFeeDo extends BaseEntity {
     private BigDecimal fAmt;
 
     /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String fRemarks;
+
+    /**
      * 状态(默认 T ,正常T 停用F 下拉选择)
      */
     @Excel(name = "状态(默认 T ,正常T 停用F 下拉选择)")
@@ -182,6 +188,14 @@ public class TFeeDo extends BaseEntity {
         this.fSrcpid = fSrcpid;
     }
 
+    public String getfRemarks() {
+        return fRemarks;
+    }
+
+    public void setfRemarks(String fRemarks) {
+        this.fRemarks = fRemarks;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -195,6 +209,7 @@ public class TFeeDo extends BaseEntity {
                 .append("fFeeid", getfFeeid())
                 .append("fAmtdr", getfAmtdr())
                 .append("fAmt", getfAmt())
+                .append("fRemarks", getfRemarks())
                 .append("fStatus", getfStatus())
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -117,6 +117,7 @@ public class TFeeServiceImpl implements ITFeeService {
                 map1.put("fSrcdc",fees.getfSrcdc());
                 map1.put("fAmt",fees.getfAmt());
                 map1.put("fAmtdr",fees.getfAmtdr());
+                map1.put("fRemarks",fees.getfRemarks());
                 if(tWarehousebills.getfBilltype().equals("SJRK")){
                     map1.put("fBilltype","入库");
                 } else if(tWarehousebills.getfBilltype().equals("SJCK")){

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

@@ -16,6 +16,7 @@
         <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="createTime" column="create_time"/>
@@ -24,7 +25,7 @@
     </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, del_flag, create_by, create_time, update_by, update_time from t_fee_do
+        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
     </sql>
 
     <select id="selectTFeeDoList" parameterType="TFeeDo" resultMap="TFeeDoResult">
@@ -61,6 +62,7 @@
             <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="createTime != null">create_time,</if>
@@ -78,6 +80,7 @@
             <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="createTime != null">#{createTime},</if>
@@ -99,6 +102,7 @@
             <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="createTime != null">create_time = #{createTime},</if>

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

@@ -58,7 +58,8 @@
         f.f_amtcr AS fAmtcr,
         f.f_billtype AS fBilltype,
         f.f_billstatus AS fBillstatus,
-        f.f_remarks AS fRemarks
+        f.f_remarks AS fRemarks,
+        f.create_by AS createBy
         FROM
         t_fee AS f
         LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id