fix:1.生产指示书对于内部,无法查看生产科单价。

2.业务研发利润表中的包装费用表,添加跟单提成。 3.业务研发底下的四个表添加未完成状态筛选。

fix:1.生产指示书对于内部,无法查看生产科单价。
2.业务研发利润表中的包装费用表,添加跟单提成。 3.业务研发底下的四个表添加未完成状态筛选。
chenhang4442024
1 parent c7b3407f
Showing 10 changed files with 180 additions and 36 deletions
src/main/java/com/order/erp/common/utils/EasyPdfUtils.java
src/main/java/com/order/erp/domain/dto/order/OrderCostInfoDO.java
src/main/java/com/order/erp/domain/vo/order/BusinessProfitDetailVO.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/domain/vo/order/OrderCostInfoVO.java
src/main/java/com/order/erp/domain/vo/order/OrderCostInfolockFieldVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
src/main/resources/mapper/ProjectBaseInfoMapper.xml
@@ -420,8 +420,13 @@ public class EasyPdfUtils {
             }
             dataCellList.add(createCell(productionDepartmentConsignTime, 110F));
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPacketType()) ? producePdfVO.getPacketType() : "", 80F));
-            dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentPrice()) ? "" + "￥"+producePdfVO.getProductionDepartmentPrice() : "", 110F));
-            dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? "" + "￥"+producePdfVO.getProductionDepartmentTotalPrice() : "", 110F));
+            if(!"内部".equals(producePdfVO.getProductionDepartment())){
+                dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentPrice()) ? "" + "￥"+producePdfVO.getProductionDepartmentPrice() : "", 110F));
+                dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? "" + "￥"+producePdfVO.getProductionDepartmentTotalPrice() : "", 110F));
+            }else{
+                dataCellList.add(createCell( "无权限", 110F));
+                dataCellList.add(createCell( "无权限", 110F));
+            }
             rowList.add(XEasyPdfHandler.Table.Row.build(dataCellList));
         }
@@ -442,7 +447,11 @@ public class EasyPdfUtils {
             endCellList.add(createCell("", 110F));
             endCellList.add(createCell("", 80F));
             endCellList.add(createCell("", 110F));
+            if("内部".equals(pdfVOList.get(0).getProductionDepartment())){
+            endCellList.add(createCell("无权限" , 110F, 16F));
+            }else{
             endCellList.add(createCell("￥" + totalPrice, 110F, 16F));
+            }
             rowList.add(XEasyPdfHandler.Table.Row.build(endCellList));
         }
