预算联查

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetSettle.java

@@ -27,7 +27,7 @@ public class CmcBudgetSettle extends BaseEntity
     @Excel(name = "结算单价id")
     private Integer priceId;
 
-    private CmcPrice price;
+    private CmcPrice cmcPrice;
 
     /** 工作量 */
     @Excel(name = "工作量")
@@ -68,14 +68,14 @@ public class CmcBudgetSettle extends BaseEntity
     {
         return priceId;
     }
-    public void setPrice(CmcPrice price)
+    public void setCmcPrice(CmcPrice cmcPrice)
     {
-        this.price = price;
+        this.cmcPrice = cmcPrice;
     }
 
-    public CmcPrice getPrice()
+    public CmcPrice getCmcPrice()
     {
-        return price;
+        return cmcPrice;
     }
     public void setWorkload(Double workload)
     {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetStaff.java

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.math.BigDecimal;
 
+import com.ruoyi.common.core.domain.entity.CmcPostSalary;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -35,6 +36,8 @@ public class CmcBudgetStaff extends BaseEntity
     @Excel(name = "天数")
     private Integer days;
 
+    private CmcPostSalary salary;
+
     /** 人员成本 */
     @Excel(name = "人员成本")
     private BigDecimal staffCost;
@@ -101,6 +104,15 @@ public class CmcBudgetStaff extends BaseEntity
     {
         return staffCost;
     }
+    public void setSalary(CmcPostSalary salary)
+    {
+        this.salary = salary;
+    }
+
+    public CmcPostSalary getSalary()
+    {
+        return salary;
+    }
     public void setInOutPrice(BigDecimal inOutPrice) 
     {
         this.inOutPrice = inOutPrice;

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

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcCar" id="CmcCarResult">
         <result property="carId"    column="car_id"    />
         <result property="licensePlate"    column="license_plate"    />
+        <result property="dayCost"    column="day_cost"    />
     </resultMap>
 
     <sql id="selectCmcBudgetCarVo">
-        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense from cmc_budget_car as bc
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense from cmc_budget_car as bc
         left join cmc_car as c on c.car_id = bc.car_id
     </sql>
 

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

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name"    column="name"    />
         <result property="series"    column="series"    />
         <result property="brand"    column="brand"    />
+        <result property="dayCost"    column="day_cost"    />
     </resultMap>
 
     <sql id="selectCmcBudgetDeviceVo">
-        select bd.budget_device_id, bd.budget_id, d.code, d.name, d.series, d.brand, bd.device_id, bd.days, bd.depreciation from cmc_budget_device as bd
+        select bd.budget_device_id, bd.budget_id, d.code, d.name, d.series, d.brand, d.day_cost, bd.device_id, bd.days, bd.depreciation from cmc_budget_device as bd
         left join cmc_device as d on d.device_id = bd.device_id
     </sql>
 

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

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workload"    column="workload"    />
         <result property="coefficient"    column="coefficient"    />
         <result property="settle"    column="settle"    />
-        <association property="price"    javaType="CmcPrice"         resultMap="CmcPriceResult" />
+        <association property="cmcPrice"    javaType="CmcPrice"         resultMap="CmcPriceResult" />
     </resultMap>
 
     <resultMap type="CmcPrice" id="CmcPriceResult">
@@ -21,10 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="subItem"    column="sub_item"    />
         <result property="scaleGrade"    column="scale_grade"    />
         <result property="unit"    column="unit"    />
+        <result property="commonPrice"    column="common_price"    />
+        <result property="complexPrice"    column="complex_price"    />
     </resultMap>
 
     <sql id="selectCmcBudgetSettleVo">
-        select bs.budget_settle_id, bs.budget_id, bs.price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, bs.workload, bs.coefficient, bs.settle from cmc_budget_settle as bs
+        select bs.budget_settle_id, bs.budget_id, bs.price_id, p.work_type, p.work_item, p.sub_item, p.scale_grade, p.unit, p.common_price, p.complex_price, bs.workload, bs.coefficient, bs.settle from cmc_budget_settle as bs
         left join cmc_price as p on p.id = bs.price_id
     </sql>
 

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

@@ -13,16 +13,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inOutPrice"    column="in_out_price"    />
         <result property="inOutExpense"    column="in_out_expense"    />
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="nick_name"    />
+        <result property="postLevel"    column="post_level"    />
+        <result property="salaryLevel"    column="salary_level"    />
+    </resultMap>
+
+    <resultMap type="CmcPostSalary" id="CmcPostSalaryResult">
+        <result property="salaryId"    column="salary_id"    />
+        <result property="postLevel"    column="post_level"    />
+        <result property="salaryLevel"    column="salary_level"    />
+        <result property="salary"    column="salary"    />
     </resultMap>
 
     <sql id="selectCmcBudgetStaffVo">
-        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.nick_name, bs.days, bs.staff_cost, bs.in_out_price, bs.in_out_expense from cmc_budget_staff as bs
+        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.in_out_price, bs.in_out_expense from cmc_budget_staff as bs
         left join sys_user as u on u.user_id = bs.user_id
+        left join cmc_post_salary as ps on u.salary_level = ps.salary_level and u.post_level = ps.post_level
     </sql>
 
     <select id="selectCmcBudgetStaffList" parameterType="CmcBudgetStaff" resultMap="CmcBudgetStaffResult">

oa-ui/src/store/getters.js

@@ -15,6 +15,7 @@ const getters = {
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   userId: state => state.user.id,
+  deptId: state => state.user.deptId,
   deptName: state => state.user.deptName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,

oa-ui/src/store/modules/user.js

@@ -72,7 +72,7 @@ const user = {
           }
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.nickName)
-          commit('SET_DEPTID',user.dept.deptId)
+          commit('SET_DEPTID',user.deptId)
           commit('SET_DEPTNAME',user.dept.deptName)
           commit('SET_AVATAR', avatar)
           resolve(res)