fix: 修复导出/编辑利润率/审核列表

谢茂盛
1 parent b2821c68
Showing 7 changed files with 138 additions and 18 deletions
src/main/java/com/order/erp/AdminApplication.java
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisVO.java
src/main/java/com/order/erp/job/OrderJob.java
src/main/java/com/order/erp/service/order/OrderBaseInfoService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -11,6 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -23,6 +24,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableAsync
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.order.erp"})
 @MapperScan("com.order.erp.**.mapper")
+@EnableScheduling
 @EnableTransactionManagement
 @EnableSwagger2
 public class AdminApplication {
@@ -6,7 +6,6 @@ import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
 /**
- *
  * @author makejava
  * @since 2023-09-08 15:26:47
  */
@@ -75,7 +74,7 @@ public class OrderProfitAnalysisFieldVO implements Serializable {
     /**
      * 默认 0 公式1，1 公式2
      */
-    private int profitType;
+    private String profitType;
 }
@@ -84,7 +84,7 @@ public class OrderProfitAnalysisVO implements Serializable {
     /**
      * 默认 0 公式1，1 公式2
      */
-    private int profitType;
+    private String profitType;
 }
+package com.order.erp.job;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.utils.DateUtils;
+import com.order.erp.common.utils.TransactionHelper;
+import com.order.erp.domain.OrderStatusEnum;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.order.*;
+import com.order.erp.domain.vo.order.OrderInfoResultVO;
+import com.order.erp.service.order.*;
+import lombok.extern.slf4j.Slf4j;
+import org.joda.time.DateTime;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2023/6/25 10:35
+ * @version: 1.0
+ */
+@Slf4j
+@Component
+public class OrderJob {
+
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
+    @Resource
+    private OrderProfitAnalysisService profitAnalysisService;
+
+    @Resource
+    private OrderCompletionReportService reportService;
+
+    @Resource
+    private OrderTrackStageService trackStageService;
+
+    @Resource
+    private OrderInspectionStageService inspectionStageService;
+
+    @Resource
+    private TransactionHelper transactionHelper;
+
+    /**
+     * 每隔5分执行一次
+     */
+    @Scheduled(cron = "0 */5 * * * ?")
+//    @Scheduled(cron = "*/5 * * * * ?")
+    public void checkCompleteExecute() {
+        log.info("执行开始时间：{}", DateTime.now().toString("yyyy-MM-dd HH:mm:ss"));
+        LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .ge(OrderBaseInfoDO::getCreateTime, DateUtils.format(DateTime.now().minusMonths(Constant.ONE).toDate(), DateUtils.DATE_TIME))
+                .le(OrderBaseInfoDO::getCreateTime, DateUtils.format(DateTime.now().toDate(), DateUtils.DATE_TIME))
+                .ne(OrderBaseInfoDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
+        List<OrderBaseInfoDO> ordersDOS = orderBaseInfoService.list(queryWrapper);
+
+        List<OrderInfoResultVO> orderInfoResultVOS = orderBaseInfoService.wrapperOrderResultList(false, ordersDOS);
+        if (CollectionUtils.isNotEmpty(orderInfoResultVOS)) {
+            Set<Long> orderIds = orderInfoResultVOS.stream().filter(x -> Objects.nonNull(x.getSchedule()) && Constant.ONE == x.getSchedule()).map(OrderInfoResultVO::getId).collect(Collectors.toSet());
+            LambdaUpdateWrapper<OrderBaseInfoDO> orderBaseUpdateWrapper = new LambdaUpdateWrapper<OrderBaseInfoDO>()
+                    .in(OrderBaseInfoDO::getId, orderIds).set(OrderBaseInfoDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
+
+            LambdaUpdateWrapper<OrderCompletionReportDO> reportUpdateWrapper = new LambdaUpdateWrapper<OrderCompletionReportDO>()
+                    .in(OrderCompletionReportDO::getOrderId, orderIds).set(OrderCompletionReportDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
+
+            LambdaUpdateWrapper<OrderProfitAnalysisDO> profitUpdateWrapper = new LambdaUpdateWrapper<OrderProfitAnalysisDO>()
+                    .in(OrderProfitAnalysisDO::getOrderId, orderIds).set(OrderProfitAnalysisDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
+
+            LambdaUpdateWrapper<OrderTrackStageDO> trackUpdateWrapper = new LambdaUpdateWrapper<OrderTrackStageDO>()
+                    .in(OrderTrackStageDO::getOrderId, orderIds).set(OrderTrackStageDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
+
+            LambdaUpdateWrapper<OrderInspectionStageDO> inspectUpdateWrapper = new LambdaUpdateWrapper<OrderInspectionStageDO>()
+                    .in(OrderInspectionStageDO::getOrderId, orderIds).set(OrderInspectionStageDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
+
+            transactionHelper.run(() -> {
+                orderBaseInfoService.update(orderBaseUpdateWrapper);
+                reportService.update(reportUpdateWrapper);
+                profitAnalysisService.update(profitUpdateWrapper);
+                trackStageService.update(trackUpdateWrapper);
+                inspectionStageService.update(inspectUpdateWrapper);
+            });
+        }
+        log.info("执行结束时间：{}", DateTime.now().toString("yyyy-MM-dd HH:mm:ss"));
+    }
+
+}
@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
-import com.order.erp.domain.vo.order.OrderAddVO;
-import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
-import com.order.erp.domain.vo.order.OrderUnlockFieldApplyVO;
-import com.order.erp.domain.vo.order.OrderUpdateVO;
+import com.order.erp.domain.vo.order.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -38,6 +35,11 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
      */
     ServerResult list(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
+    /**
+     * @param orderBaseInfoDOList
+     * @return
+     */
+    List<OrderInfoResultVO> wrapperOrderResultList(Boolean locked, List<OrderBaseInfoDO> orderBaseInfoDOList);
     /**
      * @param orderBaseInfoQueryVO
@@ -140,8 +140,20 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         Page<OrderInfoResultVO> webVOPage = new Page<>();
         List<OrderBaseInfoDO> orderBaseInfoDOList = iPage.getRecords();
+        webVOPage.setRecords(wrapperOrderResultList(true, orderBaseInfoDOList));
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+    /**
+     * @param orderBaseInfoDOList
+     * @return
+     */
+    @Override
+    public List<OrderInfoResultVO> wrapperOrderResultList(Boolean locked, List<OrderBaseInfoDO> orderBaseInfoDOList) {
+        List<OrderInfoResultVO> resultVOList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
-            List<OrderInfoResultVO> resultVOList = orderBaseInfoDOList.stream().map(x -> {
+            resultVOList = orderBaseInfoDOList.stream().map(x -> {
                 OrderInfoResultVO resultVO = new OrderInfoResultVO();
                 BeanUtils.copyProperties(x, resultVO);
                 return resultVO;
@@ -159,16 +171,16 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充质检信息
             fillInspectionStageInfo(resultVOList);
-            // 填充字段锁定信息
-            fillLockFields(resultVOList);
+            if (locked) {
+                // 填充字段锁定信息
+                fillLockFields(resultVOList);
+            }
             // 填充进度
             fillSchedules(resultVOList);
-            webVOPage.setRecords(resultVOList);
         }
-        BeanUtils.copyProperties(page, webVOPage, "records");
-        return ServerResult.success(webVOPage);
+        return resultVOList;
     }
     @Override
@@ -530,7 +542,16 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
      * @param userId
      * @return
      */
-    private OrderFieldLockApplyDO buildProfitFieldLockApplyDO(OrderProfitAnalysisVO profitAnalysisVO, Long userId) {
+    private OrderFieldLockApplyDO buildProfitFieldLockApplyDO(OrderBaseInfoDO orderBaseInfoDO, OrderProfitAnalysisVO profitAnalysisVO, Long userId) {
+        if (Objects.nonNull(profitAnalysisVO.getCustomerPrice())) {
+            profitAnalysisVO.setCustomerTotalPrice(profitAnalysisVO.getCustomerPrice() * orderBaseInfoDO.getOrderCount());
+        }
+        if (Objects.nonNull(profitAnalysisVO.getPacketPrice())) {
+            profitAnalysisVO.setPacketTotalPrice(profitAnalysisVO.getPacketPrice() * orderBaseInfoDO.getOrderCount());
+        }
+        if (Objects.nonNull(profitAnalysisVO.getProductionDepartmentPrice())) {
+            profitAnalysisVO.setProductionDepartmentTotalPrice(profitAnalysisVO.getProductionDepartmentPrice() * orderBaseInfoDO.getOrderCount());
+        }
         OrderProfitAnalysisFieldVO profitAnalysisFieldVO = profitAnalysis2profitAnalysisField(profitAnalysisVO);
         return OrderFieldLockApplyDO.builder()
                 .applyUserId(userId)
@@ -554,7 +575,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 && Objects.nonNull(profitAnalysisVO.getPacketTotalPrice())
                 && Objects.nonNull(profitAnalysisVO.getProductionDepartmentTotalPrice())) {
             profitRate = ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
-                    .profitType(profitAnalysisVO.getProfitType())
+                    .profitType(StringUtils.isBlank(profitAnalysisVO.getProfitType()) ? Constant.ZERO : Integer.parseInt(profitAnalysisVO.getProfitType()))
                     .customerTotalPrice(profitAnalysisVO.getCustomerTotalPrice())
                     .exchangeRate(profitAnalysisVO.getExchangeRate())
                     .packetTotalPrice(profitAnalysisVO.getPacketTotalPrice())
@@ -1205,7 +1226,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
             checkApply(updateVO.getOrderId(), userId);
-            OrderFieldLockApplyDO orderFieldLockApplyDO = buildProfitFieldLockApplyDO(updateVO.getProfitAnalysisInfo(), userId);
+            OrderFieldLockApplyDO orderFieldLockApplyDO = buildProfitFieldLockApplyDO(orderBaseInfoDo, updateVO.getProfitAnalysisInfo(), userId);
             orderFieldLockApplyService.save(orderFieldLockApplyDO);
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
@@ -456,7 +456,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 profitAnalysisDO.setProductionDepartmentTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getProductionDepartmentTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getProductionDepartmentTotalPrice()) : null);
                 profitAnalysisDO.setProductionDepartmentCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getProductionDepartmentCurrency()) ? profitAnalysisFieldVO.getProductionDepartmentCurrency() : null);
                 profitAnalysisDO.setProfitRate(Objects.nonNull(profitAnalysisFieldVO.getProfitRate()) ? Double.valueOf(profitAnalysisFieldVO.getProfitRate()) : null);
-                profitAnalysisDO.setProfitType(profitAnalysisFieldVO.getProfitType());
+                profitAnalysisDO.setProfitType(StringUtils.isBlank(profitAnalysisFieldVO.getProfitType()) ? Constant.ZERO : Integer.parseInt(profitAnalysisFieldVO.getProfitType()));
                 profitAnalysisService.updateById(profitAnalysisDO);
             }
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
@@ -490,7 +490,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     private OrderProfitAnalysisDO profitField2profitDo(OrderProfitAnalysisFieldVO profitAnalysisFieldVO) {
         return OrderProfitAnalysisDO.builder()
                 .orderId(profitAnalysisFieldVO.getOrderId())
-                .profitType(profitAnalysisFieldVO.getProfitType())
+                .profitType(StringUtils.isBlank(profitAnalysisFieldVO.getProfitType()) ? Constant.ZERO : Integer.parseInt(profitAnalysisFieldVO.getProfitType()))
                 .customerPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerPrice()) : null)
                 .customerTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerTotalPrice()) : null)
                 .customerCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getCustomerCurrency()) ? profitAnalysisFieldVO.getCustomerCurrency() : null)