@@ -41,6 +41,8 @@ public class OrderCostInfoDO extends BaseDO implements Serializable {
     private BigDecimal productionDepartmentPredictPrice;
     private BigDecimal productionActualPrice;
+    //包装费用明细表中的跟单评分。 (1-100分)
+    private Integer orderScore;
     private BigDecimal packetActualRmbTotalPrice;
     //生产科预算单价
@@ -87,6 +87,16 @@ public class BusinessProfitDetailVO implements Serializable {
      */
     @ApiModelProperty(value = "包装费用实际金额（人民币）")
     private BigDecimal packetActualRmbTotalPrice;
+    /**
+     * 跟单评分
+     * */
+    @ApiModelProperty(value = "跟单评分")
+    private Integer orderScore;
+    /**
+     * 跟单金额。
+     * */
+    @ApiModelProperty(value = "跟单提成（人民币）")
+    private BigDecimal copyCommission;
     /**
      * 实际跟单单价￥
@@ -26,6 +26,10 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     private List<Long> ids;
     private Set<Long> orderIds;
+   /**
+    * 查询不通过的订单。
+    * */
+    private Set<Long> notInOrderIds;
     private Long id;
@@ -232,5 +236,10 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
      * 业务研发以及内部生产表中的前缀项目号
      * */
     private Set<String> projectNoPrefixSet;
+
+    /**
+     * 控制mapper.xml文件中查询分支的判断依据。
+     * */
+    private Boolean isFinish;
 }
@@ -45,7 +45,8 @@ public class OrderCostInfoVO implements Serializable {
     private Integer orderCount;
     //单价  之前前端是传递productionDepartmentPredictPrice,现在改为传递单价,所以传递productionDepartmentPredictUnitPrice。
     private BigDecimal productionDepartmentPredictUnitPrice;
-
+    //包装费用明细表中的跟单评分。 (1-100分)
+    private Integer orderScore;
     //内部生产费用明细表状态。
     private Integer innerProduceStatus;
     //包装费用费用明细表状态。
@@ -41,6 +41,10 @@ public class OrderCostInfolockFieldVO implements Serializable {
     private String packetActualRmbTotalPrice;
     /**
+     * 跟单评分
+     * */
+    private String orderScore;
+    /**
      * 生产科预算单价。
      * */
     private String productionDepartmentPredictUnitPrice;
@@ -1607,6 +1607,7 @@ end
                 .ge(StringUtils.isNotBlank(queryVO.getOrderHodStartTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodStartTime())
                 .le(StringUtils.isNotBlank(queryVO.getOrderHodEndTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodEndTime())
                 .in(CollectionUtils.isNotEmpty(queryVO.getOrderIds()), OrderBaseInfoDO::getId, queryVO.getOrderIds())
+                .notIn(CollectionUtils.isNotEmpty(queryVO.getNotInOrderIds()), OrderBaseInfoDO::getId, queryVO.getNotInOrderIds())
                 .in(CollectionUtils.isNotEmpty(queryVO.getInvoiceNo()),OrderBaseInfoDO::getInvoiceNo,queryVO.getInvoiceNo())
                 .in(CollectionUtils.isNotEmpty(queryVO.getCheckNo()),OrderBaseInfoDO::getCheckNo,queryVO.getCheckNo())
                 .eq(Objects.nonNull(queryVO.getInvoiceStatus()), OrderBaseInfoDO::getInvoiceStatus, queryVO.getInvoiceStatus())
@@ -21,6 +21,7 @@ import com.order.erp.common.utils.*;
 import com.order.erp.config.DataScope;
 import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
 import com.order.erp.domain.dto.order.OrderCostInfoDO;
@@ -115,6 +116,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         OrderCostInfolockFieldVO originOrderCostInfolockFieldVO = JSONObject.parseObject(Optional.ofNullable(orderCostFieldLockRecord.getFields()).orElse("{}"), OrderCostInfolockFieldVO.class);
         if(Objects.nonNull(vo.getPacketActualRmbTotalPrice())){
             originOrderCostInfolockFieldVO.setPacketActualRmbTotalPrice(OrderLockFieldEnum.LOCKED.name());
+            originOrderCostInfolockFieldVO.setOrderScore(OrderLockFieldEnum.LOCKED.name());
             type=ProjectOptTypeEnum.PACKAGING_COST_TYPE.getType();
             operationDesc = isUpdate
                     ? OrderOptTypeEnum.PROJECT_COST_EDIT.getDesc()
@@ -122,7 +124,9 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             //编辑包装费用实际金额之后状态为待审核
             /*需要考虑一个问题,假如状态为已通过,但是没有进行任何的修改而点击了确认,那么它的状态会由已审核变为待审核,所以需要进行判断一下,此次传递来的数据是否与上一次的数据一致,如果不一致则需要进行状态设置*/
             if(isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getPackStatus())
-                    && vo.getPacketActualRmbTotalPrice().compareTo(oldOrderCostInfoDO.getPacketActualRmbTotalPrice()) == 0){
+                    && vo.getPacketActualRmbTotalPrice().compareTo(oldOrderCostInfoDO.getPacketActualRmbTotalPrice()) == 0
+                    && ( vo.getOrderScore().equals(oldOrderCostInfoDO.getOrderScore()))
+            ){
             }else{
                 orderCostInfoDO.setPackStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
             }
@@ -167,6 +171,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         }
         OrderCostInfolockFieldVO lockField = OrderCostInfolockFieldVO.builder()
                 .packetActualRmbTotalPrice(vo.getPacketActualRmbTotalPrice())
+                .orderScore(vo.getOrderScore())
                 .productionActualPrice(vo.getProductionActualPrice())
                 .productionDepartmentPredictPrice(vo.getProductionDepartmentPredictPrice())
                 .productionDepartmentPredictUnitPrice(vo.getProductionDepartmentPredictUnitPrice())
@@ -196,10 +201,18 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Override
     public ServerResult<Page<InnerProfitDetailVO>> listInnerProfitDetailByPage(OrderBaseInfoQueryVO queryVO) {
         Set<Long> orderIds = null;
+        Long loginUserId = dataScope.getLoginUserId();
         if(Objects.nonNull(queryVO.getInnerProduceStatus())){
-            List<OrderCostInfoDO> list = list(new LambdaQueryWrapper<OrderCostInfoDO>()
-                    .select(OrderCostInfoDO::getOrderId).eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(OrderCostInfoDO::getInnerProduceStatus, queryVO.getInnerProduceStatus()));
+            List<OrderCostInfoDO> list;
+            if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getInnerProduceStatus())){
+                 list = list(new LambdaQueryWrapper<OrderCostInfoDO>()
+                        .select(OrderCostInfoDO::getOrderId).eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(OrderCostInfoDO::getInnerProduceStatus, ProfitStatusEnum.PENDING_APPROVAL.getStatus(), ProfitStatusEnum.APPROVED.getStatus()));
+            }else{
+                 list = list(new LambdaQueryWrapper<OrderCostInfoDO>()
+                        .select(OrderCostInfoDO::getOrderId).eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(OrderCostInfoDO::getInnerProduceStatus, queryVO.getInnerProduceStatus()));
+            }
             orderIds = CollectionUtils.isEmpty(list)
                     ? new HashSet<>()
                     : list.stream()
@@ -208,7 +221,11 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .collect(Collectors.toSet());
         }
         if(CollectionUtils.isNotEmpty(orderIds)){
-            queryVO.setOrderIds(orderIds);
+             if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getInnerProduceStatus())){
+                 queryVO.setNotInOrderIds(orderIds);
+             }else{
+                 queryVO.setOrderIds(orderIds);
+             }
         }
         ServerResult serverResult = orderBaseInfoService.listByPage(queryVO);
         Page<OrderInfoResultVO> page = (Page<OrderInfoResultVO>) serverResult.getData();
@@ -219,7 +236,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     Set<Long> collect = records.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
                     if (CollUtil.isNotEmpty(collect)) {
                         query.in(OrderCostFieldLockRecord::getOrderId, collect);
-
+                        query.eq(OrderCostFieldLockRecord::getUserId, loginUserId);
                     } else {
                         query.apply("1!=1");
                     }
@@ -232,7 +249,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             } catch (JsonProcessingException e) {
                 throw new RuntimeException(e);
             }
