-修改用户单位查询

master/src/main/java/com/ruoyi/project/ehs/domain/TJobticket.java

@@ -1,14 +1,14 @@
 package com.ruoyi.project.ehs.domain;
 
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 工作票对象 t_jobticket
  *
@@ -173,7 +173,7 @@ public class TJobticket extends BaseEntity
     private Long userMg;
 
     /** 用户单位 */
-    private Long userUnit;
+    private String userUnit;
 
 
     public void setId(Long id)
@@ -498,12 +498,12 @@ public class TJobticket extends BaseEntity
         return userMg;
     }
 
-    public void setUserUnit(Long userUnit)
+    public void setUserUnit(String userUnit)
     {
         this.userUnit = userUnit;
     }
 
-    public Long getUserUnit()
+    public String getUserUnit()
     {
         return userUnit;
     }

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

@@ -7,7 +7,7 @@ import com.deepoove.poi.data.Texts;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.SpringContextUtils;
-import com.ruoyi.common.utils.*;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -22,7 +22,6 @@ import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
 import com.ruoyi.project.invoice.mapper.TInvoiceWorkcontentMapper;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
-import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictTypeService;
@@ -427,7 +426,7 @@ public class TInvoiceBookingworkticketController extends BaseController
     public AjaxResult add(@RequestBody TInvoiceBookingworkticket tInvoiceBookingworkticket)
     {
         List<TInvoiceWorkcontent>  workcontentList = tInvoiceBookingworkticket.gettInvoiceWorkcontentList();
-        if (workcontentList.get(0).getXpxp().equals("12")) { //续票
+        if ("12".equals(workcontentList.get(0).getXpxp())) { //续票
            int i =  tInvoiceWorkcontentMapper.countXp(workcontentList.get(0));
             logger.info("预约票数量:" + i);
            if (i >= 15) {

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

@@ -1,8 +1,5 @@
 package com.ruoyi.project.invoice.domain;
 
-import java.util.Date;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -10,6 +7,9 @@ import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 预约作业票台账对象 t_invoice_bookingworkticket
  *
@@ -91,7 +91,7 @@ public class TInvoiceBookingworkticket extends BaseEntity
 
     /** 用户单位 */
     @Excel(name = "用户单位")
-    private Long userUnit;
+    private String userUnit;
 
     @TableField(exist = false)
     private List<TInvoiceWorkcontent> tInvoiceWorkcontentList;
@@ -293,7 +293,7 @@ public class TInvoiceBookingworkticket extends BaseEntity
         return userMg;
     }
 
-    public void setUserUnit(Long userUnit)
+    public void setUserUnit(String userUnit)
     {
         this.userUnit = userUnit;
     }
@@ -310,7 +310,7 @@ public class TInvoiceBookingworkticket extends BaseEntity
     }
 
 
-    public Long getUserUnit()
+    public String getUserUnit()
     {
         return userUnit;
     }