From dba871c46eb05394e22e4b7600183b7a44c28244 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 02 十一月 2023 08:48:38 +0800
Subject: [PATCH] 优化三维信息
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
index a638503..3edc5a7 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
@@ -1,11 +1,10 @@
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.m.InoutManageUtil;
+import com.ld.igds.models.InoutPlan;
import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MPlan;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1501;
import com.ld.igds.sh.param.ApiRequest;
@@ -22,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;
/**
* 杞崲璁″垝淇℃伅鏁版嵁鎺ュ彛
@@ -54,16 +54,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1501);
- 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<MPlan> dataList = hApiShServiceImpl.listPlan(companyId,
- InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
+ List<InoutPlan> dataList = hApiShServiceImpl.listPlan(companyId,
+ InoutManageUtil.PLAN_TYPE_3, param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if(dataList == null || dataList.isEmpty()){
@@ -75,7 +78,7 @@
InteStatusLog log;
InteStatusLog addLog;
//灏佽鏁版嵁淇℃伅
- for (MPlan plan : dataList) {
+ for (InoutPlan plan : dataList) {
dto1501 = new Dto1501();
dto1501.setJhbm(plan.getId());
dto1501.setJhnd(StringUtils.isEmpty(plan.getYear())?DateFormatUtils.format(plan.getCreateTime(), "yyyy"):plan.getYear());
--
Gitblit v1.9.3