From 0a008372d206c8476df835817d413c3c1a0e76c2 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 24 Mar 2025 10:15:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E6=97=B6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1383897353388032]IT服务-子任务完成时记录用户点击的操作按钮 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1383897353388032 --- .../mapper/processtask/ProcessTaskStepTaskMapper.java | 2 +- .../mapper/processtask/ProcessTaskStepTaskMapper.xml | 7 +++++-- .../service/ProcessTaskStepTaskServiceImpl.java | 3 ++- .../process/changelog/2025-03-22/neatlogic_tenant.sql | 2 ++ .../process/changelog/2025-03-22/version.json | 11 +++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/neatlogic/resources/process/changelog/2025-03-22/neatlogic_tenant.sql create mode 100644 src/main/resources/neatlogic/resources/process/changelog/2025-03-22/version.json diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.java index 706988ce0..364d495c2 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.java @@ -89,7 +89,7 @@ public interface ProcessTaskStepTaskMapper extends IProcessTaskStepTaskCrossover int updateTask(ProcessTaskStepTaskVo processTaskStepTaskVo); - int updateTaskUserByTaskIdAndUserUuid(@Param("status") String status, @Param("processTaskStepTaskId") Long processtaskStepTaskId, @Param("userUuid") String userUuid); +// int updateTaskUserByTaskIdAndUserUuid(@Param("status") String status, @Param("processTaskStepTaskId") Long processtaskStepTaskId, @Param("userUuid") String userUuid); int updateTaskUserById(ProcessTaskStepTaskUserVo processTaskStepTaskUserVo); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.xml index 37aa259ed..94109ff60 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepTaskMapper.xml @@ -515,20 +515,23 @@ WHERE `id` = #{id}; - + UPDATE `processtask_step_task_user` SET `end_time` = now(3), `user_uuid` = #{userUuid}, + + `button` = #{button}, + `status` = #{status} WHERE `id` = #{id} diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java index b8880160d..6e975cae9 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java @@ -514,11 +514,12 @@ public class ProcessTaskStepTaskServiceImpl implements ProcessTaskStepTaskServic isChangeContent = true; } } - if (isChangeContent || Objects.equals(oldProcessTaskStepTaskUserVo.getStatus(), ProcessTaskStepTaskUserStatus.PENDING) || !Objects.equals(oldProcessTaskStepTaskUserVo.getUserUuid(), UserContext.get().getUserUuid())) { + if (isChangeContent || Objects.equals(oldProcessTaskStepTaskUserVo.getStatus(), ProcessTaskStepTaskUserStatus.PENDING.getValue()) || !Objects.equals(oldProcessTaskStepTaskUserVo.getUserUuid(), UserContext.get().getUserUuid())) { ProcessTaskStepTaskUserVo processTaskStepTaskUserVo = new ProcessTaskStepTaskUserVo(); processTaskStepTaskUserVo.setId(stepTaskUserId); processTaskStepTaskUserVo.setUserUuid(UserContext.get().getUserUuid()); processTaskStepTaskUserVo.setStatus(ProcessTaskStepTaskUserStatus.SUCCEED.getValue()); + processTaskStepTaskUserVo.setButton(button); processTaskStepTaskMapper.updateTaskUserById(processTaskStepTaskUserVo); isChange = true; } diff --git a/src/main/resources/neatlogic/resources/process/changelog/2025-03-22/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/process/changelog/2025-03-22/neatlogic_tenant.sql new file mode 100644 index 000000000..847ba596c --- /dev/null +++ b/src/main/resources/neatlogic/resources/process/changelog/2025-03-22/neatlogic_tenant.sql @@ -0,0 +1,2 @@ +ALTER TABLE `processtask_step_task_user` + ADD COLUMN `button` VARCHAR (100) NULL COMMENT '操作按钮' AFTER `is_delete`; \ No newline at end of file diff --git a/src/main/resources/neatlogic/resources/process/changelog/2025-03-22/version.json b/src/main/resources/neatlogic/resources/process/changelog/2025-03-22/version.json new file mode 100644 index 000000000..dfcca70d6 --- /dev/null +++ b/src/main/resources/neatlogic/resources/process/changelog/2025-03-22/version.json @@ -0,0 +1,11 @@ +{ + "content":[ + { + "type":"增加功能", + "detail":[ + {"msg":"1.子任务完成时记录操作按钮"} + ] + } + ] +} + -- Gitee From ea1bb58db232f22042dc877b606e3b5d82c9d997 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 24 Mar 2025 11:07:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E6=97=B6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1383897353388032]IT服务-子任务完成时记录用户点击的操作按钮 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1383897353388032 --- .../condition/handler/ProcessTaskFormAttributeCondition.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java index 976f6c073..f021fa987 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java @@ -312,8 +312,12 @@ public class ProcessTaskFormAttributeCondition extends ProcessTaskConditionBase if (handler != null) { Object simpleValue = handler.getSimpleValue(value); newRowObj.put(downwardFormAttribute.getUuid(), simpleValue); + newRowObj.put(downwardFormAttribute.getKey(), simpleValue); + newRowObj.put(downwardFormAttribute.getLabel(), simpleValue); } else { newRowObj.put(downwardFormAttribute.getUuid(), value); + newRowObj.put(downwardFormAttribute.getKey(), value); + newRowObj.put(downwardFormAttribute.getLabel(), value); } } } -- Gitee From 6e9b04e979556409c049a83350755bfc96664bef Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 24 Mar 2025 11:11:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20IT=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?-=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E6=97=B6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1383897353388032]IT服务-子任务完成时记录用户点击的操作按钮 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1383897353388032 --- .../module/process/api/processtask/ProcessTaskCreateApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java index c26d12c4d..52e67bc6a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java @@ -48,7 +48,7 @@ public class ProcessTaskCreateApi extends PrivateApiComponentBase { @Param(name = "title", type = ApiParamType.STRING, isRequired = true, maxLength = 80, desc = "common.title"), @Param(name = "owner", type = ApiParamType.STRING, isRequired = true, desc = "term.itsm.owner", help = "上报人uuid和上报人id入参"), @Param(name = "reporter", type = ApiParamType.STRING, desc = "term.itsm.reporter"), - @Param(name = "priority", type = ApiParamType.STRING, isRequired = true, desc = "common.priority"), + @Param(name = "priority", type = ApiParamType.STRING, desc = "common.priority"), @Param(name = "formAttributeDataList", type = ApiParamType.JSONARRAY, desc = "term.itsm.formattributedatalist"), @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.hidecomponentlist"), @Param(name = "readcomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.readcomponentlist"), -- Gitee