liux
/
nxdt-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

系统bug修改

This commit is contained in:
haozq 2025-06-10 18:36:15 +08:00
parent 8136a62e90
commit ae1d3efa73
19 changed files with 130 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/page/TableSupport.java
View File

@ -2,6 +2,7 @@ package com.bonus.common.core.web.page;
import com.bonus.common.core.text.Convert; import com.bonus.common.core.text.Convert;
import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.utils.ServletUtils;
import org.hibernate.validator.internal.util.StringHelper;
//import org.jetbrains.annotations.NotNull; //import org.jetbrains.annotations.NotNull;
/** /**
@ -43,8 +44,21 @@ public class TableSupport
public static PageDomain getPageDomain() public static PageDomain getPageDomain()
{ {
PageDomain pageDomain = new PageDomain(); PageDomain pageDomain = new PageDomain();
pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1)); String pageNum=ServletUtils.getParameter(PAGE_NUM);
pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10)); 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.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE)); pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));

5
bonus-common/bonus-common-swagger/src/main/java/com/bonus/common/swagger/config/SwaggerAutoConfiguration.java
View File

@ -2,6 +2,7 @@ package com.bonus.common.swagger.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Predicate; import java.util.function.Predicate;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ -34,7 +35,9 @@ public class SwaggerAutoConfiguration
/** /**
* 默认的排除路径，排除Spring Boot默认的错误处理路径和端点 * 默认的排除路径，排除Spring Boot默认的错误处理路径和端点
*/ */
private static final List<String> DEFAULT_EXCLUDE_PATH = Arrays.asList("/error", "/actuator/**"); // private static final List<String> DEFAULT_EXCLUDE_PATH = Arrays.asList("/error", "/actuator/**");
private static final List<String> DEFAULT_EXCLUDE_PATH = Collections.singletonList("/error");
private static final String BASE_PATH = "/**"; private static final String BASE_PATH = "/**";

35
bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java
View File

@ -64,6 +64,7 @@ public class BusinessServiceImpl implements BusinessService {
return AjaxResult.error("请选择审核类型"); return AjaxResult.error("请选择审核类型");
} }
//驳回id //驳回id
String status="1";
String rejectId = null; String rejectId = null;
String rejectSort = null; String rejectSort = null;
String rejectVersion = null; String rejectVersion = null;
@ -87,6 +88,9 @@ public class BusinessServiceImpl implements BusinessService {
// } // }
rejectId = list.get(0).getUserId(); rejectId = list.get(0).getUserId();
rejectSort = list.get(0).getSort(); rejectSort = list.get(0).getSort();
if(!"0".equals(rejectSort)){
status="2";
}
rejectVersion = list.get(0).getVersion(); rejectVersion = list.get(0).getVersion();
repeatedSubmit = list.get(0).getRepeatedSubmit(); repeatedSubmit = list.get(0).getRepeatedSubmit();
} else if (list != null && list.size() > 1) { } else if (list != null && list.size() > 1) {
@ -191,7 +195,7 @@ public class BusinessServiceImpl implements BusinessService {
} }
} else { } 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; 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": case "03":
@ -298,7 +302,7 @@ public class BusinessServiceImpl implements BusinessService {
//分包商提交 下一步进入承包商审核流程 //分包商提交 下一步进入承包商审核流程
contUserId = String.valueOf(StringUtils.isNotEmpty(uuidMap.get("contUserId") + "") ? uuidMap.get("contUserId") : null); contUserId = String.valueOf(StringUtils.isNotEmpty(uuidMap.get("contUserId") + "") ? uuidMap.get("contUserId") : null);
supUserId = String.valueOf(StringUtils.isNotEmpty(uuidMap.get("supUserId") + "") ? uuidMap.get("supUserId") : 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": case "00":
@ -348,7 +352,7 @@ public class BusinessServiceImpl implements BusinessService {
} }
} else { } 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: default:
return AjaxResult.error("审核提交失败"); return AjaxResult.error("审核提交失败");
@ -358,7 +362,7 @@ public class BusinessServiceImpl implements BusinessService {
private AjaxResult rejectSubmit(AuditTask auditTask, String screenExamineId, String rejectSort, String rejectVersion, 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)) { if ("0".equals(rejectSort)) {
List<String> finalList = new ArrayList<>(); List<String> finalList = new ArrayList<>();
@ -484,7 +488,7 @@ public class BusinessServiceImpl implements BusinessService {
} }
return startFlowAble(auditTask, finalList, userId, taskId, ProcessConstants.OWNER, newFinalJudgment return startFlowAble(auditTask, finalList, userId, taskId, ProcessConstants.OWNER, newFinalJudgment
, newExamineId, newSort, newProcessKey, iaAdd, "1", version); , newExamineId, newSort, newProcessKey, iaAdd, status, version);
} else { } else {
return AjaxResult.error("审核提交失败"); return AjaxResult.error("审核提交失败");
} }
@ -916,12 +920,25 @@ public class BusinessServiceImpl implements BusinessService {
} }
finalList.get(0).setIsActive("10"); finalList.get(0).setIsActive("10");
} }
boolean isBh=true;
for (ConfigurationVo configurationVo : finalList) { for (ConfigurationVo configurationVo : finalList) {
if (configurationVo.getAuditStatus() == null) { if (configurationVo.getAuditStatus() !=null) {
configurationVo.setAuditStatus(4); if (configurationVo.getAuditStatus() == 2) {
break; isBh = false;
break;
}
}
}
if(isBh){
for (ConfigurationVo configurationVo : finalList) {
if(configurationVo.getAuditStatus() ==null){
configurationVo.setAuditStatus(4);
break;
}
} }
} }
return finalList; return finalList;
} }

