fix:跟单和业务能够看到自己负责的应收款和应付款审核情况

chenhang4442024
1 parent a3b7a347
Showing 17 changed files with 237 additions and 334 deletions
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/common/utils/OrderFieldUtils.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/dto/order/InvoiceBillOrderDO.java
src/main/java/com/order/erp/domain/dto/order/ProducePaymentCheckBillOrderDO.java
src/main/java/com/order/erp/domain/vo/order/BusinessProfitRatioResultVO.java
src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java
src/main/java/com/order/erp/job/FinanceJob.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/CalculateProfitServiceImpl.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
src/main/resources/application.yml
@@ -167,6 +167,7 @@ public class Constant {
     public static final int HUNDRED=100;
+    public static final int HUNDREDANDFIVE=105;
     public static final int THOUSAND = 1000;
     public static final String DATE_TIME = "yyyy-MM-dd HH:mm:ss";
@@ -38,9 +38,10 @@ public class OrderFieldUtils {
      * @param orderId
      * @return
      */
-    public static OrderFieldLockApplyDO generatorBaseInfoFieldLockApplyDO(OrderUnlockFieldApplyVO fieldVO, Long userId, Long orderId) {
+    public static OrderFieldLockApplyDO  generatorProfitAnalysisFieldLockApplyDO(OrderUnlockFieldApplyVO fieldVO, Long userId, Long orderId) {
         OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
-        lockFieldVO.setBaseFields(fieldVO.getBaseFields());
+        lockFieldVO.setProfitAnalysisFields(fieldVO.getProfitAnalysisFields());
+        lockFieldVO.setReportFields(fieldVO.getReportFields());
         OrderFieldLockApplyDO applyDO = OrderFieldLockApplyDO.builder()
                 .applyUserId(userId)
                 .auditUserId(null)
@@ -49,15 +50,13 @@ public class OrderFieldUtils {
                 .remark(ApplyTypeEnum.FIELD_EDIT_APPLY.getDesc())
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                 .build();
-        if (Objects.nonNull(fieldVO.getBaseFields()) && checkOrderBaseField4apply(fieldVO.getBaseFields())) {
+        if (Objects.nonNull(fieldVO.getProfitAnalysisFields()) && checkProfitAnalysisField4apply(fieldVO.getProfitAnalysisFields())
+                || (Objects.nonNull(fieldVO.getReportFields()) && checkReportField4apply(fieldVO.getReportFields()))) {
+            lockFieldVO.setBaseFields(initOrderBaseField(OrderLockFieldEnum.LOCKED));
             lockFieldVO.setInspectionStageFields(initInspectionStageField(OrderLockFieldEnum.LOCKED));
-            lockFieldVO.setProfitAnalysisFields(initProfitAnalysisField(OrderLockFieldEnum.LOCKED));
-            lockFieldVO.setReportFields(initReportField(OrderLockFieldEnum.LOCKED));
             lockFieldVO.setTrackStageFields(initTrackStageField(OrderLockFieldEnum.LOCKED));
             applyDO.setFields(JSONObject.toJSONString(lockFieldVO));
-            //在这里增加字段的描述。   applyDO.setXxxx("xxxx原因。");
-            applyDO.setApplyRemark(fieldVO.getApplyRemark());
-            applyDO.setAuditRoleCodes(RoleEnum.BUSINESS_USER.getCode() + Constant.COMMA_CHARACTER + RoleEnum.ADMIN.getCode());
+            applyDO.setAuditRoleCodes(RoleEnum.ADMIN.getCode());
             return applyDO;
         } else {
             return null;
@@ -70,21 +69,23 @@ public class OrderFieldUtils {
      * @return
      */
     public static OrderFieldLockApplyDO generatorOtherInfoFieldLockApplyDO(OrderUnlockFieldApplyVO fieldVO, Long userId) {
-        if ((Objects.nonNull(fieldVO.getInspectionStageFields()) && checkInspectionStageField4apply(fieldVO.getInspectionStageFields()))
-                || (Objects.nonNull(fieldVO.getProfitAnalysisFields()) && checkProfitAnalysisField4apply(fieldVO.getProfitAnalysisFields()))
-                || (Objects.nonNull(fieldVO.getReportFields()) && checkReportField4apply(fieldVO.getReportFields()))
-                || (Objects.nonNull(fieldVO.getTrackStageFields()) && checkTrackStageField4apply(fieldVO.getTrackStageFields()))) {
+        if ( (Objects.nonNull(fieldVO.getInspectionStageFields()) && checkInspectionStageField4apply(fieldVO.getInspectionStageFields()))
+                || (Objects.nonNull(fieldVO.getTrackStageFields()) && checkTrackStageField4apply(fieldVO.getTrackStageFields()))
+                || (Objects.nonNull(fieldVO.getBaseFields()) && checkOrderBaseField4apply(fieldVO.getBaseFields()))) {
             OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
-            fieldVO.setBaseFields(initOrderBaseField(OrderLockFieldEnum.LOCKED));
+            fieldVO.setProfitAnalysisFields(initProfitAnalysisField(OrderLockFieldEnum.LOCKED));
+            fieldVO.setReportFields( initReportField(OrderLockFieldEnum.LOCKED));
             BeanUtils.copyProperties(fieldVO, lockFieldVO);
             return OrderFieldLockApplyDO.builder()
                     .applyUserId(userId)
                     .auditUserId(null)
                     .fields(JSONObject.toJSONString(lockFieldVO))
-                    .auditRoleCodes(RoleEnum.ADMIN.getCode())
+                    .auditRoleCodes(RoleEnum.ADMIN.getCode()+Constant.COMMA_CHARACTER+RoleEnum.BUSINESS_USER.getCode())
                     .orderId(fieldVO.getOrderId())
                     .type(ApplyTypeEnum.FIELD_EDIT_APPLY.getType())
                     .remark(ApplyTypeEnum.FIELD_EDIT_APPLY.getDesc())
+                     //在这里增加字段的描述。   applyDO.setXxxx("xxxx原因。");
+                    .applyRemark(fieldVO.getApplyRemark())
                     .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                     .build();
         } else {
@@ -99,10 +100,11 @@ public class OrderFieldUtils {
      */
     public static List<OrderFieldLockApplyDO> initOrderFieldLockApplyDOS(OrderUnlockFieldApplyVO fieldVO, Long userId) {
         List<OrderFieldLockApplyDO> resultList = new ArrayList<>();
-        OrderFieldLockApplyDO baseLockApply = generatorBaseInfoFieldLockApplyDO(fieldVO, userId, fieldVO.getOrderId());
+        OrderFieldLockApplyDO baseLockApply =  generatorProfitAnalysisFieldLockApplyDO(fieldVO, userId, fieldVO.getOrderId());
         if (Objects.nonNull(baseLockApply)) {
             resultList.add(baseLockApply);
         }
+        //跟单,项目报告书由管理员审核转化为管理员和业务员都能审核。
         OrderFieldLockApplyDO otherLockApply = generatorOtherInfoFieldLockApplyDO(fieldVO, userId);
         if (Objects.nonNull(otherLockApply)) {
             resultList.add(otherLockApply);
@@ -175,6 +175,14 @@ public class InvoiceBillOrderController {
     public void exportReceipt(HttpServletResponse response, @RequestBody InvoiceBillOrderDO queryVO) throws IOException {
         invoiceBillOrderService.exportReceipt(response,queryVO);
     }
-
+    /**
+     * 设置必须回款日期
+     * @param createVO 必须回款日期
+     * @return
+     */
+    @PostMapping("/setBackRefundDate")
+   public void setBackRefundDate(@RequestBody InvoiceBillCreateVO createVO) {
+        invoiceBillOrderService.setBackRefundDate(createVO);
+    }
 }
@@ -187,5 +187,10 @@ public class ProducePaymentCheckBillOrderController {
     public void exportReceipt(HttpServletResponse response, @RequestBody ProducePaymentCheckBillOrderDO queryVO) throws IOException {
         producePaymentCheckBillOrderService.exportReceipt(response,queryVO);
     }
+
+    @PostMapping("/setPayedDate")
+    public void setPayedDate(@RequestBody ProducePaymentCheckBillCreateVO producePaymentCheckBillCreatevo) {
+       producePaymentCheckBillOrderService.setPayedDate(producePaymentCheckBillCreatevo);
+    }
 }
@@ -95,5 +95,9 @@ public class InvoiceBillOrderDO extends BaseDO implements Serializable {
      * 财务 --审核时使用。
      * */
     private String financePerson;
+    /**
+     * 跟单 --业务创建单子,跟单也能看到。
+     * */
+    private String trackerUser;
 }
@@ -104,6 +104,10 @@ public class ProducePaymentCheckBillOrderDO extends BaseDO implements Serializab
      * 财务 --审核时使用。
      * */
     private String financePerson;
+    /**
+     * 跟单 --业务创建单子,跟单也能看到。
+     * */
+    private String trackerUser;
 }
@@ -52,7 +52,7 @@ public class BusinessProfitRatioResultVO implements Serializable {
     private String produceEndTime;
     /**
-     * 客户总价$
+     * 客户总价￥
      */
     private BigDecimal customerTotalPrice;
@@ -159,5 +159,18 @@ public class BusinessProfitRatioResultVO implements Serializable {
      * 实际跟单费用
      */
     private BigDecimal  actualdocumentaryPrice;
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPriceUsd;
+
+    /**
+     * 生成科总价$
+     */
+    private BigDecimal  productionDepartmentTotalPriceUsd;
+    /**
+     * 包装费用合计$
+     */
+    private BigDecimal  packetTotalPriceUsd;
 }
@@ -87,6 +87,14 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab
      * 0 管理员，1：业务员
      */
     private Integer auditType;
+    /**
+     * invoice编号
+     */
+    private String invoiceNo;
+    /**
+     * checkNo编号
+     */
+    private String checkNo;
 }
@@ -44,10 +44,10 @@ public class FinanceJob {
     @Resource
     private RedisUtils redisService;
     //每天的7:15执行一次
-//    @Scheduled(cron = "0 15 7 * * ?", zone = "Asia/Shanghai")
+    @Scheduled(cron = "0 15 7 * * ?", zone = "Asia/Shanghai")
     //每分钟执行一次
-    @Scheduled(cron = "0 * * * * ?", zone = "Asia/Shanghai")
+//    @Scheduled(cron = "0 * * * * ?", zone = "Asia/Shanghai")
     public void financeJob() {
         List<InvoiceBillOrderDO> eventInvoiceBillOrderDO=invoiceBillOrderService.getOverEvnetList();
         List<ProducePaymentCheckBillOrderDO> eventProducePaymentCheckBillOrderDO= producePaymentCheckBillOrderService.getOverEventList();
@@ -84,7 +84,7 @@ public class FinanceJob {
                            emailList.addAll(financeEmailList);
                        }
                        Set<String> userSet = new HashSet<>();
-                       userSet.add(invoiceBillOrderDO.getCreateBy());
+                       userSet.add(invoiceBillOrderDO.getTrackerUser());
                        userSet.add(invoiceBillOrderDO.getBusinesPerson());
                        List<String> emails = userSet.stream()
                                .map(userName::get)
@@ -98,9 +98,9 @@ public class FinanceJob {
                        FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
                        eventJobVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
                        emailSendUtils.sendEmail(FinanceOverEnum.INVOICE_OVERTIME, new ArrayList<>(emailList), eventJobVO);
-                       boolean set = redisService.set(redisKey, invoiceBillOrderDO, Constant.TWENTY_FIRST, TimeUnit.DAYS);// 设置为21天后过期
+                       boolean set = redisService.set(redisKey, invoiceBillOrderDO, Constant.HUNDREDANDFIVE, TimeUnit.DAYS);// 设置为21天后过期
                        if(set){
-                           redisService.saddWithExpiry(Constant.REDISKEY,redisKey, Constant.TWENTY_FIRST, TimeUnit.DAYS);
+                           redisService.saddWithExpiry(Constant.REDISKEY,redisKey, Constant.HUNDREDANDFIVE, TimeUnit.DAYS);
                        }
                    }
                }
@@ -120,7 +120,7 @@ public class FinanceJob {
                        //发送邮件
                        Set<String> userSet = new HashSet<>();
                        //获取业务,财务,管理员
-                       userSet.add(producePaymentCheckBillOrderDO.getCreateBy());
+                       userSet.add(producePaymentCheckBillOrderDO.getTrackerUser());
                        userSet.add(producePaymentCheckBillOrderDO.getBusinesPerson());
                        List<String> emails = userSet.stream()
                                .map(userName::get)
@@ -135,9 +135,9 @@ public class FinanceJob {
                        FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
                        eventJobVO.setProducePaymentCheckBillOrderDO(producePaymentCheckBillOrderDO);
                        emailSendUtils.sendEmail(FinanceOverEnum.PRODUCE_PAYMENT_CHECK_OVERTIME, new ArrayList<>(emailList), eventJobVO);
-                       boolean set = redisService.set(redisKey, producePaymentCheckBillOrderDO, Constant.TWENTY_FIRST, TimeUnit.DAYS);// 设置为21天后过期
+                       boolean set = redisService.set(redisKey, producePaymentCheckBillOrderDO, Constant.HUNDREDANDFIVE, TimeUnit.DAYS);// 设置为21天后过期
                        if(set){
-                           redisService.saddWithExpiry(Constant.REDISKEY,redisKey, Constant.TWENTY_FIRST, TimeUnit.DAYS);
+                           redisService.saddWithExpiry(Constant.REDISKEY,redisKey, Constant.HUNDREDANDFIVE, TimeUnit.DAYS);
                        }
                    }
                    }
@@ -217,8 +217,8 @@ public class FinanceJob {
                 if (expireTime != null && expireTime > 0) { // 确保 expireTime 有值且大于 0
                     long daysRemaining = TimeUnit.SECONDS.toDays(expireTime);
-                    // 如果剩余时间为14天7天或1天，则符合条件
-                    if (daysRemaining==14 || daysRemaining == 7 || daysRemaining == 1) {
+                    // 每隔7天检查一下,如果是7的倍数，则获取里面的值,查看
+                    if (Constant.ZERO==daysRemaining % 7) {
                         validKeys.add(key); // 满足条件，加入有效的 keys 列表
                     }
                 }
@@ -115,4 +115,6 @@ public interface InvoiceBillOrderService extends IService&lt;InvoiceBillOrderDO&gt; {
     List<InvoiceBillOrderDO>  getOverEvnetList();
+    ServerResult setBackRefundDate(InvoiceBillCreateVO createVO);
+
 }
@@ -108,4 +108,5 @@ public interface ProducePaymentCheckBillOrderService extends IService&lt;ProducePay
     ServerResult exportReceipt(HttpServletResponse response, ProducePaymentCheckBillOrderDO queryVO) throws IOException;
     List<ProducePaymentCheckBillOrderDO> getOverEventList();
+    ServerResult setPayedDate(ProducePaymentCheckBillCreateVO createVO);
 }
@@ -114,15 +114,15 @@ public class CalculateProfitServiceImpl {
 //第六行
         createMergedCell(sheet, workbook, 12, 0, 12, 13, 0, 4, "客户总金额计算");
         createMergedCell(sheet, workbook, 12, 5, 12, 13, 5, 6, "￥"+resultVO.getCustomerTotalPrice());
-        createMergedCell(sheet, workbook, 12, 9, 12, 13, 7, 9, "");
+        createMergedCell(sheet, workbook, 12, 7, 12, 13, 7, 9, "$"+resultVO.getCustomerTotalPriceUsd());
 ////第七行
         createMergedCell(sheet, workbook, 14, 0, 14, 15, 0, 4, "生产科总价合计");
         createMergedCell(sheet, workbook, 14, 5, 14, 15, 5, 6, "￥"+resultVO.getProductionDepartmentTotalPrice());
-        createMergedCell(sheet, workbook, 14, 7, 14, 15, 7, 9, "");
+        createMergedCell(sheet, workbook, 14, 7, 14, 15, 7, 9, "$"+resultVO.getProductionDepartmentTotalPriceUsd());
 ////第八行
         createMergedCell(sheet, workbook, 16, 0, 16, 17, 0, 4, "包装费用合计");
         createMergedCell(sheet, workbook, 16, 5, 16, 17, 5, 6, "￥"+resultVO.getPacketTotalPrice());
-        createMergedCell(sheet, workbook, 16, 7, 16, 17, 7, 9, "");
+        createMergedCell(sheet, workbook, 16, 7, 16, 17, 7, 9, "$"+resultVO.getPacketTotalPriceUsd());
 ////第九行
         createMergedCell(sheet, workbook, 18, 0, 18, 19, 0, 4, "研发开发费合计");
         createMergedCell(sheet, workbook, 18, 5, 18, 19, 5, 6, "￥"+resultVO.getDevelopTotalPrice().setScale(2, RoundingMode.HALF_UP));
@@ -371,11 +371,6 @@ public class CalculateProfitServiceImpl {
         if(CollectionUtils.isEmpty(profitAnalysisList) ||orderIds.size()!= profitAnalysisDOS.size()){
             throw new BusinessException("勾选订单的利润信息未填写!");
         }
-//        for(OrderProfitAnalysisDO analysisDO : profitAnalysisList){
-//            if(analysisDO.getCustomerPrice()==null){
-//                throw new BusinessException("勾选订单的利润信息未填写！");
-//            }
-//        }
         int sumCount = orderBaseInfoDOList.stream().mapToInt(OrderBaseInfoDO::getOrderCount).sum();
         Set<String> projectList = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getProjectNo).collect(Collectors.toSet());
         //得到当前汇率。
@@ -429,7 +424,7 @@ public class CalculateProfitServiceImpl {
         chinaRatioProfitPrice = chainRatioValue.multiply(customerRmbTotalPrice);
         BigDecimal dailyCostValue = new BigDecimal(dailyCost);
         fixCost = dailyCostValue.multiply(new BigDecimal(getProjectDays(queryVO)));
-        BigDecimal outTotalPrice = customerRmbTotalPrice.add(productionDepartmentTotalPrice).add(packetTotalPrice)
+        BigDecimal outTotalPrice = productionDepartmentTotalPrice.add(packetTotalPrice)
                 .add(queryVO.getDevelopTotalPrice()).add(queryVO.getCopyTotalPrice())
                 .add(fixCost).add(spainRatioProfitPrice).add(chinaRatioProfitPrice);
         BigDecimal developProfit = customerRmbTotalPrice.subtract(outTotalPrice);
@@ -469,6 +464,9 @@ public class CalculateProfitServiceImpl {
         //12
         resultVO.setGrossProfit(customerRmbTotalPrice.subtract(productionDepartmentTotalPrice).subtract(packetTotalPrice).setScale(2, BigDecimal.ROUND_HALF_UP));
         resultVO.setProjectNo(String.join(",",projectList));
+        resultVO.setPacketTotalPriceUsd(packetTotalPrice.divide(exchangeRate, 2, RoundingMode.HALF_UP));
+        resultVO.setCustomerTotalPriceUsd(customerTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        resultVO.setProductionDepartmentTotalPriceUsd(productionDepartmentTotalPrice.divide(exchangeRate, 2, RoundingMode.HALF_UP));
         return resultVO;
     }
@@ -566,7 +564,7 @@ public class CalculateProfitServiceImpl {
           if(queryVO.getProductionDepartmentPredictPrice().compareTo(BigDecimal.ZERO) == 0){
           }else{
               predictRatio = queryVO.getProductionActualPrice()
-                      .divide(queryVO.getProductionDepartmentPredictPrice(),2,BigDecimal.ROUND_HALF_UP);
+                      .divide(queryVO.getProductionDepartmentPredictPrice(),4,BigDecimal.ROUND_HALF_UP);
           }
         }
         //如果大于1.05则就把内部生产提成变为0
@@ -92,7 +92,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
         //跟单也只能看到自己创建的   业务只能看到自己的
         if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())){
-            queryWrapper.eq(InvoiceBillOrderDO::getCreateBy, dataScope.getLoginUserName());
+            queryWrapper.eq(InvoiceBillOrderDO::getTrackerUser, dataScope.getLoginUserName());
         }
         if(Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())){
             queryWrapper.eq(InvoiceBillOrderDO::getBusinesPerson, dataScope.getLoginUserName());
@@ -197,45 +197,6 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
 //    private List<Map<String, Object>> buildExportMapVOS(InvoiceBillAnalysisResultVO resultVO)  {
     //第二版
     private List<Map<String, Object>> buildExportMapVOS(List<InvoiceBillAnalysisResultVO> resultVO)  {
-/*        List<InvoiceBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
-        List<Map<String, Object>> list = new ArrayList<>();
-        int i = 0;
-        for (InvoiceBillAnalysisExportVO exportVO : exportVOS) {
-            Map<String, Object> map = new LinkedHashMap<>();
-            map.put("编号", i++);
-            map.put("客户编码", exportVO.getCustomerCode());
-            map.put("INVOICE编码", exportVO.getInvoiceNo());
-            map.put("客户总金额汇总", exportVO.getCustomerTotalPrice());
-            map.put("客户扣款金额汇总", exportVO.getDeductAmount());
-            map.put("实际应收金额", exportVO.getActualReceivableAmount());
-            map.put("实际收款金额汇总", exportVO.getActualPayedAmount());
-            map.put("其他费用金额汇总", exportVO.getOtherAmount());
-            map.put("其他费用合计", exportVO.getOtherTotalAmount());
-            map.put("必须回款日期", exportVO.getBackRefundDate());
-            map.put("实际回款日期", exportVO.getActualRefundDate());
-            list.add(map);
-        }
-        Map<String, Object> map = new LinkedHashMap<>();
-        map.put("编号", "合计");
-        map.put("客户编码", "");
-        map.put("INVOICE编码", "");
-        map.put("客户总金额汇总", resultVO.getCustomerTotalPrice());
-        map.put("客户扣款金额汇总", resultVO.getDeductAmount());
-        map.put("实际应收金额", resultVO.getActualReceivableAmount());
-        map.put("实际收款金额汇总", resultVO.getActualPayedAmount());
-        map.put("其他费用金额汇总", resultVO.getOtherAmount());
-        map.put("其他费用合计", resultVO.getOtherTotalAmount());
-        map.put("必须回款日期", "");
-        map.put("实际回款日期", "");
-        list.add(map);
-        return list;*/
-
-
-
-
-
-
-//      List<InvoiceBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
         //第二版开始
         List<InvoiceBillAnalysisExportVO> exportVOS = resultVO.stream()
                 .flatMap(X -> X.getExportVOS().stream())  // 展开每个 resultVO 的 exportVOS 列表
@@ -340,7 +301,6 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @param queryVO
      * @return
      */
-//    private InvoiceBillAnalysisResultVO getAnalysisResult(InvoiceBillAnalysisVO queryVO) {
     //第二版
     private List<InvoiceBillAnalysisResultVO> getAnalysisResult(InvoiceBillAnalysisVO queryVO) {
         LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
@@ -365,57 +325,6 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @param exportVOS
      * @return
      */
-//    private InvoiceBillAnalysisResultVO wrapperAnalysisResultVO(List<InvoiceBillAnalysisExportVO> exportVOS) {
-//        if (CollectionUtils.isEmpty(exportVOS)) {
-//            return null;
-//        }
-//        InvoiceBillAnalysisResultVO resultVO = InvoiceBillAnalysisResultVO.builder().exportVOS(exportVOS).build();
-//        BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
-//        BigDecimal deductAmount = new BigDecimal(Constant.ZERO);
-////        BigDecimal actualReceivableAmount = new BigDecimal(Constant.ZERO);
-//        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
-////        BigDecimal otherAmount = new BigDecimal(Constant.ZERO);
-//        BigDecimal otherTotalAmount = new BigDecimal(Constant.ZERO);
-//        for (InvoiceBillAnalysisExportVO exportVO : exportVOS) {
-//            if (Objects.nonNull(exportVO.getCustomerTotalPrice())) {
-//                customerTotalPrice = customerTotalPrice.add(exportVO.getCustomerTotalPrice());
-//            }
-//            if (Objects.nonNull(exportVO.getDeductAmount())) {
-//                deductAmount = deductAmount.add(exportVO.getDeductAmount());
-//            }
-////            if (Objects.nonNull(exportVO.getActualReceivableAmount())) {
-////                actualReceivableAmount = actualReceivableAmount.add(exportVO.getActualReceivableAmount());
-////            }
-//            if (Objects.nonNull(exportVO.getActualPayedAmount())) {
-//                actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
-//            }
-////            if (Objects.nonNull(exportVO.getOtherAmount())) {
-////                otherAmount = customerTotalPrice.add(exportVO.getOtherAmount());
-////            }
-//            if (Objects.nonNull(exportVO.getOtherTotalAmount())) {
-//                otherTotalAmount = otherTotalAmount.add(exportVO.getOtherTotalAmount());
-//            }
-//        }
-//        //5889---1  正确
-//        resultVO.setCustomerTotalPrice(customerTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-//        //2---2     正确
-//        resultVO.setDeductAmount(deductAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
-//        //3003---4   错误
-////        resultVO.setActualReceivableAmount(actualReceivableAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
-//        resultVO.setActualReceivableAmount(actualPayedAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
-//        //0---5     错误  每个订单的合计的其他费用。  (已改正)
-//        resultVO.setOtherTotalAmount(otherTotalAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
-//        //5890---3  错误  1-2得到
-////        resultVO.setOtherAmount(otherAmount);
-//        //改正后
-//        resultVO.setOtherAmount(resultVO.getCustomerTotalPrice().subtract(resultVO.getDeductAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
-//        //2997---wu
-////        resultVO.setActualPayedAmount(actualPayedAmount);
-//        //已改正
-//        resultVO.setActualPayedAmount(resultVO.getOtherAmount().subtract(resultVO.getActualReceivableAmount()).subtract(resultVO.getOtherTotalAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
-//        return resultVO;
-//    }
-
     //第二版
     private List<InvoiceBillAnalysisResultVO> wrapperAnalysisResultVO(List<InvoiceBillAnalysisExportVO> exportVOS) {
         if (CollectionUtils.isEmpty(exportVOS)) {
@@ -798,6 +707,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
                 .backRefundDate(createVO.getBackRefundDate())
                 .status(ApplyStatusEnum.NO_COMMIT.getStatus())
                 .businesPerson(orderBaseInfoDOList.get(0).getBusinessPerson())
+                .trackerUser(orderBaseInfoDOList.get(0).getCreateBy())
                 .build();
     }
@@ -893,19 +803,6 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         }
         checkCommitApply(invoiceBillOrderDo.getId());
-
-//        Set<String> deductUrlSet = new HashSet<>(Arrays.asList(
-//               org.apache.commons.lang3.StringUtils.defaultString(invoiceBillOrderDo.getDeductUrl()).split(",")
-//        ));
-//        String newDeductUrl = deductInfoVO.getDeductUrl();
-//        if (StringUtils.isNotBlank(newDeductUrl)) {
-//            // 如果新 URL 不为空且不在现有 URL 中，则添加到 Set 中
-//            if (!deductUrlSet.contains(newDeductUrl)) {
-//                deductUrlSet.add(newDeductUrl);
-//            }
-//        }
-//        String updatedDeductUrl = String.join(",", deductUrlSet);
-//        invoiceBillOrderDo.setDeductUrl(updatedDeductUrl);
         if(StringUtils.isNotBlank(invoiceBillOrderDo.getDeductUrl())){
 //记住:需要修改数据表对应的字段deduct_url的varchar数据范围,修改为1000左右。
             if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
@@ -981,32 +878,9 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         String loginUserName = dataScope.getLoginUserName();
         checkApply(commitApplyVO.getId(), userId);
-        /*List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
-                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(InvoiceBillMappingDO::getInvoiceNo, invoiceBillOrderDO.getInvoiceNo()));
-        if(CollectionUtils.isNotEmpty(invoiceBillMappingDOS)){
-            List<Long> orderIds = invoiceBillMappingDOS.stream().map(InvoiceBillMappingDO::getOrderId).collect(Collectors.toList());
-            List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
-                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .in(OrderProfitAnalysisDO::getOrderId, orderIds));
-            if(CollectionUtils.isNotEmpty(orderProfitAnalysisDOS)){
-                List<Double> totalPrice = orderProfitAnalysisDOS.stream().map(OrderProfitAnalysisDO::getCustomerTotalPrice).collect(Collectors.toList());
-                if(CollectionUtils.isNotEmpty(totalPrice)){
-                    double totalSum = totalPrice.stream()
-                            .reduce(0.00, Double::sum);
-                    BigDecimal bigDecimalValue = BigDecimal.valueOf(totalSum);
-                    //客户总价金额汇总。 美元
-                    invoiceBillOrderDO.setTotalCustomerAmount(bigDecimalValue);
-                }else {
-                    invoiceBillOrderDO.setTotalCustomerAmount( BigDecimal.ZERO);
-                }
-            }
-        }
-        if(Objects.isNull(invoiceBillOrderDO.getDeductAmount())){
-            invoiceBillOrderDO.setDeductAmount(BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
-        }*/
         invoiceBillOrderDO.setActualRefundDate(commitApplyVO.getActualRefundDate());
         invoiceBillOrderDO.setPayee(commitApplyVO.getPayee());
+        //这里设置财务人员,是因为他们最后是点击提交审核的人员,所以当时候申请人就是获取FinancePerson这个变量。
         invoiceBillOrderDO.setFinancePerson(loginUserName);
         OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(invoiceBillOrderDO, userId);
         transactionHelper.run(() -> {
@@ -1065,7 +939,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
                 .type(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
                 .remark(ApplyTypeEnum.INVOICE_BILL_APPLY.getDesc())
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
-                .auditRoleCodes(RoleEnum.ADMIN.getCode())
+                .auditRoleCodes(RoleEnum.ADMIN.getCode() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
                 .build();
     }
@@ -1212,6 +1086,20 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         return baseMapper.getOverEventList();
     }
+    @Override
+    public ServerResult setBackRefundDate(InvoiceBillCreateVO createVO) {
+        if(Objects.isNull(createVO.getId())){
+            return  ServerResult.fail();
+        }
+        InvoiceBillOrderDO invoiceBillOrderDO = getById(createVO.getId());
+        if(Objects.isNull(invoiceBillOrderDO)){
+            throw new BusinessException("应收款单不存在！");
+        }
+        invoiceBillOrderDO.setBackRefundDate(createVO.getBackRefundDate());
+        updateById(invoiceBillOrderDO);
+        return ServerResult.success();
+    }
+
     public void createMergedCell(Sheet sheet, Workbook workbook, int rowIndex, int colIndex, int startRow, int endRow, int startCol, int endCol, String value) {
         // 创建或获取当前行
@@ -2007,7 +2007,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         orderOpinionLogService.saveBatch(orderOpinionLogDOList);
         return ServerResult.success();
     }
-//这个方法的作用就是:她们反应对于内部编号相同的订单,就不需要发送四个测试结果的产品意见信息,不然创建一个订单就发送四个测试结果,太麻烦了,所以这里根据项目号和测试结果进行区分。
+//这个方法的作用就是:她们反应对于内部编号相同的订单,就不需要发送四个测试结果的产品意见信息,不然创建一个订单选择测试结果后就发送四个测试结果,太麻烦了,所以这里根据项目号和测试结果进行区分。
     public void setEmailSendUtilsRedis(OrderBaseInfoDO orderBaseInfoDo,String resultText,String productionComment){
         if(!redisUtils.hasKey(orderBaseInfoDo.getInnerNo()+Constant.CROSS_BAR_CHARACTER+resultText)){
             sendProductionCommentEmail(orderBaseInfoDo,productionComment);
@@ -113,7 +113,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     @Override
     public ServerResult listByPage(OrderFieldLockApplyQueryVO queryVO) {
-        LambdaQueryWrapper<OrderFieldLockApplyDO> queryWrapper = buildQueryByParam(queryVO);
+        RoleEnum roleEnum = dataScope.getRole();
+        String loginUserName = dataScope.getLoginUserName();
+        LambdaQueryWrapper<OrderFieldLockApplyDO> queryWrapper = buildQueryByParam(queryVO,roleEnum);
         Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
         IPage<OrderFieldLockApplyDO> iPage = page(page, queryWrapper);
@@ -139,7 +141,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                         resultVO.setFieldInfos(fieldVO);
                     }
                     if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())) {
-                        //自定义。   解决待审批列表中的应收款要显示内部编码。
+                        // 解决待审批列表中的应收款要显示内部编码。 这里开始
                         OrderLockFieldVO orderLockFieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
                         if(Objects.nonNull(orderLockFieldVO.getInvoiceBillOrderDO()) && StringUtils.isNotBlank(orderLockFieldVO.getInvoiceBillOrderDO().getInvoiceNo())){
                             List<InvoiceBillMappingDO> invoiceBillMappingDOList= invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
@@ -159,12 +161,26 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                                     }
                                 }
                             }
+                        } //这里结束  上述为待审核列表中应收款要显示内部编码。
+                        //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
+                        if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
+                            if(Objects.nonNull(orderLockFieldVO.getInvoiceBillOrderDO()) && orderLockFieldVO.getInvoiceBillOrderDO().getBusinesPerson().equals(loginUserName)){
+                                resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                            }
+                        } else if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode())) {
+                            if(Objects.nonNull(orderLockFieldVO.getInvoiceBillOrderDO()) && orderLockFieldVO.getInvoiceBillOrderDO().getTrackerUser().equals(loginUserName)){
+                                resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                            }
+                        } else{
+                            resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                        }
+                        if(Objects.isNull(resultVO.getFieldInfos())){
+                           resultVO=null;
                         }
-                        resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                     }
                     if (ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(x.getType()) || ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(x.getType())) {
-
                         OrderLockFieldVO orderLockFieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
+                        // 解决待审批列表中的应付款要显示内部编码。 这里开始
                         if(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && StringUtils.isNotBlank(orderLockFieldVO.getCheckBillOrderDO().getCheckNo())){
                             List<CheckBillMappingDO> checkBillMappingDOList= checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
                                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
@@ -183,15 +199,31 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                                     }
                                 }
                             }
+                        }//这里结束  上述为待审核列表中应收款要显示内部编码。
+                        //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
+                        if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
+                            if(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getBusinesPerson().equals(loginUserName)){
+                                resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                            }
+                        } else if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode())) {
+                            if(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getTrackerUser().equals(loginUserName)){
+                                resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                            }
+                        } else{
+                            resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                        }
+                        if(Objects.isNull(resultVO.getFieldInfos())){
+                            resultVO=null;
                         }
-
-                        resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                     }
                 }
                 return resultVO;
-            }).collect(Collectors.toList());
-
-            fillOrderInfo(resultVOList);
+            }).filter(result->result!=null).collect(Collectors.toList());
+            if (resultVOList != null && resultVOList.stream().noneMatch(x -> ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())
+                    || ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(x.getType())
+                    || ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(x.getType()))) {
+                fillOrderInfo(resultVOList);
+            }
             webVOPage.setRecords(resultVOList);
         }
         BeanUtils.copyProperties(page, webVOPage, "records");
@@ -355,8 +387,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
      * @param queryVO
      * @return
      */
-    private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO) {
-        RoleEnum roleEnum = dataScope.getRole();
+    private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO,RoleEnum roleEnum) {
         RoleEnum roleSelect = null;
         if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) {
             queryVO.setBusinessPerson(dataScope.getLoginUserName());
@@ -369,21 +400,29 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 roleSelect = RoleEnum.ADMIN;
             }
         }
