Merge remote-tracking branch 'origin/fix-main-ch' into fix-main-ch

# Conflicts: # src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java

Merge remote-tracking branch 'origin/fix-main-ch' into fix-main-ch
# Conflicts: # src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
曾国涛
2 parents e878b011 b39798e6
Showing 25 changed files with 763 additions and 163 deletions
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/common/utils/EmailSendUtils.java
src/main/java/com/order/erp/controller/IndexController.java
src/main/java/com/order/erp/controller/InvoiceBillOrderController.java
src/main/java/com/order/erp/controller/ProducePaymentCheckBillOrderController.java
src/main/java/com/order/erp/domain/EmailTemplateEnum.java
src/main/java/com/order/erp/domain/FinanceOverEnum.java
src/main/java/com/order/erp/domain/vo/order/FinanceEventJobVO.java
src/main/java/com/order/erp/domain/vo/order/FinanceInvoiceBillOrderVO.java
src/main/java/com/order/erp/domain/vo/order/FinanceProducePayCheckBillOrderVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceAndCheckAnalysisVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceIdAndCheckIdResultVO.java
src/main/java/com/order/erp/domain/vo/order/OrderLockFieldVO.java
src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillVO.java
src/main/java/com/order/erp/job/FinanceJob.java
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/java/com/order/erp/mapper/order/InvoiceBillOrderMapper.java
src/main/java/com/order/erp/service/order/InvoiceBillOrderService.java
src/main/java/com/order/erp/service/order/ProducePaymentCheckBillOrderService.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
@@ -340,4 +340,8 @@ public class Constant {
     public static final String FINANCE_EVENT_TIME = "请自行去系统中查询！";
+    public static final String FINANCE_EVENT_TITLE_INNERNO = " , 对应内部编号为 : ";
+
+    public static final String FINANCE_EVENT_TITLE_PROJECTNO = " , 对应项目号为 : ";
+
 }
@@ -21,10 +21,7 @@ import javax.mail.internet.MimeMessage;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 /**
  * @Author:ch
@@ -55,7 +52,7 @@ public class EmailSendUtils {
         MimeMessage mimeMessage = javaMailSender.createMimeMessage();
         MimeMessageHelper helper= null;
         Map<String, Object> map = new HashMap<>();
-        map.put("context",emailTemplateEnum.getContent());
+        map.put("context",emailTemplateEnum.getContent()+orderEventJobVO.getBaseInfo().getProjectNo());
         map.put("title",emailTemplateEnum.getTitle());
         map.put("data",orderEventJobVO);
         Template template = null;
@@ -136,11 +133,44 @@ public class EmailSendUtils {
             helper.setFrom(sendEmail);
             helper.setTo(receiveemailListArray);
             helper.setSentDate(new Date());
+            // 构建邮件内容（HTML 格式）
+            StringBuilder emailContent = new StringBuilder();
+            emailContent.append("<html><body>");
+
             if(FinanceOverEnum.INVOICE_OVERTIME==emailTemplateEnum){
-                helper.setText(emailTemplateEnum.getDesc()+orderEventJobVO.getInvoiceBillOrderDO().getInvoiceNo()+"  "+ Constant.FINANCE_EVENT_TIME);
+                emailContent.append("<p style='font-size:24px;'>")
+                        .append(emailTemplateEnum.getDesc())
+                        .append("<span style='color:red; font-weight:bold; font-size:24px;'>")
+                        .append(orderEventJobVO.getFinanceInvoiceBillOrderVO().getInvoiceNo())
+                        .append("</span>")
+                        .append(Constant.FINANCE_EVENT_TITLE_INNERNO)
+                        .append("<span style='color:red; font-weight:bold; font-size:24px;'>")
+                        .append(Objects.toString(orderEventJobVO.getFinanceInvoiceBillOrderVO().getInnerNo(), " "))
+                        .append("</span>")
+                        .append(Constant.FINANCE_EVENT_TITLE_PROJECTNO)
+                        .append("<span style='color:red; font-weight:bold; font-size:24px;'>")
+                        .append(Objects.toString(orderEventJobVO.getFinanceInvoiceBillOrderVO().getProjectNo(), " "))
+                        .append("</span>")
+                        .append("</p>");
             }else if(FinanceOverEnum.PRODUCE_PAYMENT_CHECK_OVERTIME==emailTemplateEnum){
-                helper.setText(emailTemplateEnum.getDesc()+orderEventJobVO.getProducePaymentCheckBillOrderDO().getCheckNo()+"  "+Constant.FINANCE_EVENT_TIME);
+                emailContent.append("<p style='font-size:24px;'>")
+                        .append(emailTemplateEnum.getDesc())
+                        .append("<span style='color:red; font-weight:bold; font-size:24px;'>")
+                        .append(orderEventJobVO.getFinanceProducePayCheckBillOrderVO().getCheckNo())
+                        .append("</span>")
+                        .append(Constant.FINANCE_EVENT_TITLE_INNERNO)
+                        .append("<span style='color:red; font-weight:bold; font-size:24px;'>")
+                        .append(Objects.toString(orderEventJobVO.getFinanceProducePayCheckBillOrderVO().getInnerNo(), " "))
+                        .append("</span>")
+                        .append(Constant.FINANCE_EVENT_TITLE_PROJECTNO)
+                        .append("<span style='color:red; font-weight:bold; font-size:24px;'>")
+                        .append(Objects.toString(orderEventJobVO.getFinanceProducePayCheckBillOrderVO().getProjectNo(), " "))
+                        .append("</span>")
+                        .append("</p>");
             }
+            emailContent.append("<p style='font-size:24px;'>").append(Constant.FINANCE_EVENT_TIME).append("</p>");
+            emailContent.append("</body></html>");
+            helper.setText(emailContent.toString(), true);
         } catch ( MessagingException e) {
             throw new RuntimeException("邮件发送失败！", e);
         }
@@ -68,15 +68,15 @@ public class IndexController {
         long orderRecentYearCount = orderBaseInfoService.countRecentYear();
         IndexDataVO indexDataVo = new IndexDataVO();
-        indexDataVo.setOrderFinishedCount(orderTotalFinished);
+        indexDataVo.setOrderFinishedCount(orderTotalFinished);  //订单完成。
         indexDataVo.setOrderRecentMonthFinishedCount(orderRecentMonthFinished);
-        indexDataVo.setOrderInspectingCount(inspecting);
+        indexDataVo.setOrderInspectingCount(inspecting);  //跟单和质检中。
         indexDataVo.setOrderRecentMonthInspectingCount(recentMonthInspecting);
-        indexDataVo.setOrderProfitWaitAuditCount(orderProfitWaitAudit);
+        indexDataVo.setOrderProfitWaitAuditCount(orderProfitWaitAudit);  //利润分析表待审核。
         indexDataVo.setOrderRecentWeekProfitWaitAuditCount(orderRecentWeekProfitWaitAudit);
-        indexDataVo.setOrderReportWaitAuditCount(orderReport);
+        indexDataVo.setOrderReportWaitAuditCount(orderReport);   //项目报告书待审核。
         indexDataVo.setOrderReportRecentYearWaitAuditCount(orderYearReport);
-        indexDataVo.setOrderCount(orderCount);
+        indexDataVo.setOrderCount(orderCount);   //订单初始化。
         indexDataVo.setOrderRecentYearCount(orderRecentYearCount);
         return ServerResult.success(indexDataVo);
@@ -62,7 +62,7 @@ public class InvoiceBillOrderController {
      * @return 查询结果
      */
     @PostMapping("/list_analysis_by")
-    public ServerResult listAnalysisBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillAnalysisVO queryVO) {
+    public ServerResult listAnalysisBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceAndCheckAnalysisVO queryVO) {
         return invoiceBillOrderService.listAnalysisBy(queryVO);
     }
