From 3631219246be48aec1e745e94e5b28ff4e8799c8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 19:35:54 +0800
Subject: [PATCH] 调整上海原版接口
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
index 2831ee1..beeec7e 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
@@ -1,16 +1,16 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
-import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.InoutLossOver;
+import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1311;
import com.ld.igds.sh.param.ApiRequest;
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;
@@ -21,8 +21,9 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 鎹熸孩鍗曟暟鎹帴鍙�
@@ -53,16 +54,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1311);
- 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<InoutLossOver> dataList = hApiShServiceImpl.listLossOver(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -77,7 +81,7 @@
for (InoutLossOver data : dataList) {
dto1311 = new Dto1311();
dto1311.setSydbh(data.getId());
- dto1311.setHwbm(data.getDepotId());
+ dto1311.setHwbm(ApiShUtil.getGbDepotId(data.getDepotId()) + "01");
dto1311.setYwrq(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy-MM-dd"));
dto1311.setSylx("3");
if ("LOSS".equals(data.getType())) {
@@ -96,10 +100,10 @@
dto1311.setRksj(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy-MM-dd HH:mm:ss"));
dto1311.setSyyy(StringUtils.isEmpty(data.getRemark()) ? "0" : data.getRemark());
- dto1311.setNm(data.getDepotId().substring(0, 21));
- dto1311.setZznm(data.getDepotId().substring(0, 21));
+ dto1311.setNm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 21));
+ dto1311.setZznm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 21));
dto1311.setSydjdbh(data.getId());
- dto1311.setWlbh(StringUtils.isEmpty(data.getFoodVariety()) ? "0" : data.getFoodVariety());
+// dto1311.setWlbh(StringUtils.isEmpty(data.getFoodVariety()) ? "0" : data.getFoodVariety());
dto1311.setRknx(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy"));
dto1311.setNx(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy"));
dto1311.setLrsj(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy-MM-dd HH:mm:ss"));
--
Gitblit v1.9.3