14
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java
View File

@ -116,10 +116,11 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();
@ -474,10 +475,11 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

8
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ConsApprovalServiceImpl.java
View File

@ -59,10 +59,12 @@ public class ConsApprovalServiceImpl implements ConsApprovalService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }

14
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ContEntryExitServiceImpl.java
View File

@ -88,10 +88,11 @@ public class ContEntryExitServiceImpl implements ContEntryExitService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
@ -228,10 +229,11 @@ public class ContEntryExitServiceImpl implements ContEntryExitService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

7
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EngineeringEquipmentBindServiceImpl.java
View File

@ -92,10 +92,11 @@ public class EngineeringEquipmentBindServiceImpl implements EngineeringEquipment
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

14
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java
View File

@ -65,10 +65,11 @@ public class EquipServiceImpl implements EquipService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();
@ -206,10 +207,11 @@ public class EquipServiceImpl implements EquipService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

7
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/MaterialServiceImpl.java
View File

@ -69,10 +69,11 @@ public class MaterialServiceImpl implements MaterialService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

1
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java
View File

@ -533,6 +533,7 @@ public class ProjectServiceImpl implements ProjectService {
throw new RuntimeException("Failed to add address project"); throw new RuntimeException("Failed to add address project");
} }
} }
project.setSupUuid(projectMapper.getSupUuid(project.getSupervisorUnitUserId()));
//插入承包商-工程关联信息(先删后增---临时先放开 后期可能会删除) //插入承包商-工程关联信息(先删后增---临时先放开 后期可能会删除)
projectMapper.delConsProject(project); projectMapper.delConsProject(project);
projectMapper.delMaterialProject(project); projectMapper.delMaterialProject(project);

30
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SecurityCheckServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.bonus.common.core.domain.R;
import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.domain.RequestEntity;
import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.PageUtils;
import com.bonus.common.core.utils.StaticVariableUtils; 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.core.web.domain.AjaxResult;
import com.bonus.common.safetycheck.*; import com.bonus.common.safetycheck.*;
import com.bonus.common.security.utils.SecurityUtils; 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.bonus.system.api.domain.SysFile;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAspectSupport;
@ -414,10 +414,11 @@ public class SecurityCheckServiceImpl implements SecurityCheckService {
proInsId.add((String) map.get("proInsId")); proInsId.add((String) map.get("proInsId"));
checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck")); checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck"));
}); });
if (com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { if (!StringUtils.isNotEmpty(data)) {
dto.setDataType(1); proInsId.add("999");
dto.setProInsId(proInsId);
} }
dto.setDataType(1);
dto.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();
@ -526,10 +527,11 @@ public class SecurityCheckServiceImpl implements SecurityCheckService {
proInsId.add((String) map.get("proInsId")); proInsId.add((String) map.get("proInsId"));
checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck")); checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck"));
}); });
if (com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { if (!StringUtils.isNotEmpty(data)) {
dto.setDataType(1); proInsId.add("999");
dto.setProInsId(proInsId);
} }
dto.setDataType(1);
dto.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();
@ -560,10 +562,11 @@ public class SecurityCheckServiceImpl implements SecurityCheckService {
proInsId.add((String) map.get("proInsId")); proInsId.add((String) map.get("proInsId"));
checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck")); checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck"));
}); });
if (com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { if (!StringUtils.isNotEmpty(data)) {
dto.setDataType(1); proInsId.add("999");
dto.setProInsId(proInsId);
} }
dto.setDataType(1);
dto.setProInsId(proInsId);
} }
} }
@ -761,10 +764,11 @@ public class SecurityCheckServiceImpl implements SecurityCheckService {
proInsId.add((String) map.get("proInsId")); proInsId.add((String) map.get("proInsId"));
checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck")); checkMaps.put((String) map.get("proInsId"), (String) map.get("finalCheck"));
}); });
if (com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) { if (!StringUtils.isNotEmpty(data)) {
dto.setDataType(1); proInsId.add("999");
dto.setProInsId(proInsId);
} }
dto.setDataType(1);
dto.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

