From ebf2ae5abadc06765fcc17e89ff3d2ad1a421bb8 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 08 十二月 2023 13:35:49 +0800
Subject: [PATCH] 设备加工工件个数报表

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/AreaController.java |   87 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 86 insertions(+), 1 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..59fde69 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,27 @@
 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 com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.poi.hssf.record.DVALRecord;
+import org.jeecg.common.api.vo.CommonGenericTree;
 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.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.eam.entity.Area;
+import org.jeecg.modules.eam.entity.FaultCause;
+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;
@@ -30,10 +41,14 @@
 @Api(tags = "杞﹂棿 鍓嶇鎺у埗鍣�")
 @RestController
 @RequestMapping("/base/area")
-public class AreaController {
+public class AreaController extends JeecgController<Area,IAreaService> {
 
 	@Autowired
 	private IAreaService areaService;
+
+	@Autowired
+	private ITeamService teamService;
+
 
 	@AutoLog(value = "杞﹂棿-鍒嗛〉鏌ヨ")
 	@ApiOperation(value = "杞﹂棿-鍒嗛〉鏌ヨ", notes = "杞﹂棿-鍒嗛〉鏌ヨ")
@@ -43,6 +58,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);
 	}
 
@@ -50,6 +81,18 @@
 	@ApiOperation(value = "杞﹂棿-鏂板", notes = "杞﹂棿-鏂板")
 	@PostMapping("/add")
 	public Result<?> add(@RequestBody Area area) {
+		String parentId = area.getParentId();
+		if("-1".equals(parentId)){
+			area.setType("1");
+		}else{
+			Area nextArea = areaService.getById(parentId);
+			String type = nextArea.getType();
+			if("1".equals(type)){
+				area.setType("2");
+			}else{
+				area.setType("3");
+			}
+		}
 		area.setStatus(CommonConstant.STATUS_1);
 		areaService.save(area);
 		return Result.ok("鏂板鎴愬姛");
@@ -93,4 +136,46 @@
 		return Result.ok("鏇存柊鎴愬姛锛�");
 	}
 
+	@GetMapping(value = "/getAlllist")
+	public Result<?> getAlllist(Area area, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+						  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+//		QueryWrapper<Area> queryWrapper = QueryGenerator.initQueryWrapper(area, req.getParameterMap());
+		QueryWrapper<Area> queryWrapper = Wrappers.query();
+		Page<Area> page = new Page<Area>(pageNo, pageSize);
+
+		String num = area.getNum();
+		String name = area.getName();
+		String parentId = area.getParentId();
+		if(StringUtils.isNotBlank(parentId)){
+			queryWrapper.eq("parent_id", parentId);
+		}else{
+			queryWrapper.eq("parent_id", "-1");
+		}
+		if(StringUtils.isNotBlank(num)){
+			queryWrapper.like("num", num);
+		}
+		if(StringUtils.isNotBlank(name)){
+			queryWrapper.like("name", name);
+		}
+		IPage<Area> pageList = areaService.page(page, queryWrapper);
+		List<Area> records = pageList.getRecords();
+		for (Area record : records) {
+			String id = record.getId();
+			List<Area> areas = areaService.lambdaQuery().eq(Area::getParentId, id).eq(Area::getDelFlag, "0").list();
+			record.setNextAreas(areas);
+		}
+		return Result.OK(pageList);
+	}
+
+	/**
+	 * @MethodName: loadTree
+	 * @Description: 鏁呴殰鍘熷洜 鏍�
+	 */
+	@GetMapping("/loadTree")
+	public Result<?> loadTree(HttpServletRequest httpServletRequest) {
+		List<CommonGenericTree> list = areaService.loadTree();
+		return Result.ok(list);
+	}
+
+
 }
\ No newline at end of file

--
Gitblit v1.9.3