发票-个人开票列表调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/controller/CwFinanceInvoiceController.java

@@ -86,6 +86,9 @@ public class CwFinanceInvoiceController {
                     i.setAuditUserIdsInvalid(flowTaskService.getTaskAuditUsers(i.getInvalidTaskId()));  // 获取数据审核人
                 }
             }
+            if(StringUtils.isNotBlank(i.getBillingType()) && "2".equals(i.getBillingType()) && StringUtils.isNotBlank(i.getName())){
+                i.setBillingWorkplaceReal(i.getName());
+            }
         });
         System.out.println("当前时间2："+System.currentTimeMillis());
         return ResponseEntity.ok (result);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -255,6 +255,9 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
             if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReportType())){
                 queryWrapper.eq("fi.report_type",cwFinanceInvoiceDTO.getReportType()).or(i->i.eq("pr.report_type",cwFinanceInvoiceDTO.getReportType()));
             }
+            if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getName())){
+                queryWrapper.like("fi.name",cwFinanceInvoiceDTO.getName());
+            }
 
             // 对账人
 //            if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getReconciliationPeopleName())) {