凯和修改-财务审核添加金额字段,自定义列修改添加字段-显示字段显示位置

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -84,7 +84,7 @@ public class SysLoginService {
                 if (StringUtils.equals(username, user.getUsername()))
                 {
                     // 若发现有其他用户登录，顶替掉其他用户
-//                    redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + user.getToken());
+                    redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + user.getToken());
                 }
             }
         }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTableSet.java

@@ -56,6 +56,9 @@ private static final long serialVersionUID=1L;
     /**是否固定列*/
     @Excel(name = "是否固定列")
     private String fixed;
+    /**显示位置*/
+    @Excel(name = "显示位置")
+    private String align;
 
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();

ruoyi-system/src/main/resources/mapper/system/SysTableSetMapper.xml

@@ -14,10 +14,11 @@
         <result property="checked" column="checked"/>
         <result property="width" column="width"/>
         <result property="fixed" column="fixed"/>
+        <result property="align" column="align"/>
     </resultMap>
 
     <sql id="selectSysTableSetVo">
-        select id, table_name, user_id, surface, label, fixed, name, checked, width from sys_table_set
+        select id, table_name, user_id, surface, label, fixed, name, checked, width,align from sys_table_set
     </sql>
 
     <select id="selectSysTableSetList" parameterType="SysTableSet" resultMap="SysTableSetResult">
@@ -31,6 +32,7 @@
             <if test="checked != null ">and checked = #{checked}</if>
             <if test="width != null ">and width = #{width}</if>
             <if test="fixed != null ">and fixed = #{fixed}</if>
+            <if test="align != null and align != ''">and align = #{align}</if>
         </where>
     </select>
 
@@ -63,6 +65,7 @@
             <if test="checked != null">checked,</if>
             <if test="width != null">width,</if>
             <if test="fixed != null">fixed,</if>
+            <if test="align != null">align,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tableName != null">#{tableName},</if>
@@ -73,6 +76,7 @@
             <if test="checked != null">#{checked},</if>
             <if test="width != null">#{width},</if>
             <if test="fixed != null">#{fixed},</if>
+            <if test="align != null">#{align},</if>
         </trim>
     </insert>
 
@@ -86,7 +90,8 @@
             <if test="name != null">name = #{name},</if>
             <if test="checked != null">checked = #{checked},</if>
             <if test="width != null">width = #{width},</if>
-            <if test="fixed != null">width = #{fixed},</if>
+            <if test="fixed != null">fixed = #{fixed},</if>
+            <if test="align != null">align = #{align},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/domain/AuditItems.java

@@ -1,5 +1,6 @@
 package com.ruoyi.approvalFlow.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -160,6 +161,18 @@ public class AuditItems extends BaseEntity {
 
     /*根据业务编号做搜索*/
     private String fBsno;
+    /**
+     * 财务审批提交金额
+     */
+    private BigDecimal amount;
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
 
     public String getfBsno() {
         return fBsno;
@@ -386,6 +399,7 @@ public class AuditItems extends BaseEntity {
                 ", auditStatus='" + auditStatus + '\'' +
                 ", billTime=" + billTime +
                 ", fidStatus='" + fidStatus + '\'' +
+                ", amount='" + amount + '\'' +
                 ", times=" + times +
                 '}';
     }

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

@@ -107,6 +107,7 @@ public class AuditItemsServiceImpl implements IAuditItemsService {
             auditItem.setIffinalItem(levels.getIffinalItem());
             auditItem.setSendUserId(auditItems.getSendUserId());
             auditItem.setSendName(auditItems.getSendName());
+            auditItem.setAmount(auditItems.getAmount());
             auditItem.setSendTime(new Date());
             if (Objects.equals(num, 1)) {
                 auditItem.setAuditStatus("S");

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

@@ -870,7 +870,12 @@ public class TFeeServiceImpl implements ITFeeService {
             }
         }
         // 这里加个判断取系统参数来确定是否需要启用审批流
-
+        BigDecimal amount = BigDecimal.ZERO;//财务对账金额
+        //获取账单明细
+        List<TFeeDo> list = tFeeDoMapper.selectTFeeDoByfPid(tFee.getfId());
+        if (CollectionUtils.isNotEmpty(list)){
+            amount = list.stream().filter(e -> e.getfAmt() != null).map(TFeeDo::getfAmt).reduce(BigDecimal.ZERO, BigDecimal::add);
+        }
         if (isApprove) {
             AuditItems auditItems = new AuditItems();
             auditItems.setLevelId(0L);
@@ -892,6 +897,7 @@ public class TFeeServiceImpl implements ITFeeService {
             auditItems.setAuditMsg("提交");
             auditItems.setAuditStatus("O");// 提交状态
             auditItems.setfSrcBillnos(fSrcBillnos);// 装载业务编号数据（来源单据编号）
+            auditItems.setAmount(amount);//对账金额
             AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);// 生成审批流
             Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
             if (code.equals(500L)) {

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -29,6 +29,7 @@
         <result property="billTime"    column="bill_time"    />
         <result property="fidStatus"    column="fid_status"    />
         <result property="times"    column="times"    />
+        <result property="amount"    column="amount"    />
     </resultMap>
 
     <resultMap type="com.ruoyi.approvalFlow.domain.vo.AppAuditItemVO" id="AppQueryResult">
@@ -46,7 +47,7 @@
 
     <sql id="selectAuditItemsVo">
         select id, act_id, bill_id, bill_no, refno1, refno2, refno3, path_id, level_id, iffinal_item, branch_id, send_user_id, send_name,
-         send_time, send_msg, audit_user_id, audit_item, audit_op_time, audit_msg, audit_status, bill_time, fid_status, times from audit_items
+         send_time, send_msg, audit_user_id, audit_item, audit_op_time, audit_msg, audit_status, bill_time, fid_status, times,amount from audit_items
     </sql>
 
     <select id="selectAuditItemsList" parameterType="AuditItems" resultMap="AuditItemsResult">
@@ -74,6 +75,7 @@
             <if test="billTime != null "> and bill_time = #{billTime},</if>
             <if test="fidStatus != null  and fidStatus != ''"> and fid_status = #{fidStatus}</if>
             <if test="times != null "> and times = #{times}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
         </where>
     </select>
 
@@ -112,6 +114,7 @@
             <if test="billTime != null">bill_time,</if>
             <if test="fidStatus != null">fid_status,</if>
             <if test="times != null">times,</if>
+            <if test="amount != null">amount,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="actId != null">#{actId},</if>
@@ -136,6 +139,7 @@
             <if test="billTime != null">#{billTime},</if>
             <if test="fidStatus != null">#{fidStatus},</if>
             <if test="times != null">#{times},</if>
+            <if test="amount != null">#{amount},</if>
         </trim>
     </insert>
 
@@ -164,6 +168,7 @@
             <if test="billTime != null">bill_time = #{billTime},</if>
             <if test="fidStatus != null">fid_status = #{fidStatus},</if>
             <if test="times != null">times = #{times},</if>
+            <if test="amount != null">times = #{amount},</if>
         </trim>
         where id = #{id}
     </update>
@@ -226,6 +231,7 @@
             item.refno2 AS refno4,
             item.bill_no AS billNo,
             us.user_id AS userId,
+            item.amount AS amount,
             item.audit_item,
             item.audit_user_id AS auditUserId,
             CASE