admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

安全质量修改bug

Browse Source
This commit is contained in:
guoshengxiong 2025-12-02 16:40:36 +08:00
parent 843286d13d
commit 273d186f2b
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java
View File

@ -29,7 +29,7 @@ import java.util.Map;
* @version： V1.0 * @version： V1.0
*/ */
@RestController @RestController
@RequestMapping("/xmgl/InspectTaskItemRecord") @RequestMapping("/xmgl/inspectTaskItemRecord")
@Slf4j @Slf4j
@Api(tags = "检查任务-子任务") @Api(tags = "检查任务-子任务")
public class InspectTaskItemRecordController { public class InspectTaskItemRecordController {

6
src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java
View File

@ -342,11 +342,11 @@ public class DangerTypeRecordController {
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
records.addAll(recordVos); records.addAll(recordVos);
if (StrUtil.isNotBlank(projectClassify)) {
records = records.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList());
}
records = records.stream().sorted(Comparator.comparing(TopProjectClassifyTypeRecordTreeVo::getId)).collect(Collectors.toList()); records = records.stream().sorted(Comparator.comparing(TopProjectClassifyTypeRecordTreeVo::getId)).collect(Collectors.toList());
List<TopProjectClassifyTypeRecordTreeVo> vos = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(records)), "id", "parentId", "children"), TopProjectClassifyTypeRecordTreeVo.class); List<TopProjectClassifyTypeRecordTreeVo> vos = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(records)), "id", "parentId", "children"), TopProjectClassifyTypeRecordTreeVo.class);
if (StrUtil.isNotBlank(projectClassify)) {
vos = vos.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList());
}
return Result.success(vos); return Result.success(vos);
} }

3
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
View File

@ -145,6 +145,9 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
} }
if (Objects.equals(securityType, 2)) { if (Objects.equals(securityType, 2)) {
//质量 //质量
qualityRegion.setSecurityEnterpriseIds(qualityRegion.getQualityEnterpriseIds());
qualityRegion.setSecurityDutyIds(qualityRegion.getQualityDutyIds());
qualityRegion.setSecurityReviewIds(qualityRegion.getQualityReviewIds());
if (StrUtil.isNotBlank(qualityRegion.getQualityEnterpriseIds())) { if (StrUtil.isNotBlank(qualityRegion.getQualityEnterpriseIds())) {
qualityRegion.setEnterpriseNames(StrUtil.split(qualityRegion.getQualityEnterpriseIds(), ",").stream().map(key -> enterpriseIdMap.get(Convert.toLong(key))).filter(Objects::nonNull).map(EnterpriseInfo::getEnterpriseName).collect(Collectors.joining(","))); qualityRegion.setEnterpriseNames(StrUtil.split(qualityRegion.getQualityEnterpriseIds(), ",").stream().map(key -> enterpriseIdMap.get(Convert.toLong(key))).filter(Objects::nonNull).map(EnterpriseInfo::getEnterpriseName).collect(Collectors.joining(",")));
} }

6
src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java
View File

@ -342,11 +342,11 @@ public class XzSecurityDangerTypeRecordController {
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
records.addAll(recordVos); records.addAll(recordVos);
if (StrUtil.isNotBlank(projectClassify)) {
records = records.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList());
}
records = records.stream().sorted(Comparator.comparing(TopProjectClassifyTypeRecordTreeVo::getId)).collect(Collectors.toList()); records = records.stream().sorted(Comparator.comparing(TopProjectClassifyTypeRecordTreeVo::getId)).collect(Collectors.toList());
List<TopProjectClassifyTypeRecordTreeVo> vos = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(records)), "id", "parentId", "children"), TopProjectClassifyTypeRecordTreeVo.class); List<TopProjectClassifyTypeRecordTreeVo> vos = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(records)), "id", "parentId", "children"), TopProjectClassifyTypeRecordTreeVo.class);
if (StrUtil.isNotBlank(projectClassify)) {
vos = vos.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList());
}
return Result.success(vos); return Result.success(vos);
} }