@@ -75,7 +75,7 @@ public class InvoiceBillOrderController {
     @PostMapping(value = "/export")
     @ApiOperation("导出分析列表")
     @AnonymousAccess
-    public void export(HttpServletResponse response, @RequestBody @Validated InvoiceBillAnalysisVO queryVO) throws IOException, Excel4JException {
+    public void export(HttpServletResponse response, @RequestBody @Validated InvoiceAndCheckAnalysisVO queryVO) throws IOException, Excel4JException {
         invoiceBillOrderService.export(response, queryVO);
     }
@@ -39,10 +39,10 @@ public class ProducePaymentCheckBillOrderController {
      * @param queryVO 查询条件
      * @return 查询结果
      */
-    @PostMapping("/list_by_page")
+    /*@PostMapping("/list_by_page")
     public ServerResult listByPage(@RequestBody @Validated({OperateGroup.List.class}) ProducePaymentCheckBillOrderQueryVO queryVO) {
         return producePaymentCheckBillOrderService.listByPage(queryVO);
-    }
+    }*/
     /**
      * 基础订单查询 wanchen
@@ -62,7 +62,7 @@ public class ProducePaymentCheckBillOrderController {
      * @return 查询结果
      */
     @PostMapping("/list_analysis_by")
-    public ServerResult listAnalysisBy(@RequestBody @Validated({OperateGroup.List.class}) ProducePaymentCheckBillOrderQueryVO queryVO) {
+    public ServerResult listAnalysisBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceAndCheckAnalysisVO queryVO) {
         return producePaymentCheckBillOrderService.listAnalysisBy(queryVO);
     }
@@ -75,7 +75,7 @@ public class ProducePaymentCheckBillOrderController {
     @PostMapping(value = "/export")
     @ApiOperation("导出分析列表")
     @AnonymousAccess
-    public void export(HttpServletResponse response, @RequestBody @Validated ProducePaymentCheckBillOrderQueryVO queryVO) throws IOException, Excel4JException {
+    public void export(HttpServletResponse response, @RequestBody @Validated InvoiceAndCheckAnalysisVO queryVO) throws IOException, Excel4JException {
         producePaymentCheckBillOrderService.export(response, queryVO);
     }
@@ -13,27 +13,27 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum EmailTemplateEnum {
-    CONFIRM_SAMPLE_TEMPLATE("确认样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的确认样确认，请尽快完成", 1L),
+    CONFIRM_SAMPLE_TEMPLATE("确认样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的确认样确认，请尽快完成 项目号为: ", 1L),
-    OTHER_SAMPLE_TEMPLATE("EXTRA,SHOWROOM,ONLINE sample发送日期", "您收到此邮件是因为您未能在规定的期限内完成以下货号的EXTRA,SHOWROOM,ONLINE sample的发送，请尽快完成", 2L),
+    OTHER_SAMPLE_TEMPLATE("EXTRA,SHOWROOM,ONLINE sample发送日期", "您收到此邮件是因为您未能在规定的期限内完成以下货号的EXTRA,SHOWROOM,ONLINE sample的发送，请尽快完成 项目号为: ", 2L),
-    BIG_SAMPLE_TEMPLATE("大货样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的大货样确认，请尽快完成", 3L),
+    BIG_SAMPLE_TEMPLATE("大货样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的大货样确认，请尽快完成 项目号为: ", 3L),
-    AITEX_SGS_TEST_TEMPLATE("AITEX/SGS测试状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的AITEX/SGS测试通过，请尽快完成", 4L),
+    AITEX_SGS_TEST_TEMPLATE("AITEX/SGS测试状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的AITEX/SGS测试通过，请尽快完成 项目号为: ", 4L),
-    BARCODE_ARRIVAL_TEMPLATE("要求包材到货日期", "您收到此邮件是因为您未能在规定的期限内收到所有包材，请尽快确认", 5L),
+    BARCODE_ARRIVAL_TEMPLATE("要求包材到货日期", "您收到此邮件是因为您未能在规定的期限内收到所有包材，请尽快确认 项目号为: ", 5L),
-    LATEST_DC_TEMPLATE("最晚订舱日期", "您收到此邮件是因为您未能在规定的期限内完成订舱，请尽快完成", 6L),
+    LATEST_DC_TEMPLATE("最晚订舱日期", "您收到此邮件是因为您未能在规定的期限内完成订舱，请尽快完成 项目号为: ", 6L),
-    END_CHECK_DATE_TEMPLATE("尾期验货日期", "您收到此邮件是因为您未能在规定的期限内完成尾期验货，请尽快完成", 7L),
+    END_CHECK_DATE_TEMPLATE("尾期验货日期", "您收到此邮件是因为您未能在规定的期限内完成尾期验货，请尽快完成 项目号为: ", 7L),
-    MID_CHECK_REPORT_TEMPLATE("中期验货报告", "您好，请查收中期验货报告", 8L),
+    MID_CHECK_REPORT_TEMPLATE("中期验货报告", "您好，请查收中期验货报告 项目号为: ", 8L),
-    END_CHECK_REPORT_TEMPLATE("尾期验货报告", "您好，请查收尾期验货报告", 9L),
+    END_CHECK_REPORT_TEMPLATE("尾期验货报告", "您好，请查收尾期验货报告 项目号为: ", 9L),
     PRODUCE_INDICATE_REPORT("生产指示书","你好，请查收附件生产订单",10L),
-    PRODUCE_IDEA("产品意见信息","你好，请查收产品意见信息",11L),
+    PRODUCE_IDEA("产品意见信息","你好，请查收产品意见信息 项目号为: ",11L),
     ;
@@ -6,8 +6,8 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum FinanceOverEnum {
-    INVOICE_OVERTIME("你有invoice应收款未提交,请查收","Hi All  你以下invoice已超过回款日期,仍未生成应收款对账单提交审核,麻烦财务查询是否已打款,如未打款请业务员及时跟进\n。Invoice号为:"),
-    PRODUCE_PAYMENT_CHECK_OVERTIME("你有生产科对账单未提交,请查收","Hi All 你以下生产科对账单已超过应付款日期,麻烦财务查询是否已打款,如未打款请说明原因,如未收到发票,请业务员及时跟进\n。生产科对账单号为:"),
+    INVOICE_OVERTIME("你有invoice应收款未提交,请查收","Hi All  你以下invoice已超过回款日期,仍未生成应收款对账单提交审核,麻烦财务查询是否已打款,如未打款请业务员及时跟进\n。Invoice号为: "),
+    PRODUCE_PAYMENT_CHECK_OVERTIME("你有生产科对账单未提交,请查收","Hi All 你以下生产科对账单已超过应付款日期,麻烦财务查询是否已打款,如未打款请说明原因,如未收到发票,请业务员及时跟进\n。生产科对账单号为: "),
     ;
     private String title;
@@ -14,7 +14,7 @@ import lombok.experimental.SuperBuilder;
 public class FinanceEventJobVO {
     //应收款。
-    private InvoiceBillOrderDO invoiceBillOrderDO;
+    private FinanceInvoiceBillOrderVO financeInvoiceBillOrderVO;
     //未收款。
-    private ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDO;
+    private FinanceProducePayCheckBillOrderVO financeProducePayCheckBillOrderVO;
 }
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class FinanceInvoiceBillOrderVO {
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * 订单id
+     */
+    private Long orderId ;
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+    /**
+     * 实际回款日期
+     */
+    private String actualRefundDate;
+    /**
+     * 内部编号
+     * */
+    private String innerNo;
+    /**
+     * 项目号
+     * */
+    private String projectNo;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class FinanceProducePayCheckBillOrderVO {
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+
+    /**
+     * orderId
+     */
+    private Long orderId;
+
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+
+    /**
+     * 生产科实际付款日期
+     */
+    private String actualPayedDate;
+    /**
+     * 内部编号
+     */
+    private  String innerNo;
+    /**
+     * 项目号
+     */
+    private String projectNo;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceAndCheckAnalysisVO {
+    //invocieId或者checkId
+    private List<Long> ids;
+    //orderId
+    private List<Long> orderIds;
+    //查询条件
+    private InvoiceBillOrderQueryVO queryVO;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceIdAndCheckIdResultVO {
+
+    private Long orderId;
+    private Long checkId;
+    private Long invoiceId;
+}
@@ -61,7 +61,7 @@ public class OrderLockFieldVO implements Serializable {
      * 应付款账单字段
      */
     //这个专门给发票审核用的。
-    private ProducePaymentCheckBillOrderDO checkBillOrderDO;
+    private ProducePaymentCheckBillVO checkBillVO;
     private  ProducePaymentCheckBillFieldVO producePaymentCheckBillFieldVO;
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillVO {
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+
+    /**
+     * orderId
+     */
+    private Long orderId;
+    /**
+     * 发票url地址
+     */
+    private String invoiceUrl;
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+
+    /**
+     * 生产科实际付款日期
+     */
+    private String actualPayedDate;
+
+    /**
+     * 生产科扣款责任部门
+     */
+    private String deductDept;
+    /**
+     * 生产科扣款金额
+     */
+    private BigDecimal deductAmount;
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actualPayedAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+    //需要在表中添加三个字段。
+    /**
+     * 生产科发票审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer departmentInvoiceStatus;
+
+    /**
+     * 生产科总金额汇总
+     * */
+    private BigDecimal totalProductionAmount;
+    /**
+     * 实际付款金额汇总
+     * */
+    private BigDecimal totalActualPayedAmount;
+    /**
+     * 创建生产科对账单号选择的生产科
+     * */
+    private String productionName;
+    /**
+     * 未付金额
+     * */
+    private BigDecimal unPayedAmount;
+    /**
+     * 业务员
+     * */
+    private String businesPerson;
+    /**
+     * 财务 --审核时使用。
+     * */
+    private String financePerson;
+    /**
+     * 跟单 --业务创建单子,跟单也能看到。
+     * */
+    private String trackerUser;
+    /**
+     * 备注。
+     * */
+    private String notes;
+    /**
+     * 内部编码。
+     * */
+    private String innerNo;
+}
 package com.order.erp.job;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.order.erp.common.constant.Constant;
@@ -12,11 +13,15 @@ import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.AdminUserDO;
 import com.order.erp.domain.dto.admin.AdminUserRoleDO;
 import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
 import com.order.erp.domain.vo.order.FinanceEventJobVO;
+import com.order.erp.domain.vo.order.FinanceInvoiceBillOrderVO;
+import com.order.erp.domain.vo.order.FinanceProducePayCheckBillOrderVO;
 import com.order.erp.service.admin.AdminUserRoleService;
 import com.order.erp.service.admin.AdminUserService;
 import com.order.erp.service.order.InvoiceBillOrderService;
+import com.order.erp.service.order.OrderBaseInfoService;
 import com.order.erp.service.order.ProducePaymentCheckBillOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -28,6 +33,7 @@ import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 @Slf4j
 @Component
@@ -44,8 +50,10 @@ public class FinanceJob {
     private AdminUserService adminUserService;
     @Resource
     private RedisUtils redisService;
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
     //每天的7:15执行一次
-//    @Scheduled(cron = "0 15 7 * * ?", zone = "Asia/Shanghai")
+    @Scheduled(cron = "0 15 7 * * ?", zone = "Asia/Shanghai")
     //每分钟执行一次
 //    @Scheduled(cron = "0 * * * * ?", zone = "Asia/Shanghai")
@@ -55,6 +63,26 @@ public class FinanceJob {
        LocalDate today = LocalDate.now();
         List<InvoiceBillOrderDO> invoiceBillOrderDOList = eventInvoiceBillOrderDO.stream().filter(invoice -> invoice.getBackRefundDate() != null && Strings.isNotEmpty(invoice.getBackRefundDate()))
                 .collect(Collectors.toList());
+        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList= eventProducePaymentCheckBillOrderDO.stream().filter(producePaymentCheckBillOrderDO -> producePaymentCheckBillOrderDO.getPayedDate()!=null && Strings.isNotEmpty(producePaymentCheckBillOrderDO.getPayedDate()))
+                .collect(Collectors.toList());
+        List<Long> orderIds = invoiceBillOrderDOList.stream()
+                .filter(invoice -> Objects.nonNull(invoice.getOrderId()))
+                .map(InvoiceBillOrderDO::getOrderId)
+                .collect(Collectors.toList());
+        List<Long> orderIdList = producePaymentCheckBillOrderDOList.stream()
+                .filter(check -> Objects.nonNull(check.getOrderId()))
+                .map(ProducePaymentCheckBillOrderDO::getOrderId)
+                .collect(Collectors.toList());
+      // 去重
+        List<Long> combinedOrderIds = Stream.concat(
+                        orderIds.stream(),
+                        orderIdList.stream()
+                )
+                .distinct() // 去重
+                .collect(Collectors.toList()); // 转换为 List
+
+        Map<Long, OrderBaseInfoDO> orderBaseInfoInnerMap = orderBaseInfoService.listByIds(combinedOrderIds).stream()
+                .collect(Collectors.toMap(OrderBaseInfoDO::getId, orderBaseInfo -> orderBaseInfo));
         Set<String> emailList= new HashSet<>();
         Set<String> twoEmail = new HashSet<>();
         //获取所有用户。
@@ -98,7 +126,13 @@ public class FinanceJob {
                            emailList.addAll(emails);
                        }
                        FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
-                       eventJobVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
+                       FinanceInvoiceBillOrderVO financeInvoiceBillOrderVO = new FinanceInvoiceBillOrderVO();
+                       BeanUtil.copyProperties(invoiceBillOrderDO,financeInvoiceBillOrderVO );
+                       if(CollectionUtils.isNotEmpty(orderBaseInfoInnerMap) && orderBaseInfoInnerMap.containsKey(invoiceBillOrderDO.getOrderId())){
+                                  financeInvoiceBillOrderVO.setInnerNo(orderBaseInfoInnerMap.get(invoiceBillOrderDO.getOrderId()).getInnerNo());
+                                  financeInvoiceBillOrderVO.setProjectNo(orderBaseInfoInnerMap.get(invoiceBillOrderDO.getOrderId()).getProjectNo());
+                       }
+                       eventJobVO.setFinanceInvoiceBillOrderVO(financeInvoiceBillOrderVO);
                        emailSendUtils.sendEmail(FinanceOverEnum.INVOICE_OVERTIME, new ArrayList<>(emailList), eventJobVO);
                        boolean set = redisService.set(redisKey, invoiceBillOrderDO, Constant.HUNDREDANDFIVE, TimeUnit.DAYS);// 设置为105天后过期
                        if(set){
@@ -108,8 +142,6 @@ public class FinanceJob {
                }
            });
        }
-      List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList= eventProducePaymentCheckBillOrderDO.stream().filter(producePaymentCheckBillOrderDO -> producePaymentCheckBillOrderDO.getPayedDate()!=null && Strings.isNotEmpty(producePaymentCheckBillOrderDO.getPayedDate()))
-               .collect(Collectors.toList());
        if(CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)){
            producePaymentCheckBillOrderDOList.forEach(producePaymentCheckBillOrderDO -> {
                if(today.toString().equals(producePaymentCheckBillOrderDO.getPayedDate())){
@@ -135,7 +167,13 @@ public class FinanceJob {
                            emailList.addAll(emails);
                        }
                        FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
-                       eventJobVO.setProducePaymentCheckBillOrderDO(producePaymentCheckBillOrderDO);
+                       FinanceProducePayCheckBillOrderVO financeProducePayCheckBillOrderVO = new FinanceProducePayCheckBillOrderVO();
+                       BeanUtil.copyProperties(producePaymentCheckBillOrderDO,financeProducePayCheckBillOrderVO);
+                       if(CollectionUtils.isNotEmpty(orderBaseInfoInnerMap) && orderBaseInfoInnerMap.containsKey(producePaymentCheckBillOrderDO.getOrderId())){
+                           financeProducePayCheckBillOrderVO.setInnerNo(orderBaseInfoInnerMap.get(producePaymentCheckBillOrderDO.getOrderId()).getInnerNo());
+                           financeProducePayCheckBillOrderVO.setProjectNo(orderBaseInfoInnerMap.get(producePaymentCheckBillOrderDO.getOrderId()).getProjectNo());
+                       }
+                       eventJobVO.setFinanceProducePayCheckBillOrderVO(financeProducePayCheckBillOrderVO);
                        emailSendUtils.sendEmail(FinanceOverEnum.PRODUCE_PAYMENT_CHECK_OVERTIME, new ArrayList<>(emailList), eventJobVO);
                        boolean set = redisService.set(redisKey, producePaymentCheckBillOrderDO, Constant.HUNDREDANDFIVE, TimeUnit.DAYS);// 设置为21天后过期
                        if(set){
@@ -183,7 +221,13 @@ public class FinanceJob {
                                 twoEmail.addAll(emails);
                             }
                             FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
-                            eventJobVO.setInvoiceBillOrderDO(x);
+                            FinanceInvoiceBillOrderVO financeInvoiceBillOrderVO = new FinanceInvoiceBillOrderVO();
+                            BeanUtil.copyProperties(x,financeInvoiceBillOrderVO );
+                            if(CollectionUtils.isNotEmpty(orderBaseInfoInnerMap) && orderBaseInfoInnerMap.containsKey(x.getOrderId())){
+                                financeInvoiceBillOrderVO.setInnerNo(orderBaseInfoInnerMap.get(x.getOrderId()).getInnerNo());
+                                financeInvoiceBillOrderVO.setProjectNo(orderBaseInfoInnerMap.get(x.getOrderId()).getProjectNo());
+                            }
+                            eventJobVO.setFinanceInvoiceBillOrderVO(financeInvoiceBillOrderVO);
                             emailSendUtils.sendEmail(FinanceOverEnum.INVOICE_OVERTIME, new ArrayList<>(twoEmail), eventJobVO);
                         }
                     });
@@ -218,7 +262,13 @@ public class FinanceJob {
                                 twoEmail.addAll(emails);
                             }
                             FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
-                            eventJobVO.setProducePaymentCheckBillOrderDO(x);
+                            FinanceProducePayCheckBillOrderVO financeProducePayCheckBillOrderVO = new FinanceProducePayCheckBillOrderVO();
+                            BeanUtil.copyProperties(x,financeProducePayCheckBillOrderVO);
+                            if(CollectionUtils.isNotEmpty(orderBaseInfoInnerMap) && orderBaseInfoInnerMap.containsKey(x.getOrderId())){
+                                financeProducePayCheckBillOrderVO.setInnerNo(orderBaseInfoInnerMap.get(x.getOrderId()).getInnerNo());
+                                financeProducePayCheckBillOrderVO.setProjectNo(orderBaseInfoInnerMap.get(x.getOrderId()).getProjectNo());
+                            }
+                            eventJobVO.setFinanceProducePayCheckBillOrderVO(financeProducePayCheckBillOrderVO);
                             emailSendUtils.sendEmail(FinanceOverEnum.PRODUCE_PAYMENT_CHECK_OVERTIME, new ArrayList<>(twoEmail), eventJobVO);
                         }
                     });
@@ -160,13 +160,15 @@ public class OrderOverTimeEventJob {
                     //得到订单的尾期验货日期的邮件配置中的邮箱。
                     LambdaQueryWrapper<ReceiveEmailMappingDO> receiveEmailMappingDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
                     receiveEmailMappingDOLambdaQueryWrapper.eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN);
-                    if(!orderEventJob.getBaseInfo().getCustomerCode().contains("-") && !orderEventJob.getBaseInfo().getCustomerCode().contains("——")){
-                        receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderEventJob.getBaseInfo().getCustomerCode())
-                        .last("limit 1");
-                    }else{
-                        receiveEmailMappingDOLambdaQueryWrapper.like(ReceiveEmailMappingDO::getTypeValue, orderEventJob.getBaseInfo().getCustomerCode().split("-")[0])
-                         .last("limit 1");
-                    }
+//                    if(!orderEventJob.getBaseInfo().getCustomerCode().contains("-") && !orderEventJob.getBaseInfo().getCustomerCode().contains("——")){
+//                        receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderEventJob.getBaseInfo().getCustomerCode())
+//                        .last("limit 1");
+//                    }else{
+//                        receiveEmailMappingDOLambdaQueryWrapper.like(ReceiveEmailMappingDO::getTypeValue, orderEventJob.getBaseInfo().getCustomerCode().split("-")[0])
+//                         .last("limit 1");
+//                    }
+                    receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderEventJob.getBaseInfo().getCustomerCode())
+                       .last("limit 1");
                     ReceiveEmailMappingDO receiveEmailMappingDO = receiveEmailMappingService.getOne( receiveEmailMappingDOLambdaQueryWrapper);
                     List<String> emailList = new ArrayList<>();
                     if (Objects.nonNull(receiveEmailMappingDO)) {
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
 import com.order.erp.domain.vo.order.FinanceOrderResultVO;
 import com.order.erp.domain.vo.order.InvoiceBillOrderQueryVO;
+import com.order.erp.domain.vo.order.InvoiceIdAndCheckIdResultVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -23,5 +24,7 @@ List&lt;InvoiceBillOrderDO&gt; getOverEventList();
     IPage<FinanceOrderResultVO> byConditionGetOrder(@Param("page") Page<FinanceOrderResultVO> page, @Param("queryVO") InvoiceBillOrderQueryVO queryVO);
+    List<InvoiceIdAndCheckIdResultVO> byQuerygetInvoiceIdAndCheckId(@Param("queryVO") InvoiceBillOrderQueryVO queryVO);
+
 }
@@ -35,13 +35,13 @@ public interface InvoiceBillOrderService extends IService&lt;InvoiceBillOrderDO&gt; {
      * @param queryVO
      * @return
      */
-    ServerResult listAnalysisBy(InvoiceBillAnalysisVO queryVO);
+    ServerResult listAnalysisBy(InvoiceAndCheckAnalysisVO queryVO);
     /**
      * @param queryVO
      * @return
      */
-    ServerResult export(HttpServletResponse response, InvoiceBillAnalysisVO queryVO) throws IOException;
+    ServerResult export(HttpServletResponse response, InvoiceAndCheckAnalysisVO queryVO) throws IOException;
     /**
      * 新增数据
@@ -23,7 +23,7 @@ public interface ProducePaymentCheckBillOrderService extends IService&lt;ProducePay
      * @param queryVO 筛选条件
      * @return 查询结果
      */
-    ServerResult listByPage(ProducePaymentCheckBillOrderQueryVO queryVO);
+//    ServerResult listByPage(ProducePaymentCheckBillOrderQueryVO queryVO);
     /**
      * 基础订单查询
@@ -36,17 +36,17 @@ public interface ProducePaymentCheckBillOrderService extends IService&lt;ProducePay
     /**
      * 分析列表
      *
-     * @param analysisVO
+     * @param queryVO
      * @return
      */
-    ServerResult listAnalysisBy(ProducePaymentCheckBillOrderQueryVO analysisVO);
+    ServerResult listAnalysisBy(InvoiceAndCheckAnalysisVO queryVO);
     /**
      *
-     * @param analysisVO
+     * @param queryVO
      * @return
      */
-    ServerResult export(HttpServletResponse response, ProducePaymentCheckBillOrderQueryVO analysisVO) throws IOException;
+    ServerResult export(HttpServletResponse response, InvoiceAndCheckAnalysisVO queryVO) throws IOException;
     /**
      * 创建生产科应付单据
@@ -95,7 +95,36 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         //分页查询既会筛选基本信息也会筛选invoice信息。只能是选通过一边,要么是基本信息这边,要么是invoice这边,然后根据对应invoice或者orderId去查询。
         //例如:查询基本信息中项目号为A01-C2409,并且invoice状态为已通过,那么就先去基本信息中查找A01-C2409,然后找到对应的invoice,判断A01-C2409对应的订单集合是否有invoice,有的话,就查找已通过的invocie。
         //要是查询invoice为67,并且订单HOD时间小于2024-12-25,那么就先去invoice中查找是否有checkNo为67的订单,然后查找对应orderId,使用orderId去查找对应订单基本信息,查看是否有HOD小于2024-12-25的单子。
-
+           if(StringUtils.isNotEmpty(queryVO.getCreateStartTime())){
+              queryVO.setCreateStartTime(queryVO.getCreateStartTime().substring(0,10)+" 00:00:00");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getCreateEndTime())){
+            queryVO.setCreateEndTime(queryVO.getCreateEndTime().substring(0,10)+" 23:59:59");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getCheckStartTime())){
+            queryVO.setCheckStartTime(queryVO.getCheckStartTime().substring(0,10)+" 00:00:00");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getCheckEndTime())){
+            queryVO.setCheckEndTime(queryVO.getCheckEndTime().substring(0,10)+" 23:59:59");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getInvoiceStartTime())){
+            queryVO.setInvoiceStartTime(queryVO.getInvoiceStartTime().substring(0,10)+" 00:00:00");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getInvoiceEndTime())){
+            queryVO.setInvoiceEndTime(queryVO.getInvoiceEndTime().substring(0,10)+" 23:59:59");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getOrderHodStartTime())){
+               queryVO.setOrderHodStartTime(queryVO.getOrderHodStartTime().substring(0,10)+" 00:00:00");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getOrderHodEndTime())){
+               queryVO.setOrderHodEndTime(queryVO.getOrderHodEndTime().substring(0,10)+" 23:59:59");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getProductionDepartmentConsignStartTime())){
+            queryVO.setProductionDepartmentConsignStartTime(queryVO.getProductionDepartmentConsignStartTime().substring(0,10)+" 00:00:00");
+           }
+           if(StringUtils.isNotEmpty(queryVO.getProductionDepartmentConsignEndTime())){
+            queryVO.setProductionDepartmentConsignEndTime(queryVO.getProductionDepartmentConsignEndTime().substring(0,10)+" 23:59:59");
+          }
             RoleEnum role = dataScope.getRole();
             Page<FinanceOrderResultVO> page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
             if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())) {
@@ -116,7 +145,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @param queryVO
      * @return
      */
-    private LambdaQueryWrapper<InvoiceBillOrderDO> getQueryWrapper(InvoiceBillOrderQueryVO queryVO) {
+    private LambdaQueryWrapper<InvoiceBillOrderDO> getQueryWrapper(InvoiceAndCheckAnalysisVO queryVO) {
         LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>()
                 .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
                /* .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
@@ -127,7 +156,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
             queryWrapper.in(InvoiceBillOrderDO::getId, queryVO.getIds());
         } else {
-            Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
+            Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO.getQueryVO());
             queryWrapper.in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds);
         }
         return queryWrapper;
@@ -175,12 +204,12 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     }
     @Override
-    public ServerResult listAnalysisBy(InvoiceBillAnalysisVO queryVO) {
+    public ServerResult listAnalysisBy(InvoiceAndCheckAnalysisVO queryVO) {
         return ServerResult.success(getAnalysisResult(queryVO));
     }
     @Override
-    public ServerResult export(HttpServletResponse response, InvoiceBillAnalysisVO queryVO) throws IOException {
+    public ServerResult export(HttpServletResponse response, InvoiceAndCheckAnalysisVO queryVO) throws IOException {
 //        InvoiceBillAnalysisResultVO resultVO = getAnalysisResult(queryVO);
         //第二版
        List<InvoiceBillAnalysisResultVO> resultVO = getAnalysisResult(queryVO);
@@ -315,54 +344,87 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @return
      */
     //第二版
-    private List<InvoiceBillAnalysisResultVO> getAnalysisResult(InvoiceBillAnalysisVO queryVO) {
-        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
-        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(queryWrapper);
-        if (CollectionUtils.isEmpty(invoiceBillOrderDOS)) {
-            return null;
+    private List<InvoiceBillAnalysisResultVO> getAnalysisResult(InvoiceAndCheckAnalysisVO queryVO) {
+
+
+        List<Long> notExistOrderIds = new ArrayList<>();
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = new ArrayList<>();
+        //不通过用户点击勾选来获取。
+        if(CollectionUtils.isEmpty(queryVO.getOrderIds())){
+
+            RoleEnum role=dataScope.getRole();
+            if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())){
+                queryVO.getQueryVO().setTrackerUserName(dataScope.getLoginUserName());
+            }
+            if(Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())){
+                queryVO.getQueryVO().setBusinessUserName(dataScope.getLoginUserName());
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getCreateStartTime())){
+                queryVO.getQueryVO().setCreateStartTime(queryVO.getQueryVO().getCreateStartTime().substring(0,10)+" 00:00:00");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getCreateEndTime())){
+                queryVO.getQueryVO().setCreateEndTime(queryVO.getQueryVO().getCreateEndTime().substring(0,10)+" 23:59:59");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getCheckStartTime())){
+                queryVO.getQueryVO().setCheckStartTime(queryVO.getQueryVO().getCheckStartTime().substring(0,10)+" 00:00:00");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getCheckEndTime())){
+                queryVO.getQueryVO().setCheckEndTime(queryVO.getQueryVO().getCheckEndTime().substring(0,10)+" 23:59:59");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getInvoiceStartTime())){
+                queryVO.getQueryVO().setInvoiceStartTime(queryVO.getQueryVO().getInvoiceStartTime().substring(0,10)+" 00:00:00");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getInvoiceEndTime())){
+                queryVO.getQueryVO().setInvoiceEndTime(queryVO.getQueryVO().getInvoiceEndTime().substring(0,10)+" 23:59:59");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getOrderHodStartTime())){
+                queryVO.getQueryVO().setOrderHodStartTime(queryVO.getQueryVO().getOrderHodStartTime().substring(0,10)+" 00:00:00");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getOrderHodEndTime())){
+                queryVO.getQueryVO().setOrderHodEndTime(queryVO.getQueryVO().getOrderHodEndTime().substring(0,10)+" 23:59:59");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getProductionDepartmentConsignStartTime())){
+                queryVO.getQueryVO().setProductionDepartmentConsignStartTime(queryVO.getQueryVO().getProductionDepartmentConsignStartTime().substring(0,10)+" 00:00:00");
+            }
+            if(StringUtils.isNotEmpty(queryVO.getQueryVO().getProductionDepartmentConsignEndTime())){
+                queryVO.getQueryVO().setProductionDepartmentConsignEndTime(queryVO.getQueryVO().getProductionDepartmentConsignEndTime().substring(0,10)+" 23:59:59");
+            }
+            Set<Long> existOrderIdSet=new HashSet<>();
+            //查询数据
+            List<InvoiceIdAndCheckIdResultVO> idResultVOS = baseMapper.byQuerygetInvoiceIdAndCheckId(queryVO.getQueryVO());
+            List<Long> invoiceIds = idResultVOS.stream().map(x -> x.getInvoiceId()).filter(Objects::nonNull).collect(Collectors.toList());
+            if(CollectionUtils.isEmpty(invoiceIds)){
+                throw new BusinessException("未创建invoice单号！");
+            }
+            //对应
+             invoiceBillOrderDOS = listByIds(invoiceIds);
+            List<Long> existOrderIds = invoiceBillOrderDOS.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
+            existOrderIdSet.addAll(existOrderIds);
+            List<Long> orderIdList = idResultVOS.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
+            notExistOrderIds = orderIdList.stream()
+                    .filter(orderId -> !existOrderIdSet.contains(orderId))
+                    .collect(Collectors.toList());
+
+        }else{
+            LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+            invoiceBillOrderDOS = list(queryWrapper);
+            if (CollectionUtils.isEmpty(invoiceBillOrderDOS)) {
+                return null;
+            }
+            List<Long> existOrderIds = invoiceBillOrderDOS.stream()
+                    .map(InvoiceBillOrderDO::getOrderId)
+                    .collect(Collectors.toList());
+//得到没有创建invoice订单的orderid。
+           notExistOrderIds = queryVO.getOrderIds().stream()
+                    .filter(orderId -> !existOrderIds.contains(orderId))
+                    .collect(Collectors.toList());
+
         }
+
      Map<Long, InvoiceBillOrderDO> invoiceBillOrderDOMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
         List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(invoiceBillOrderDOMap);
-      /*  //得到里面的orderId,这个里面的orderId一定是有对应invocie,不然也不会查出来。然后得到前端传来的orderIds,筛选出没有invoice的orderId。
-        List<Long> existOrderIds = invoiceBillOrderDOS.stream().map(InvoiceBillOrderDO::getOrderId).collect(Collectors.toList());
-        List<Long> notExistOrderIds = queryVO.getOrderIds().stream().filter(x -> !existOrderIds.contains(x)).collect(Collectors.toList());
-        //得到没有invoice的orderIds之后,订单信息,查询利润信息。
-        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
-                .eq(BaseDO::getEnableFlag,Constant.ENABLE_TEN)
-                .in(OrderProfitAnalysisDO::getOrderId,notExistOrderIds));
-        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(notExistOrderIds);
-        //根据客户编码进行分类,计算形同客户编码的利润信息,然后累加。
-        Map<String, List<OrderBaseInfoDO>> groupedByCustomerCode = orderBaseInfoDOList.stream()
-                .collect(Collectors.groupingBy(OrderBaseInfoDO::getCustomerCode));
-        //得到客户编码相同的利润信息。  计算客户编码相同的利润信息的总和。  需要遍历这个map集合,然后把每一次值中的id集合收集起来,每一次遍历代表不同的客户编码。然后得到对应利润信息。
-        HashMap<String, BigDecimal> hashMap = new HashMap<>();
-        for(Map.Entry<String, List<OrderBaseInfoDO>> entry: groupedByCustomerCode.entrySet()){
-          List<OrderBaseInfoDO> entryValue = entry.getValue();
-          List<Long> orderids = entryValue.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
-          List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                  .in(OrderProfitAnalysisDO::getOrderId, orderids));
-          BigDecimal totalCustomerPrice = orderProfitAnalysisDOS.stream()
-                  .map(OrderProfitAnalysisDO::getCustomerTotalPrice) // 提取每个元素的 customerTotalPrice（double 类型）
-                  .filter(Objects::nonNull)                          // 过滤掉 null 值
-                  .map(BigDecimal::valueOf)                          // 转换为 BigDecimal 类型
-                  .reduce(BigDecimal.ZERO, BigDecimal::add);
-          // 累加,其中key为客户编码。
-            hashMap.put(entry.getKey(),totalCustomerPrice);
-      }*/
-
-        List<Long> existOrderIds = invoiceBillOrderDOS.stream()
-                .map(InvoiceBillOrderDO::getOrderId)
-                .collect(Collectors.toList());
+        //获取invoice中对应的orderid。
-        List<Long> notExistOrderIds = queryVO.getOrderId().stream()
-                .filter(orderId -> !existOrderIds.contains(orderId))
-                .collect(Collectors.toList());
-
-// 查询没有 invoice 的订单信息和利润信息
-  /*      List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(
-                new LambdaQueryWrapper<OrderProfitAnalysisDO>()
-                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                        .in(OrderProfitAnalysisDO::getOrderId, notExistOrderIds));*/
         Map<String, BigDecimal> customerProfitMap=null;
         if(CollectionUtils.isNotEmpty(notExistOrderIds)) {
@@ -1265,6 +1327,8 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
             //这里要删除对应invoiceNo号,但是为了删除后产生空指针异常,所以定义为"N/N";
             order.setInvoiceNo("N/N");
+            //设置状态为-1,未创建。
+            order.setInvoiceStatus(FinanceEnum.NOT_CREATED.getStatus());
             return order;
         }).collect(Collectors.toList());
         transactionHelper.run(() -> {
@@ -1354,13 +1418,17 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         //第二行
         Row row2 = sheet.createRow(3);
         Cell cell2 = row2.createCell(0);
-        cell2.setCellValue("提交人：");
+        cell2.setCellValue("提交人："+queryVO.getFinancePerson());
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 1));
         Cell cell3 = row2.createCell(2);
         cell3.setCellValue("");
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 2, 7));
         Cell cell4 = row2.createCell(8);