-        }));
+        },(v1, v2) -> v2));
         List<InnerProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
             OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
             OrderCostInfolockFieldVO lockFields = Optional.ofNullable(orderId2fieldMapMap.get(record.getId()))
@@ -317,11 +334,19 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Override
     public ServerResult<Page<BusinessProfitDetailVO>> listBusinessProfitDetailByPage(OrderBaseInfoQueryVO queryVO) {
+        Long loginUserId = dataScope.getLoginUserId();
         Set<Long> orderIds=null;
         if(Objects.nonNull(queryVO.getPackStatus())){
-            List<OrderCostInfoDO> list = list(new LambdaQueryWrapper<OrderCostInfoDO>().select(OrderCostInfoDO::getOrderId)
-                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(OrderCostInfoDO::getPackStatus, queryVO.getPackStatus()));
+            List<OrderCostInfoDO> list;
+            if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getPackStatus())){
+                 list = list(new LambdaQueryWrapper<OrderCostInfoDO>().select(OrderCostInfoDO::getOrderId)
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(OrderCostInfoDO::getPackStatus, ProfitStatusEnum.PENDING_APPROVAL.getStatus(), ProfitStatusEnum.APPROVED.getStatus()));
+            }else{
+                list = list(new LambdaQueryWrapper<OrderCostInfoDO>().select(OrderCostInfoDO::getOrderId)
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(OrderCostInfoDO::getPackStatus, queryVO.getPackStatus()));
+            }
              orderIds = CollectionUtils.isEmpty(list)
                     ? new HashSet<>()
                     : list.stream()
