LY 预约续票

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceBookingworkticketController.java

@@ -149,6 +149,25 @@ public class TInvoiceBookingworkticketController extends BaseController
                 iterator.remove();
             }
         }
+
+        List<TInvoiceWorkcontent> newWorkcontentList = new ArrayList<>();
+        //多个工作类型拆分成多条数据
+        for (TInvoiceWorkcontent t: tInvoiceWorkcontentList
+             ) {
+            String[] wtArr=t.getWorkType().split(",");
+            if (wtArr.length > 1) {
+                for (int i = 0; i < wtArr.length; i++) {
+                    TInvoiceWorkcontent arrItem = new TInvoiceWorkcontent();
+                    arrItem = t;
+                    arrItem.setWorkType(wtArr[i]);
+                    newWorkcontentList.add(arrItem);
+                }
+            }else {
+                newWorkcontentList.add(t);
+            }
+        }
+
+
         SXSSFWorkbook wb = new SXSSFWorkbook(1000);
         CellStyle wrapStyle = wb.createCellStyle();
         wrapStyle.setWrapText(true);    //设置自动换行
@@ -193,12 +212,20 @@ public class TInvoiceBookingworkticketController extends BaseController
         row0.createCell(10).setCellValue("变更原因");row0.getCell(10).setCellStyle(style);
         row0.createCell(11).setCellValue("作业是否取消");row0.getCell(11).setCellStyle(style);
         row0.createCell(12).setCellValue("取消原因");row0.getCell(12).setCellStyle(style);
+        row0.createCell(13).setCellValue("装置批准人");row0.getCell(13).setCellStyle(style);
+        row0.createCell(14).setCellValue("用户单位");row0.getCell(14).setCellStyle(style);
+        row0.createCell(15).setCellValue("用户主管");row0.getCell(15).setCellStyle(style);
+        row0.createCell(16).setCellValue("危害工作许可证号");row0.getCell(16).setCellStyle(style);
+        row0.createCell(17).setCellValue("动火作业许可证号");row0.getCell(17).setCellStyle(style);
+        row0.createCell(18).setCellValue("危害工作许可证号");row0.getCell(18).setCellStyle(style);
+        row0.createCell(19).setCellValue("限制空间许可证号");row0.getCell(19).setCellStyle(style);
+        row0.createCell(20).setCellValue("盲板作业许可证号");row0.getCell(20).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
         StringBuilder contentUserWorkType=new StringBuilder();
         String cuw="";
