预结算工作量类型调整

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

@@ -31,7 +31,7 @@ public class CmcBudgetSettle extends BaseEntity
 
     /** 工作量 */
     @Excel(name = "工作量")
-    private Long workload;
+    private Double workload;
 
     /** 系数 */
     @Excel(name = "系数")
@@ -77,12 +77,12 @@ public class CmcBudgetSettle extends BaseEntity
     {
         return price;
     }
-    public void setWorkload(Long workload) 
+    public void setWorkload(Double workload)
     {
         this.workload = workload;
     }
 
-    public Long getWorkload() 
+    public Double getWorkload()
     {
         return workload;
     }

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

@@ -103,6 +103,14 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "工会审批意见")
     private String unionComment;
 
+    /** 总经理审批人 */
+    @Excel(name = "总经理审批人")
+    private Long gmUserId;
+
+    /** 总经理审批意见 */
+    @Excel(name = "总经理审批意见")
+    private String gmComment;
+
     /** 调度员 */
     @Excel(name = "调度员")
     private Long dispatcher;
@@ -318,6 +326,24 @@ public class CmcCarApproval extends BaseEntity
     {
         return unionComment;
     }
+    public void setGmUserId(Long gmUserId)
+    {
+        this.gmUserId = gmUserId;
+    }
+
+    public Long getGmUserId()
+    {
+        return gmUserId;
+    }
+    public void setGmComment(String gmComment)
+    {
+        this.gmComment = gmComment;
+    }
+
+    public String getGmComment()
+    {
+        return gmComment;
+    }
     public void setDispatcher(Long dispatcher)
     {
         this.dispatcher = dispatcher;

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

@@ -25,6 +25,8 @@
         <result property="managerComment"    column="manager_comment"    />
         <result property="unionUserId"    column="union_user_id"    />
         <result property="unionComment"    column="union_comment"    />
+        <result property="gmUserId"    column="gm_user_id"    />
+        <result property="gmComment"    column="gm_comment"    />
         <result property="dispatcher"    column="dispatcher"    />
         <result property="dispatchComment"    column="dispatch_comment"    />
         <result property="estimateCost"    column="estimate_cost"    />
@@ -50,7 +52,7 @@
     </resultMap>
 
     <sql id="selectCmcCarApprovalVo">
-        select ca.car_apply_id, ca.applier, u.nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name, ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.begin_halfday, ca.end_date, ca.end_halfday, ca.days, ca.dept_user_id, ca.dept_comment, ca.manager_user_id, ca.manager_comment, ca.union_user_id, ca.union_comment, ca.dispatcher, ca.dispatch_comment, ca.estimate_cost from cmc_car_approval as ca
+        select ca.car_apply_id, ca.applier, u.nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name, ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.begin_halfday, ca.end_date, ca.end_halfday, ca.days, ca.dept_user_id, ca.dept_comment, ca.manager_user_id, ca.manager_comment, ca.union_user_id, ca.union_comment, ca.gm_user_id, ca.gm_comment, ca.dispatcher, ca.dispatch_comment, ca.estimate_cost from cmc_car_approval as ca
             left join sys_user as u on u.user_id = ca.applier
             left join sys_dept as d on d.dept_id = ca.use_dept
             left join cmc_project as p on ca.project_id = p.project_id
@@ -78,6 +80,8 @@
             <if test="managerComment != null  and managerComment != ''"> and ca.manager_comment = #{managerComment}</if>
             <if test="unionUserId != null "> and ca.union_user_id = #{unionUserId}</if>
             <if test="unionComment != null  and unionComment != ''"> and ca.union_comment = #{unionComment}</if>
+            <if test="gmUserId != null "> and ca.gm_user_id = #{gmUserId}</if>
+            <if test="gmComment != null  and gmComment != ''"> and ca.gm_comment = #{gmComment}</if>
             <if test="dispatcher != null "> and ca.dispatcher = #{dispatcher}</if>
             <if test="dispatchComment != null  and dispatchComment != ''"> and ca.dispatch_comment = #{dispatchComment}</if>
             <if test="estimateCost != null "> and ca.estimate_cost = #{estimateCost}</if>
@@ -112,6 +116,8 @@
             <if test="managerComment != null">manager_comment,</if>
             <if test="unionUserId != null">union_user_id,</if>
             <if test="unionComment != null">union_comment,</if>
+            <if test="gmUserId != null">gm_user_id,</if>
+            <if test="gmComment != null">gm_comment,</if>
             <if test="dispatcher != null">dispatcher,</if>
             <if test="dispatchComment != null">dispatch_comment,</if>
             <if test="estimateCost != null">estimate_cost,</if>
@@ -137,6 +143,8 @@
             <if test="managerComment != null">#{managerComment},</if>
             <if test="unionUserId != null">#{unionUserId},</if>
             <if test="unionComment != null">#{unionComment},</if>
+            <if test="gmUserId != null">#{gmUserId},</if>
+            <if test="gmComment != null">#{gmComment},</if>
             <if test="dispatcher != null">#{dispatcher},</if>
             <if test="dispatchComment != null">#{dispatchComment},</if>
             <if test="estimateCost != null">#{estimateCost},</if>
@@ -165,6 +173,8 @@
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
             <if test="unionUserId != null">union_user_id = #{unionUserId},</if>
             <if test="unionComment != null">union_comment = #{unionComment},</if>
+            <if test="gmUserId != null">gm_user_id = #{gmUserId},</if>
+            <if test="gmComment != null">gm_comment = #{gmComment},</if>
             <if test="dispatcher != null">dispatcher = #{dispatcher},</if>
             <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
             <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>

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

@@ -7,6 +7,7 @@ const user = {
     id: '',
     name: '',
     avatar: '',
+    deptId:'',
     deptName:'',
     roles: [],
     permissions: []
@@ -22,6 +23,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_DEPTID:(state, deptId) => {
+      state.deptId = deptId
+    },
     SET_DEPTNAME:(state, deptName) => {
       state.deptName = deptName
     },
@@ -68,6 +72,7 @@ const user = {
           }
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.nickName)
+          commit('SET_DEPTID',user.dept.deptId)
           commit('SET_DEPTNAME',user.dept.deptName)
           commit('SET_AVATAR', avatar)
           resolve(res)