LY 预约票导出问题

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

@@ -21,6 +21,7 @@ import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
 import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
 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;
@@ -130,15 +131,20 @@ public class TInvoiceBookingworkticketController extends BaseController
         logger.info(JSON.toJSONString(tInvoiceBookingworkticket));
         //字典查询
         List<SysDictData> book_work_type = iSysDictTypeService.selectDictDataByType("book_work_type");
-        //
 
         List<TInvoiceWorkcontent> tInvoiceWorkcontentList = tInvoiceBookingworkticketService.selectTInvoiceWorkcontentList(tInvoiceBookingworkticket);
         for (TInvoiceWorkcontent workcontent : tInvoiceWorkcontentList) {
-
                 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) {
+                iterator.remove();
+            }
+        }
         SXSSFWorkbook wb = new SXSSFWorkbook(1000);
         CellStyle wrapStyle = wb.createCellStyle();
         wrapStyle.setWrapText(true);    //设置自动换行
@@ -311,29 +317,29 @@ public class TInvoiceBookingworkticketController extends BaseController
             List<String> contentlist = Arrays.asList(wtArr);
             if(contentlist.contains("2")){
                workType0++;
-            }else  if(contentlist.contains("3")){
+            }if(contentlist.contains("3")){
                 workType1++;
-            }else  if(contentlist.contains("1")){
+            }if(contentlist.contains("1")){
                 workType2++;
-            }else  if(contentlist.contains("5")||contentlist.contains("6")||contentlist.contains("7")||contentlist.contains("8")){
+            }if(contentlist.contains("5")||contentlist.contains("6")||contentlist.contains("7")||contentlist.contains("8")){
                 workType3++;
-            }else  if(contentlist.contains("15")){
+            }if(contentlist.contains("15")){
                 workType4++;
-            }else  if(contentlist.contains("12")||contentlist.contains("13")||contentlist.contains("14")){
+            }if(contentlist.contains("12")||contentlist.contains("13")||contentlist.contains("14")){
                 workType5++;
-            }else  if(contentlist.contains("4")){
+            }if(contentlist.contains("4")){
                 workType6++;
-            }else  if(contentlist.contains("9")){
+            }if(contentlist.contains("9")){
                 workType7++;
-            }else  if(contentlist.contains("10")){
+            }if(contentlist.contains("10")){
                 workType8++;
-            }else  if(contentlist.contains("11")){
+            }if(contentlist.contains("11")){
                 workType9++;//盲板
-            }else  if(contentlist.contains("17")){
+            }if(contentlist.contains("17")){
                 workType11++;//清罐
-            }else  if(contentlist.contains("16")){
+            }if(contentlist.contains("16")){
                 workType12++;//倒灌
-            }else  if(contentlist.contains("18")){
+            }if(contentlist.contains("18")){
                 workType13++;//切水
             }else {
                 //变更、承包、停车装置暂无数据

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

@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by b.work_start_time ,d.bookingticket_id desc
+        order by b.work_start_time desc ,d.bookingticket_id desc
     </select>
 
     <select id="selectDetailById" parameterType="Long" resultMap="TInvoiceBookingworkticketResultVo">

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

@@ -640,13 +640,13 @@ export default {
     // 自定义校验重复数据规则
     checkSame(rule, value, callback){
       // rule 对应使用bargainMoney自定义验证的 对象
-      // value 对应使用bargainMoney自定义验证的 数值 
+      // value 对应使用bargainMoney自定义验证的 数值
       // callback 回调函数
           let arr=[]
           this.ruleForm.forEach(item => {
 
           arr.push(item.workDescription)
-       }) 
+       })
 	         for (var i=0; i<arr.length; i++) {
         for (var j=i+1; j<arr.length; j++) {
             if (arr[i] == arr[j]) {
@@ -657,7 +657,7 @@ export default {
         }
         return callback();
     }
-     
+
     },
     //得到行key
     getRowKey(row) {
@@ -666,11 +666,11 @@ export default {
     //作业票统计
     tickedStatis(){
         let putData=this.$refs.multipleTable.selection
-     
+
           batchAddJobticket(putData).then(response => {
        this.msgSuccess(this.$t(response.msg));
       });
-  
+
     },
     //根据用户单位 查询对应选择的用户主管  根据用户单位 字段 查找对应的多个主管 返回 Sysuser的集合(id,name)
         checkCategoryPromotion(oneId){
@@ -805,7 +805,7 @@ export default {
             strDate = "0" + strDate;
         }
         var currentdate = year + seperator1 + month + seperator1 + strDate;
-        this.queryParams.createdate=currentdate
+        // this.queryParams.createdate=currentdate
         return currentdate;
     },
     // 重置方法
@@ -1120,7 +1120,7 @@ export default {
       putData.mbzyxkzh=this.licenseForm.mbzyxkzh
       putData.gczyxkzh=this.licenseForm.gczyxkzh
       putData.gczyjb=this.licenseForm.gczyjb
-    
+
        }else{
         return  this.msgError("请至少关联一张许可证号");
       }