@@ -330,7 +355,11 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .collect(Collectors.toSet());
         }
         if(CollectionUtils.isNotEmpty(orderIds)){
-            queryVO.setOrderIds(orderIds);
+            if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getPackStatus())){
+                queryVO.setNotInOrderIds(orderIds);
+            }else{
+                queryVO.setOrderIds(orderIds);
+            }
         }
         ServerResult serverResult = orderBaseInfoService.listByPage(queryVO);
         Page<OrderInfoResultVO> page = (Page<OrderInfoResultVO>) serverResult.getData();
@@ -341,6 +370,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     Set<Long> collect = records.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
                     if (CollUtil.isNotEmpty(collect)) {
                         query.in(OrderCostFieldLockRecord::getOrderId, collect);
+                        query.eq(OrderCostFieldLockRecord::getUserId, loginUserId);
                     } else {
                         query.apply("1!=1");
@@ -354,9 +384,13 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             } catch (JsonProcessingException e) {
                 throw new RuntimeException(e);
             }
-        }));
+        },(v1, v2) -> v2));
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
-
+        //获取所有的客户提成提成配置。
+        List<SystemSettingDO> systemSettingDOS = systemSettingService.list(new LambdaQueryWrapper<SystemSettingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getRelationCode, "costSettingItem"));
+        Map<String, List<SystemSettingDO>> systemSettingDOSMap = systemSettingDOS.stream().collect(Collectors.groupingBy(SystemSettingDO::getSettingValue));
         List<BusinessProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
             OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
             OrderCostInfolockFieldVO lockFields = Optional.ofNullable(orderId2fieldMapMap.get(record.getId())).orElse(
@@ -366,6 +400,11 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
                     lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
+                //跟单评分。
+                if(Objects.isNull(lockFields.getOrderScore())){
+                    lockFields.setOrderScore(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getOrderScore()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+
+                }
                 if(Objects.isNull(lockFields.getProductionActualPrice())){
                     lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
                 }
@@ -376,6 +415,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 lockFields.setPacketActualRmbTotalPrice(OrderLockFieldEnum.UN_LOCKED.name());
                 lockFields.setProductionActualPrice(OrderLockFieldEnum.UN_LOCKED.name());
                 lockFields.setProductionDepartmentPredictPrice(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setOrderScore(OrderLockFieldEnum.UN_LOCKED.name());
             }
             BusinessProfitDetailVO vo = BusinessProfitDetailVO.builder()
                     .orderId(record.getId())
@@ -409,6 +449,35 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 //包装费用净利润率 = 包装费用收益/包装费用合计
                 vo.setPacketProfitRate(vo.getPacketProfitRmbPrice().divide(BigDecimal.valueOf(vo.getPacketRmbTotalPrice()), 4, RoundingMode.HALF_UP));
             }
+            if(Objects.nonNull(orderCostInfo) && Objects.nonNull(orderCostInfo.getOrderScore())){
+                vo.setOrderScore(orderCostInfo.getOrderScore());
+                String projectFix = ProjectNoUtils.extractProjectNoPrefix(record.getProjectNo());
+                String substring = projectFix.substring(projectFix.lastIndexOf("-") + 1).substring(0, 2);
+                Optional<SystemSettingDO> optionalSetting = systemSettingDOSMap.values().stream()
+                        .flatMap(List::stream)
+                        .filter(setting -> setting.getSettingValue().equals(record.getCustomerCode()))
+                        .filter(setting -> setting.getRelationName().substring(2, 4).equals(substring))
+                        .findFirst();
+                if(optionalSetting.isPresent()){
+                    SystemSettingDO systemSettingDO = optionalSetting.get();
+                    List<Map<String,String>> relations=null;
+                    try {
+                     relations= objectMapper.readValue(systemSettingDO.getRelationValue(),objectMapper.getTypeFactory().constructType(List.class, Map.class));
+                    } catch (JsonProcessingException e) {
+                        throw new RuntimeException(e);
+                    }
+                    String  copyCommission= null;
+                    for(Map<String,String> relation:relations){
+                        if("copyCommission".equals(relation.get("relationCode"))){
+                            copyCommission = relation.get("relationValue");
+                        }
+                    }
+                    if(StringUtils.isNotBlank(copyCommission)){
+                        //提成金额 = 跟单评分 * 跟单提成计算。
+                        vo.setCopyCommission(new BigDecimal(copyCommission) .multiply(BigDecimal.valueOf(orderCostInfo.getOrderScore()).divide(BigDecimal.valueOf(100))).setScale(2, RoundingMode.HALF_UP));
+                    }
+                    }
+            }
             return vo;
         }).collect(Collectors.toList());
         Page<BusinessProfitDetailVO> webVOPage = new Page<>();
