From ae1d3efa7374469756897ee04b58cd6012dadd67 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Tue, 10 Jun 2025 18:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/web/page/TableSupport.java | 18 ++++++++-- .../config/SwaggerAutoConfiguration.java | 5 ++- .../service/impl/BusinessServiceImpl.java | 35 ++++++++++++++----- .../impl/AdmissionRequestServiceImpl.java | 14 ++++---- .../service/impl/ConsApprovalServiceImpl.java | 8 +++-- .../impl/ContEntryExitServiceImpl.java | 14 ++++---- .../EngineeringEquipmentBindServiceImpl.java | 7 ++-- .../service/impl/EquipServiceImpl.java | 14 ++++---- .../service/impl/MaterialServiceImpl.java | 7 ++-- .../service/impl/ProjectServiceImpl.java | 1 + .../impl/SecurityCheckServiceImpl.java | 30 +++++++++------- .../service/impl/SubEntryExitServiceImpl.java | 14 ++++---- .../project/service/impl/SubServiceImpl.java | 7 ++-- .../impl/SupervisionUnitServiceImpl.java | 18 +++++----- .../impl/ViolationManagementServiceImpl.java | 7 ++-- .../safetycheck/SecurityCheckMapper.xml | 2 +- .../safetycheck/ViolationManagementMapper.xml | 2 +- .../mapper/system/ConsApprovalMapper.xml | 2 +- .../monitor/config/WebSecurityConfigurer.java | 2 +- 19 files changed, 130 insertions(+), 77 deletions(-) diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/page/TableSupport.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/page/TableSupport.java index 203a096..f23d198 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/page/TableSupport.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/page/TableSupport.java @@ -2,6 +2,7 @@ package com.bonus.common.core.web.page; import com.bonus.common.core.text.Convert; import com.bonus.common.core.utils.ServletUtils; +import org.hibernate.validator.internal.util.StringHelper; //import org.jetbrains.annotations.NotNull; /** @@ -43,8 +44,21 @@ public class TableSupport public static PageDomain getPageDomain() { PageDomain pageDomain = new PageDomain(); - pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1)); - pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10)); + String pageNum=ServletUtils.getParameter(PAGE_NUM); + String pageSize=ServletUtils.getParameter(PAGE_SIZE); + if(!StringHelper.isNullOrEmptyString(pageNum)){ + Integer num=Integer.parseInt(pageNum); + pageDomain.setPageNum(num); + }else { + pageDomain.setPageNum(1); + } + if(!StringHelper.isNullOrEmptyString(pageSize)){ + Integer num2=Integer.parseInt(pageSize); + pageDomain.setPageSize(num2); + }else { + pageDomain.setPageSize(100); + } + pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE)); diff --git a/bonus-common/bonus-common-swagger/src/main/java/com/bonus/common/swagger/config/SwaggerAutoConfiguration.java b/bonus-common/bonus-common-swagger/src/main/java/com/bonus/common/swagger/config/SwaggerAutoConfiguration.java index 173ac9f..2d8ce46 100644 --- a/bonus-common/bonus-common-swagger/src/main/java/com/bonus/common/swagger/config/SwaggerAutoConfiguration.java +++ b/bonus-common/bonus-common-swagger/src/main/java/com/bonus/common/swagger/config/SwaggerAutoConfiguration.java @@ -2,6 +2,7 @@ package com.bonus.common.swagger.config; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.function.Predicate; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -34,7 +35,9 @@ public class SwaggerAutoConfiguration /** * 默认的排除路径，排除Spring Boot默认的错误处理路径和端点 */ - private static final List DEFAULT_EXCLUDE_PATH = Arrays.asList("/error", "/actuator/**"); + // private static final List DEFAULT_EXCLUDE_PATH = Arrays.asList("/error", "/actuator/**"); + + private static final List DEFAULT_EXCLUDE_PATH = Collections.singletonList("/error"); private static final String BASE_PATH = "/**"; diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java index 116b629..3cd60c0 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java @@ -64,6 +64,7 @@ public class BusinessServiceImpl implements BusinessService { return AjaxResult.error("请选择审核类型"); } //驳回id + String status="1"; String rejectId = null; String rejectSort = null; String rejectVersion = null; @@ -87,6 +88,9 @@ public class BusinessServiceImpl implements BusinessService { // } rejectId = list.get(0).getUserId(); rejectSort = list.get(0).getSort(); + if(!"0".equals(rejectSort)){ + status="2"; + } rejectVersion = list.get(0).getVersion(); repeatedSubmit = list.get(0).getRepeatedSubmit(); } else if (list != null && list.size() > 1) { @@ -191,7 +195,7 @@ public class BusinessServiceImpl implements BusinessService { } } else { //重新提交至驳回之人 - return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, null, null, examineType); + return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, null, null, examineType,status); } break; @@ -269,7 +273,7 @@ public class BusinessServiceImpl implements BusinessService { } - return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, supUserId, null, examineType); + return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, supUserId, null, examineType,status); } case "03": @@ -298,7 +302,7 @@ public class BusinessServiceImpl implements BusinessService { //分包商提交 下一步进入承包商审核流程 contUserId = String.valueOf(StringUtils.isNotEmpty(uuidMap.get("contUserId") + "") ? uuidMap.get("contUserId") : null); supUserId = String.valueOf(StringUtils.isNotEmpty(uuidMap.get("supUserId") + "") ? uuidMap.get("supUserId") : null); - return rejectSubmit(auditTask, exId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, supUserId, contUserId, examineType); + return rejectSubmit(auditTask, exId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, supUserId, contUserId, examineType,status); } case "00": @@ -348,7 +352,7 @@ public class BusinessServiceImpl implements BusinessService { } } else { //重新提交至驳回之人 - return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, null, null, examineType); + return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, null, null, examineType,status); } default: return AjaxResult.error("审核提交失败"); @@ -358,7 +362,7 @@ public class BusinessServiceImpl implements BusinessService { private AjaxResult rejectSubmit(AuditTask auditTask, String screenExamineId, String rejectSort, String rejectVersion, - String rejectId, String userId, String taskId, boolean iaAdd, String version, String repeatedSubmit, String supUserId, String contUserId, String examineType) { + String rejectId, String userId, String taskId, boolean iaAdd, String version, String repeatedSubmit, String supUserId, String contUserId, String examineType,String status) { //还未到业主审核 if ("0".equals(rejectSort)) { List finalList = new ArrayList<>(); @@ -484,7 +488,7 @@ public class BusinessServiceImpl implements BusinessService { } return startFlowAble(auditTask, finalList, userId, taskId, ProcessConstants.OWNER, newFinalJudgment - , newExamineId, newSort, newProcessKey, iaAdd, "1", version); + , newExamineId, newSort, newProcessKey, iaAdd, status, version); } else { return AjaxResult.error("审核提交失败"); } @@ -916,12 +920,25 @@ public class BusinessServiceImpl implements BusinessService { } finalList.get(0).setIsActive("10"); } + + boolean isBh=true; for (ConfigurationVo configurationVo : finalList) { - if (configurationVo.getAuditStatus() == null) { - configurationVo.setAuditStatus(4); - break; + if (configurationVo.getAuditStatus() !=null) { + if (configurationVo.getAuditStatus() == 2) { + isBh = false; + break; + } + } + } + if(isBh){ + for (ConfigurationVo configurationVo : finalList) { + if(configurationVo.getAuditStatus() ==null){ + configurationVo.setAuditStatus(4); + break; + } } } + return finalList; } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java index 478d279..2c26235 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java @@ -116,10 +116,11 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); @@ -474,10 +475,11 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java index 3f46d8c..e92a4a2 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java @@ -59,10 +59,12 @@ public class ConsApprovalServiceImpl implements ConsApprovalService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); + } } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java index bf6f2da..e1c8534 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java @@ -88,10 +88,11 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } @@ -228,10 +229,11 @@ public class ContEntryExitServiceImpl implements ContEntryExitService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java index 9e20718..ad86118 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java @@ -92,10 +92,11 @@ public class EngineeringEquipmentBindServiceImpl implements EngineeringEquipment proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java index 6112d0d..0793cb3 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java @@ -65,10 +65,11 @@ public class EquipServiceImpl implements EquipService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); @@ -206,10 +207,11 @@ public class EquipServiceImpl implements EquipService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java index 1f7bd80..664e739 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java @@ -69,10 +69,11 @@ public class MaterialServiceImpl implements MaterialService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java index 52b4bc0..331496a 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java @@ -533,6 +533,7 @@ public class ProjectServiceImpl implements ProjectService { throw new RuntimeException("Failed to add address project"); } } + project.setSupUuid(projectMapper.getSupUuid(project.getSupervisorUnitUserId())); //插入承包商-工程关联信息(先删后增---临时先放开 后期可能会删除) projectMapper.delConsProject(project); projectMapper.delMaterialProject(project); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java index ae3f44c..ac9abb0 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java @@ -6,6 +6,7 @@ import com.bonus.common.core.domain.R; import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.StaticVariableUtils; +import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.safetycheck.*; import com.bonus.common.security.utils.SecurityUtils; @@ -17,7 +18,6 @@ import com.bonus.system.api.RemoteFileService; import com.bonus.system.api.domain.SysFile; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -414,10 +414,11 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { proInsId.add((String) map.get("proInsId")); checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck")); }); - if (com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { - dto.setDataType(1); - dto.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + dto.setDataType(1); + dto.setProInsId(proInsId); } } PageUtils.startPage(); @@ -526,10 +527,11 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { proInsId.add((String) map.get("proInsId")); checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck")); }); - if (com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { - dto.setDataType(1); - dto.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + dto.setDataType(1); + dto.setProInsId(proInsId); } } PageUtils.startPage(); @@ -560,10 +562,11 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { proInsId.add((String) map.get("proInsId")); checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck")); }); - if (com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { - dto.setDataType(1); - dto.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + dto.setDataType(1); + dto.setProInsId(proInsId); } } @@ -761,10 +764,11 @@ public class SecurityCheckServiceImpl implements SecurityCheckService { proInsId.add((String) map.get("proInsId")); checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck")); }); - if (com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { - dto.setDataType(1); - dto.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + dto.setDataType(1); + dto.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java index fa0f08f..78343c4 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java @@ -57,10 +57,11 @@ public class SubEntryExitServiceImpl implements SubEntryExitService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); @@ -117,10 +118,11 @@ public class SubEntryExitServiceImpl implements SubEntryExitService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java index 6948c93..40b2337 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java @@ -172,10 +172,11 @@ public class SubServiceImpl implements SubService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java index 0b6ef18..cabd7e7 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java @@ -139,10 +139,11 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); @@ -548,13 +549,12 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(StringUtils.isNotEmpty(data)){ - bean.setDataType(1); - bean.setProInsId(proInsId); - } - if (proInsId.isEmpty()){ - return list; + + if (!StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + bean.setDataType(1); + bean.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java index b678726..7a90cc6 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java @@ -161,10 +161,11 @@ public class ViolationManagementServiceImpl implements ViolationManagementServic proInsId.add((String)map.get("proInsId")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); }); - if(com.bonus.common.core.utils.StringUtils.isNotEmpty(data)){ - dto.setDataType(1); - dto.setProInsId(proInsId); + if (!com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { + proInsId.add("999"); } + dto.setDataType(1); + dto.setProInsId(proInsId); } } PageUtils.startPage(); diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/SecurityCheckMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/SecurityCheckMapper.xml index f987c65..692c0ca 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/SecurityCheckMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/SecurityCheckMapper.xml @@ -436,7 +436,7 @@ AND ypi.check_status = #{checkStatus} - + AND ypi.check_state = #{checkState} diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ViolationManagementMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ViolationManagementMapper.xml index e820150..86ffa78 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ViolationManagementMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ViolationManagementMapper.xml @@ -369,7 +369,7 @@ and wvd.issuer_name like concat('%',#{signerName},'%') - + and wvi.check_status = #{status} order by wvi.violation_id desc diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml index ecc78be..d11b785 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml @@ -68,7 +68,7 @@ pci.cont_name like concat('%',#{keyWord},'%') ) - + and lpc.into_status = #{status} diff --git a/bonus-visual/bonus-monitor/src/main/java/com/bonus/modules/monitor/config/WebSecurityConfigurer.java b/bonus-visual/bonus-monitor/src/main/java/com/bonus/modules/monitor/config/WebSecurityConfigurer.java index cef190b..fd38fb4 100644 --- a/bonus-visual/bonus-monitor/src/main/java/com/bonus/modules/monitor/config/WebSecurityConfigurer.java +++ b/bonus-visual/bonus-monitor/src/main/java/com/bonus/modules/monitor/config/WebSecurityConfigurer.java @@ -34,7 +34,7 @@ public class WebSecurityConfigurer .and().authorizeRequests() .antMatchers(adminContextPath + "/assets/**" , adminContextPath + "/login" - , adminContextPath + "/actuator/**" + // , adminContextPath + "/actuator/**" , adminContextPath + "/instances/**" ).permitAll() .anyRequest().authenticated()