结算驾驶班审核

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

@@ -83,6 +83,20 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "综合事务部审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date zhTime;
 
+    /** 综合事务部驾驶班审核意见 */
+    @Excel(name = "综合事务部驾驶班审核意见")
+    private String jsbComment;
+
+    /** 综合事务部驾驶班审核人 */
+    @Excel(name = "综合事务部驾驶班审核人")
+    private String jsbUserName;
+    private Long jsbUserId;
+
+    /** 综合事务部驾驶班审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "综合事务部驾驶班审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date jsbTime;
+
     /** 技术质量与安全部审核意见 */
     @Excel(name = "技术质量与安全部审核意见")
     private String jsComment;
@@ -169,6 +183,8 @@ public class CmcSettle extends BaseEntity
 
     private SysUser zhUser;
 
+    private SysUser jsbUser;
+
     private SysUser jsUser;
 
     private SysUser jyUser;
@@ -321,6 +337,34 @@ public class CmcSettle extends BaseEntity
     {
         return zhComment;
     }
+
+    public void setJsbUserId(Long jsbUserId)
+    {
+        this.jsbUserId = jsbUserId;
+    }
+
+    public Long getJsbUserId()
+    {
+        return jsbUserId;
+    }
+    public void setJsbTime(Date jsbTime)
+    {
+        this.jsbTime = jsbTime;
+    }
+
+    public Date getJsbTime()
+    {
+        return jsbTime;
+    }
+    public void setJsbComment(String jsbComment)
+    {
+        this.jsbComment = jsbComment;
+    }
+
+    public String getJsbComment()
+    {
+        return jsbComment;
+    }
     public void setJsUserId(Long jsUserId) 
     {
         this.jsUserId = jsUserId;
@@ -503,6 +547,17 @@ public class CmcSettle extends BaseEntity
     {
         return zhUser;
     }
+
+    public void setJsbUser(SysUser jsbUser)
+    {
+        this.jsbUser = jsbUser;
+        this.jsbUserName = jsbUser == null ? "" : jsbUser.getNickName();
+    }
+
+    public SysUser getJsbUser()
+    {
+        return jsbUser;
+    }
     public void setJyUser(SysUser jyUser)
     {
         this.jyUser = jyUser;
@@ -576,6 +631,9 @@ public class CmcSettle extends BaseEntity
             .append("zhUserId", getZhUserId())
             .append("zhTime", getZhTime())
             .append("zhComment", getZhComment())
+            .append("jsbUserId", getJsbUserId())
+            .append("jsbTime", getJsbTime())
+            .append("jsbComment", getJsbComment())
             .append("jsUserId", getJsUserId())
             .append("jsTime", getJsTime())
             .append("jsComment", getJsComment())

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

@@ -18,6 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zhUserId"    column="zh_user_id"    />
         <result property="zhTime"    column="zh_time"    />
         <result property="zhComment"    column="zh_comment"    />
+        <result property="jsbUserId"    column="jsb_user_id"    />
+        <result property="jsbTime"    column="jsb_time"    />
+        <result property="jsbComment"    column="jsb_comment"    />
         <result property="jsUserId"    column="js_user_id"    />
         <result property="jsTime"    column="js_time"    />
         <result property="jsComment"    column="js_comment"    />
@@ -39,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="amount"    column="amount"    />
         <association property="reportUser"    javaType="SysUser"         resultMap="ReportUserResult" />
         <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
+        <association property="jsbUser"    javaType="SysUser"         resultMap="jsbUserResult" />
         <association property="jsUser"    javaType="SysUser"         resultMap="JsUserResult" />
         <association property="jyUser"    javaType="SysUser"         resultMap="JyUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
@@ -58,6 +62,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="zh_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="jsbUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="jsb_nick_name"    />
+    </resultMap>
+
     <resultMap type="SysUser" id="JsUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="js_nick_name"    />
@@ -96,17 +105,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcSettleVo">
-        select distinct s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, s.workload_report, s.reporter, u.nick_name as report_nick_name, s.report_time, s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,
-               s.zh_time, s.zh_comment, s.js_user_id, u2.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u3.nick_name as jy_nick_name, s.jy_time, s.jy_comment, ss.amount,
-               s.manager_user_id, u4.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u5.nick_name as gm_nick_name, s.gm_time, s.gm_comment, ss.content,
-               s.dsz_user_id, u6.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document, s.report_dept, d.dept_name from cmc_settle as s
+        select distinct s.settle_id, s.project_id, p.project_number, p.project_name, p.undertaking_dept, s.xm_name, s.workload_report, s.reporter, u.nick_name as report_nick_name, s.report_time,
+               s.settle_comment, s.zh_user_id, u1.nick_name as zh_nick_name,s.zh_time, s.zh_comment, s.jsb_user_id, u2.nick_name as jsb_nick_name,s.jsb_time, s.jsb_comment, 
+               s.js_user_id, u3.nick_name as js_nick_name, s.js_time, s.js_comment, s.jy_user_id, u4.nick_name as jy_nick_name, s.jy_time, s.jy_comment, ss.amount,
+               s.manager_user_id, u5.nick_name as manager_nick_name, s.manager_time, s.manager_comment, s.gm_user_id, u6.nick_name as gm_nick_name, s.gm_time, s.gm_comment, ss.content,
+               s.dsz_user_id, u7.nick_name as dsz_nick_name, s.dsz_time, s.dsz_comment, s.settle_document, s.modify_document, s.final_document, s.report_dept, d.dept_name from cmc_settle as s
         left join sys_user as u on u.user_id = s.reporter
         left join sys_user as u1 on u1.user_id = s.zh_user_id
-        left join sys_user as u2 on u2.user_id = s.js_user_id
-        left join sys_user as u3 on u3.user_id = s.jy_user_id
-        left join sys_user as u4 on u4.user_id = s.manager_user_id
-        left join sys_user as u5 on u5.user_id = s.gm_user_id
-        left join sys_user as u6 on u6.user_id = s.dsz_user_id
+        left join sys_user as u2 on u2.user_id = s.jsb_user_id
+        left join sys_user as u3 on u3.user_id = s.js_user_id
+        left join sys_user as u4 on u4.user_id = s.jy_user_id
+        left join sys_user as u5 on u5.user_id = s.manager_user_id
+        left join sys_user as u6 on u6.user_id = s.gm_user_id
+        left join sys_user as u7 on u7.user_id = s.dsz_user_id
         left join cmc_project as p on p.project_id = s.project_id
         left join sys_dept as d on d.dept_id = s.report_dept
         left join cmc_settle_summary as ss on ss.settle_id = s.settle_id
@@ -129,6 +140,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zhUserId != null "> and s.zh_user_id = #{zhUserId}</if>
             <if test="zhTime != null "> and s.zh_time = #{zhTime}</if>
             <if test="zhComment != null  and zhComment != ''"> and s.zh_comment = #{zhComment}</if>
+            <if test="jsbUserId != null "> and s.jsb_user_id = #{jsbUserId}</if>
+            <if test="jsbTime != null "> and s.jsb_time = #{jsbTime}</if>
+            <if test="jsbComment != null  and jsbComment != ''"> and s.jsb_comment = #{jsbComment}</if>
             <if test="jsUserId != null "> and s.js_user_id = #{jsUserId}</if>
             <if test="jsTime != null "> and s.js_time = #{jsTime}</if>
             <if test="jsComment != null  and jsComment != ''"> and s.js_comment = #{jsComment}</if>
@@ -166,6 +180,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zhUserId != null">zh_user_id,</if>
             <if test="zhTime != null">zh_time,</if>
             <if test="zhComment != null">zh_comment,</if>
+            <if test="jsbUserId != null">jsb_user_id,</if>
+            <if test="jsbTime != null">jsb_time,</if>
+            <if test="jsbComment != null">jsb_comment,</if>
             <if test="jsUserId != null">js_user_id,</if>
             <if test="jsTime != null">js_time,</if>
             <if test="jsComment != null">js_comment,</if>
@@ -197,6 +214,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zhUserId != null">#{zhUserId},</if>
             <if test="zhTime != null">#{zhTime},</if>
             <if test="zhComment != null">#{zhComment},</if>
+            <if test="jsbUserId != null">#{jsbUserId},</if>
+            <if test="jsbTime != null">#{jsbTime},</if>
+            <if test="jsbComment != null">#{jsbComment},</if>
             <if test="jsUserId != null">#{jsUserId},</if>
             <if test="jsTime != null">#{jsTime},</if>
             <if test="jsComment != null">#{jsComment},</if>
@@ -231,6 +251,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zhUserId != null">zh_user_id = #{zhUserId},</if>
             <if test="zhTime != null">zh_time = #{zhTime},</if>
             <if test="zhComment != null">zh_comment = #{zhComment},</if>
+            <if test="jsbUserId != null">jsb_user_id = #{jsbUserId},</if>
+            <if test="jsbTime != null">jsb_time = #{jsbTime},</if>
+            <if test="jsbComment != null">jsb_comment = #{jsbComment},</if>
             <if test="jsUserId != null">js_user_id = #{jsUserId},</if>
             <if test="jsTime != null">js_time = #{jsTime},</if>
             <if test="jsComment != null">js_comment = #{jsComment},</if>

oa-ui/src/views/oa/price/index.vue

@@ -68,7 +68,7 @@
 
     <el-table v-loading="loading" :data="priceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="结算单价id" align="center" prop="id" />
+      <!-- <el-table-column label="结算单价id" align="center" prop="id" /> -->
       <el-table-column label="工作类别" align="center" prop="workType" />
       <el-table-column label="工作内容" align="center" prop="workItem" />
       <el-table-column label="等级或比例尺" align="center" prop="scaleGrade" />