-        cell4.setCellValue("日期：");
+        if(StringUtils.isNotBlank(queryVO.getActualRefundDate())){
+            cell4.setCellValue("日期："+queryVO.getActualRefundDate());
+        }else{
+            cell4.setCellValue("日期：");
+        }
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 8, 9));
         //第三行
         createMergedCell(sheet, workbook, 5, 0, 5, 6, 0, 1, "INVOICE编号");
@@ -1503,7 +1503,16 @@ end
 //                queryVO.setOrderIds(collect);
 //            }
 //        }
-
+        if(StringUtils.isNotBlank(queryVO.getCreateEndTime())){
+           //要是传递为2024-01-31,不进行处理,他其实没有查询31号这天数据,会默认补00:00:00,就是三十一号的凌晨。
+            queryVO.setCreateEndTime(queryVO.getCreateEndTime().substring(0,10)+" 23:59:59");
+        }
+        if(StringUtils.isNotBlank(queryVO.getOrderHodEndTime())){
+            queryVO.setOrderHodEndTime(queryVO.getOrderHodEndTime().substring(0,10)+" 23:59:59");
+        }
+        if(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignEndTime())){
+            queryVO.setProductionDepartmentConsignEndTime(queryVO.getProductionDepartmentConsignEndTime().substring(0,10)+" 23:59:59");
+        }
         return new LambdaQueryWrapper<OrderBaseInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .in(CollectionUtils.isNotEmpty(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
@@ -1753,15 +1762,23 @@ end
                     orderOpinionLogDOList.add(orderOpinionLogDO);
                 }
                 String date = currentMonth + "/" + dayOfMonth;
+                //旧的
                 String productionComment = orderBaseInfoDo.getProductionComment();
                 StringBuilder stringBuilder = new StringBuilder(productionComment);
                 String[] newProductionComment = updateVO.getBaseInfo().getProductionComment().split("\n");
                //对于四个结果,并且当前输入产品意见文字小于上一次的产品意见后续填写不需要换行。
                 if((!newProductionComment[newProductionComment.length - 1].trim().contains("确认通过") &&
                         !newProductionComment[newProductionComment.length - 1].trim().contains("确认未通过")) && updateVO.getBaseInfo().getProductionComment().length() > orderBaseInfoDo.getProductionComment().length()){
-                    stringBuilder.append("\n").append(date + ": " + newProductionComment[newProductionComment.length - 1].trim());
-                    updateVO.getBaseInfo().setProductionComment(stringBuilder.toString());
-                    sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        String extra=updateVO.getBaseInfo().getProductionComment().substring(productionComment.length());
+                        //当新填写的产品意见是以句号开始,就不换行。
+                       if(extra.substring(0,2).contains("。")){
+                           sendProductionCommentEmail(orderBaseInfoDo,updateVO.getBaseInfo().getProductionComment());
+                        }else{
+                           //其他情况就需要换行
+                        stringBuilder.append("\n").append(date + ": " + newProductionComment[newProductionComment.length - 1].trim());
+                        updateVO.getBaseInfo().setProductionComment(stringBuilder.toString());
+                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                    }
                 }else{
                     sendProductionCommentEmail(orderBaseInfoDo,updateVO.getBaseInfo().getProductionComment());
                 }
@@ -2528,13 +2545,15 @@ end
                 orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsignTime);
                 LambdaQueryWrapper<ReceiveEmailMappingDO> receiveEmailMappingDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 receiveEmailMappingDOLambdaQueryWrapper.eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN);
