LY 预约工作票导出

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

@@ -231,8 +231,9 @@ public class TJobticketController extends BaseController {
             }
             TJobticket tJobticket = new TJobticket();
             TInvoiceWorkcontent tInvoiceWorkcontent = dto.get(i);
-            //部门应该是导入票数据来源的承包商的所属部门
-            tJobticket.setDeptId(tInvoiceWorkcontent.getBookingworkticket().getDeptId());
+            //部门应该是CBP/C 写死
+            tJobticket.setDeptId(103l);
+
             tJobticket.setContent(tInvoiceWorkcontent.getBookingworkticket().getWorkArea() + tInvoiceWorkcontent.getWorkDescription());
             //byc 联系人 用户主管+用户单位
             if (tInvoiceWorkcontent.getBookingworkticket().getUserUnit() != null) {

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

@@ -533,8 +533,15 @@ public class TInvoiceBookingworkticketController extends BaseController {
         List<TInvoiceWorkcontent> tInvoiceWorkcontentList = tInvoiceBookingworkticketService.selectTInvoiceWorkcontentList(tInvoiceBookingworkticket);
         for (TInvoiceWorkcontent workcontent : tInvoiceWorkcontentList) {
             TInvoiceBookingworkticket bookingworkticket = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(workcontent.getBookingticketId());
+            SysUser mg = sysUserService.selectUserById(bookingworkticket.getUserMg());
+            bookingworkticket.setUserMgDeptName(mg.getDept().getDeptName());
+            if (bookingworkticket.getUserSupId() != null) {
+                SysUser sup = sysUserService.selectUserById(Long.parseLong(bookingworkticket.getUserSupId()));
+                bookingworkticket.setUserSupDeptName(sup.getDept().getDeptName());
+            }
             workcontent.setBookingworkticket(bookingworkticket);
         }
+
         //除去作废的票 以及 续票
         Iterator<TInvoiceWorkcontent> iterator = tInvoiceWorkcontentList.iterator();
         while (iterator.hasNext()) {
@@ -659,7 +666,8 @@ public class TInvoiceBookingworkticketController extends BaseController {
                     row.createCell(3).setCellValue(t.getWorkDescription());
                 }
                 //工艺主管
-                row.createCell(4).setCellValue(t.getBookingworkticket().getUserSupName() + " " + t.getBookingworkticket().getUserSupPhone());
+
+                row.createCell(4).setCellValue(t.getBookingworkticket().getUserSupDeptName() +" " + t.getBookingworkticket().getUserSupName() + " " + t.getBookingworkticket().getUserSupPhone());
                 //作业单位
                 if (t.getBookingworkticket().getWorkUnit() != null) {
                     row.createCell(5).setCellValue(t.getBookingworkticket().getWorkUnit());
@@ -669,7 +677,8 @@ public class TInvoiceBookingworkticketController extends BaseController {
                 //电话
                 row.createCell(7).setCellValue(t.getBookingworkticket().getPhonenumber());
                 //用户
-                row.createCell(8).setCellValue(t.getBookingworkticket().getUserMgName() + " " + t.getBookingworkticket().getUserMgPhone());
+
+                row.createCell(8).setCellValue(t.getBookingworkticket().getUserMgDeptName() +" " +t.getBookingworkticket().getUserMgName() + " " + t.getBookingworkticket().getUserMgPhone());
                 //票号
                 String ticketNo = t.getWhgzxkzh() + t.getDhzyxkzh()+t.getGczyxkzh()+t.getMbzyxkzh()+t.getXzkjxkzh() + t.getYqxkzh();
                 row.createCell(9).setCellValue(ticketNo.replaceAll("null" , ""));

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

@@ -97,6 +97,10 @@ public class TInvoiceBookingworkticket extends BaseEntity
     @TableField(exist = false)
     private String userMgPhone;
 
+    /** 用户主管部门 */
+    @TableField(exist = false)
+    private String userMgDeptName;
+
     /** 用户单位 */
     @Excel(name = "用户单位")
     private String userUnit;
@@ -165,6 +169,10 @@ public class TInvoiceBookingworkticket extends BaseEntity
     @TableField(exist = false)
     private String userSupPhone;
 
+    /** 装置主管部门 */
+    @TableField(exist = false)
+    private String userSupDeptName;
+
     @TableField(exist = false)
     private String deptName;
 
@@ -516,4 +524,20 @@ public class TInvoiceBookingworkticket extends BaseEntity
     public void setTag(String tag) {
         this.tag = tag;
     }
+
+    public String getUserMgDeptName() {
+        return userMgDeptName;
+    }
+
+    public void setUserMgDeptName(String userMgDeptName) {
+        this.userMgDeptName = userMgDeptName;
+    }
+
+    public String getUserSupDeptName() {
+        return userSupDeptName;
+    }
+
+    public void setUserSupDeptName(String userSupDeptName) {
+        this.userSupDeptName = userSupDeptName;
+    }
 }

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

@@ -274,6 +274,7 @@
              , s.dept_name
              , d.filename
              , d.reservation_number
+             , su.user_id    as userSupId
              , su.nick_name    as userSupName
              , su.PHONENUMBER  as userSupPhone
              , su2.nick_name   as userMgName

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -172,7 +172,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-
 		where u.user_id = #{userId}
 	</select>