张丁 修改票号字段为五种类型等2.0

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -142,7 +142,7 @@ public class TJobticketController extends BaseController
             TJobticket tJobticket=new TJobticket();
             TInvoiceWorkcontent tInvoiceWorkcontent=dto.get(i);
             tJobticket.setContent(tInvoiceWorkcontent.getBookingworkticket().getWorkArea()+tInvoiceWorkcontent.getWorkDescription());
-            //用户单位
+            //byc 联系人 用户主管+用户单位
             if(tInvoiceWorkcontent.getBookingworkticket().getUserUnit()!=null){
                 for (SysDictData p : book_user_unit) {
                     if (tInvoiceWorkcontent.getBookingworkticket().getUserUnit().toString().equals(p.getDictValue())) {
@@ -151,7 +151,6 @@ public class TJobticketController extends BaseController
                 }
 
             }
-            //用户主管
             if(tInvoiceWorkcontent.getBookingworkticket().getUserMg()!=null){
                 SysUser sysUser =sysUserService.selectUserById(tInvoiceWorkcontent.getBookingworkticket().getUserMg());
               contentUserUnit.append(sysUser.getNickName());
@@ -161,6 +160,14 @@ public class TJobticketController extends BaseController
             tJobticket.setSgdw(tInvoiceWorkcontent.getBookingworkticket().getWorkUnit());
             tJobticket.setLxr(tInvoiceWorkcontent.getBookingworkticket().getContact());
             tJobticket.setLxdh(tInvoiceWorkcontent.getBookingworkticket().getPhonenumber());
+            //各项票号
+            tJobticket.setXzkjxkzh(tInvoiceWorkcontent.getXzkjxkzh());
+            tJobticket.setMbzyxkzh(tInvoiceWorkcontent.getMbzyxkzh());
+            tJobticket.setWhgzxkzh(tInvoiceWorkcontent.getWhgzxkzh());
+            tJobticket.setHpjb(tInvoiceWorkcontent.getHpjb());
+            tJobticket.setGczyxkzh(tInvoiceWorkcontent.getGczyxkzh());
+            tJobticket.setGczyjb(tInvoiceWorkcontent.getGczyjb());
+            tJobticket.setDhzyxkzh(tInvoiceWorkcontent.getDhzyxkzh());
             tJobticketService.insertTJobticket(tJobticket);
         }
         return AjaxResult.success();

master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceBookingworkticket.java

@@ -98,8 +98,38 @@ public class TInvoiceBookingworkticket extends BaseEntity
 
     /** 筛选工作类型 */
     @TableField(exist = false)
-    private Long workType
-            ;
+    private Long workType;
+
+    /** 危害 */
+    @TableField(exist = false)
+    private String whgzxkzh;
+
+    /** 动火  */
+    @TableField(exist = false)
+    private String dhzyxkzh;
+
+    /** 限制 */
+    @TableField(exist = false)
+    private String xzkjxkzh;
+
+    /** 盲板 */
+    @TableField(exist = false)
+    private String mbzyxkzh;
+
+    /** 高处作业 */
+    @TableField(exist = false)
+    private String gczyxkzh;
+
+    /** 高处 */
+    @TableField(exist = false)
+    private String gczyjb;
+
+    /** 筛选工作类型 */
+    @TableField(exist = false)
+    private String hpjb;
+
+
+
     /** 预约票号 */
     @Excel(name = "预约票号")
     private String reservationNumber;
@@ -346,4 +376,61 @@ public class TInvoiceBookingworkticket extends BaseEntity
     public void setWorkType(Long workType) {
         this.workType = workType;
     }
+
+    public String getHpjb() {
+        return hpjb;
+    }
+
+    public void setHpjb(String hpjb) {
+        this.hpjb = hpjb;
+    }
+
+
+    public String getWhgzxkzh() {
+        return whgzxkzh;
+    }
+
+    public void setWhgzxkzh(String whgzxkzh) {
+        this.whgzxkzh = whgzxkzh;
+    }
+
+    public String getDhzyxkzh() {
+        return dhzyxkzh;
+    }
+
+    public void setDhzyxkzh(String dhzyxkzh) {
+        this.dhzyxkzh = dhzyxkzh;
+    }
+
+    public String getXzkjxkzh() {
+        return xzkjxkzh;
+    }
+
+    public void setXzkjxkzh(String xzkjxkzh) {
+        this.xzkjxkzh = xzkjxkzh;
+    }
+
+    public String getMbzyxkzh() {
+        return mbzyxkzh;
+    }
+
+    public void setMbzyxkzh(String mbzyxkzh) {
+        this.mbzyxkzh = mbzyxkzh;
+    }
+
+    public String getGczyxkzh() {
+        return gczyxkzh;
+    }
+
+    public void setGczyxkzh(String gczyxkzh) {
+        this.gczyxkzh = gczyxkzh;
+    }
+
+    public String getGczyjb() {
+        return gczyjb;
+    }
+
+    public void setGczyjb(String gczyjb) {
+        this.gczyjb = gczyjb;
+    }
 }

master/src/main/resources/mybatis/invoice/TInvoiceBookingworkticketMapper.xml

@@ -61,12 +61,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="riskLevel"    column="risk_level"    />
         <result property="workDescription"    column="work_description"    />
         <result property="workPeopleNumber"    column="work_people_number"    />
-        <result property="guardianUnit"    column="guardian_unit"    />
+        <result property="hpjb"    column="hpjb"    />
         <result property="estimateWorktime"    column="estimate_worktime"    />
         <result property="bookingticketId"    column="bookingticket_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptName" column="dept_name" />
         <result property="reservationNumber"    column="reservation_number"    />