-        //这里是否还u需要添加财务角色权限的逻辑。
         Set<Long> orderIds = new HashSet<>();
-        if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
-                || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
-            List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>()
-                    .eq(StringUtils.isNotBlank(queryVO.getBusinessPerson()), OrderBaseInfoDO::getBusinessPerson, queryVO.getBusinessPerson())
-                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .in(CollectionUtils.isNotEmpty(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
-                    .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
-                    .in(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
-                    .in(CollectionUtils.isNotEmpty(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo()));
-            if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
-                orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
-            } else {
-                orderIds.add(-1L);
+        //由于下面是原始的代码,怕改出错了,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。   限制情况为跟单业务,对应收款,应付款,发票审核请求时。
+        if(RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
+
+        }else if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
+
+        }else{
+            /** 这部分代码是之前的,每台看懂,就先不修改了,保留*/
+            //这里是否还u需要添加财务角色权限的逻辑。
+            if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
+                    || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
+                List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>()
+                        .eq(StringUtils.isNotBlank(queryVO.getBusinessPerson()), OrderBaseInfoDO::getBusinessPerson, queryVO.getBusinessPerson())
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(CollectionUtils.isNotEmpty(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                        .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
+                        .in(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
+                        .in(CollectionUtils.isNotEmpty(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo()));
+                if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
+                    orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
+                } else {
+                    orderIds.add(-1L);
+                }
             }
         }
         LambdaQueryWrapper<OrderFieldLockApplyDO> queryWrapper = new LambdaQueryWrapper<OrderFieldLockApplyDO>()
@@ -392,6 +431,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus())
                 .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList())
                 .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
+        //这里应该加上应收款待审核,应付款待审核,应付款已审核,应收款已审核已审核的一个条件。
         if(Objects.nonNull(queryVO.getType())){
             if(Constant.FOUR == String.valueOf(queryVO.getType()).length()){
                 int firstTwoDigits = queryVO.getType() / 100;
@@ -401,11 +441,50 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
             }
         }
-        if (Objects.isNull(roleSelect)) {
-            queryWrapper.like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode());
-        }else {
-            queryWrapper.eq(Objects.nonNull(roleSelect), OrderFieldLockApplyDO::getAuditRoleCodes, roleSelect.getCode());
+  /*      //只针对于应收款的过滤信息。这两个搜索框只会在应收款和应付款中进行展示。 还没有测试行不行。
+        if (StringUtils.isNotBlank(queryVO.getInvoiceNo())) {
+            String invoiceNos = queryVO.getInvoiceNo();
+            // 防止空值或分割后的数组为空
+            if (invoiceNos != null && !invoiceNos.trim().isEmpty()) {
+                String[] invoiceNoArray = invoiceNos.split(",");
+                // 确保数组不为空并过滤空白元素
+                String condition = Arrays.stream(invoiceNoArray)
+                        .filter(StringUtils::isNotBlank) // 过滤掉空白字符串
+                        .map(val -> "'" + val.trim() + "'") // 去掉多余空格并加单引号
+                        .collect(Collectors.joining(","));
+                if (!condition.isEmpty()) { // 防止最终拼接的条件为空
+                    queryWrapper.apply("JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceNo')) IN (" + condition + ")");
+                }
+            }
+        }
+//只针对于应付款的过滤信息。
+        if (StringUtils.isNotBlank(queryVO.getCheckNo())) {
+            String checkNos = queryVO.getCheckNo();
+            // 防止空值或分割后的数组为空
+            if (checkNos != null && !checkNos.trim().isEmpty()) {
+                String[] checkNoArray = checkNos.split(",");
+                // 确保数组不为空并过滤空白元素
+                String condition = Arrays.stream(checkNoArray)
+                        .filter(StringUtils::isNotBlank) // 过滤掉空白字符串
+                        .map(val -> "'" + val.trim() + "'") // 去掉多余空格并加单引号
+                        .collect(Collectors.joining(","));
+                if (!condition.isEmpty()) { // 防止最终拼接的条件为空
+                    queryWrapper.apply("JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceNo')) IN (" + condition + ")");
+                }
+            }
+        }*/
+        //由于不懂下面的代码,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。
+        if(RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
+        }else if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
+
+        }else{
+            if (Objects.isNull(roleSelect)) {
+                queryWrapper.like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode());
+            }else {
+                queryWrapper.eq(Objects.nonNull(roleSelect), OrderFieldLockApplyDO::getAuditRoleCodes, roleSelect.getCode());
+
+            }
         }
         return queryWrapper;
     }
