From a87eff704037284e46568c7c7b8a60caaae884c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 17 五月 2023 20:22:44 +0800
Subject: [PATCH] 调整计划管理模块
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
index c67efc9..ec87b3c 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
@@ -6,8 +6,8 @@
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.MPlanDetail;
+import com.ld.igds.models.InoutPlan;
+import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1502;
import com.ld.igds.sh.param.ApiRequest;
@@ -63,16 +63,16 @@
redisUtil.set(key, param.getEndTime());
//鏌ヨ杞崲璁″垝淇℃伅
- List<MPlan> planList = hApiShServiceImpl.listPlan(companyId,
+ List<InoutPlan> planList = hApiShServiceImpl.listPlan(companyId,
InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
if (planList == null || planList.isEmpty()) {
return RespUtil.error(RespCodeEnum.CODE_2000.getCode(), request);
}
//鏌ヨ杞崲鏄庣粏璁″垝淇℃伅
- List<MPlanDetail> list0 = new ArrayList<>();
- List<MPlanDetail> dataList;
- for (MPlan plan : planList) {
+ List<InoutPlanDetail> list0 = new ArrayList<>();
+ List<InoutPlanDetail> dataList;
+ for (InoutPlan plan : planList) {
dataList = hApiShServiceImpl.getPlanDetail(plan.getId());
if(null != dataList){
list0.addAll(dataList);
@@ -90,7 +90,7 @@
//鏌ヨ搴撳尯淇℃伅
List<DefaultDept> deptList = hApiShServiceImpl.listDept(companyId, companyId);
DefaultDept dept = deptList.get(0);
- for (MPlanDetail planDetail : list0) {
+ for (InoutPlanDetail planDetail : list0) {
dto1502 = new Dto1502();
dto1502.setJhmxbm(planDetail.getId());
--
Gitblit v1.9.3