From 4113201ce1291a3800824c12123ee43f6704ec29 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 07 十月 2023 17:33:34 +0800
Subject: [PATCH] 工厂模型修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/AreaController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/AreaController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/AreaController.java
index 72b7834..97c3655 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/AreaController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/AreaController.java
@@ -1,16 +1,23 @@
package org.jeecg.modules.eam.controller;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import org.apache.poi.hssf.record.DVALRecord;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.Area;
+import org.jeecg.modules.eam.entity.Team;
import org.jeecg.modules.eam.service.IAreaService;
+import org.jeecg.modules.eam.service.ITeamService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.ParameterResolutionDelegate;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +42,10 @@
@Autowired
private IAreaService areaService;
+ @Autowired
+ private ITeamService teamService;
+
+
@AutoLog(value = "杞﹂棿-鍒嗛〉鏌ヨ")
@ApiOperation(value = "杞﹂棿-鍒嗛〉鏌ヨ", notes = "杞﹂棿-鍒嗛〉鏌ヨ")
@GetMapping(value = "/list")
@@ -43,6 +54,22 @@
QueryWrapper<Area> queryWrapper = QueryGenerator.initQueryWrapper(area, req.getParameterMap());
Page<Area> page = new Page<Area>(pageNo, pageSize);
IPage<Area> pageList = areaService.page(page, queryWrapper);
+ for (Area record : pageList.getRecords()) {
+ String teamNames ="";
+ String teamIds = record.getTeamId();
+ if(StringUtils.isNotBlank(teamIds)){
+ List<String> ids = Arrays.asList(teamIds.split(","));
+ for (int i = 0; i < ids.size(); i++) {
+ Team team = teamService.getById(ids.get(i));
+ String name = team.getName();
+ teamNames +=name;
+ if(i != ids.size()-1){
+ teamNames += ",";
+ }
+ }
+ }
+ record.setTeamNames(teamNames);
+ }
return Result.ok(pageList);
}
--
Gitblit v1.9.3