@@ -545,12 +624,12 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             if (Objects.nonNull(recordDO)) {
                 if (applyDO.getAuditRoleCodes().contains(RoleEnum.BUSINESS_USER.getCode())) {
                     recordField.setBaseFields(applyField.getBaseFields());
+                    recordField.setTrackStageFields(applyField.getTrackStageFields());
+                    recordField.setInspectionStageFields(applyField.getInspectionStageFields());
                     recordDO.setFields(JSONObject.toJSONString(recordField));
                 } else {
-                    recordField.setTrackStageFields(applyField.getTrackStageFields());
                     recordField.setReportFields(applyField.getReportFields());
                     recordField.setProfitAnalysisFields(applyField.getProfitAnalysisFields());
-                    recordField.setInspectionStageFields(applyField.getInspectionStageFields());
                     recordDO.setFields(JSONObject.toJSONString(recordField));
                 }
             } else {
@@ -95,7 +95,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         }
         //跟单也只能看到自己创建的,业务只能看到自己的
         if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())){
-            queryWrapper.eq(ProducePaymentCheckBillOrderDO::getCreateBy, dataScope.getLoginUserName());
+            queryWrapper.eq(ProducePaymentCheckBillOrderDO::getTrackerUser, dataScope.getLoginUserName());
         }
         if(Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())){
             queryWrapper.eq(ProducePaymentCheckBillOrderDO::getBusinesPerson, dataScope.getLoginUserName());
@@ -177,40 +177,6 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
      * @param exportVOS
      * @return
      */
-//    private CheckBillAnalysisResultVO wrapperAnalysisResultVO(List<CheckBillAnalysisExportVO> exportVOS) {
-//        if (CollectionUtils.isEmpty(exportVOS)) {
-//            return null;
-//        }
-//        CheckBillAnalysisResultVO resultVO = CheckBillAnalysisResultVO.builder().exportVOS(exportVOS).build();
-//        BigDecimal productionDepartmentTotalPrice = new BigDecimal(Constant.ZERO);
-//        BigDecimal deductAmount = new BigDecimal(Constant.ZERO);
-//        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
-//        BigDecimal calculateActualPayedAmount = new BigDecimal(Constant.ZERO);
-//        BigDecimal unPayedAmount = new BigDecimal(Constant.ZERO);
-//        for (CheckBillAnalysisExportVO exportVO : exportVOS) {
-//            if (Objects.nonNull(exportVO.getProductionDepartmentTotalPrice())) {
-//                productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(exportVO.getProductionDepartmentTotalPrice());
-//            }
-//            if (Objects.nonNull(exportVO.getDeductAmount())) {
-//                deductAmount = deductAmount.add(exportVO.getDeductAmount());
-//            }
-//            if (Objects.nonNull(exportVO.getActualPayedAmount())) {
-//                actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
-//            }
-//            if (Objects.nonNull(exportVO.getCalculateActualPayedAmount())) {
-//                calculateActualPayedAmount = calculateActualPayedAmount.add(exportVO.getCalculateActualPayedAmount());
-//            }
-//            if (Objects.nonNull(exportVO.getUnPayedAmount())) {
-//                unPayedAmount = unPayedAmount.add(exportVO.getUnPayedAmount());
-//            }
-//        }
-//        resultVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, RoundingMode.HALF_UP));
-//        resultVO.setDeductAmount(deductAmount.setScale(2, RoundingMode.HALF_UP));
-//        resultVO.setActualPayedAmount(actualPayedAmount.setScale(2, RoundingMode.HALF_UP));
-//        resultVO.setCalculateActualPayedAmount(calculateActualPayedAmount.setScale(2, RoundingMode.HALF_UP));
-//        resultVO.setUnPayedAmount(unPayedAmount.setScale(2, RoundingMode.HALF_UP));
-//        return resultVO;
-//    }
     //第二版开始。
     private List<CheckBillAnalysisResultVO> wrapperAnalysisResultVO(List<CheckBillAnalysisExportVO> exportVOS) {
@@ -237,12 +203,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                 if (Objects.nonNull(exportVO.getActualPayedAmount())) {
                     actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
                 }
-//                if (Objects.nonNull(exportVO.getCalculateActualPayedAmount())) {
-//                    calculateActualPayedAmount = calculateActualPayedAmount.add(exportVO.getCalculateActualPayedAmount());
-//                }
-//                if (Objects.nonNull(exportVO.getUnPayedAmount())) {
-//                    unPayedAmount = unPayedAmount.add(exportVO.getUnPayedAmount());
-//                }
+
             }
             resultVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, RoundingMode.HALF_UP));
             resultVO.setDeductAmount(deductAmount.setScale(2, RoundingMode.HALF_UP));
