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 c26d12c4d17b95b93a5d76a443968af6ebf33c16..52e67bc6ae7ced375db8a3912943f5fcd81b5528 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"), 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 976f6c073784d9b27f3b92568ffb0eacb79da153..f021fa9872f318586877b9b0a3b6bf558cd65c90 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); } } } 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 706988ce04fd0f2adc4db618d33d7167e7a068ef..364d495c2097a59f43068eb1e71f3518624c3434 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 37aa259ed5e6c65c502895bfb4254274c2b8a87c..94109ff609ac447d469b101d89e5e109f9c2df13 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 b8880160deddc37e488c2f69202a8f4590712a71..6e975cae97c1803a5501be4787054b9998492982 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 0000000000000000000000000000000000000000..847ba596c03f5da0a33d2ab69ae034a8e531a811 --- /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 0000000000000000000000000000000000000000..dfcca70d688c3cb98cd656f5e356e4ca2521627f --- /dev/null +++ b/src/main/resources/neatlogic/resources/process/changelog/2025-03-22/version.json @@ -0,0 +1,11 @@ +{ + "content":[ + { + "type":"增加功能", + "detail":[ + {"msg":"1.子任务完成时记录操作按钮"} + ] + } + ] +} +