-                if(!orderBaseInfoDO.getCustomerCode().contains("-") && !orderBaseInfoDO.getCustomerCode().contains("——")){
-                    receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderBaseInfoDO.getCustomerCode())
+//                if(!orderBaseInfoDO.getCustomerCode().contains("-") && !orderBaseInfoDO.getCustomerCode().contains("——")){
+//                    receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderBaseInfoDO.getCustomerCode())
+//                            .last("limit 1");
+//                }else{
+//                    receiveEmailMappingDOLambdaQueryWrapper.like(ReceiveEmailMappingDO::getTypeValue,orderBaseInfoDO.getCustomerCode().split("-")[0])
+//                            .last("limit 1");
+//                }
+                receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderBaseInfoDO.getCustomerCode())
                             .last("limit 1");
-                }else{
-                    receiveEmailMappingDOLambdaQueryWrapper.like(ReceiveEmailMappingDO::getTypeValue,orderBaseInfoDO.getCustomerCode().split("-")[0])
-                            .last("limit 1");
-                }
                 ReceiveEmailMappingDO receiveEmailMappingDO = receiveEmailMappingService.getOne( receiveEmailMappingDOLambdaQueryWrapper);
                 //得到所有的质检员。由于删除了角色,但是用户角色表中的信息没有删除,所以不能直接通过用户角色表拿角色,然后发邮件,需校验。
                 List<AdminUserRoleDO> UserRoleList = adminUserRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
