瀏覽代碼

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

lamphua 11 小時之前
父節點
當前提交
e1c78b1668

+ 11
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudget.java 查看文件

199
     @Excel(name = "管理出差核算费用")
199
     @Excel(name = "管理出差核算费用")
200
     private BigDecimal travelAdjust;
200
     private BigDecimal travelAdjust;
201
 
201
 
202
+    private String procInstId;
203
+
202
     private SysUser compilerUser;
204
     private SysUser compilerUser;
203
 
205
 
204
     private SysUser managerUser;
206
     private SysUser managerUser;
649
     {
651
     {
650
         return travelAdjust;
652
         return travelAdjust;
651
     }
653
     }
654
+    public void setProcInstId(String procInstId)
655
+    {
656
+        this.procInstId = procInstId;
657
+    }
658
+
659
+    public String getProcInstId()
660
+    {
661
+        return procInstId;
662
+    }
652
 
663
 
653
     @Override
664
     @Override
654
     public String toString() {
665
     public String toString() {

+ 6
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml 查看文件

49
         <result property="letterAdjust"    column="letter_adjust"    />
49
         <result property="letterAdjust"    column="letter_adjust"    />
50
         <result property="winAdjust"    column="win_adjust"    />
50
         <result property="winAdjust"    column="win_adjust"    />
51
         <result property="travelAdjust"    column="travel_adjust"    />
51
         <result property="travelAdjust"    column="travel_adjust"    />
52
+        <result property="procInstId"    column="proc_inst_id"    />
52
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
53
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
53
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
54
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
54
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
55
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
87
                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,
88
                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,
88
                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,
89
                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,
89
                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,
90
                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,
90
-               b.out_adjust, b.tax_adjust, b.letter_adjust, b.win_adjust, b.travel_adjust from cmc_budget as b
91
+               b.out_adjust, b.tax_adjust, b.letter_adjust, b.win_adjust, b.travel_adjust, b.proc_inst_id from cmc_budget as b
91
             left join sys_user as u on u.user_id = b.compiler
92
             left join sys_user as u on u.user_id = b.compiler
92
             left join sys_user as u1 on u1.user_id = b.manager
93
             left join sys_user as u1 on u1.user_id = b.manager
93
             left join sys_user as u2 on u2.user_id = b.auditor
94
             left join sys_user as u2 on u2.user_id = b.auditor
112
             <if test="totalBudget != null "> and b.total_budget = #{totalBudget}</if>
113
             <if test="totalBudget != null "> and b.total_budget = #{totalBudget}</if>
113
             <if test="compiler != null "> and b.compiler = #{compiler}</if>
114
             <if test="compiler != null "> and b.compiler = #{compiler}</if>
114
             <if test="auditor != null "> and b.auditor = #{auditor}</if>
115
             <if test="auditor != null "> and b.auditor = #{auditor}</if>
116
+            <if test="procInstId != null  and procInstId != ''"> and b.proc_inst_id = #{procInstId}</if>
115
         </where>
117
         </where>
116
         order by b.create_time desc
118
         order by b.create_time desc
117
     </select>
119
     </select>
167
             <if test="letterAdjust != null">letter_adjust,</if>
169
             <if test="letterAdjust != null">letter_adjust,</if>
168
             <if test="winAdjust != null">win_adjust,</if>
170
             <if test="winAdjust != null">win_adjust,</if>
169
             <if test="travelAdjust != null">travel_adjust,</if>
171
             <if test="travelAdjust != null">travel_adjust,</if>
172
+            <if test="procInstId != null">proc_inst_id,</if>
170
             create_time
173
             create_time
171
         </trim>
174
         </trim>
172
         <trim prefix="values (" suffix=")" suffixOverrides=",">
175
         <trim prefix="values (" suffix=")" suffixOverrides=",">
213
             <if test="letterAdjust != null">#{letterAdjust},</if>
216
             <if test="letterAdjust != null">#{letterAdjust},</if>
214
             <if test="winAdjust != null">#{winAdjust},</if>
217
             <if test="winAdjust != null">#{winAdjust},</if>
215
             <if test="travelAdjust != null">#{travelAdjust},</if>
218
             <if test="travelAdjust != null">#{travelAdjust},</if>
219
+            <if test="procInstId != null">#{procInstId},</if>
216
             sysdate()
220
             sysdate()
217
         </trim>
221
         </trim>
218
     </insert>
222
     </insert>
263
             <if test="letterAdjust != null">letter_adjust = #{letterAdjust},</if>
267
             <if test="letterAdjust != null">letter_adjust = #{letterAdjust},</if>
264
             <if test="winAdjust != null">win_adjust = #{winAdjust},</if>
268
             <if test="winAdjust != null">win_adjust = #{winAdjust},</if>
265
             <if test="travelAdjust != null">travel_adjust = #{travelAdjust},</if>
269
             <if test="travelAdjust != null">travel_adjust = #{travelAdjust},</if>
270
+            <if test="procInstId != null">proc_inst_id = #{procInstId},</if>
266
         </trim>
271
         </trim>
267
         where budget_id = #{budgetId}
272
         where budget_id = #{budgetId}
268
     </update>
273
     </update>

Loading…
取消
儲存