Browse Source

预算人员单日成本

lamphua 3 weeks ago
parent
commit
ee165ed615

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

74
     @Excel(name = "核算金额")
74
     @Excel(name = "核算金额")
75
     private BigDecimal amountAdjust;
75
     private BigDecimal amountAdjust;
76
 
76
 
77
+    /** 单日成本 */
78
+    @Excel(name = "单日成本")
79
+    private BigDecimal dayCost;
80
+
77
     public void setBudgetStaffId(Long budgetStaffId)
81
     public void setBudgetStaffId(Long budgetStaffId)
78
     {
82
     {
79
         this.budgetStaffId = budgetStaffId;
83
         this.budgetStaffId = budgetStaffId;
209
     {
213
     {
210
         return amountAdjust;
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
     @Override
226
     @Override
214
     public String toString() {
227
     public String toString() {

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

19
         <result property="coefficientAdjust"    column="coefficient_adjust"    />
19
         <result property="coefficientAdjust"    column="coefficient_adjust"    />
20
         <result property="amount"    column="amount"    />
20
         <result property="amount"    column="amount"    />
21
         <result property="amountAdjust"    column="amount_adjust"    />
21
         <result property="amountAdjust"    column="amount_adjust"    />
22
+        <result property="dayCost"    column="day_cost"    />
22
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
23
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
23
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
24
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
24
     </resultMap>
25
     </resultMap>
39
     </resultMap>
40
     </resultMap>
40
 
41
 
41
     <sql id="selectCmcBudgetStaffVo">
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
                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
                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
         left join sys_user as u on u.user_id = bs.user_id
45
         left join sys_user as u on u.user_id = bs.user_id
45
         left join cmc_post_salary as ps on u.salary_level = ps.salary_level and u.post_level = ps.post_level
46
         left join cmc_post_salary as ps on u.salary_level = ps.salary_level and u.post_level = ps.post_level
77
             <if test="coefficientAdjust != null">coefficient_adjust,</if>
78
             <if test="coefficientAdjust != null">coefficient_adjust,</if>
78
             <if test="amount != null">amount,</if>
79
             <if test="amount != null">amount,</if>
79
             <if test="amountAdjust != null">amount_adjust,</if>
80
             <if test="amountAdjust != null">amount_adjust,</if>
81
+            <if test="dayCost != null">day_cost,</if>
80
          </trim>
82
          </trim>
81
         <trim prefix="values (" suffix=")" suffixOverrides=",">
83
         <trim prefix="values (" suffix=")" suffixOverrides=",">
82
             <if test="budgetStaffId != null">#{budgetStaffId},</if>
84
             <if test="budgetStaffId != null">#{budgetStaffId},</if>
93
             <if test="coefficientAdjust != null">#{coefficientAdjust},</if>
95
             <if test="coefficientAdjust != null">#{coefficientAdjust},</if>
94
             <if test="amount != null">#{amount},</if>
96
             <if test="amount != null">#{amount},</if>
95
             <if test="amountAdjust != null">#{amountAdjust},</if>
97
             <if test="amountAdjust != null">#{amountAdjust},</if>
98
+            <if test="dayCost != null">#{dayCost},</if>
96
          </trim>
99
          </trim>
97
     </insert>
100
     </insert>
98
 
101
 
112
             <if test="coefficientAdjust != null">coefficient_adjust = #{coefficientAdjust},</if>
115
             <if test="coefficientAdjust != null">coefficient_adjust = #{coefficientAdjust},</if>
113
             <if test="amount != null">amount = #{amount},</if>
116
             <if test="amount != null">amount = #{amount},</if>
114
             <if test="amountAdjust != null">amount_adjust = #{amountAdjust},</if>
117
             <if test="amountAdjust != null">amount_adjust = #{amountAdjust},</if>
118
+            <if test="dayCost != null">day_cost = #{dayCost},</if>
115
         </trim>
119
         </trim>
116
         where budget_staff_id = #{budgetStaffId}
120
         where budget_staff_id = #{budgetStaffId}
117
     </update>
121
     </update>

+ 30
- 40
oa-back/sql/sq.sql
File diff suppressed because it is too large
View File


Loading…
Cancel
Save