@@ -2582,13 +2601,16 @@ end
                 orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsignTime);
                 LambdaQueryWrapper<ReceiveEmailMappingDO> receiveEmailMappingDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 receiveEmailMappingDOLambdaQueryWrapper.eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN);
-                if(!orderBaseInfoDO.getCustomerCode().contains("-") && !orderBaseInfoDO.getCustomerCode().contains("——")){
+                //不再采用匹配类似的客户编码对应的邮箱,而是直接全部精准匹配,所以需要要求在配置邮箱时需要全部都配置。不再采用A05-low会批匹配上A05。
+/*                if(!orderBaseInfoDO.getCustomerCode().contains("-") && !orderBaseInfoDO.getCustomerCode().contains("——")){
                     receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderBaseInfoDO.getCustomerCode())
                             .last("limit 1");
                 }else{
                     receiveEmailMappingDOLambdaQueryWrapper.like(ReceiveEmailMappingDO::getTypeValue,orderBaseInfoDO.getCustomerCode().split("-")[0])
                             .last("limit 1");
-                }
+                }*/
+                receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderBaseInfoDO.getCustomerCode())
+                           .last("limit 1");
                 ReceiveEmailMappingDO receiveEmailMappingDO = receiveEmailMappingService.getOne( receiveEmailMappingDOLambdaQueryWrapper);
                 //得到所有的质检员。由于删除了角色,但是用户角色表中的信息没有删除,所以不能直接通过用户角色表拿角色,然后发邮件,需校验。
                 List<AdminUserRoleDO> UserRoleList = adminUserRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