@@ -397,40 +358,6 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
 //    private List<Map<String, Object>> buildExportMapVOS(CheckBillAnalysisResultVO resultVO) throws IOException {
         //第二版开始。
         private List<Map<String, Object>> buildExportMapVOS(List<CheckBillAnalysisResultVO> resultVO) throws IOException {
-            //第二版结束。
-
-      /*  List<CheckBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
-        List<Map<String, Object>> list = new ArrayList<>();
-        int i = 0;
-        for (CheckBillAnalysisExportVO exportVO : exportVOS) {
-            Map<String, Object> map = new LinkedHashMap<>();
-            map.put("编号", i++);
-            map.put("生产科名称", exportVO.getProductionDepartment());
-            map.put("生产科对账单号码", exportVO.getCheckNo());
-            map.put("生产科总价汇总", exportVO.getProductionDepartmentTotalPrice());
-            map.put("生产科扣款金额汇总", exportVO.getDeductAmount());
-            map.put("生产科实际应付金额", exportVO.getCalculateActualPayedAmount());
-            map.put("实际付款金额汇总", exportVO.getActualPayedAmount());
-            map.put("未付金额金额", exportVO.getUnPayedAmount());
-            map.put("生产科应付款日期", exportVO.getPayedDate());
-            map.put("实际付款日期", exportVO.getActualPayedDate());
-            list.add(map);
-        }
-        Map<String, Object> map = new LinkedHashMap<>();
-        map.put("编号", i++);
-        map.put("生产科名称", "");
-        map.put("生产科对账单号码", "");
-        map.put("生产科总价汇总", resultVO.getProductionDepartmentTotalPrice());
-        map.put("生产科扣款金额汇总", resultVO.getDeductAmount());
-        map.put("生产科实际应付金额", resultVO.getCalculateActualPayedAmount());
-        map.put("实际付款金额汇总", resultVO.getActualPayedAmount());
-        map.put("未付金额金额", resultVO.getUnPayedAmount());
-        map.put("生产科应付款日期", "");
-        map.put("实际付款日期", "");
-        list.add(map);*/
-
-
-//            List<CheckBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
             //第二版开始。
             List<CheckBillAnalysisExportVO> exportVOS = resultVO.stream().flatMap(x -> x.getExportVOS().stream())
@@ -465,7 +392,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                 map.put("生产科扣款金额汇总", "￥"+exportVO.getDeductAmount());
                 map.put("生产科实际应付金额", "￥"+exportVO.getCalculateActualPayedAmount());
                 map.put("实际付款金额汇总", "￥"+exportVO.getActualPayedAmount());
-                map.put("未付金额金额","￥"+exportVO.getUnPayedAmount());
+                map.put("未付金额汇总","￥"+exportVO.getUnPayedAmount());
                 map.put("生产科应付款日期", exportVO.getPayedDate());
                 map.put("实际付款日期", exportVO.getActualPayedDate());
                 list.add(map);
@@ -486,7 +413,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                 subTotalMap.put("生产科扣款金额汇总", "￥"+subTotalDeductAmount);
                 subTotalMap.put("生产科实际应付金额", "￥"+subTotalActualReceivableAmount);
                 subTotalMap.put("实际付款金额汇总", "￥"+subTotalActualPayedAmount);
-                subTotalMap.put("未付金额金额", "￥"+subTotalOtherAmount);
+                subTotalMap.put("未付金额汇总", "￥"+subTotalOtherAmount);
                 subTotalMap.put("生产科应付款日期", "");
                 subTotalMap.put("实际付款日期", "");
                 list.add(subTotalMap);
@@ -508,7 +435,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         totalMap.put("生产科扣款金额汇总", "￥"+totalDeductAmount);
         totalMap.put("生产科实际应付金额", "￥"+totalActualReceivableAmount);
         totalMap.put("实际付款金额汇总", "￥"+totalActualPayedAmount);
-        totalMap.put("未付金额金额", "￥"+totalOtherAmount);
+        totalMap.put("未付金额汇总", "￥"+totalOtherAmount);
         totalMap.put("生产科应付款日期", "");
         totalMap.put("实际付款日期", "");
         list.add(totalMap);
@@ -759,6 +686,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                 .status(ApplyStatusEnum.NO_COMMIT.getStatus())
                 .productionName(orderBaseInfoDOList.get(0).getProductionDepartment())
                 .businesPerson(orderBaseInfoDOList.get(0).getBusinessPerson())
+                .trackerUser(orderBaseInfoDOList.get(0).getCreateBy())
                 .build();
     }
