Browse Source

新增字段预算备注

lamphua 5 months ago
parent
commit
64f2f361df

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

35
         <result property="zjlTime"    column="zjl_time"    />
35
         <result property="zjlTime"    column="zjl_time"    />
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
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
39
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
39
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
40
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
40
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
41
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
72
         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,
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,
73
                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,
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,
74
                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,
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,
75
-               b.manager_comment, b.zjl_comment, b.dsz_comment from cmc_budget as b
76
+               b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark from cmc_budget as b
76
             left join sys_user as u on u.user_id = b.compiler
77
             left join sys_user as u on u.user_id = b.compiler
77
             left join sys_user as u1 on u1.user_id = b.manager
78
             left join sys_user as u1 on u1.user_id = b.manager
78
             left join sys_user as u2 on u2.user_id = b.auditor
79
             left join sys_user as u2 on u2.user_id = b.auditor
138
             <if test="managerComment != null">manager_comment,</if>
139
             <if test="managerComment != null">manager_comment,</if>
139
             <if test="zjlComment != null">zjl_comment,</if>
140
             <if test="zjlComment != null">zjl_comment,</if>
140
             <if test="dszComment != null">dsz_comment,</if>
141
             <if test="dszComment != null">dsz_comment,</if>
142
+            <if test="remark != null">remark,</if>
141
             create_time
143
             create_time
142
         </trim>
144
         </trim>
143
         <trim prefix="values (" suffix=")" suffixOverrides=",">
145
         <trim prefix="values (" suffix=")" suffixOverrides=",">
170
             <if test="managerComment != null">#{managerComment},</if>
172
             <if test="managerComment != null">#{managerComment},</if>
171
             <if test="zjlComment != null">#{zjlComment},</if>
173
             <if test="zjlComment != null">#{zjlComment},</if>
172
             <if test="dszComment != null">#{dszComment},</if>
174
             <if test="dszComment != null">#{dszComment},</if>
175
+            <if test="remark != null">#{remark},</if>
173
             sysdate()
176
             sysdate()
174
         </trim>
177
         </trim>
175
     </insert>
178
     </insert>
206
             <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
209
             <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
207
             <if test="dszComment != null">dsz_comment = #{dszComment},</if>
210
             <if test="dszComment != null">dsz_comment = #{dszComment},</if>
208
             <if test="createTime != null">create_time = #{createTime},</if>
211
             <if test="createTime != null">create_time = #{createTime},</if>
212
+            <if test="remark != null">remark = #{remark},</if>
209
         </trim>
213
         </trim>
210
         where budget_id = #{budgetId}
214
         where budget_id = #{budgetId}
211
     </update>
215
     </update>

Loading…
Cancel
Save