@@ -188,12 +188,12 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                             }
                         }//这里结束  上述为待审核列表中应收款要显示内部编码。   //这部分不需要了。
                         //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
-                        if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) {
-                            if ((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getBusinesPerson().equals(loginUserName)) || (Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getBusinesPerson().equals(loginUserName))) {
+                        if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
+                            if((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getBusinesPerson().equals(loginUserName))||(Objects.nonNull(orderLockFieldVO.getCheckBillVO()) && orderLockFieldVO.getCheckBillVO().getBusinesPerson().equals(loginUserName))){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode())) {
-                            if ((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getTrackerUser().equals(loginUserName)) || (Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getTrackerUser().equals(loginUserName))) {
+                            if((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getTrackerUser().equals(loginUserName))||(Objects.nonNull(orderLockFieldVO.getCheckBillVO()) && orderLockFieldVO.getCheckBillVO().getTrackerUser().equals(loginUserName))){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else {
@@ -427,7 +427,10 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
                     String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                     queryWrapper.apply(
-                            "JSON_CONTAINS(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo'), JSON_QUOTE({0}))",
+                            "(" +
+                                    "JSON_CONTAINS(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo'), JSON_QUOTE({0})) " +
+                                    "OR JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillVO.innerNo')) = {0}" +
+                                    ")",
                             queryInnerNo
                     );
                 }
@@ -471,7 +474,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 // 使用括号分组确保逻辑优先级正确
                 queryWrapper.apply(
                         "((JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.checkNo')) = {0}) " +
-                                "OR (JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillOrderDO.checkNo')) = {0}))",
+                                "OR (JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillVO.checkNo')) = {0}))",
                         checkNos
                 );
             }
@@ -617,9 +620,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         } else if (ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
             OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
-            ProducePaymentCheckBillOrderDO checkBillOrderDO = lockFieldVO.getCheckBillOrderDO();
-
+            ProducePaymentCheckBillVO checkBillOrderDO = lockFieldVO.getCheckBillVO();
+            //得到旧的。
             ProducePaymentCheckBillOrderDO invoiceInfoDO = checkBillOrderService.getById(checkBillOrderDO.getId());
             invoiceInfoDO.setDepartmentInvoiceStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
             //传递给审核一直都是最新的发票。
@@ -816,7 +819,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             applyDO.setAuditUserId(auditUserId);
             applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
             OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
-            ProducePaymentCheckBillOrderDO checkBillOrderDO = lockFieldVO.getCheckBillOrderDO();
+            ProducePaymentCheckBillVO checkBillOrderDO = lockFieldVO.getCheckBillVO();
             //查询旧的。
             ProducePaymentCheckBillOrderDO invoiceInfoDO = checkBillOrderService.getById(checkBillOrderDO.getId());
             invoiceInfoDO.setDepartmentInvoiceStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
@@ -200,6 +200,26 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
     @Override
     public ServerResult<OrderProfitAnalysisVO> analysisByQueryVO(OrderProfitAnalysisVo profitAnalysisVo) {
+        //在分析利润时,这里传递的时间参数为年月日时分秒,会过滤掉当天部分参数。所以截取。
+        if(StringUtils.isNotEmpty(profitAnalysisVo.getQueryVO().getCreateStartTime()) && profitAnalysisVo.getQueryVO().getCreateStartTime().length() > 10){
+            profitAnalysisVo.getQueryVO().setCreateStartTime(profitAnalysisVo.getQueryVO().getCreateStartTime().substring(0,10));
+        }
+        //对于结束时间,要是截取后,就位00:00:00,你就忽略了当天的最后一天数据,所以需要拼接上23:59:59来得到当天的参数。
+        if(StringUtils.isNotEmpty(profitAnalysisVo.getQueryVO().getCreateEndTime()) && profitAnalysisVo.getQueryVO().getCreateEndTime().length() >= 10){
+            profitAnalysisVo.getQueryVO().setCreateEndTime(profitAnalysisVo.getQueryVO().getCreateEndTime().substring(0,10)+" 23:59:59");
+        }
+        if(StringUtils.isNotEmpty(profitAnalysisVo.getQueryVO().getOrderHodEndTime()) && profitAnalysisVo.getQueryVO().getOrderHodEndTime().length()>=10 ){
+            profitAnalysisVo.getQueryVO().setOrderHodEndTime(profitAnalysisVo.getQueryVO().getOrderHodEndTime().substring(0,10)+" 23:59:59");
+        }
+        if(StringUtils.isNotEmpty(profitAnalysisVo.getQueryVO().getOrderHodStartTime()) && profitAnalysisVo.getQueryVO().getOrderHodStartTime().length()>10){
+            profitAnalysisVo.getQueryVO().setOrderHodStartTime(profitAnalysisVo.getQueryVO().getOrderHodStartTime().substring(0,10));
+        }
+        if(StringUtils.isNotEmpty(profitAnalysisVo.getQueryVO().getProductionDepartmentConsignEndTime()) && profitAnalysisVo.getQueryVO().getProductionDepartmentConsignEndTime().length()>=10){
+            profitAnalysisVo.getQueryVO().setProductionDepartmentConsignEndTime(profitAnalysisVo.getQueryVO().getProductionDepartmentConsignEndTime().substring(0,10)+" 23:59:59");
+        }
+        if(StringUtils.isNotEmpty(profitAnalysisVo.getQueryVO().getProductionDepartmentConsignStartTime()) && profitAnalysisVo.getQueryVO().getProductionDepartmentConsignStartTime().length()>10){
+            profitAnalysisVo.getQueryVO().setProductionDepartmentConsignStartTime(profitAnalysisVo.getQueryVO().getProductionDepartmentConsignStartTime().substring(0,10));
+        }
         LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = orderBaseInfoService.buildQueryByParam(profitAnalysisVo.getQueryVO());
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
         if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
@@ -26,6 +26,7 @@ import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.dto.order.*;
 import com.order.erp.domain.vo.order.*;
+import com.order.erp.mapper.order.InvoiceBillOrderMapper;
 import com.order.erp.mapper.order.ProducePaymentCheckBillOrderMapper;
 import com.order.erp.service.SystemSettingService;
 import com.order.erp.service.order.*;
@@ -78,6 +79,8 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     @Resource
     private TransactionHelper transactionHelper;
+    @Resource
+    private InvoiceBillOrderMapper invoiceBillOrderMapper;
     /**
@@ -86,8 +89,8 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
      * @param queryVO 筛选条件
      * @return 查询结果
      */
-    @Override
-    public ServerResult listByPage(ProducePaymentCheckBillOrderQueryVO queryVO) {
+
+   /* public ServerResult listByPage(ProducePaymentCheckBillOrderQueryVO queryVO) {
         RoleEnum role = dataScope.getRole();
         LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
         //生产科,生产科只能看到属于自己的订单。
@@ -104,7 +107,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
         IPage<ProducePaymentCheckBillOrderDO> iPage = page(page, queryWrapper);
         return ServerResult.success(iPage);
-    }
+    }*/
     @Override
     public ServerResult listBaseOrderInfoBy(ProducePaymentBaseOrderQueryVO queryVO) {
@@ -145,7 +148,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     }
     @Override
-    public ServerResult listAnalysisBy(ProducePaymentCheckBillOrderQueryVO queryVO) {
+    public ServerResult listAnalysisBy(InvoiceAndCheckAnalysisVO queryVO) {
         return ServerResult.success(getAnalysisResult(queryVO));
     }
@@ -156,25 +159,76 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
 //    private CheckBillAnalysisResultVO getAnalysisResult(ProducePaymentCheckBillOrderQueryVO queryVO) {
     //第二版开始。
-        private List<CheckBillAnalysisResultVO> getAnalysisResult(ProducePaymentCheckBillOrderQueryVO queryVO) {
-            //第二版截止。
-        LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
-        List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = list(queryWrapper);
-        if (CollectionUtils.isEmpty(checkBillOrderDOS)) {
-            return null;
-        }
-       /* Set<Long> ids = checkBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getId).collect(Collectors.toSet());
-        List<CheckBillMappingDO> checkBillMappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(CheckBillMappingDO::getCheckBillId, ids));
-        if (CollectionUtils.isEmpty(checkBillMappingDOS)) {
-            return null;
-        }*/
+        private List<CheckBillAnalysisResultVO> getAnalysisResult(InvoiceAndCheckAnalysisVO queryVO) {
+           List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = new ArrayList<>();
+            List<Long> notExistOrderIds = new ArrayList<>();
+            if(CollectionUtils.isEmpty(queryVO.getOrderIds())){
+             RoleEnum role=dataScope.getRole();
+             if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())){
+                 queryVO.getQueryVO().setTrackerUserName(dataScope.getLoginUserName());
+             }
+             if(Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())){
+                 queryVO.getQueryVO().setBusinessUserName(dataScope.getLoginUserName());
+             }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getCreateStartTime())){
+                    queryVO.getQueryVO().setCreateStartTime(queryVO.getQueryVO().getCreateStartTime().substring(0,10)+" 00:00:00");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getCreateEndTime())){
+                    queryVO.getQueryVO().setCreateEndTime(queryVO.getQueryVO().getCreateEndTime().substring(0,10)+" 23:59:59");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getCheckStartTime())){
+                    queryVO.getQueryVO().setCheckStartTime(queryVO.getQueryVO().getCheckStartTime().substring(0,10)+" 00:00:00");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getCheckEndTime())){
+                    queryVO.getQueryVO().setCheckEndTime(queryVO.getQueryVO().getCheckEndTime().substring(0,10)+" 23:59:59");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getInvoiceStartTime())){
+                    queryVO.getQueryVO().setInvoiceStartTime(queryVO.getQueryVO().getInvoiceStartTime().substring(0,10)+" 00:00:00");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getInvoiceEndTime())){
+                    queryVO.getQueryVO().setInvoiceEndTime(queryVO.getQueryVO().getInvoiceEndTime().substring(0,10)+" 23:59:59");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getOrderHodStartTime())){
+                    queryVO.getQueryVO().setOrderHodStartTime(queryVO.getQueryVO().getOrderHodStartTime().substring(0,10)+" 00:00:00");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getOrderHodEndTime())){
+                    queryVO.getQueryVO().setOrderHodEndTime(queryVO.getQueryVO().getOrderHodEndTime().substring(0,10)+" 23:59:59");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getProductionDepartmentConsignStartTime())){
+                    queryVO.getQueryVO().setProductionDepartmentConsignStartTime(queryVO.getQueryVO().getProductionDepartmentConsignStartTime().substring(0,10)+" 00:00:00");
+                }
+                if(StringUtils.isNotEmpty(queryVO.getQueryVO().getProductionDepartmentConsignEndTime())){
+                    queryVO.getQueryVO().setProductionDepartmentConsignEndTime(queryVO.getQueryVO().getProductionDepartmentConsignEndTime().substring(0,10)+" 23:59:59");
+                }
+             Set<Long> existOrderIdSet=new HashSet<>();
+             //查询数据 
+                List<InvoiceIdAndCheckIdResultVO> idResultVOS = invoiceBillOrderMapper.byQuerygetInvoiceIdAndCheckId(queryVO.getQueryVO());
+                List<Long> checkIds = idResultVOS.stream().map(x -> x.getCheckId()).filter(Objects::nonNull).collect(Collectors.toList());
+                if(CollectionUtils.isEmpty(checkIds)){
+                    throw new BusinessException("未创建生产科对账单！");
+                }
+                checkBillOrderDOS = listByIds(checkIds);
+                List<Long> existOrderIds = checkBillOrderDOS.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
+                existOrderIdSet.addAll(existOrderIds);
+                List<Long> orderIdList = idResultVOS.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
+                notExistOrderIds = orderIdList.stream()
+                        .filter(orderId -> !existOrderIdSet.contains(orderId))
+                        .collect(Collectors.toList());
+            }else{
+                LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+                 checkBillOrderDOS = list(queryWrapper);
+                if (CollectionUtils.isEmpty(checkBillOrderDOS)) {
+                    return null;
+                }
+                List<Long> existOrderIds = checkBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getOrderId).collect(Collectors.toList());
+                 notExistOrderIds = queryVO.getOrderIds().stream().filter(orderId -> !existOrderIds.contains(orderId))
+                        .collect(Collectors.toList());
+
+            }
             Map<Long, ProducePaymentCheckBillOrderDO> orderBillMap = checkBillOrderDOS.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
 //            Map<Long, CheckBillMappingDO> orderBillMap = checkBillMappingDOS.stream().collect(Collectors.toMap(CheckBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
