From 9dcc346205e2c96b28f2f561f439a29bc6c2a6dc Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 16 四月 2026 15:34:06 +0800
Subject: [PATCH] 仅七天玉米价格，添加默认从粮食单价获取
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
index 3497ad2..500a5aa 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
@@ -2,15 +2,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.constant.Constant;
-import com.fzzy.igds.domain.Company;
+import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.FoodPrice;
import com.fzzy.igds.mapper.FoodPriceMapper;
+import com.fzzy.igds.timer.JobWarnService;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -19,43 +22,60 @@
* @Author CZT
* @Date 2026/01/22 09:04
*/
+@Slf4j
@Service
public class FoodPriceService {
@Resource
private FoodPriceMapper foodPriceMapper;
+ @Resource
+ private JobWarnService jobWarnService;
+
/**
*
* @return
*/
- public List<FoodPrice> listData() {
+ public List<FoodPrice> listData(IgdsBaseParam param) {
+ if(null == param){
+ param = new IgdsBaseParam();
+ }
SysUser user = ContextUtil.getLoginUser();
-
QueryWrapper<FoodPrice> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("company_id", user.getCompanyId());
-
//閾惰鐢ㄦ埛鏌ヨ褰撳墠閾惰鐨勫崟浠烽厤缃�
if (Constant.USER_TYPE_30.equals(user.getUserType())) {
queryWrapper.likeRight("bank_id", user.getUserData());
+ }
+ if(StringUtils.isNotBlank(param.getKey())){
+ queryWrapper.eq("food_variety", param.getKey());
+ }
+ if (null != param.getStart()) {
+ queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd()));
}
return foodPriceMapper.selectList(queryWrapper);
}
/**
- * 鏍规嵁閾惰鍙婂搧绉嶏紝鏌ヨ鍗曚环淇℃伅
+ * 鏍规嵁閾惰鍙婂搧绉嶏紝鏌ヨ鍗曚环淇℃伅锛岃幏鍙栧惎鐢ㄧ殑锛屾渶鏂扮殑涓�鏉�
* @param bankId
* @param foodVariety
* @return
*/
public FoodPrice getDataByBankAndFood(String bankId, String foodVariety) {
+ if(StringUtils.isBlank(bankId) || StringUtils.isBlank(foodVariety) ){
+ return null;
+ }
SysUser user = ContextUtil.getLoginUser();
-
QueryWrapper<FoodPrice> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("bank_id", bankId);
queryWrapper.eq("food_variety", foodVariety);
-
+ queryWrapper.eq("vld", Constant.YN_Y);
+ queryWrapper.orderByDesc("create_time","id");
List<FoodPrice> foodPrices = foodPriceMapper.selectList(queryWrapper);
if(null == foodPrices){
return null;
@@ -81,6 +101,9 @@
foodPriceMapper.insert( data);
}else {
foodPriceMapper.updateById( data);
+ //鏇存柊鏃讹紝鎵ц杩樻鎻愰啋閲嶆柊鍒ゆ柇
+ log.info("---------绮鍗曚环鏇存柊鏃讹紝鎵ц杩樻鎻愰啋閲嶆柊鍒ゆ柇鍗曚环id{}---------",data.getId());
+ jobWarnService.doExe(data.getBankId());
}
}
--
Gitblit v1.9.3