@@ -611,6 +680,8 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             map.put("实际跟单单价￥",Objects.nonNull(vo.getPacketActualRmbPrice()) ? vo.getPacketActualRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
             map.put("实际跟单单价$",Objects.nonNull(vo.getPacketActualPrice()) ? vo.getPacketActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
             map.put("包装费用净利润率",Objects.nonNull(vo.getPacketProfitRate()) ? vo.getPacketProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            map.put("跟单评分",Objects.nonNull(vo.getOrderScore()) ? vo.getOrderScore() : "");
+            map.put("跟单提成￥",Objects.nonNull(vo.getCopyCommission()) ? vo.getCopyCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
 //            if(StringUtils.isNotBlank(queryVO.getBusinessCostExportSelect().getPacketPrice()) &&
 //                OrderLockFieldEnum.SELECTED.name().equals(queryVO.getBusinessCostExportSelect().getPacketPrice())){
 //
@@ -290,10 +290,20 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         Set<String> projectNoPrefix = null;
         //如果有状态则先查询有状态的数据。
         if(Objects.nonNull(queryVO.getInnerProductionStatus())){
-            List<ProjectBaseInfoDO> list = list(new LambdaQueryWrapper<ProjectBaseInfoDO>()
-                    .select(ProjectBaseInfoDO::getProjectNoPrefix)
-                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(ProjectBaseInfoDO::getInnerProductionStatus, queryVO.getInnerProductionStatus()));
+            List<ProjectBaseInfoDO> list;
+            if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getInnerProductionStatus())){
+                 list = list(new LambdaQueryWrapper<ProjectBaseInfoDO>()
+                        .select(ProjectBaseInfoDO::getProjectNoPrefix)
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(ProjectBaseInfoDO::getInnerProductionStatus, ProfitStatusEnum.APPROVED.getStatus(),ProfitStatusEnum.PENDING_APPROVAL.getStatus()));
+                 queryVO.setIsFinish(false);
+            }else{
+                 list = list(new LambdaQueryWrapper<ProjectBaseInfoDO>()
+                        .select(ProjectBaseInfoDO::getProjectNoPrefix)
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(ProjectBaseInfoDO::getInnerProductionStatus, queryVO.getInnerProductionStatus()));
+                 queryVO.setIsFinish(true);
+            }
             projectNoPrefix = CollectionUtils.isEmpty(list)
                     ? new HashSet<>()
                     : list.stream()
@@ -316,10 +326,22 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         Set<String> projectNoPrefix = null;
         //如果有状态则先查询有状态的数据。
         if(Objects.nonNull(queryVO.getDevelopmentStatus())){
-            List<ProjectBaseInfoDO> list = list(new LambdaQueryWrapper<ProjectBaseInfoDO>()
-                    .select(ProjectBaseInfoDO::getProjectNoPrefix)
-                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(ProjectBaseInfoDO::getDevelopmentStatus, queryVO.getDevelopmentStatus()));
+            List<ProjectBaseInfoDO> list;
+            if(ProfitStatusEnum.Not_COMPLETED.getStatus().equals(queryVO.getDevelopmentStatus())){
+                //查询业务研发未创建的单子
+                list = list(new LambdaQueryWrapper<ProjectBaseInfoDO>()
+                        .select(ProjectBaseInfoDO::getProjectNoPrefix)
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(ProjectBaseInfoDO::getDevelopmentStatus, ProfitStatusEnum.PENDING_APPROVAL.getStatus(), ProfitStatusEnum.APPROVED.getStatus()));
+                queryVO.setIsFinish(false);
+            }else{
+                //查询业务研发待审核和审核通过的单子。
+                list = list(new LambdaQueryWrapper<ProjectBaseInfoDO>()
+                        .select(ProjectBaseInfoDO::getProjectNoPrefix)
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(ProjectBaseInfoDO::getDevelopmentStatus, queryVO.getDevelopmentStatus()));
+                queryVO.setIsFinish(true);
+            }
             projectNoPrefix = CollectionUtils.isEmpty(list)
                     ? new HashSet<>()
                     : list.stream()
@@ -504,7 +526,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     } catch (JsonProcessingException e) {
                         throw new RuntimeException(e);
                     }
-                }));
+                },(v1, v2) -> v2));
         //查询永久已保存的配置。
         List<ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOS = projectBaseAfterReviewSettingService.list(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
                 .eq(ProjectBaseAfterReviewSettingDO::getType, ProjectBaseSettingTypeEnum.FIXED_COST_OF_PRODUCTION_DEPARTMENT.getType())
@@ -770,7 +792,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     } catch (JsonProcessingException e) {
                         throw new RuntimeException(e);
                     }