-
         List<CheckOrderBaseItemVO> itemVOS = getCheckOrderBaseItems(orderBillMap);
-            List<Long> existOrderIds = checkBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getOrderId).collect(Collectors.toList());
-            List<Long> notExistOrderIds = queryVO.getOrderIds().stream().filter(orderId -> !existOrderIds.contains(orderId))
-                    .collect(Collectors.toList());
+
             Map<String, BigDecimal> productionDepartmentProfitMap=null;
             if(CollectionUtils.isNotEmpty(notExistOrderIds)){
             List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(notExistOrderIds);
@@ -406,7 +460,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     @Override
-    public ServerResult export(HttpServletResponse response, ProducePaymentCheckBillOrderQueryVO queryVO) throws IOException {
+    public ServerResult export(HttpServletResponse response, InvoiceAndCheckAnalysisVO queryVO) throws IOException {
 //        CheckBillAnalysisResultVO resultVO = getAnalysisResult(queryVO);
         //第二版开始
         List<CheckBillAnalysisResultVO> resultVO = getAnalysisResult(queryVO);
@@ -524,7 +578,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
      * @param queryVO
      * @return
      */
-    private LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> getQueryWrapper(ProducePaymentCheckBillOrderQueryVO queryVO) {
+    private LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> getQueryWrapper(InvoiceAndCheckAnalysisVO queryVO) {
         LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> queryWrapper = new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
                 .eq(ProducePaymentCheckBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
                 /*.eq(StringUtils.isNotBlank(queryVO.getCheckNo()), ProducePaymentCheckBillOrderDO::getCheckNo, queryVO.getCheckNo())
@@ -535,8 +589,8 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
             queryWrapper.in(ProducePaymentCheckBillOrderDO::getId, queryVO.getIds());
         } else {
-            Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
-            queryWrapper.in(CollectionUtils.isNotEmpty(billOrderIds), ProducePaymentCheckBillOrderDO::getId, billOrderIds);
+           /* Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO.getQueryVO());
+            queryWrapper.in(CollectionUtils.isNotEmpty(billOrderIds), ProducePaymentCheckBillOrderDO::getId, billOrderIds);*/
         }
         return queryWrapper;
     }
@@ -927,20 +981,25 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if(StringUtils.isBlank(invoiceInfoVO.getInvoiceUrl())){
             return ServerResult.success();
         }
+        OrderBaseInfoDO orderBaseInfoDO = orderBaseInfoService.getById(checkBillOrderDO.getOrderId());
         //校验是否有处于待审核的发票。
         checkCommitApply(id);
         //校验是否有处于待审核的订单。 todo
         checkApply(new ArrayList<>(Arrays.asList(id)));
         OrderLockFieldVO locakFieldVO = new OrderLockFieldVO();
-
+        ProducePaymentCheckBillVO producePaymentCheckBillVO = new ProducePaymentCheckBillVO();
         //事务:待审核,设置为admin和财务才有权限审批。
         transactionHelper.run(() -> {
             checkBillOrderDO.setDepartmentInvoiceStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
             updateById(checkBillOrderDO);
             //不保存,仅仅只是做一个审核,千万不要保存。目的是传递给审核的是最新的发票,审核通过才保存,不通过则不保存。
             checkBillOrderDO.setInvoiceUrl(invoiceInfoVO.getInvoiceUrl());
+            //复制到producePaymentCheckBillVO。
+            BeanUtils.copyProperties(checkBillOrderDO,producePaymentCheckBillVO);
+            producePaymentCheckBillVO.setInnerNo(orderBaseInfoDO.getInnerNo());
             //上述不保存,上述仅仅只是让审批时获取最新的一个审批发票记录。
-            locakFieldVO.setCheckBillOrderDO(checkBillOrderDO);
+//            locakFieldVO.setCheckBillOrderDO(checkBillOrderDO);
+            locakFieldVO.setCheckBillVO(producePaymentCheckBillVO);
             OrderFieldLockApplyDO applyDO = OrderFieldLockApplyDO.builder()
                     .applyUserId(loginUserId)
                     .auditUserId(null)
@@ -1153,6 +1212,8 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
             //这里要删除对应invoiceNo号,但是为了删除后产生空指针异常,所以定义为"N/N";
             order.setCheckNo("N/N");
+            //设置状态为-1,未创建。
+            order.setCheckStatus(FinanceEnum.NOT_CREATED.getStatus());
             return order;
         }).collect(Collectors.toList());
         transactionHelper.run(() -> {
@@ -1287,13 +1348,17 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         //第二行
         Row row2 = sheet.createRow(3);
         Cell cell2 = row2.createCell(0);
-        cell2.setCellValue("提交人：");
+        cell2.setCellValue("提交人："+queryVO.getFinancePerson());
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 1));
         Cell cell3 = row2.createCell(2);
         cell3.setCellValue("");
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 2, 7));
         Cell cell4 = row2.createCell(8);
-        cell4.setCellValue("日期：");
+        if(StringUtils.isNotBlank(queryVO.getActualPayedDate())){
+            cell4.setCellValue("日期："+queryVO.getActualPayedDate());
+        }else{
+            cell4.setCellValue("日期：");
+        }
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 8, 9));
         //第三行
         createMergedCell(sheet, workbook, 5, 0, 5, 6, 0, 1, "生产科对账单号");
