Browse Source

预算添加附件字段

lamphua 4 months ago
parent
commit
e8331fd1d5

+ 13
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudget.java View File

147
     @Excel(name = "董事长批准时间", width = 30, dateFormat = "yyyy-MM-dd")
147
     @Excel(name = "董事长批准时间", width = 30, dateFormat = "yyyy-MM-dd")
148
     private Date dszTime;
148
     private Date dszTime;
149
 
149
 
150
+    /** 预算附件 */
151
+    @Excel(name = "预算附件")
152
+    private String document;
153
+
150
     private SysUser compilerUser;
154
     private SysUser compilerUser;
151
 
155
 
152
     private SysUser managerUser;
156
     private SysUser managerUser;
480
     {
484
     {
481
         return dszComment;
485
         return dszComment;
482
     }
486
     }
487
+    public void setDocument(String document)
488
+    {
489
+        this.document = document;
490
+    }
491
+
492
+    public String getDocument()
493
+    {
494
+        return document;
495
+    }
483
 
496
 
484
     @Override
497
     @Override
485
     public String toString() {
498
     public String toString() {

+ 5
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBudgetMapper.xml View File

36
         <result property="dszTime"    column="dsz_time"    />
36
         <result property="dszTime"    column="dsz_time"    />
37
         <result property="createTime"    column="create_time"    />
37
         <result property="createTime"    column="create_time"    />
38
         <result property="remark"    column="remark"    />
38
         <result property="remark"    column="remark"    />
39
+        <result property="document"    column="document"    />
39
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
40
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
40
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
41
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
41
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
42
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
73
         select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.tax_expense,
74
         select b.budget_id, b.project_id, p.project_number, p.project_name, b.staff_cost, b.car_cost, b.device_cost, b.fix_cost, b.settle_expense, b.out_expense, b.business_expense, b.tax_expense,
74
                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,
75
                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,
75
                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,
76
                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,
76
-               b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark from cmc_budget as b
77
+               b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark, b.document from cmc_budget as b
77
             left join sys_user as u on u.user_id = b.compiler
78
             left join sys_user as u on u.user_id = b.compiler
78
             left join sys_user as u1 on u1.user_id = b.manager
79
             left join sys_user as u1 on u1.user_id = b.manager
79
             left join sys_user as u2 on u2.user_id = b.auditor
80
             left join sys_user as u2 on u2.user_id = b.auditor
140
             <if test="zjlComment != null">zjl_comment,</if>
141
             <if test="zjlComment != null">zjl_comment,</if>
141
             <if test="dszComment != null">dsz_comment,</if>
142
             <if test="dszComment != null">dsz_comment,</if>
142
             <if test="remark != null">remark,</if>
143
             <if test="remark != null">remark,</if>
144
+            <if test="document != null">document,</if>
143
             create_time
145
             create_time
144
         </trim>
146
         </trim>
145
         <trim prefix="values (" suffix=")" suffixOverrides=",">
147
         <trim prefix="values (" suffix=")" suffixOverrides=",">
173
             <if test="zjlComment != null">#{zjlComment},</if>
175
             <if test="zjlComment != null">#{zjlComment},</if>
174
             <if test="dszComment != null">#{dszComment},</if>
176
             <if test="dszComment != null">#{dszComment},</if>
175
             <if test="remark != null">#{remark},</if>
177
             <if test="remark != null">#{remark},</if>
178
+            <if test="document != null">#{document},</if>
176
             sysdate()
179
             sysdate()
177
         </trim>
180
         </trim>
178
     </insert>
181
     </insert>
210
             <if test="dszComment != null">dsz_comment = #{dszComment},</if>
213
             <if test="dszComment != null">dsz_comment = #{dszComment},</if>
211
             <if test="createTime != null">create_time = #{createTime},</if>
214
             <if test="createTime != null">create_time = #{createTime},</if>
212
             <if test="remark != null">remark = #{remark},</if>
215
             <if test="remark != null">remark = #{remark},</if>
216
+            <if test="document != null">document = #{document},</if>
213
         </trim>
217
         </trim>
214
         where budget_id = #{budgetId}
218
         where budget_id = #{budgetId}
215
     </update>
219
     </update>

Loading…
Cancel
Save