修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WeightedDetailsController.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
+
 /**
  * <p>
  * 加权明细 前端控制器
@@ -31,7 +33,7 @@ public class WeightedDetailsController {
      * @return
      */
     @GetMapping("/selectInventoryCostInfo")
-    public Page<WeightedDetails> selectInventoryCostInfo(WeightedDetails weightedDetails) {
+    public Page<WeightedDetails> selectInventoryCostInfo(WeightedDetails weightedDetails) throws ParseException {
         return weightedDetailsService.selectInventoryCostInfo(weightedDetails);
     }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWeightedDetailsService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.WeightedDetails;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.text.ParseException;
+
 /**
  * <p>
  * 加权明细 服务类
@@ -21,5 +23,5 @@ public interface IWeightedDetailsService extends IService<WeightedDetails> {
      * @param weightedDetails
      * @return
      */
-    Page<WeightedDetails> selectInventoryCostInfo(WeightedDetails weightedDetails);
+    Page<WeightedDetails> selectInventoryCostInfo(WeightedDetails weightedDetails) throws ParseException;
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeightedDetailsServiceImpl.java

@@ -9,6 +9,10 @@ import com.yh.saas.plugin.yiliangyiyun.service.IWeightedDetailsService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * <p>
  * 加权明细 服务实现类
@@ -28,14 +32,19 @@ public class WeightedDetailsServiceImpl extends ServiceImpl<WeightedDetailsMappe
      * @return
      */
     @Override
-    public Page<WeightedDetails> selectInventoryCostInfo(WeightedDetails weightedDetails) {
+    public Page<WeightedDetails> selectInventoryCostInfo(WeightedDetails weightedDetails) throws ParseException {
+        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy");
+        Date start=simpleDateFormat.parse(weightedDetails.getYear());
+        Date end=simpleDateFormat.parse(weightedDetails.getYear()+1);
         Page<WeightedDetails> weightedDetailsPage = this.selectPage(weightedDetails.getQueryPage(), new EntityWrapper<WeightedDetails>()
                 .eq("warehouse_id", weightedDetails.getWarehouseId())
-                .eq("update_date", weightedDetails.getYear())
+                .gt("update_date",start)
+                .lt("update_date",end)
                 .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
         int count = this.selectCount(new EntityWrapper<WeightedDetails>()
                 .eq("warehouse_id", weightedDetails.getWarehouseId())
-                .eq("update_date", weightedDetails.getYear())
+                .gt("update_date",start)
+                .lt("update_date",end)
                 .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
         weightedDetailsPage.setSize(count);
         return weightedDetailsPage;