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/ApiShServiceImpl1504.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
index 10cb1a8..de8f234 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
@@ -2,10 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
+import com.ld.igds.models.InoutContract;
import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MContract;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1504;
import com.ld.igds.sh.param.ApiRequest;
@@ -15,14 +14,12 @@
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
-import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
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;
/**
@@ -38,8 +35,6 @@
private HApiShServiceImpl hApiShServiceImpl;
@Autowired
private InteStatusLogService inteStatusLogService;
- @Autowired
- private RedisUtil redisUtil;
@Override
public String getInterfaceId() {
return ApiShConst.API_SH_1504;
@@ -55,16 +50,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1504);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// 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<MContract> dataList = hApiShServiceImpl.listContract(companyId,
- startTime, param.getEndTime());
+ List<InoutContract> dataList = hApiShServiceImpl.listContract(companyId,
+ param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if(dataList == null || dataList.isEmpty()){
@@ -79,7 +77,7 @@
List<DefaultDept> deptList = hApiShServiceImpl.listDept(companyId, companyId);
DefaultDept dept = deptList.get(0);
//灏佽鏁版嵁淇℃伅
- for (MContract contract : dataList) {
+ for (InoutContract contract : dataList) {
dto = new Dto1504();
dto.setZznm(contract.getId());
--
Gitblit v1.9.3