From f256f5ee253d3d3a8617a84083d391cd3d111a79 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 23 Apr 2024 21:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=A4=A7=E5=B7=A5=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/mybatis/DataScopeHandler.java | 12 +++- .../DangerousEngineeringRecordController.java | 58 +++++++++++-------- .../ProjectEnterpriseController.java | 19 +++--- 3 files changed, 57 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index 3c17cae3c..6d77b9924 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -192,7 +192,11 @@ public class DataScopeHandler implements DataPermissionHandler { Table table = (Table) fromItem; String name = table.getName(); if (tables.contains(name)) { - String aliasName = table.getAlias().getName(); + String aliasName = null; + Alias alias = table.getAlias(); + if (alias != null) { + aliasName = alias.getName(); + } rtList.add((StringUtils.isEmpty(aliasName) ? name : aliasName) + "." + field); } } @@ -206,7 +210,11 @@ public class DataScopeHandler implements DataPermissionHandler { if (rightItem instanceof Table) { Table joinTable = (Table) rightItem; if (tables.contains(joinTable.getName())) { - String aliasName = joinTable.getAlias().getName(); + String aliasName = null; + Alias alias = joinTable.getAlias(); + if (alias != null) { + aliasName = alias.getName(); + } rtList.add((StringUtils.isEmpty(aliasName) ? joinTable.getName() : aliasName) + "." + field); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java index efa7f3284..aaa291f34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java @@ -141,42 +141,54 @@ public class DangerousEngineeringRecordController { dangerousEngineeringRecord.setEngineeringTypeName(engineeringType.getTypeName()); dangerousEngineeringRecord.setBuildStartTime(buildTime.get(0)); dangerousEngineeringRecord.setBuildEndTime(buildTime.get(1)); - dangerousEngineeringRecord.setPlanStartTime(planTime.get(0)); - dangerousEngineeringRecord.setPlanEndTime(planTime.get(1)); + dangerousEngineeringRecord.setPlanStartTime(planTime== null ? null : planTime.get(0)); + dangerousEngineeringRecord.setPlanEndTime(planTime == null ? null : planTime.get(1)); dangerousEngineeringRecord.setResponsibilityCompanyId(enterpriseInfo.getId()); - dangerousEngineeringRecord.setSecurityConstructionSchemeType(MapUtils.getString(map, "securityConstructionSchemeType").equals("未完成") ? 1 : 2); - dangerousEngineeringRecord.setSpecialConstructionSchemeType(MapUtils.getString(map, "specialConstructionSchemeType").equals("未完成") ? 1 : 2); - dangerousEngineeringRecord.setTechnicalDisclosureType(MapUtils.getString(map, "technicalDisclosureType").equals("未完成") ? 1 : 2); + String securityConstructionSchemeType = MapUtils.getString(map, "securityConstructionSchemeType"); + securityConstructionSchemeType = securityConstructionSchemeType == null ? "未完成" : securityConstructionSchemeType; + String specialConstructionSchemeType = MapUtils.getString(map, "specialConstructionSchemeType"); + specialConstructionSchemeType = specialConstructionSchemeType == null ? "未完成" : specialConstructionSchemeType; + String technicalDisclosureType = MapUtils.getString(map, "technicalDisclosureType"); + technicalDisclosureType = technicalDisclosureType == null ? "未完成" : technicalDisclosureType; + dangerousEngineeringRecord.setSecurityConstructionSchemeType(securityConstructionSchemeType.equals("未完成") ? 1 : 2); + dangerousEngineeringRecord.setSpecialConstructionSchemeType(specialConstructionSchemeType.equals("未完成") ? 1 : 2); + dangerousEngineeringRecord.setTechnicalDisclosureType(technicalDisclosureType.equals("未完成") ? 1 : 2); dangerousEngineeringRecord.setTypeDescribeList(typeDescribeList); dangerousEngineeringRecord.setControlItemList(controlIds); List> teFiles = (List>) map.get("technicalDisclosureFile"); List> teFile = new ArrayList<>(); - for (Map file : teFiles) { - Map teMap = new HashMap<>(); - teMap.put("name", file.get("name")); - teMap.put("url", file.get("url")); - teMap.put("iconType", file.get("contentType")); - teFile.add(teMap); + if (teFiles != null) { + for (Map file : teFiles) { + Map teMap = new HashMap<>(); + teMap.put("name", file.get("name")); + teMap.put("url", file.get("url")); + teMap.put("iconType", file.get("contentType")); + teFile.add(teMap); + } } dangerousEngineeringRecord.setTechnicalDisclosureFile(JSON.toJSONString(teFile)); List> seFiles = (List>) map.get("securityConstructionSchemeFile"); List> seFile = new ArrayList<>(); - for (Map file : seFiles) { - Map seMap = new HashMap<>(); - seMap.put("name", file.get("name")); - seMap.put("url", file.get("url")); - seMap.put("iconType", file.get("contentType")); - seFile.add(seMap); + if (seFiles != null) { + for (Map file : seFiles) { + Map seMap = new HashMap<>(); + seMap.put("name", file.get("name")); + seMap.put("url", file.get("url")); + seMap.put("iconType", file.get("contentType")); + seFile.add(seMap); + } } dangerousEngineeringRecord.setSecurityConstructionSchemeFile(JSON.toJSONString(seFile)); List> spFiles = (List>) map.get("specialConstructionSchemeFile"); List> spFile = new ArrayList<>(); - for (Map file : spFiles) { - Map spMap = new HashMap<>(); - spMap.put("name", file.get("name")); - spMap.put("url", file.get("url")); - spMap.put("iconType", file.get("contentType")); - spFile.add(spMap); + if (spFiles != null) { + for (Map file : spFiles) { + Map spMap = new HashMap<>(); + spMap.put("name", file.get("name")); + spMap.put("url", file.get("url")); + spMap.put("iconType", file.get("contentType")); + spFile.add(spMap); + } } dangerousEngineeringRecord.setSpecialConstructionSchemeFile(JSON.toJSONString(spFile)); dangerousEngineeringRecord.setResponsibilityCompany(enterpriseInfo.getEnterpriseName()); diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java index 667a1f054..71696afc2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java @@ -84,16 +84,21 @@ public class ProjectEnterpriseController { }) @PostMapping(value = "/selectDetailList") public Result>> selectDetailList(@RequestBody Map map) { - List pageList = projectEnterpriseService.selectProjectEnterpriseList(map); - List enterpriseIds = pageList.stream().map(e -> e.get("id").toString()).collect(Collectors.toList()); - List workerInfoList = workerInfoService.list(Wrappers.lambdaQuery() - .in(WorkerInfo::getEnterpriseId, enterpriseIds)); + map.put("pageNo", -1); + map.put("pageSize", 10); + IPage pageList = projectEnterpriseService.selectProjectEnterprisePage(map); + List enterpriseIds = pageList.getRecords().stream().map(e -> e.getId()).collect(Collectors.toList()); + Map userMap = new HashMap<>(); + userMap.put("projectSn", map.get("projectSn").toString()); + List systemUserList = systemUserService.getProjectChilderSystemUserList(userMap); + List workerInfoList = workerInfoService.listByIds(systemUserList.stream().map(u -> u.getWorkerId()).collect(Collectors.toList())); + workerInfoList = workerInfoList.stream().filter(w -> enterpriseIds.contains(w.getEnterpriseId())).collect(Collectors.toList()); List> list = new ArrayList<>(); - for (EntityMap entityMap : pageList) { + for (EnterpriseInfo enterpriseInfo : pageList.getRecords()) { for (WorkerInfo workerInfo : workerInfoList) { - if (workerInfo.getEnterpriseId().equals(entityMap.get("id"))) { + if (workerInfo.getEnterpriseId().toString().equals(enterpriseInfo.getId().toString())) { Map resultMap = new HashMap<>(); - resultMap.put("name", workerInfo.getWorkerName() + " —— " + entityMap.get("enterpriseName")); + resultMap.put("name", workerInfo.getWorkerName() + " —— " + enterpriseInfo.getEnterpriseName()); resultMap.put("id", workerInfo.getId()); list.add(resultMap); }