LY 预约票 bugfix

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

@@ -188,6 +188,17 @@ public class TInvoiceBookingworkticketController extends BaseController
         sheet.setColumnWidth(10, 40*256);
         sheet.setColumnWidth(11, 40*256);
         sheet.setColumnWidth(12, 40*256);
+        sheet.setColumnWidth(13, 40*256);
+        sheet.setColumnWidth(14, 40*256);
+        sheet.setColumnWidth(15, 40*256);
+        sheet.setColumnWidth(16, 40*256);
+        sheet.setColumnWidth(17, 40*256);
+        sheet.setColumnWidth(18, 40*256);
+        sheet.setColumnWidth(19, 40*256);
+        sheet.setColumnWidth(20, 40*256);
+        sheet.setColumnWidth(21, 40*256);
+        sheet.setColumnWidth(22, 40*256);
+
         //设置开始行和开始列
         Row row0 = sheet.createRow(0);
         CellStyle style = wb.createCellStyle();
@@ -214,13 +225,15 @@ public class TInvoiceBookingworkticketController extends BaseController
         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);
+        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);
+        row0.createCell(21).setCellValue("盲板作业许可证号");row0.getCell(21).setCellStyle(style);
+        row0.createCell(22).setCellValue("高处作业许可证号");row0.getCell(22).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -278,20 +291,24 @@ public class TInvoiceBookingworkticketController extends BaseController
             row.createCell(12).setCellValue("");
             //装置批准人
             row.createCell(13).setCellValue(t.getBookingworkticket().getUserSupName());
+            //装置批准人短号
+            row.createCell(14).setCellValue(t.getBookingworkticket().getUserSupPhone());
             //用户单位
-            row.createCell(14).setCellValue(t.getBookingworkticket().getUserUnit());
+            row.createCell(15).setCellValue(t.getBookingworkticket().getUserUnit());
             //用户主管
-            row.createCell(15).setCellValue(t.getBookingworkticket().getUserMgName());
+            row.createCell(16).setCellValue(t.getBookingworkticket().getUserMgName());
+            //用户主管短号
+            row.createCell(17).setCellValue(t.getBookingworkticket().getUserMgPhone());
             //危害工作许可证号
-            row.createCell(16).setCellValue(t.getWhgzxkzh());
+            row.createCell(18).setCellValue(t.getWhgzxkzh());
             //动火作业许可证号
-            row.createCell(17).setCellValue(t.getDhzyxkzh());
+            row.createCell(19).setCellValue(t.getDhzyxkzh());
             //限制空间许可证号
-            row.createCell(18).setCellValue(t.getXzkjxkzh());
+            row.createCell(20).setCellValue(t.getXzkjxkzh());
             //盲板作业许可证号
-            row.createCell(19).setCellValue(t.getMbzyxkzh());
+            row.createCell(21).setCellValue(t.getMbzyxkzh());
             //高处作业许可证号
-            row.createCell(20).setCellValue(t.getGczyxkzh());
+            row.createCell(22).setCellValue(t.getGczyxkzh());
 
 
             rowIndex++;

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

@@ -93,6 +93,10 @@ public class TInvoiceBookingworkticket extends BaseEntity
     @TableField(exist = false)
     private String userMgName;
 
+    /** 用户主管号码 */
+    @TableField(exist = false)
+    private String userMgPhone;
+
     /** 用户单位 */
     @Excel(name = "用户单位")
     private String userUnit;
@@ -149,6 +153,10 @@ public class TInvoiceBookingworkticket extends BaseEntity
     @TableField(exist = false)
     private String userSupName;
 
+    /** 装置主管号码 */
+    @TableField(exist = false)
+    private String userSupPhone;
+
     @TableField(exist = false)
     private String deptName;
 
@@ -468,4 +476,20 @@ public class TInvoiceBookingworkticket extends BaseEntity
     public void setUserSupName(String userSupName) {
         this.userSupName = userSupName;
     }
+
+    public String getUserMgPhone() {
+        return userMgPhone;
+    }
+
+    public void setUserMgPhone(String userMgPhone) {
+        this.userMgPhone = userMgPhone;
+    }
+
+    public String getUserSupPhone() {
+        return userSupPhone;
+    }
+
+    public void setUserSupPhone(String userSupPhone) {
+        this.userSupPhone = userSupPhone;
+    }
 }

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

@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTInvoiceBookingworkticketById" parameterType="Long" resultMap="TInvoiceBookingworkticketResult">
         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.nick_name as userSupName,su2.nick_name as userMgName
+        ,su.nick_name as userSupName,su.PHONENUMBER as userSupPhone ,su2.nick_name as userMgName,su2.PHONENUMBER as userMgPhone
         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