新增字段预算备注

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

@@ -35,6 +35,7 @@
         <result property="zjlTime"    column="zjl_time"    />
         <result property="dszTime"    column="dsz_time"    />
         <result property="createTime"    column="create_time"    />
+        <result property="remark"    column="remark"    />
         <association property="compilerUser"    javaType="SysUser"         resultMap="CompilerResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerResult" />
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlResult" />
@@ -72,7 +73,7 @@
         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,
                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 from cmc_budget as b
+               b.manager_comment, b.zjl_comment, b.dsz_comment, b.remark 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
@@ -138,6 +139,7 @@
             <if test="managerComment != null">manager_comment,</if>
             <if test="zjlComment != null">zjl_comment,</if>
             <if test="dszComment != null">dsz_comment,</if>
+            <if test="remark != null">remark,</if>
             create_time
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -170,6 +172,7 @@
             <if test="managerComment != null">#{managerComment},</if>
             <if test="zjlComment != null">#{zjlComment},</if>
             <if test="dszComment != null">#{dszComment},</if>
+            <if test="remark != null">#{remark},</if>
             sysdate()
         </trim>
     </insert>
@@ -206,6 +209,7 @@
             <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
             <if test="dszComment != null">dsz_comment = #{dszComment},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where budget_id = #{budgetId}
     </update>