浏览代码

预算人员单日成本

lamphua 3 周前
父节点
当前提交
ee165ed615

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

@@ -74,6 +74,10 @@ public class CmcBudgetStaff extends BaseEntity
74 74
     @Excel(name = "核算金额")
75 75
     private BigDecimal amountAdjust;
76 76
 
77
+    /** 单日成本 */
78
+    @Excel(name = "单日成本")
79
+    private BigDecimal dayCost;
80
+
77 81
     public void setBudgetStaffId(Long budgetStaffId)
78 82
     {
79 83
         this.budgetStaffId = budgetStaffId;
@@ -209,6 +213,15 @@ public class CmcBudgetStaff extends BaseEntity
209 213
     {
210 214
         return amountAdjust;
211 215
     }
216
+    public void setDayCost(BigDecimal dayCost)
217
+    {
218
+        this.dayCost = dayCost;
219
+    }
220
+
221
+    public BigDecimal getDayCost()
222
+    {
223
+        return dayCost;
224
+    }
212 225
 
213 226
     @Override
214 227
     public String toString() {

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

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
19 19
         <result property="coefficientAdjust"    column="coefficient_adjust"    />
20 20
         <result property="amount"    column="amount"    />
21 21
         <result property="amountAdjust"    column="amount_adjust"    />
22
+        <result property="dayCost"    column="day_cost"    />
22 23
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
23 24
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
24 25
     </resultMap>
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
39 40
     </resultMap>
40 41
 
41 42
     <sql id="selectCmcBudgetStaffVo">
42
-        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.dept_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.remark,
43
+        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.dept_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.remark, bs.day_cost,
43 44
                bs.type, bs.days_adjust, bs.performance, bs.performance_adjust, bs.coefficient, bs.coefficient_adjust, bs.amount, bs.amount_adjust from cmc_budget_staff as bs
44 45
         left join sys_user as u on u.user_id = bs.user_id
45 46
         left join cmc_post_salary as ps on u.salary_level = ps.salary_level and u.post_level = ps.post_level
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
77 78
             <if test="coefficientAdjust != null">coefficient_adjust,</if>
78 79
             <if test="amount != null">amount,</if>
79 80
             <if test="amountAdjust != null">amount_adjust,</if>
81
+            <if test="dayCost != null">day_cost,</if>
80 82
          </trim>
81 83
         <trim prefix="values (" suffix=")" suffixOverrides=",">
82 84
             <if test="budgetStaffId != null">#{budgetStaffId},</if>
@@ -93,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
93 95
             <if test="coefficientAdjust != null">#{coefficientAdjust},</if>
94 96
             <if test="amount != null">#{amount},</if>
95 97
             <if test="amountAdjust != null">#{amountAdjust},</if>
98
+            <if test="dayCost != null">#{dayCost},</if>
96 99
          </trim>
97 100
     </insert>
98 101
 
@@ -112,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
112 115
             <if test="coefficientAdjust != null">coefficient_adjust = #{coefficientAdjust},</if>
113 116
             <if test="amount != null">amount = #{amount},</if>
114 117
             <if test="amountAdjust != null">amount_adjust = #{amountAdjust},</if>
118
+            <if test="dayCost != null">day_cost = #{dayCost},</if>
115 119
         </trim>
116 120
         where budget_staff_id = #{budgetStaffId}
117 121
     </update>

+ 30
- 40
oa-back/sql/sq.sql
文件差异内容过多而无法显示
查看文件


正在加载...
取消
保存