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/ApiShServiceImpl1404.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
index 0fab172..0862f16 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
@@ -1,7 +1,6 @@
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.DrugLog;
import com.ld.igds.models.InteStatusLog;
@@ -11,6 +10,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;
@@ -21,6 +21,7 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -54,16 +55,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1404);
- 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<DrugLog> dataList = hApiShServiceImpl.listDrugLog(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -77,8 +81,8 @@
//灏佽鏁版嵁淇℃伅
for (DrugLog data : dataList) {
dto = new Dto1404();
- dto.setXzzybm(data.getDepotId().substring(0, 25) + data.getId());
- dto.setCfdm(data.getDepotId().substring(0, 25));
+ dto.setXzzybm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 25) + data.getId());
+ dto.setCfdm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 25));
dto.setXzkssj(DateFormatUtils.format(data.getStart()==null?(new Date()):data.getStart(),"yyyy-MM-dd"));
dto.setXzjssj(DateFormatUtils.format(data.getEnd()==null?(new Date()):data.getEnd(),"yyyy-MM-dd"));
dto.setHcjcdh(StringUtils.isEmpty(data.getPestBatchId())?"0":data.getPestBatchId());
--
Gitblit v1.9.3