From 921ed67368431c332b68450a0407b0bd151052c5 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 12:20:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..211165d 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
@@ -5,7 +5,7 @@
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MPlan;
+import com.ld.igds.models.InoutPlan;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1501;
import com.ld.igds.sh.param.ApiRequest;
@@ -62,7 +62,7 @@
redisUtil.set(key, param.getEndTime());
//鏌ヨ璁″垝淇℃伅
- List<MPlan> dataList = hApiShServiceImpl.listPlan(companyId,
+ List<InoutPlan> dataList = hApiShServiceImpl.listPlan(companyId,
InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
@@ -75,7 +75,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