@@ -848,21 +776,6 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         checkCommitApply(checkBillOrderDO.getId());
         //需要判断一下是否为空?不然知己以逗号分隔会报错。
-//        if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
-//            List<String> deductUrlList = new ArrayList<>(Arrays.asList(
-//                    org.apache.commons.lang3.StringUtils.defaultString(deductInfoVO.getDeductUrl()).split(",")
-//            ));
-//            String lastElement = deductUrlList.get(deductUrlList.size() - 1);
-//            if(StringUtils.isNotBlank(lastElement)){
-//                if(!deductUrlList.contains(lastElement)){
-//                    deductUrlList.add(lastElement);
-//                }
-//            }
-//            String updatedDeductUrl = String.join(",", deductUrlList);
-//            checkBillOrderDO.setDeductUrl(updatedDeductUrl);
-//        }else{
-//            checkBillOrderDO.setDeductUrl(deductInfoVO.getDeductUrl());
-//        }
         if(StringUtils.isNotBlank(checkBillOrderDO.getDeductUrl())){
 //记住:需要修改数据表对应的字段deduct_url的varchar数据范围,修改为1000左右。
             if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
@@ -938,21 +851,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         //校验是否有处于待审核的订单。
         checkCommitApply(checkBillOrderDO.getId());
         OrderLockFieldVO locakFieldVO = new OrderLockFieldVO();
-//        if(StringUtils.isNotBlank(checkBillOrderDO.getInvoiceUrl())){
-//            if(StringUtils.isNotBlank(invoiceInfoVO.getInvoiceUrl())){
-//               Set<String> deductUrlSet = new HashSet<>(Arrays.asList(
-//                        org.apache.commons.lang3.StringUtils.defaultString(checkBillOrderDO.getInvoiceUrl()).split(",")));
-//               if(!deductUrlSet.contains(invoiceInfoVO.getInvoiceUrl())){
-//                   deductUrlSet.add(invoiceInfoVO.getInvoiceUrl());
-//                   String updateDeductUrl=String.join(",",deductUrlSet);
-//                   checkBillOrderDO.setInvoiceUrl(updateDeductUrl);
-//               }
-//            }
-//        }else {
-//            if(StringUtils.isNotBlank(invoiceInfoVO.getInvoiceUrl())){
-//                checkBillOrderDO.setInvoiceUrl(invoiceInfoVO.getInvoiceUrl());
-//            }
-//        }
+
         //事务:待审核,设置为admin和财务才有权限审批。
         transactionHelper.run(() -> {
             checkBillOrderDO.setDepartmentInvoiceStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
@@ -989,30 +888,6 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         String loginUserName = dataScope.getLoginUserName();
         checkApply(commitApplyVO.getId(), userId,ApplyTypeEnum.CHECK_BILL_APPLY.getType());
-     /*   List<CheckBillMappingDO> checkBillMappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
-                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(CheckBillMappingDO::getCheckNo, checkBillOrderDO.getCheckNo()));
-        if(CollectionUtils.isNotEmpty(checkBillMappingDOS)){
-            List<Long> orderIds = checkBillMappingDOS.stream().map(CheckBillMappingDO::getOrderId).collect(Collectors.toList());
-            List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
-                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .in(OrderProfitAnalysisDO::getOrderId, orderIds));
-            if(CollectionUtils.isNotEmpty(orderProfitAnalysisDOS)){
-//                List<Double> totalPrice = orderProfitAnalysisDOS.stream().map(OrderProfitAnalysisDO::getProductionDepartmentTotalPrice).collect(Collectors.toList());
-                BigDecimal totalConvertedAmount = orderProfitAnalysisDOS.stream().map(order -> BigDecimal.valueOf(order.getProductionDepartmentTotalPrice()))
-                        .reduce(BigDecimal.ZERO, BigDecimal::add);
-                BigDecimal formattedSum = totalConvertedAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                if(Objects.nonNull(formattedSum)){
-                    //客户总价金额汇总。
-                    checkBillOrderDO.setTotalProductionAmount(formattedSum);
-                }else {
-                    checkBillOrderDO.setTotalProductionAmount( BigDecimal.ZERO);
-                }
-            }
-        }
-        if(Objects.isNull(checkBillOrderDO.getDeductAmount())){
-             checkBillOrderDO.setDeductAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
-        }*/
         checkBillOrderDO.setActualPayedDate(commitApplyVO.getActualPayedDate());
         checkBillOrderDO.setFinancePerson(loginUserName);
         OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(checkBillOrderDO, userId);
@@ -1041,7 +916,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                 .type(ApplyTypeEnum.CHECK_BILL_APPLY.getType())
                 .remark(ApplyTypeEnum.CHECK_BILL_APPLY.getDesc())
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
-                .auditRoleCodes(RoleEnum.ADMIN.getCode())
+                .auditRoleCodes(RoleEnum.ADMIN.getCode() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
                 .build();
     }
@@ -1186,6 +1061,21 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     public List<ProducePaymentCheckBillOrderDO> getOverEventList(){
        return  baseMapper.getOverEventList();
     }
+
+    @Override
+    public ServerResult setPayedDate(ProducePaymentCheckBillCreateVO createVO) {
+        if(Objects.isNull(createVO.getId())){
+            return  ServerResult.fail();
+        }
+        ProducePaymentCheckBillOrderDO checkBillOrderDO = getById(createVO.getId());
+        if(Objects.isNull(checkBillOrderDO)){
+            throw new BusinessException("生产科对账单不存在！");
+        }
+        checkBillOrderDO.setPayedDate(createVO.getPayedDate());
+        updateById(checkBillOrderDO);
+        return ServerResult.success();
+    }
+
     @Override
     public ServerResult exportReceipt(HttpServletResponse response,ProducePaymentCheckBillOrderDO queryVO) throws IOException {
         XSSFWorkbook workbook = new XSSFWorkbook();
 server:
-  port: 18001
+  port: 8000
 spring:
   profiles:
-    active: pre-prod
 \ No newline at end of file
+    active: prod
 \ No newline at end of file