张丁 修改用户主管2.0

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

@@ -29,7 +29,9 @@ import com.ruoyi.project.invoice.service.ITInvoiceWorkcontentService;
 import com.ruoyi.project.sems.domain.ParamData;
 import com.ruoyi.project.sems.domain.TSpecdevCc;
 import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.project.system.service.ISysUserService;
 import io.jsonwebtoken.lang.Assert;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.ss.formula.functions.T;
@@ -69,6 +71,9 @@ public class TInvoiceBookingworkticketController extends BaseController
 
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询预约作业票台账列表
      */
@@ -377,6 +382,8 @@ public class TInvoiceBookingworkticketController extends BaseController
         for(int i=0;i<w.size();i++){
              TInvoiceWorkcontent wt= w.get(i);
             wt.setBookingticketId(didi);
+            //关联的票号
+            wt.setReservationNumber("Steam Cracker"+tInvoiceBookingworkticket.getId().toString()+"-"+wt.getId().toString());
             tInvoiceBookingworkticketService.insertTInvoiceWorkcontent(wt);
         }
         try {
@@ -464,15 +471,6 @@ public class TInvoiceBookingworkticketController extends BaseController
         String fileDir = RuoYiConfig.getProfile() + "/"+ "ticketWord";
         // 生成word的文件名称
         // 承包商+联系人+当前时间
-        StringBuilder contentUserWorkUnit=new StringBuilder();
-        List<SysDictData> book_work_unit = iSysDictTypeService.selectDictDataByType("book_work_unit");
-        if(invoiceBookingworkticket.getWorkUnit()!=null){
-            for (SysDictData p : book_work_unit) {
-                if (invoiceBookingworkticket.getWorkUnit().toString().equals(p.getDictValue())) {
-                    contentUserWorkUnit.append(p.getDictLabel());//施工单位承包商
-                }
-            }
-        }
         String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm"));
         String fileName = invoiceBookingworkticket.getWorkUnit()+invoiceBookingworkticket.getContact() +time+".docx";
         String wordPath = this.createWord(templatePath, fileDir, fileName, params);
@@ -491,7 +489,6 @@ public class TInvoiceBookingworkticketController extends BaseController
         List<SysDictData> book_work_type = iSysDictTypeService.selectDictDataByType("book_work_type");
         List<SysDictData> book_user_unit = iSysDictTypeService.selectDictDataByType("book_user_unit");
         List<SysDictData> book_risk_level = iSysDictTypeService.selectDictDataByType("book_risk_level");
-        List<SysDictData> book_user_mg = iSysDictTypeService.selectDictDataByType("book_user_mg");
         //构造模板的value
         StringBuilder content=new StringBuilder();
         StringBuilder contentUserUnit=new StringBuilder();
@@ -521,13 +518,9 @@ public class TInvoiceBookingworkticketController extends BaseController
                }
            }
            if(ticket.getUserMg()!=null){
-               for (SysDictData p : book_user_mg) {
-                   if (ticket.getUserMg().toString().equals(p.getDictValue())) {
-                       contentUserMg.append(p.getDictLabel());//用户主管
-                   }
-               }
+               SysUser sysUser =sysUserService.selectUserById(ticket.getUserMg());
                if(!params.containsKey("userMg")){
-                   params.put("userMg", Texts.of(contentUserMg.toString()).fontSize(10).bold().create());
+                   params.put("userMg", Texts.of(sysUser.getNickName()).fontSize(10).bold().create());
                }
            }
            //承包商
@@ -553,7 +546,7 @@ public class TInvoiceBookingworkticketController extends BaseController
                params.put("workEndTime",Texts.of(DateUtils.dateTime(ticket.getWorkEndTime())).fontSize(10).bold().create());
            }
            //关联票号
-           params.put("associated"+i, Texts.of( "Steam Cracker"+ticket.getId()+"-"+tInvoiceWorkcontent.getId().toString()).fontSize(10).bold().create());
+           params.put("associated"+i, Texts.of(tInvoiceWorkcontent.getReservationNumber()).fontSize(10).bold().create());
 
            params.put("urlImg", "C:\\Users\\shi'sen'yuan\\Downloads\\SamplePNGImage_3mbmb.png");
            content.delete(0, content.length());

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

@@ -87,7 +87,7 @@ public class TInvoiceBookingworkticket extends BaseEntity
 
     /** 用户主管 */
     @Excel(name = "用户主管")
-    private String userMg;
+    private Long userMg;
 
     /** 用户单位 */
     @Excel(name = "用户单位")
@@ -249,12 +249,12 @@ public class TInvoiceBookingworkticket extends BaseEntity
     {
         return deptId;
     }
-    public void setUserMg(String userMg)
+    public void setUserMg(Long userMg)
     {
         this.userMg = userMg;
     }
 
-    public String getUserMg()
+    public Long getUserMg()
     {
         return userMg;
     }

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

@@ -69,6 +69,10 @@ public class TInvoiceWorkcontent extends BaseEntity
     @Excel(name = "关联的预约开票ID")
     private Long bookingticketId;
 
+    /** 预约票号 */
+    @Excel(name = "预约票号")
+    private String reservationNumber;
+
     private TInvoiceBookingworkticket bookingworkticket;
 
     /** 部门编号 */
@@ -202,6 +206,16 @@ public class TInvoiceWorkcontent extends BaseEntity
         return deptId;
     }
 
+    public void setReservationNumber(String reservationNumber)
+    {
+        this.reservationNumber = reservationNumber;
+    }
+
+    public String getReservationNumber()
+    {
+        return reservationNumber;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -220,6 +234,7 @@ public class TInvoiceWorkcontent extends BaseEntity
             .append("bookingticketId", getBookingticketId())
                 .append("bookingworkticket", getBookingworkticket())
             .append("deptId", getDeptId())
+                .append("reservationNumber", getReservationNumber())
             .toString();
     }
 

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

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bookingticketId"    column="bookingticket_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="deptName" column="dept_name" />
+        <result property="reservationNumber"    column="reservation_number"    />
     </resultMap>
 
     <sql id="selectTInvoiceWorkcontentVo">
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="guardianUnit != null  and guardianUnit != ''"> and guardian_unit = #{guardianUnit}</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>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             and d.del_flag = 0
         </where>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="estimateWorktime != null">estimate_worktime,</if>
             <if test="bookingticketId != null">bookingticket_id,</if>
             <if test="deptId != null">dept_id,</if>
+            <if test="reservationNumber != null">reservation_number,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -95,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="estimateWorktime != null">#{estimateWorktime},</if>
             <if test="bookingticketId != null">#{bookingticketId},</if>
             <if test="deptId != null">#{deptId},</if>
+            <if test="reservationNumber != null">#{reservationNumber},</if>
          </trim>
     </insert>
 
@@ -115,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="estimateWorktime != null">estimate_worktime = #{estimateWorktime},</if>
             <if test="bookingticketId != null">bookingticket_id = #{bookingticketId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="reservationNumber != null">reservation_number = #{reservationNumber},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -260,7 +260,7 @@
               v-for="dict in userMgOptions"
             :key="dict.userId"
             :label="dict.nickName"
-            :value="dict.nickName"
+            :value="dict.userId"
             ></el-option>
           </el-select>
         </el-form-item>