From 38fb356e2669e46c35e543e0e651e2c9be0dfdb8 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 30 Jan 2024 13:46:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=2081475=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9/=E5=8F=98=E6=9B=B4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B--=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=A1=AB=E5=86=99=E7=9A=84=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=92=8C=E9=99=84=E4=BB=B6=E6=B2=A1=E6=9C=89=E5=B8=A6?= =?UTF-8?q?=E5=85=A5=E5=88=B0=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E4=B8=BB=E8=B5=B7=E8=8D=89=E4=BA=BA=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esAbolish/service/impl/ProcessEsAbolishServiceImpl.java | 2 ++ .../service/impl/ProcessEsAnnualInitServiceImpl.java | 2 ++ .../service/impl/ProcessEsAnnualReportServiceImpl.java | 2 ++ .../esArchive/service/impl/ProcessEsArchiveServiceImpl.java | 2 ++ .../esChange/service/impl/ProcessEsChangeServiceImpl.java | 2 ++ .../esEnable/service/impl/ProcessEsEnableServiceImpl.java | 2 ++ .../service/impl/ProcessEsInitChangeServiceImpl.java | 2 ++ .../esRecheck/service/impl/ProcessEsRecheckServiceImpl.java | 2 ++ .../process/esRevision/service/impl/EsRevisionServiceImpl.java | 2 ++ 9 files changed, 18 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java index 41082ca6..29c72bbb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java @@ -109,6 +109,8 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl Date: Tue, 30 Jan 2024 14:37:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=2081398=20=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=AE=A1=E6=89=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E9=94=99=E8=AF=AF=20fix=2081401=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E9=83=A8=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E5=9B=9E=E6=98=BE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessProjectStandardTermMapper.java | 2 + .../xml/ProcessProjectStandardTermMapper.xml | 15 +++++++ .../ProcessProjectStandardTermUserMapper.xml | 3 ++ .../ProcessProjectStandardService.java | 42 ++++++++++++------- 4 files changed, 47 insertions(+), 15 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java index e209eb5e..07abc650 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java @@ -14,6 +14,8 @@ import java.util.List; public interface ProcessProjectStandardTermMapper extends BaseMapper { List getByResponsibleUnitLeader(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("hasModuleOwner") Boolean hasModuleOwner); + List getByResponsibleUnitLeaderSp(@Param("processId") String processId, @Param("originUserId") String originUserId); + List getByModuleOwner(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId, @Param("hasDesignEngineer") Boolean hasDesignEngineer); List getByRejectModuleOwner(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml index 58dfabc8..f9bfaf05 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml @@ -59,6 +59,21 @@ and ppstu.id is not null + +