+        <result property="whgzxkzh"    column="whgzxkzh"    />
+        <result property="dhzyxkzh"    column="dhzyxkzh"    />
+        <result property="xzkjxkzh"    column="xzkjxkzh"    />
+        <result property="mbzyxkzh"    column="mbzyxkzh"    />
+        <result property="gczyxkzh"    column="gczyxkzh"    />
+        <result property="gczyjb"    column="gczyjb"    />
     </resultMap>
 
     <sql id="selectTInvoiceBookingworkticketVo">
@@ -75,7 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="selectTInvoiceWorkcontentVo">
-        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.work_type, d.risk_level, d.work_description, d.work_people_number, d.guardian_unit, d.estimate_worktime, d.bookingticket_id, d.dept_id ,d.reservation_number,s.dept_name from t_invoice_workcontent d
+        select d.id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.work_type, d.risk_level, d.work_description, d.work_people_number, d.hpjb, d.estimate_worktime, d.bookingticket_id, d.dept_id ,d.reservation_number,s.dept_name,
+            d.whgzxkzh,d.dhzyxkzh,d.xzkjxkzh,d.mbzyxkzh,d.gczyxkzh,d.gczyjb from t_invoice_workcontent d
        left join sys_dept s on s.dept_id = d.dept_id  left join t_invoice_bookingworkticket b on d.bookingticket_id =b.id
     </sql>
 
@@ -131,6 +138,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workEndTime != null "> and b.work_end_time = #{workEndTime}</if>
             <if test="contact != null  and contact != ''"> and b.contact = #{contact}</if>
             <if test="phonenumber != null  and phonenumber != ''"> and  b.phonenumber = #{phonenumber}</if>
+            <if test="whgzxkzh != null  and whgzxkzh != ''"> and whgzxkzh = #{whgzxkzh}</if>
+            <if test="dhzyxkzh != null  and dhzyxkzh != ''"> and dhzyxkzh = #{dhzyxkzh}</if>
+            <if test="xzkjxkzh != null  and xzkjxkzh != ''"> and xzkjxkzh = #{xzkjxkzh}</if>
+            <if test="mbzyxkzh != null  and mbzyxkzh != ''"> and mbzyxkzh = #{mbzyxkzh}</if>
+            <if test="gczyxkzh != null  and gczyxkzh != ''"> and gczyxkzh = #{gczyxkzh}</if>
+            <if test="gczyjb != null  and gczyjb != ''"> and gczyjb = #{gczyjb}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/invoice/TInvoiceWorkcontentMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="riskLevel != null "> and risk_level = #{riskLevel}</if>
             <if test="workDescription != null  and workDescription != ''"> and work_description = #{workDescription}</if>
             <if test="workPeopleNumber != null "> and work_people_number = #{workPeopleNumber}</if>
-            <if test="guardianUnit != null  and guardianUnit != ''"> and guardian_unit = #{guardianUnit}</if>
+            <if test="hpjb != null  and hpjb != ''"> and hpjb = #{hpjb}</if>
             <if test="estimateWorktime != null  and estimateWorktime != ''"> and estimate_worktime = #{estimateWorktime}</if>
             <if test="bookingticketId != null "> and bookingticket_id = #{bookingticketId}</if>
             <if test="reservationNumber != null  and reservationNumber != ''"> and reservation_number = #{reservationNumber}</if>
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="riskLevel != null">risk_level,</if>
             <if test="workDescription != null">work_description,</if>
             <if test="workPeopleNumber != null">work_people_number,</if>
-            <if test="guardianUnit != null">guardian_unit,</if>
+            <if test="hpjb != null">hpjb,</if>
             <if test="estimateWorktime != null">estimate_worktime,</if>
             <if test="bookingticketId != null">bookingticket_id,</if>
             <if test="deptId != null">dept_id,</if>
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="riskLevel != null">#{riskLevel},</if>
             <if test="workDescription != null">#{workDescription},</if>
             <if test="workPeopleNumber != null">#{workPeopleNumber},</if>
-            <if test="guardianUnit != null">#{guardianUnit},</if>
+            <if test="hpjb != null">#{hpjb},</if>
             <if test="estimateWorktime != null">#{estimateWorktime},</if>
             <if test="bookingticketId != null">#{bookingticketId},</if>
             <if test="deptId != null">#{deptId},</if>
@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="riskLevel != null">risk_level = #{riskLevel},</if>
             <if test="workDescription != null">work_description = #{workDescription},</if>
             <if test="workPeopleNumber != null">work_people_number = #{workPeopleNumber},</if>
-            <if test="guardianUnit != null">guardian_unit = #{guardianUnit},</if>
+            <if test="hpjb != null">hpjb = #{hpjb},</if>
             <if test="estimateWorktime != null">estimate_worktime = #{estimateWorktime},</if>
             <if test="bookingticketId != null">bookingticket_id = #{bookingticketId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>

ui/src/views/invoice/bookingworkticket/index.vue

@@ -164,6 +164,13 @@
           ></el-button>
            </template>
  </el-table-column>
+   <el-table-column label="危害工作许可证号" align="center" prop="whgzxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column label="动火作业许可证号" align="center" prop="dhzyxkzh" :show-overflow-tooltip="true"/>
+        <el-table-column label="火票级别" align="center" prop="hpjb" :show-overflow-tooltip="true"/>
+      <el-table-column label="限制空间许可证号" align="center" prop="xzkjxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column label="盲板作业许可证号" align="center" prop="mbzyxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column label="高处作业许可证号" align="center" prop="gczyxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column label="高处作业级别" align="center" prop="gczyjb" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button