张丁 修复预约票台账导出数据不正确bug

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

@@ -120,8 +120,6 @@ public class TInvoiceBookingworkticketController extends BaseController
         logger.info(JSON.toJSONString(tInvoiceBookingworkticket));
         //字典查询
         List<SysDictData> book_work_type = iSysDictTypeService.selectDictDataByType("book_work_type");
-        List<SysDictData> book_work_unit = iSysDictTypeService.selectDictDataByType("book_work_unit");
-        List<SysDictData> book_work_area = iSysDictTypeService.selectDictDataByType("book_work_area");
         //
         List<TInvoiceWorkcontent>  newtInvoiceWorkcontentList =new ArrayList<>();
         List<TInvoiceBookingworkticket> list = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketList(tInvoiceBookingworkticket);
@@ -184,7 +182,7 @@ public class TInvoiceBookingworkticketController extends BaseController
         for (TInvoiceWorkcontent t: newtInvoiceWorkcontentList) {
             Row row = sheet.createRow(rowIndex);
             row.createCell(0).setCellValue("扬子石化-巴斯夫有限责任公司");
-            //
+            //作业类型
             if (t.getWorkType()!= null){
                 for (SysDictData p : book_work_type) {
                     if (t.getWorkType().toString().equals(p.getDictValue())) {
@@ -199,21 +197,15 @@ public class TInvoiceBookingworkticketController extends BaseController
             if (t.getBookingworkticket().getWorkEndTime()!= null){
                 row.createCell(3).setCellValue(new SimpleDateFormat("yyyy/MM/dd").format(t.getBookingworkticket().getWorkEndTime()));
             }
-            if (t.getBookingworkticket().getWorkArea()!= null){
-                for (SysDictData p : book_work_area) {
-                    if (t.getBookingworkticket().getWorkArea().toString().equals(p.getDictValue())) {
-                        row.createCell(4).setCellValue(p.getDictLabel());
-                    }
-                }
+            //作业地址
+            if (t.getWorkDescription()!= null){
+                        row.createCell(4).setCellValue(t.getWorkDescription());
+
             }
             row.createCell(5).setCellValue("是");
-            //
+            //作业单位
             if (t.getBookingworkticket().getWorkUnit()!= null){
-                for (SysDictData p : book_work_unit) {
-                    if (t.getBookingworkticket().getWorkUnit().toString().equals(p.getDictValue())) {
-                        row.createCell(6).setCellValue(p.getDictLabel());
-                    }
-                }
+                        row.createCell(6).setCellValue(t.getBookingworkticket().getWorkUnit());
             }
             //
             row.createCell(7).setCellValue(t.getBookingworkticket().getContact());

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndSuccessListener.java

@@ -166,7 +166,6 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
         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> DEPARTMENT = iSysDictTypeService.selectDictDataByType("DEPARTMENT");
         //构造模板的value
         StringBuilder content=new StringBuilder();
         StringBuilder contentUserUnit=new StringBuilder();

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

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTInvoiceBookingworkticketById" parameterType="Long" resultMap="TInvoiceBookingworkticketResult">
         <include refid="selectTInvoiceBookingworkticketVo"/>
         where id = #{id}
+        and d.del_flag = 0
     </select>
         
     <insert id="insertTInvoiceBookingworkticket" parameterType="TInvoiceBookingworkticket" useGeneratedKeys = "true" keyProperty = "id">

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

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTInvoiceWorkcontentById" parameterType="Long" resultMap="TInvoiceWorkcontentResult">
         <include refid="selectTInvoiceWorkcontentVo"/>
         where id = #{id}
+        and d.del_flag = 0
     </select>
 
     <select id="selectTInvoiceWorkcontentBybookingticketId" parameterType="Long" resultMap="TInvoiceWorkcontentResult">