diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java index 34ff01b1304aae8929cc560169e45e6749e33822..8f3f9c2aeebef434deebd9f78d40344832b0f6a3 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverService.java @@ -123,11 +123,27 @@ public interface IProcessTaskCrossoverService extends ICrossoverService { */ List getFormAttributeListByProcessTaskId(Long processTaskId); + /** + * 根据工单id获取工单绑定的表单信息 + * @param processTaskId 工单ID + * @param tag 标签 + * @return + */ + List getFormAttributeListByProcessTaskIdAngTag(Long processTaskId, String tag); + /** * 根据工单id获取表单属性数据列表 * @param processTaskId 工单id * @return */ List getProcessTaskFormAttributeDataListByProcessTaskId(Long processTaskId); + + /** + * 根据工单id获取表单属性数据列表 + * @param processTaskId 工单id + * @param tag 标签 + * @return + */ + List getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(Long processTaskId, String tag); } diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java index 1186a3879a4a24df7e99ec60cf6862df3315f310..60697588c86021897d354f2efa9997efa5580670 100644 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java +++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.java @@ -70,12 +70,14 @@ public interface ProcessTaskMapper { ProcessTaskFormVo getProcessTaskFormByProcessTaskId(Long processTaskId); - List getProcessTaskFormExtendAttributeListByProcessTaskId(Long processTaskId); + List getProcessTaskFormExtendAttributeListByProcessTaskIdAndTag(@Param("processTaskId") Long processTaskId, @Param("tag") String tag); List getProcessTaskFormListByProcessTaskIdList(List existsProcessTaskIdList); List getProcessTaskFormAttributeDataIdListByProcessTaskId(Long processTaskId); + List getProcessTaskFormAttributeDataListByProcessTaskId(Long processTaskId); + List getProcessTaskExtendFormAttributeDataIdListByProcessTaskId(Long processTaskId); List getProcessTaskExtendFormAttributeDataListByProcessTaskId(@Param("processTaskId") Long processTaskId, @Param("tag") String tag); diff --git a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml index 7fcdde19239457d0f27546f7ec70e026c024b283..ea8df3b83ecc825ee6096c451b11e37ebe0254db 100644 --- a/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml +++ b/src/main/java/neatlogic/framework/process/dao/mapper/ProcessTaskMapper.xml @@ -300,7 +300,7 @@ along with this program. If not, see .--> WHERE a.`processtask_id` = #{value} - SELECT `processtask_id` AS processTaskId, `form_uuid` AS formUuid, @@ -313,7 +313,10 @@ along with this program. If not, see .--> `handler`, `config_hash` AS configHash FROM `processtask_form_extend_attribute` - WHERE `processtask_id` = #{value} + WHERE `processtask_id` = #{processTaskId} + + AND `tag` = #{tag} + + + diff --git a/src/main/java/neatlogic/framework/process/dto/ActionVo.java b/src/main/java/neatlogic/framework/process/dto/ActionVo.java index 1e6300ff2daf9234dc4a7502b943d0f2dbbb86ba..24d3eba4cda89e8ca37d6fd8322061b0077842ea 100755 --- a/src/main/java/neatlogic/framework/process/dto/ActionVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ActionVo.java @@ -10,6 +10,7 @@ public class ActionVo { private String integrationName; private boolean isSucceed; private String statusText; + private String error; public Long getProcessTaskStepId() { return processTaskStepId; } @@ -58,4 +59,12 @@ public class ActionVo { public void setStatusText(String statusText) { this.statusText = statusText; } + + public String getError() { + return error; + } + + public void setError(String error) { + this.error = error; + } }