Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/operation/claimbilling/claimbilling.vue

@@ -31,6 +31,9 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.closeDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
+              <el-form-item label="开票单位">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="开票名称">
                 <el-input v-model="listQuery.params.invoiceName" placeholder="" clearable/>
               </el-form-item>
@@ -72,6 +75,7 @@
             <el-table-column prop="createByName" label="申请人" align="center" width="120" />
             <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
             <el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
+            <el-table-column prop="purchaseSystemName" label="开票单位" align="center" width="120" />
             <el-table-column prop="invoiceName" label="开票名称" align="center" width="100" />
             <el-table-column prop="invoiceValue" label="开票类型" align="center" width="100" />
             <el-table-column prop="invoiceMoney" label="开票金额" align="center" width="100" />
@@ -168,6 +172,7 @@ export default {
           closeDateEnd: '',
           invoiceName: '',
           invoiceValue: '',
+          purchaseSystemName: '',
           menuUrl: '',
           userSid: '',
           orgPath: ''
@@ -291,6 +296,7 @@ export default {
           closeDateEnd: '',
           invoiceName: '',
           invoiceValue: '',
+          purchaseSystemName: '',
           menuUrl: '',
           userSid: '',
           orgPath: ''

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java

@@ -31,6 +31,8 @@ public class AsBusclaimInvoiceBillQuery implements Query {
     private String closeDateEnd;
     @ApiModelProperty("开票名称")
     private String invoiceName;
+    @ApiModelProperty("开票单位名称")
+    private String purchaseSystemName;
     @ApiModelProperty("开票类型key")
     private String invoiceValue;
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.as.api.asappendix.AsAppendix;
-import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply;
 import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
-import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillExcelInfo;
-import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
 import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckDto;
 import com.yxt.anrui.as.api.asbusclaiminvoicebill.*;
 import com.yxt.anrui.as.api.asbusclaiminvoicebill.flowable.*;
@@ -22,7 +19,6 @@ import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillPr
 import com.yxt.anrui.as.api.asbusclaiminvoicebillproject.AsBusclaimInvoiceBillProjectFile;
 import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
 import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
-import com.yxt.anrui.as.api.asbwinvoiceapply.AsBwinvoiceapplyFile;
 import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
 import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusclaimcheck.AsBusclaimCheckService;
@@ -65,10 +61,8 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
@@ -191,6 +185,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         if (StringUtils.isNotBlank(query.getInvoiceName())) {
             qw.like("a.invoiceName", query.getInvoiceName());
         }
+        //开票单位名称
+        if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
+            qw.like("a.purchaseSystemName", query.getPurchaseSystemName());
+        }
         //开票类型
         if (StringUtils.isNotBlank(query.getInvoiceValue())) {
             qw.like("a.invoiceValue", query.getInvoiceValue());