From 6619409697a61055d350edea6f722e14cc3dfd5e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 14 Jun 2024 17:19:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=81=9A=E4=BA=86=E8=BD=AC=E4=BA=A4=E6=93=8D=E4=BD=9C=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E9=83=BD=E8=A6=81=E5=9C=A8=E5=A4=84=E7=90=86=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E4=B8=AD=E7=95=99=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=81=9A?= =?UTF-8?q?=E4=BA=86=E8=BD=AC=E4=BA=A4=E6=93=8D=E4=BD=9C=E7=9A=84=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=9C=A8=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E4=B8=AD=E6=9F=A5=E5=88=B0=E8=BF=99=E6=9D=A1?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1178993405952000]后端-做了转交操作的,都要在处理历史中留记录,做了转交操作的人,也可以在我的已办中查到这条工单。 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1178993405952000 --- .../api/processtask/ProcessTaskStepListApi.java | 2 ++ .../dao/mapper/processtask/ProcessTaskMapper.java | 5 +++++ .../dao/mapper/processtask/ProcessTaskMapper.xml | 13 +++++++++++++ .../process/service/ProcessStepHandlerUtil.java | 10 ++++++++++ .../process/service/ProcessTaskServiceImpl.java | 2 ++ .../changelog/2024-06-14/neatlogic_tenant.sql | 6 ++++++ .../process/changelog/2024-06-14/version.json | 10 ++++++++++ .../neatlogic/resources/process/sqlscript/ddl.sql | 10 ++++++++++ 8 files changed, 58 insertions(+) create mode 100644 src/main/resources/neatlogic/resources/process/changelog/2024-06-14/neatlogic_tenant.sql create mode 100644 src/main/resources/neatlogic/resources/process/changelog/2024-06-14/version.json diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java index 0ba6f2ae4..c1d235960 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java @@ -134,6 +134,7 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); + typeList.add(ProcessTaskOperationType.STEP_TRANSFER.getValue()); startProcessTaskStepVo.setCommentList( processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(startProcessTaskStepVo.getId(), typeList)); //任务列表 @@ -162,6 +163,7 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); + typeList.add(ProcessTaskOperationType.STEP_TRANSFER.getValue()); processTaskStepVo.setCommentList( processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepVo.getId(), typeList)); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java index e30aff40b..48db39c0e 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.java @@ -18,6 +18,7 @@ package neatlogic.module.process.dao.mapper.processtask; import neatlogic.framework.dto.AuthenticationInfoVo; +import neatlogic.framework.dto.WorkAssignmentUnitVo; import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.process.crossover.IProcessTaskCrossoverMapper; @@ -197,6 +198,8 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { List getFileIdListByContentId(Long contentId); + List getTargetListByContentId(Long contentId); + ProcessTaskStepContentVo getProcessTaskStepContentById(Long id); List getProcessTaskStepUserList(ProcessTaskStepUserVo processTaskStepUserVo); @@ -401,6 +404,8 @@ public interface ProcessTaskMapper extends IProcessTaskCrossoverMapper { int insertProcessTaskStepContent(ProcessTaskStepContentVo processTaskStepContentVo); + int insertProcessTaskStepContentTarget(@Param("contentId") Long contentId, @Param("type") String type, @Param("uuid") String uuid); + int insertProcessTaskOperationContent(ProcessTaskOperationContentVo processTaskOperationContentVo); int insertProcessTaskStepAudit(ProcessTaskStepAuditVo processTaskStepAuditVo); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml index 1ca1b3bec..e5e2d8239 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml @@ -1325,6 +1325,14 @@ WHERE `content_id` = #{value} + +