From 1db6b8de8430f77546a08cbe26ef27a62a2d0eb4 Mon Sep 17 00:00:00 2001 From: lijiarao <136157943@qq.com> Date: Sat, 3 Feb 2024 16:12:45 +0800 Subject: [PATCH] =?UTF-8?q?fix=2080746=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=BF=87=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E6=80=A7=E6=80=BB=E8=A7=88=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=98=E5=8C=96=EF=BC=8C=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA=E6=93=8D=E4=BD=9C=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessProjectStandardService.java | 5 ++-- .../LawsProjectLibraryController.java | 11 ++++--- .../mapper/LawsAssessMapper.java | 2 +- .../mapper/xml/LawsAssessMapper.xml | 3 +- .../service/impl/LawsAssessServiceImpl.java | 29 +++++++++++-------- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 4b9d0a03..94fc4a6c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -705,7 +705,6 @@ public class ProcessProjectStandardService extends ServiceImpl termUserList = termIdMap.get(termId); String description = termUserList.stream().map(ProcessProjectStandardTermUser::getDescription).collect(Collectors.joining(",")); projectLibrary.setDescription(description); + String modelSeries = termUserList.stream().map(ProcessProjectStandardTermUser::getModelSeries).distinct().collect(Collectors.joining(",")); + projectLibrary.setModelSeries(modelSeries); } if (allTermIdMap.containsKey(termId)) { List termUserList = allTermIdMap.get(termId); diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java index eac6ba53..23d9bdd8 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java @@ -10,6 +10,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; @@ -180,13 +181,15 @@ public class LawsProjectLibraryController extends JeroController wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsAssess::getProjectId, id); - List list = lawsAssessService.list(wrapper); - List collect = list.stream().map(LawsAssess::getId).collect(Collectors.toList()); - if (collect.isEmpty()) { + wrapper.eq(LawsAssess::getDelFlag, YesOrNoEnum.NO.getValue()); + List assessList = lawsAssessService.list(wrapper); + List standardIdList = assessList.stream().map(LawsAssess::getStandardId).collect(Collectors.toList()); + if (standardIdList.isEmpty()) { return Result.OK(new RiskOverviewVo(0, 0, 0, 0)); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(LawsAssessResults::getProjectId, id); + queryWrapper.eq(LawsAssessResults::getProjectId, id); + queryWrapper.in(LawsAssessResults::getStandardId, standardIdList); List assessResults = lawsAssessResultsService.list(queryWrapper); int a = Math.toIntExact(assessResults.stream().filter(LawsAssessResults -> "1".equals(LawsAssessResults.getAssessResults())).count()); int b = Math.toIntExact(assessResults.stream().filter(LawsAssessResults -> "2".equals(LawsAssessResults.getAssessResults())).count()); diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/LawsAssessMapper.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/LawsAssessMapper.java index 7336a429..1005a756 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/LawsAssessMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/LawsAssessMapper.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface LawsAssessMapper extends BaseMapper { - Integer changeDelFlag(@Param("id") String id); + Integer changeDelFlag(@Param("projectId") String projectId, @Param("standardId") String standardId); List getAllByProjectIdDeleted(@Param("projectId") String projectId); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsAssessMapper.xml b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsAssessMapper.xml index df5b4e54..559ca486 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsAssessMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsAssessMapper.xml @@ -34,6 +34,7 @@ update laws_assess la set la.del_flag = 0 - where id = #{id} + where project_id = #{projectId} + and standard_id = #{standardId} diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java index 797a5089..42a5f814 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.projectLibrary.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.CommonConstant; import com.jero.common.system.api.ISysBaseAPI; @@ -12,7 +13,9 @@ import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.projectLibrary.common.AssessCommon; import com.jero.modules.projectLibrary.entity.LawsAssess; +import com.jero.modules.projectLibrary.entity.LawsAssessResults; import com.jero.modules.projectLibrary.mapper.LawsAssessMapper; +import com.jero.modules.projectLibrary.service.ILawsAssessResultsService; import com.jero.modules.projectLibrary.service.ILawsAssessService; import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO; import com.jero.modules.projectLibrary.vo.LawsAssessAddVo; @@ -57,6 +60,8 @@ public class LawsAssessServiceImpl extends ServiceImpl