From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
index 5b26c40..3ceca65 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.CheckType;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.CheckItem;
import com.ld.igds.models.InteStatusLog;
@@ -13,6 +12,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -57,15 +57,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1201);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
- List<MQuality> dataList = hApiShServiceImpl.listQuality(companyId, param.getDepotId(), startTime, param.getEndTime());
+ List<MQuality> dataList = hApiShServiceImpl.listQuality(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -81,9 +84,9 @@
for (MQuality data : dataList) {
dto = new Dto1201();
dto.setZjbgdbh(data.getId());
- dto.setHwbm(data.getDepotId());
+ dto.setHwbm(ApiShUtil.getGbDepotId(data.getDepotId()) + "01");
dto.setPznm(StringUtils.isEmpty(data.getFoodVariety())?"0":data.getFoodVariety());
- dto.setZznm(data.getDepotId().substring(0, 21));
+ dto.setZznm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 21));
dto.setSkdjbm(StringUtils.isEmpty(data.getFoodLevel())?"0":data.getFoodLevel());
dto.setQysj(DateFormatUtils.format((data.getCheckTime() == null ? new Date() : data.getCheckTime()), "yyyy-MM-dd"));
dto.setRkrq(DateFormatUtils.format((data.getCheckTime() == null ? new Date() : data.getCheckTime()), "yyyy-MM-dd"));
@@ -110,10 +113,9 @@
dto.setShrxm(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
dto.setQyqy(StringUtils.isEmpty(data.getCheckArea())?"0":data.getCheckArea());
dto.setQyrxm(StringUtils.isEmpty(data.getCheckUser())?"0":data.getCheckUser());
- // TODO
-// dto.setYpsl(data.getCheckNum()==null?"0.0":(data.getCheckNum() + ""));
-// dto.setDbsl(StringUtils.isEmpty(data.getCheckRepresent())?"0":data.getCheckRepresent());
-// dto.setYpdj(StringUtils.isEmpty(data.getCheckLevel())?"0":data.getCheckLevel());
+ dto.setYpsl(data.getYpsl()==null?"0.0":(data.getYpsl() + ""));
+ dto.setDbsl(data.getDbsl() == null?"0.0":data.getDbsl() + "");
+ dto.setYpdj(StringUtils.isEmpty(data.getYpdj())?"0":data.getYpdj());
dto.setSfzcccnx(StringUtils.isEmpty(data.getNormalYear())?"0":data.getNormalYear());
dto.setLsxz(StringUtils.isEmpty(data.getFoodLevel())?"0":data.getFoodLevel());
dto.setBgbh(data.getId());
--
Gitblit v1.9.3