LY 工作票bug fix

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

@@ -507,7 +507,7 @@ public class TInvoiceBookingworkticketController extends BaseController
         String fileDir = RuoYiConfig.getProfile() + "/"+ "ticketWord";
         // 生成word的文件名称
         // 承包商+联系人+当前时间
-        String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm"));
+        String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss"));
         String fileName = invoiceBookingworkticket.getWorkUnit()+invoiceBookingworkticket.getContact() +time+".docx";
         String wordPath = this.createWord(templatePath, fileDir, fileName, params);
 

master/src/main/resources/mybatis/ehs/TJobticketMapper.xml

@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="postponeNumber != null "> and postpone_number = #{postponeNumber}</if>
             <if test="userMg != null "> and user_mg = #{userMg}</if>
             <if test="userUnit != null "> and user_unit = #{userUnit}</if>
-            <if test="tag != null "> and tag = #{tag}</if>
+            <if test="tag != null and tag != '' "> and tag = #{tag}</if>
             and d.del_flag = 0 and xpxp = 10
         </where>
         <!-- 数据范围过滤 -->