LY 工作票

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

@@ -122,12 +122,23 @@ public class TInvoiceBookingworkticketController extends BaseController {
             TInvoiceBookingworkticket bookingworkticket = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(workcontent.getBookingticketId());
             workcontent.setBookingworkticket(bookingworkticket);
         }
-        //除去作废的票 以及 续票
-        Iterator<TInvoiceWorkcontent> iterator = tInvoiceWorkcontentList.iterator();
-        while (iterator.hasNext()) {
-            TInvoiceWorkcontent t = iterator.next();
-            if (t.getBookingworkticket().getStatus() != 3 || t.getXpxp().equals("12")) {
-                iterator.remove();
+        if (tInvoiceBookingworkticket.getStatus() != null && tInvoiceBookingworkticket.getStatus() == 7){
+            //除去作废的票 以及 续票
+            Iterator<TInvoiceWorkcontent> iterator = tInvoiceWorkcontentList.iterator();
+            while (iterator.hasNext()) {
+                TInvoiceWorkcontent t = iterator.next();
+                if (t.getBookingworkticket().getStatus() == 7 || t.getXpxp().equals("12")) {
+                    iterator.remove();
+                }
+            }
+        }else {
+            //除去未完成的票 以及 续票
+            Iterator<TInvoiceWorkcontent> iterator = tInvoiceWorkcontentList.iterator();
+            while (iterator.hasNext()) {
+                TInvoiceWorkcontent t = iterator.next();
+                if (t.getBookingworkticket().getStatus() != 3 || t.getXpxp().equals("12")) {
+                    iterator.remove();
+                }
             }
         }
 
@@ -233,9 +244,9 @@ public class TInvoiceBookingworkticketController extends BaseController {
         StringBuilder contentUserWorkType = new StringBuilder();
         String cuw = "";
         for (TInvoiceWorkcontent t : newWorkcontentList) {
-            if (t.getBookingworkticket().getStatus() != 3) {
-                continue;
-            }
+//            if (t.getBookingworkticket().getStatus() != 3) {
+//                continue;
+//            }
             Row row = sheet.createRow(rowIndex);
             row.createCell(0).setCellValue("扬子石化-巴斯夫有限责任公司");
             //作业类型

master/src/main/resources/mybatis/sems/TReportYlgdMapper.xml

@@ -236,8 +236,8 @@
             <if test="createdate != null">createdate,</if>
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
-            <if test="yearWarnDate != null">check_date</if>
-            <if test="yearNextWarnDate != null">next_check_date </if>
+            <if test="yearWarnDate != null">check_date,</if>
+            <if test="yearNextWarnDate != null">next_check_date,</if>
             pj1,pj2,pj3,pj4,pj5,pj6,pj7,pj8,pj9,pj10,pj11,pj12,pj13,con
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">

master/src/main/resources/mybatis/sems/TReportYlrqMapper.xml

@@ -206,8 +206,8 @@
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
             <if test="yearReportNo != null">year_report_no,</if>
-            <if test="yearWarnDate != null">check_date</if>
-            <if test="yearNextWarnDate != null">next_check_date </if>
+            <if test="yearWarnDate != null">check_date,</if>
+            <if test="yearNextWarnDate != null">next_check_date, </if>
             pj1,pj2,pj3,pj4,pj5,pj6,pj7,pj8,pj9,pj10,pj11,pj12,pj13,pj14,pj15,pj16,pj17,
             pj18,pj19,pj20,pj21,pj22,pj23,pj24,pj25,pj26,pj27,pj28,pj29,pj30,pj31,pj32,con
         </trim>

ui/src/api/invoice/bookingworkticket.js

@@ -73,6 +73,14 @@ export function exportBookingworkticketZb(query) {
     params: query
   })
 }
+// 导出预约作业票台账值班
+export function exportBookingworkticketNowAll(query) {
+  return request({
+    url: '/invoice/bookingworkticket/exportBookNowAll',
+    method: 'get',
+    params: query
+  })
+}
 
 // 生成word并预览作业票
 export function seeBookingworkticket(query) {

ui/src/views/ehs/jobticket/index.vue

@@ -963,7 +963,9 @@ export default {
     },
     //根据用户单位 查询对应选择的用户主管  根据用户单位 字段 查找对应的多个主管 返回 Sysuser的集合(id,name)
     checkCategoryPromotion(oneId) {
-
+      if (!oneId){
+        return
+      }
       getUserByUnit(oneId).then(response => {
         //     this.form.userMg=null;
         this.userMgOptions = response.data;

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

@@ -141,6 +141,16 @@
         >值班导出
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExportNowAll"
+          v-hasPermi="['invoice:bookingworkticket:export']"
+        >导出当前所有
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="cancelQuery"></right-toolbar>
     </el-row>
 
@@ -526,6 +536,7 @@ import {
   updateBookingworkticket,
   exportBookingworkticket,
   exportBookingworkticketZb,
+  exportBookingworkticketNowAll,
   cancelBookingworkticket,
   importTemplate,
   seeBookingworkticket,
@@ -864,7 +875,6 @@ export default {
     },
     //根据用户单位 查询对应选择的用户主管  根据用户单位 字段 查找对应的多个主管 返回 Sysuser的集合(id,name)
     checkCategoryPromotion(oneId) {
-
       getUserByUnit(oneId).then(response => {
         //     this.form.userMg=null;
         this.userMgOptions = response.data;
@@ -1289,6 +1299,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
+      queryParams.status = null
       this.$confirm('是否确认导出所有预约作业票台账数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1312,6 +1323,22 @@ export default {
         this.download(response.msg);
       })
     },
+
+    /** 当前所有导出按钮操作 */
+    handleExportNowAll() {
+      const queryParams = this.queryParams;
+      queryParams.status = 7
+      this.$confirm('是否确认导出预约作业票台账数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportBookingworkticket(queryParams);
+      }).then(response => {
+        queryParams.status = null
+        this.download(response.msg);
+      })
+    },
     /** 导出按钮操作 */
     handleExportToday() {
       const queryParams = {};
@@ -1329,6 +1356,9 @@ export default {
     // 预约续票
     handleXp(row) {
       this.xpForm = base.deepClone(row)
+      if(!this.xpForm.yqxkzh) {
+        this.xpForm.yqxkzh = 'V'
+      }
       this.xpVisible = true
     },
     //提交预约续票