@@ -161,34 +161,34 @@
             AND o.customer_po = #{queryVO.customerPo}
         </if>
         <if test="queryVO.invoiceStartTime != null">
-            AND DATE(i.create_time) &gt;= LEFT(#{queryVO.invoiceStartTime}, 10)
+            AND i.create_time &gt;= #{queryVO.invoiceStartTime}
         </if>
         <if test="queryVO.invoiceEndTime != null">
-            AND DATE(i.create_time) &lt;= LEFT(#{queryVO.invoiceEndTime}, 10)
+            AND i.create_time &lt;= #{queryVO.invoiceEndTime}
         </if>
         <if test="queryVO.checkStartTime != null ">
-            AND DATE(p.create_time) &gt;= LEFT(#{queryVO.checkStartTime}, 10)
+            AND p.create_time &gt;= #{queryVO.checkStartTime}
         </if>
         <if test="queryVO.checkEndTime != null">
-            AND DATE(p.create_time) &lt;= LEFT(#{queryVO.checkEndTime}, 10)
+            AND p.create_time &lt;= #{queryVO.checkEndTime}
         </if>
         <if test="queryVO.createStartTime !=null">
-            AND DATE(o.create_time) &gt;= LEFT(#{queryVO.createStartTime}, 10)
+            AND o.create_time &gt;= #{queryVO.createStartTime}
         </if>
         <if test="queryVO.createEndTime != null">
-            AND DATE(o.create_time) &lt;= LEFT(#{queryVO.createEndTime}, 10)
+            AND o.create_time &lt;= #{queryVO.createEndTime}
         </if>
         <if test="queryVO.productionDepartmentConsignStartTime != null ">
-            AND DATE(o.production_department_consign_time)  &gt;= LEFT(#{queryVO.productionDepartmentConsignStartTime} , 10)
+            AND o.production_department_consign_time  &gt;= #{queryVO.productionDepartmentConsignStartTime}
         </if>
         <if test="queryVO.productionDepartmentConsignEndTime != null">
-            AND DATE(o.production_department_consign_time)  &lt;= LEFT(#{queryVO.productionDepartmentConsignEndTime} , 10)
+            AND o.production_department_consign_time &lt;= #{queryVO.productionDepartmentConsignEndTime}
         </if>
         <if test="queryVO.orderHodStartTime != null ">
-            AND DATE(o.order_hod_time) &gt;= LEFT(#{queryVO.orderHodStartTime} , 10)
+            AND o.order_hod_time &gt;= #{queryVO.orderHodStartTime}
         </if>
         <if test="queryVO.orderHodEndTime != null">
-            AND DATE(o.order_hod_time) &lt;= LEFT(#{queryVO.orderHodEndTime} , 10)
+            AND o.order_hod_time &lt;= #{queryVO.orderHodEndTime}
         </if>
         <if test="queryVO.trackerUserName != null and queryVO.trackerUserName != ''">
             AND o.create_by = #{queryVO.trackerUserName}
@@ -199,4 +199,97 @@
         ORDER BY o.id DESC
     </select>
+
+
+    <select id="byQuerygetInvoiceIdAndCheckId"  parameterType="com.order.erp.domain.vo.order.InvoiceBillOrderQueryVO" resultType="com.order.erp.domain.vo.order.InvoiceIdAndCheckIdResultVO">
+       SELECT
+       o.id AS orderId,
+       p.id AS checkId,
+       i.id AS invoiceId
+       FROM order_base_info o
+       LEFT JOIN invoice_bill_order AS i
+       ON o.id = i.order_id AND i.enable_flag = 10
+       LEFT JOIN produce_payment_check_bill_order AS p
+       ON o.id = p.order_id AND p.enable_flag = 10
+       LEFT JOIN order_profit_analysis AS a
+       ON o.id = a.order_id AND a.enable_flag = 10
+       WHERE o.enable_flag = 10
+        <if test="queryVO.invoiceNo != null and queryVO.invoiceNo != ''">
+            AND i.invoice_no = #{queryVO.invoiceNo}
+        </if>
+        <if test="queryVO.checkNo != null and queryVO.checkNo != ''">
+            AND p.check_no = #{queryVO.checkNo}
+        </if>
+        <if test="queryVO.invoiceStatus != null">
+            AND o.invoice_status = #{queryVO.invoiceStatus}
+        </if>
+        <if test="queryVO.checkNoStatus != null">
+            AND o.check_status = #{queryVO.checkNoStatus}
+        </if>
+        <if test="queryVO.customerCode != null and queryVO.customerCode.size > 0 ">
+            AND o.customer_code IN
+            <foreach collection="queryVO.customerCode" item="customerCode" open="(" separator="," close=")">
+                #{customerCode}
+            </foreach>
+        </if>
+        <if test="queryVO.projectNo != null and queryVO.projectNo.size > 0 ">
+            AND o.project_no IN
+            <foreach collection="queryVO.projectNo" item="projectNo" open="(" separator="," close=")">
+                #{projectNo}
+            </foreach>
+        </if>
+        <if test="queryVO.productionDepartment != null and queryVO.productionDepartment.size > 0 ">
+            AND o.production_department IN
+            <foreach collection="queryVO.productionDepartment" item="productionDepartment" open="(" separator="," close=")">
+                #{productionDepartment}
+            </foreach>
+        </if>
+        <if test="queryVO.innerNo != null and queryVO.innerNo.size > 0 ">
+            AND o.inner_no IN
+            <foreach collection="queryVO.innerNo" item="innerNo" open="(" separator="," close=")">
+                #{innerNo}
+            </foreach>
+        </if>
+        <if test="queryVO.customerPo != null and queryVO.customerPo != ''">
+            AND o.customer_po = #{queryVO.customerPo}
+        </if>
+        <if test="queryVO.invoiceStartTime != null">
+            AND i.create_time &gt;= #{queryVO.invoiceStartTime}
+        </if>
+        <if test="queryVO.invoiceEndTime != null">
+            AND i.create_time &lt;= #{queryVO.invoiceEndTime}
+        </if>
+        <if test="queryVO.checkStartTime != null ">
+            AND p.create_time &gt;= #{queryVO.checkStartTime}
+        </if>
+        <if test="queryVO.checkEndTime != null">
+            AND p.create_time &lt;= #{queryVO.checkEndTime}
+        </if>
+        <if test="queryVO.createStartTime !=null">
+            AND o.create_time &gt;= #{queryVO.createStartTime}
+        </if>
+        <if test="queryVO.createEndTime != null">
+            AND o.create_time &lt;= #{queryVO.createEndTime}
+        </if>
+        <if test="queryVO.productionDepartmentConsignStartTime != null ">
+            AND o.production_department_consign_time  &gt;= #{queryVO.productionDepartmentConsignStartTime}
+        </if>
+        <if test="queryVO.productionDepartmentConsignEndTime != null">
+            AND o.production_department_consign_time &lt;= #{queryVO.productionDepartmentConsignEndTime}
+        </if>
+        <if test="queryVO.orderHodStartTime != null ">
+            AND o.order_hod_time &gt;= #{queryVO.orderHodStartTime}
+        </if>
+        <if test="queryVO.orderHodEndTime != null">
+            AND o.order_hod_time &lt;= #{queryVO.orderHodEndTime}
+        </if>
+        <if test="queryVO.trackerUserName != null and queryVO.trackerUserName != ''">
+            AND o.create_by = #{queryVO.trackerUserName}
+        </if>
+        <if test="queryVO.businessUserName != null and queryVO.businessUserName != ''">
+            AND o.business_person = #{queryVO.businessUserName}
+        </if>
+
+    </select>
+
 </mapper>