预算增加预算流程id，区分相同项目不同预算

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudget.java

@@ -199,6 +199,8 @@ public class CmcBudget extends BaseEntity
     @Excel(name = "管理出差核算费用")
     private BigDecimal travelAdjust;
 
+    private String procInstId;
+
     private SysUser compilerUser;
 
     private SysUser managerUser;
@@ -649,6 +651,15 @@ public class CmcBudget extends BaseEntity
     {
         return travelAdjust;
     }
+    public void setProcInstId(String procInstId)
+    {
+        this.procInstId = procInstId;
+    }
+
+    public String getProcInstId()
+    {
+        return procInstId;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml

@@ -49,6 +49,7 @@
         <result property="letterAdjust"    column="letter_adjust"    />
         <result property="winAdjust"    column="win_adjust"    />
         <result property="travelAdjust"    column="travel_adjust"    />
+        <result property="procInstId"    column="proc_inst_id"    />
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
@@ -87,7 +88,7 @@
                b.rent_expense, b.other_expense, b.out_remark, b.business_remark, b.tax_remark, b.rent_remark, b.other_remark, b.direct_expense, b.total_budget, b.compiler,
                u.nick_name as compiler_nick_name, b.manager, u1.nick_name as manager_nick_name, b.auditor, u2.nick_name as zjl_nick_name, b.approver, u3.nick_name as dsz_nick_name, b.create_time, b.manager_time, b.zjl_time, b.dsz_time,
                b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark, b.document, b.letter_expense, b.win_expense, b.travel_expense, b.settle_adjust, b.letter_remark, b.travel_remark, b.win_remark,
-               b.out_adjust, b.tax_adjust, b.letter_adjust, b.win_adjust, b.travel_adjust from cmc_budget as b
+               b.out_adjust, b.tax_adjust, b.letter_adjust, b.win_adjust, b.travel_adjust, b.proc_inst_id from cmc_budget as b
             left join sys_user as u on u.user_id = b.compiler
             left join sys_user as u1 on u1.user_id = b.manager
             left join sys_user as u2 on u2.user_id = b.auditor
@@ -112,6 +113,7 @@
             <if test="totalBudget != null "> and b.total_budget = #{totalBudget}</if>
             <if test="compiler != null "> and b.compiler = #{compiler}</if>
             <if test="auditor != null "> and b.auditor = #{auditor}</if>
+            <if test="procInstId != null  and procInstId != ''"> and b.proc_inst_id = #{procInstId}</if>
         </where>
         order by b.create_time desc
     </select>
@@ -167,6 +169,7 @@
             <if test="letterAdjust != null">letter_adjust,</if>
             <if test="winAdjust != null">win_adjust,</if>
             <if test="travelAdjust != null">travel_adjust,</if>
+            <if test="procInstId != null">proc_inst_id,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -213,6 +216,7 @@
             <if test="letterAdjust != null">#{letterAdjust},</if>
             <if test="winAdjust != null">#{winAdjust},</if>
             <if test="travelAdjust != null">#{travelAdjust},</if>
+            <if test="procInstId != null">#{procInstId},</if>
             sysdate()
         </trim>
     </insert>
@@ -263,6 +267,7 @@
             <if test="letterAdjust != null">letter_adjust = #{letterAdjust},</if>
             <if test="winAdjust != null">win_adjust = #{winAdjust},</if>
             <if test="travelAdjust != null">travel_adjust = #{travelAdjust},</if>
+            <if test="procInstId != null">proc_inst_id = #{procInstId},</if>
         </trim>
         where budget_id = #{budgetId}
     </update>