Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/controller/ReimbursementInfoController.java

@@ -149,8 +149,8 @@ public class ReimbursementInfoController {
     @GetMapping("exportInvoiceReimbursementFile")
     @ApiOperation(value = "评估电子发票报销数据")
     public void exportInvoiceReimbursementFile(QueryListDto cwDTO, Page <RetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
-        String fileName = "评估电子发票报销数据表";
-        String sheetName = "评估电子发票报销列表";
+        String fileName = "评估数电发票报销数据表";
+        String sheetName = "评估数电发票报销列表";
         List<RetureListDto> result = new ArrayList<>();
         if ( ExportMode.current.equals ( options.getMode() ) ) {
             result = service.list (page,cwDTO).getRecords();

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/controller/CcpmReimbursementInfoController.java

@@ -177,8 +177,8 @@ public class CcpmReimbursementInfoController {
     @GetMapping("exportInvoiceReimbursementFile")
     @ApiOperation(value = "项目电子发票报销数据")
     public void exportInvoiceReimbursementFile(CcpmQueryListDto cwDTO, Page <CcpmRetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
-        String fileName = "项目电子发票报销数据表";
-        String sheetName = "项目电子发票报销列表";
+        String fileName = "项目数电发票报销数据表";
+        String sheetName = "项目数电发票报销列表";
         List<CcpmRetureListDto> result = new ArrayList<>();
         if (ExportMode.current.equals ( options.getMode() ) ) {
             result = service.list (page,cwDTO).getRecords();

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/controller/ZsReimbursementInfoController.java

@@ -175,8 +175,8 @@ public class ZsReimbursementInfoController {
     @GetMapping("exportInvoiceReimbursementFile")
     @ApiOperation(value = "中审电子发票报销数据")
     public void exportInvoiceReimbursementFile(ZsQueryListDto cwDTO, Page <ZsRetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
-        String fileName = "中审电子发票报销数据表";
-        String sheetName = "中审电子发票报销列表";
+        String fileName = "中审数电发票报销数据表";
+        String sheetName = "中审数电发票报销列表";
         List<ZsRetureListDto> result = new ArrayList<>();
         if (ExportMode.current.equals ( options.getMode() ) ) {
             result = service.list (page,cwDTO).getRecords();

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/controller/ConsultancyReimbursementInfoController.java

@@ -177,8 +177,8 @@ public class ConsultancyReimbursementInfoController {
     @GetMapping("exportInvoiceReimbursementFile")
     @ApiOperation(value = "项目电子发票报销数据")
     public void exportInvoiceReimbursementFile(ConsultancyQueryListDto cwDTO, Page <ConsultancyRetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
-        String fileName = "项目电子发票报销数据表";
-        String sheetName = "项目电子发票报销列表";
+        String fileName = "项目数电发票报销数据表";
+        String sheetName = "项目数电发票报销列表";
         List<ConsultancyRetureListDto> result = new ArrayList<>();
         if (ExportMode.current.equals ( options.getMode() ) ) {
             result = service.list (page,cwDTO).getRecords();

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

@@ -336,6 +336,10 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                     if ("1".equals(item.getIsPreInvoice())){
                         item.setIsCompleteInvoice("2");
                     }
+                }else if (StringUtils.isNotBlank(item.getIsPreInvoice()) && StringUtils.isBlank(item.getReportNos()) && StringUtils.isNotBlank(item.getNo())){
+                    if ("1".equals(item.getIsPreInvoice())){
+                        item.setIsCompleteInvoice("0");
+                    }
                 }
             });
         }else{

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/controller/CwReimbursementInfoController.java

@@ -230,8 +230,8 @@ public class CwReimbursementInfoController {
     @GetMapping("exportInvoiceReimbursementFile")
     @ApiOperation(value = "财务电子发票报销数据")
     public void exportInvoiceReimbursementFile(QueryListDto cwDTO, Page <RetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
-        String fileName = "财务电子发票报销数据表";
-        String sheetName = "财务电子发票报销列表";
+        String fileName = "财务数电发票报销数据表";
+        String sheetName = "财务数电发票报销列表";
         List<RetureListDto> result = new ArrayList<>();
         if ( com.jeeplus.common.excel.ExportMode.current.equals ( options.getMode() ) ) {
             result = service.list (page,cwDTO).getRecords();
@@ -276,8 +276,8 @@ public class CwReimbursementInfoController {
     @GetMapping("exportInvoiceReimbursementFile2")
     @ApiOperation(value = "财务电子发票报销数据")
     public void exportInvoiceReimbursementFile2(QueryListDto cwDTO, Page <RetureListDto> page, ExcelOptions options, HttpServletResponse response) throws Exception {
-        String fileName = "财务电子发票报销数据表";
-        String sheetName = "财务电子发票报销列表";
+        String fileName = "数电发票报销数据表";
+        String sheetName = "数电发票报销列表";
         List<RetureListDto> result = new ArrayList<>();
         if ( com.jeeplus.common.excel.ExportMode.current.equals ( options.getMode() ) ) {
             result = service.list2 (page,cwDTO).getRecords();