-        for (TInvoiceWorkcontent t: tInvoiceWorkcontentList) {
+        for (TInvoiceWorkcontent t: newWorkcontentList) {
             if(t.getBookingworkticket().getStatus()!=3){
                 continue;
             }
@@ -248,6 +275,24 @@ public class TInvoiceBookingworkticketController extends BaseController
             row.createCell(11).setCellValue("否");
             //
             row.createCell(12).setCellValue("");
+            //装置批准人
+            row.createCell(13).setCellValue(t.getBookingworkticket().getContact());
+            //用户单位
+            row.createCell(14).setCellValue(t.getBookingworkticket().getUserUnit());
+            //用户主管
+            row.createCell(15).setCellValue(t.getBookingworkticket().getUserMg());
+            //危害工作许可证号
+            row.createCell(16).setCellValue(t.getWhgzxkzh());
+            //动火作业许可证号
+            row.createCell(17).setCellValue(t.getDhzyxkzh());
+            //限制空间许可证号
+            row.createCell(18).setCellValue(t.getXzkjxkzh());
+            //盲板作业许可证号
+            row.createCell(19).setCellValue(t.getMbzyxkzh());
+            //高处作业许可证号
+            row.createCell(20).setCellValue(t.getGczyxkzh());
+
+
             rowIndex++;
             contentUserWorkType.delete(0, contentUserWorkType.length());
         }
@@ -310,7 +355,7 @@ public class TInvoiceBookingworkticketController extends BaseController
         int workType15=0; int workType16=0; int workType17=0;
         //填充下一个表格
         int count=0;
-        for (TInvoiceWorkcontent t: tInvoiceWorkcontentList) {
+        for (TInvoiceWorkcontent t: newWorkcontentList) {
             if(t.getBookingworkticket().getStatus()!=3){
                 continue;
             }

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

@@ -138,6 +138,11 @@ public class TInvoiceBookingworkticket extends BaseEntity
     @Excel(name = "预约作业申请单文件名")
     private String filename;
 
+    @TableField(exist = false)
+    private String userSupId;
+
+    @TableField(exist = false)
+    private String userSupName;
 
     public void setId(Long id)
     {
@@ -433,4 +438,20 @@ public class TInvoiceBookingworkticket extends BaseEntity
     public void setGczyjb(String gczyjb) {
         this.gczyjb = gczyjb;
     }
+
+    public String getUserSupId() {
+        return userSupId;
+    }
+
+    public void setUserSupId(String userSupId) {
+        this.userSupId = userSupId;
+    }
+
+    public String getUserSupName() {
+        return userSupName;
+    }
+
+    public void setUserSupName(String userSupName) {
+        this.userSupName = userSupName;
+    }
 }

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

@@ -159,7 +159,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTInvoiceBookingworkticketById" parameterType="Long" resultMap="TInvoiceBookingworkticketResult">
-        <include refid="selectTInvoiceBookingworkticketVo"/>
+        select d.id, d.work_unit, d.work_area, d.unit_number, d.floor_location, d.work_start_time, d.work_end_time, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.contact, d.phonenumber, d.status, d.dept_id, d.user_mg ,d.user_unit,s.dept_name,d.filename,d.reservation_number
+        ,su.nickname as userSupName
+        from t_invoice_bookingworkticket d
+         left join sys_dept s on s.dept_id = d.dept_id
+        left join t_approve_reserve_invoice r on r.invoice_id = d.id
+         left join sys_user su on r.user_sup_id = su.id
         where id = #{id}
         and d.del_flag = 0
     </select>

ui/src/store/modules/user.js

@@ -29,6 +29,9 @@ const user = {
     },
     SET_HOME: (state, homeType) => {
       state.homeType = homeType
+    },
+    SET_DEPT_ID: (state, deptId) => {
+      state.deptId = deptId
     }
   },
 
@@ -65,6 +68,7 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           commit('SET_HOME', user.homeType)
+          commit('SET_DEPT_ID' , user.deptId)
           resolve(res)
         }).catch(error => {
           reject(error)

ui/src/views/ehs/jobticket/index.vue

@@ -36,6 +36,33 @@
       <!--          />-->
       <!--        </el-select>-->
       <!--      </el-form-item>-->
+      <el-form-item label="延期许可证号" prop="yqxkzh">
+        <el-input
+          v-model="queryParams.yqxkzh"
+          placeholder="请输入延期许可证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="危害工作许可证号" prop="whgzxkzh">
+        <el-input
+          v-model="queryParams.whgzxkzh"
+          placeholder="请输入危害工作许可证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="动火作业许可证号" prop="dhzyxkzh">
+        <el-input
+          v-model="queryParams.dhzyxkzh"
+          placeholder="请输入动火作业许可证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="$t('火票级别')" label-width="50" prop="hpjb">
         <el-select v-model="queryParams.hpjb" :placeholder="$t('请选择') + $t('火票级别')" clearable size="small"
                    @change="handleQuery">
@@ -47,6 +74,43 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="限制空间许可证号" prop="xzkjxkzh">
+        <el-input
+          v-model="queryParams.xzkjxkzh"
+          placeholder="请输入限制空间许可证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="盲板作业许可证号" prop="mbzyxkzh">
+        <el-input
+          v-model="queryParams.mbzyxkzh"
+          placeholder="请输入盲板作业许可证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="高处作业许可证号" prop="gczyxkzh">
+        <el-input
+          v-model="queryParams.gczyxkzh"
+          placeholder="请输入高处作业许可证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="内容" prop="content">
+        <el-input
+          v-model="queryParams.content"
+          placeholder="请输入内容"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item :label="$t('作业票状态')" label-width="50" prop="zypzt">
         <el-select v-model="queryParams.zypzt" :placeholder="$t('请选择') + $t('作业票状态')" clearable size="small"
                    @change="handleQuery">
@@ -58,9 +122,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('限制空间许可证号')" label-width="50" prop="xzkjxkzh">
-        <el-checkbox v-model="queryParams.xzkjxkzh" @change="handleQuery"></el-checkbox>
-      </el-form-item>
       <el-form-item :label="$t('索引')" label-width="50" prop="tag">
         <el-select v-model="queryParams.tag" :placeholder="$t('请选择') + $t('索引')" filterable clearable size="small"
                    @change="handleQuery">

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

@@ -271,6 +271,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.form.deptId = this.$store.state.user.deptId
       this.title = "添加工作票索引";
     },
     /** 修改按钮操作 */