14
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubEntryExitServiceImpl.java
View File

@ -57,10 +57,11 @@ public class SubEntryExitServiceImpl implements SubEntryExitService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();
@ -117,10 +118,11 @@ public class SubEntryExitServiceImpl implements SubEntryExitService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

7
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java
View File

@ -172,10 +172,11 @@ public class SubServiceImpl implements SubService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

18
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java
View File

@ -139,10 +139,11 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){ if (!StringUtils.isNotEmpty(data)) {
bean.setDataType(1); proInsId.add("999");
bean.setProInsId(proInsId);
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();
@ -548,13 +549,12 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService {
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(StringUtils.isNotEmpty(data)){
bean.setDataType(1); if (!StringUtils.isNotEmpty(data)) {
bean.setProInsId(proInsId); proInsId.add("999");
}
if (proInsId.isEmpty()){
return list;
} }
bean.setDataType(1);
bean.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

7
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ViolationManagementServiceImpl.java
View File

@ -161,10 +161,11 @@ public class ViolationManagementServiceImpl implements ViolationManagementServic
proInsId.add((String)map.get("proInsId")); proInsId.add((String)map.get("proInsId"));
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
}); });
if(com.bonus.common.core.utils.StringUtils.isNotEmpty(data)){ if (!com.bonus.common.core.utils.StringUtils.isNotEmpty(data)) {
dto.setDataType(1); proInsId.add("999");
dto.setProInsId(proInsId);
} }
dto.setDataType(1);
dto.setProInsId(proInsId);
} }
} }
PageUtils.startPage(); PageUtils.startPage();

2
bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/SecurityCheckMapper.xml
View File

@ -436,7 +436,7 @@
<if test="checkStatus != null and checkStatus != ''"> <if test="checkStatus != null and checkStatus != ''">
AND ypi.check_status = #{checkStatus} AND ypi.check_status = #{checkStatus}
</if> </if>
<if test="checkState != null and checkState != ''"> <if test="checkState != null and checkState != '' and checkState!=1 and checkState!='1'">
AND ypi.check_state = #{checkState} AND ypi.check_state = #{checkState}
</if> </if>
<if test="pitfallCode != null and pitfallCode != ''"> <if test="pitfallCode != null and pitfallCode != ''">

2
bonus-modules/bonus-project/src/main/resources/mapper/safetycheck/ViolationManagementMapper.xml
View File

@ -369,7 +369,7 @@
<if test="signerName != null and signerName != ''"> <if test="signerName != null and signerName != ''">
and wvd.issuer_name like concat('%',#{signerName},'%') and wvd.issuer_name like concat('%',#{signerName},'%')
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != '' and status != 1 and status != '1' ">
and wvi.check_status = #{status} and wvi.check_status = #{status}
</if> </if>
order by wvi.violation_id desc order by wvi.violation_id desc

2
bonus-modules/bonus-project/src/main/resources/mapper/system/ConsApprovalMapper.xml
View File

@ -68,7 +68,7 @@
pci.cont_name like concat('%',#{keyWord},'%') pci.cont_name like concat('%',#{keyWord},'%')
) )
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != '' and status != 1 and status != '1'">
and lpc.into_status = #{status} and lpc.into_status = #{status}
</if> </if>
<if test='dataType==1'> <if test='dataType==1'>

2
bonus-visual/bonus-monitor/src/main/java/com/bonus/modules/monitor/config/WebSecurityConfigurer.java
View File

@ -34,7 +34,7 @@ public class WebSecurityConfigurer
.and().authorizeRequests() .and().authorizeRequests()
.antMatchers(adminContextPath + "/assets/**" .antMatchers(adminContextPath + "/assets/**"
, adminContextPath + "/login" , adminContextPath + "/login"
, adminContextPath + "/actuator/**" // , adminContextPath + "/actuator/**"
, adminContextPath + "/instances/**" , adminContextPath + "/instances/**"
).permitAll() ).permitAll()
.anyRequest().authenticated() .anyRequest().authenticated()