-                }));
+                },(v1 ,v2) -> v2));
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
         //查询永久已保存的配置。 如果永久保存配置没有,就去查询系统配置进行显示。
         List<ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOS = projectBaseAfterReviewSettingService.list(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
@@ -22,9 +22,16 @@
             </if>
             <if test="queryVO.projectNoPrefixSet != null and queryVO.projectNoPrefixSet.size() > 0">
                 AND (
-                <foreach collection="queryVO.projectNoPrefixSet" item="proj" separator="OR">
-                    project_no LIKE CONCAT(#{proj}, '%')
-                </foreach>
+                <if test="queryVO.isFinish">
+                    <foreach collection="queryVO.projectNoPrefixSet" item="proj" separator="OR">
+                        project_no LIKE CONCAT(#{proj}, '%')
+                    </foreach>
+                </if>
+                <if test="!queryVO.isFinish">
+                    <foreach collection="queryVO.projectNoPrefixSet" item="proj" separator="AND">
+                        project_no NOT LIKE CONCAT(#{proj}, '%')
+                    </foreach>
+                </if>
                 )
             </if>
         </where>
@@ -47,13 +54,6 @@
                     #{proj}
                 </foreach>
             </if>
-            <if test="queryVO.projectNoPrefixSet != null and queryVO.projectNoPrefixSet.size() > 0">
-                AND  project_no IN
-                <foreach collection="queryVO.projectNoPrefixSet" item="proj" open="(" separator="," close=")">
-                    #{proj}
-                </foreach>
-
-            </if>
             <if test="queryVO.ProductionDepartment !=null and queryVO.ProductionDepartment.size() > 0">
                 AND production_department
                 IN
@@ -61,6 +61,21 @@
                     #{department}
                 </foreach>
             </if>
+            <if test="queryVO.projectNoPrefixSet != null and queryVO.projectNoPrefixSet.size() > 0">
+                <if test="queryVO.isFinish">
+                    AND project_no IN
+                    <foreach collection="queryVO.projectNoPrefixSet" item="proj" open="(" separator="," close=")">
+                        #{proj}
+                    </foreach>
+                </if>
+                <if test="!queryVO.isFinish">
+                    AND project_no NOT IN
+                    <foreach collection="queryVO.projectNoPrefixSet" item="proj" open="(" separator="," close=")">
+                        #{proj}
+                    </foreach>
+                </if>
+            </if>
+
             <if test="queryVO.projectNoLikeRight != null and queryVO.projectNoLikeRight != ''">
                 AND project_no LIKE #{queryVO.projectNoLikeRight}
             </if>