杰生

hx-service-api/storage-api/src/main/java/com/fjhx/entity/stock/StockBack.java

@@ -74,6 +74,11 @@ public class StockBack implements Serializable {
     private Date createTime;
 
     /**
+     * 统计时间
+     */
+    private Date statisticsDate;
+
+    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableLogic

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockBackController.java

@@ -1,5 +1,7 @@
 package com.fjhx.stock.controller;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,10 +21,7 @@ import com.fjhx.stock.service.StockBackService;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
@@ -267,5 +266,27 @@ public class StockBackController {
         return R.success(result);
     }
 
+
+    @GetMapping("/setStatisticsDate")
+    public R setStatisticsDate() {
+        List<StockBack> list = stockBackService.list(
+                Wrappers.<StockBack>lambdaQuery().select(StockBack::getId, StockBack::getOperationTime));
+        for (StockBack stockBack : list) {
+            Date date = stockBack.getOperationTime();
+
+            if (date == null) {
+                continue;
+            }
+
+            if (Convert.toInt(DateUtil.format(date, "H")) < 10) {
+                stockBack.setStatisticsDate(DateUtil.offsetDay(date, -1));
+            } else {
+                stockBack.setStatisticsDate(date);
+            }
+        }
+        stockBackService.updateBatchById(list);
+        return R.success();
+    }
+
 }
 

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fjhx.stock.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,6 +15,7 @@ import com.fjhx.entity.stock.StockBackDetails;
 import com.fjhx.entity.stock.StockBackPlanDetails;
 import com.fjhx.material.service.MaterialService;
 import com.fjhx.params.stock.*;
+import com.fjhx.plan.service.PlanConfigService;
 import com.fjhx.stock.mapper.StockBackMapper;
 import com.fjhx.stock.service.StockBackDetailsService;
 import com.fjhx.stock.service.StockBackPlanDetailsService;
@@ -49,6 +51,9 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
     @Autowired
     private StockBackPlanDetailsService stockBackPlanDetailsService;
 
+    @Autowired
+    private PlanConfigService planConfigService;
+
     @Override
     public Page<StockBack> getPage(Map<String, String> condition) {
 
@@ -139,6 +144,13 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
             stockBack.setStatus(StatusConstant.NO);
             stockBack.setDelFlag(0);
             stockBack.setCreateTime(date);
+
+            Date operationTime = stockBack.getOperationTime();
+            if (Convert.toInt(DateUtil.format(operationTime, "H")) < 10) {
+                stockBack.setStatisticsDate(DateUtil.offsetDay(operationTime, -1));
+            } else {
+                stockBack.setStatisticsDate(operationTime);
+            }
             save(stockBack);
 
             // 退仓详情