From 17116b23556ef7943a6fe4eb93b21e76231c86cb Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 23 Apr 2024 16:53:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1141293256769536]后端-自定义表单标准规范定义 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1141293256769536 --- .../api/form/FormAttributeCheckApi.java | 2 +- .../api/process/ProcessConditionList.java | 11 +++++- .../processtask/ProcessTaskDraftSaveApi.java | 1 + .../ProcessTaskFormDataListForEmailApi.java | 2 +- .../ProcessTaskStepDraftSaveApi.java | 1 + .../workcenter/WorkcenterDataExportApi.java | 8 ++--- .../handler/FormAuditHandler.java | 2 +- .../ProcessTaskFormAttributeCondition.java | 3 +- .../handler/param/FormParamHandler.java | 2 +- .../ProcessTaskCreatePublicServiceImpl.java | 2 +- .../service/ProcessTaskServiceImpl.java | 5 +++ .../component/TimerProcessComponent.java | 2 +- .../utilhandler/ProcessStepHandlerUtil.java | 36 +++++++++++++++++++ .../handler/FormWorkerPolicyHandler.java | 4 +-- 14 files changed, 66 insertions(+), 15 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/form/FormAttributeCheckApi.java b/src/main/java/neatlogic/module/process/api/form/FormAttributeCheckApi.java index c41c0f1a6..1bed04023 100644 --- a/src/main/java/neatlogic/module/process/api/form/FormAttributeCheckApi.java +++ b/src/main/java/neatlogic/module/process/api/form/FormAttributeCheckApi.java @@ -132,7 +132,7 @@ public class FormAttributeCheckApi extends PrivateApiComponentBase { AttributeDataVo attributeDataVo = new AttributeDataVo(); attributeDataVo.setAttributeUuid(attributeUuid); attributeDataVo.setData(jsonObj.getString("data")); - JSONObject configObj = formAttribute.getConfigObj(); + JSONObject configObj = formAttribute.getConfig(); configObj.put("worktimeUuid", worktimeUuid); return handler.valid(attributeDataVo, configObj); }else { diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java index 556da2eae..996f765db 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java @@ -15,6 +15,8 @@ import neatlogic.framework.form.attribute.core.IFormAttributeHandler; import neatlogic.framework.form.constvalue.FormConditionModel; import neatlogic.framework.form.dao.mapper.FormMapper; import neatlogic.framework.form.dto.FormAttributeVo; +import neatlogic.framework.form.dto.FormVo; +import neatlogic.framework.form.exception.FormNotFoundException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; import neatlogic.framework.restful.annotation.*; @@ -95,6 +97,13 @@ public class ProcessConditionList extends PrivateApiComponentBase { String formUuid = jsonObj.getString("formUuid"); if (StringUtils.isNotBlank(formUuid)) { //List conditionableAttrUuidList = new ArrayList<>(); + FormVo form = formMapper.getFormByUuid(formUuid); + if (form == null) { + throw new FormNotFoundException(formUuid); + } + // TODO 需要确定条件节点表单扩展属性标签 +// IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class); +// List formAttributeList = formCrossoverService.getFormAttributeList(formUuid, form.getName(), "condition"); List formAttrList = formMapper.getFormAttributeList(new FormAttributeVo(formUuid)); for (FormAttributeVo formAttributeVo : formAttrList) { IFormAttributeHandler formHandler = FormAttributeHandlerFactory.getHandler(formAttributeVo.getHandler()); @@ -111,7 +120,7 @@ public class ProcessConditionList extends PrivateApiComponentBase { conditionParamVo.setController(formAttributeVo.getHandlerType()); conditionParamVo.setType(formAttributeVo.getType()); conditionParamVo.setHandler(formAttributeVo.getHandler()); - conditionParamVo.setConfig(formAttributeVo.getConfig()); + conditionParamVo.setConfig(formAttributeVo.getConfig().toJSONString()); ParamType paramType = formHandler.getParamType(); if (paramType != null) { diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java index d9134859d..cf52d3faa 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java @@ -67,6 +67,7 @@ public class ProcessTaskDraftSaveApi extends PrivateApiComponentBase { @Param(name = "owner", type = ApiParamType.STRING, desc = "请求人"), @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "优先级uuid"), @Param(name = "formAttributeDataList", type = ApiParamType.JSONARRAY, desc = "表单属性数据列表"), + @Param(name = "formExtendAttributeDataList", type = ApiParamType.JSONARRAY, desc = "表单扩展属性数据列表"), @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "隐藏表单属性列表"), @Param(name = "readcomponentList", type = ApiParamType.JSONARRAY, desc = "只读表单属性列表"), @Param(name = "content", type = ApiParamType.STRING, desc = "描述"), diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormDataListForEmailApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormDataListForEmailApi.java index 5aa538001..db3b3bdab 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormDataListForEmailApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormDataListForEmailApi.java @@ -101,7 +101,7 @@ public class ProcessTaskFormDataListForEmailApi extends PrivateApiComponentBase // System.out.println(formAttribute.getHandler() + "-" + (System.currentTimeMillis() - startTime)); // attributeDataVo.setDataObj(value); long startTime2 = System.currentTimeMillis(); - JSONObject valueObj = handler.getDetailedData(attributeDataVo, JSONObject.parseObject(formAttribute.getConfig())); + JSONObject valueObj = handler.getDetailedData(attributeDataVo, formAttribute.getConfig()); System.out.println(formAttribute.getHandler() + "-" + (System.currentTimeMillis() - startTime2)); attributeDataVo.setDataObj(valueObj); } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java index 6097941f3..1d04e16b5 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java @@ -58,6 +58,7 @@ public class ProcessTaskStepDraftSaveApi extends PrivateApiComponentBase { @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "步骤id"), @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "优先级uuid"), @Param(name = "formAttributeDataList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "表单属性数据列表"), + @Param(name = "formExtendAttributeDataList", type = ApiParamType.JSONARRAY, desc = "表单扩展属性数据列表"), @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "隐藏表单属性列表"), @Param(name = "readcomponentList", type = ApiParamType.JSONARRAY, desc = "只读表单属性列表"), @Param(name = "content", type = ApiParamType.STRING, desc = "描述"), diff --git a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportApi.java b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportApi.java index 7d926ae01..460d52450 100644 --- a/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportApi.java +++ b/src/main/java/neatlogic/module/process/api/workcenter/WorkcenterDataExportApi.java @@ -198,7 +198,7 @@ public class WorkcenterDataExportApi extends PrivateBinaryStreamApiComponentBase if (handler == null) { continue; } - formLabelCellRangeMap.put(formAttributeVo.getLabel(), handler.getExcelHeadLength(formAttributeVo.getConfigObj())); + formLabelCellRangeMap.put(formAttributeVo.getLabel(), handler.getExcelHeadLength(formAttributeVo.getConfig())); formLabelList.add(formAttributeVo.getLabel()); formAttributeVoList.add(formAttributeVo); } @@ -274,7 +274,7 @@ public class WorkcenterDataExportApi extends PrivateBinaryStreamApiComponentBase if (handler == null) { continue; } - int excelRowCount = handler.getExcelRowCount(formAttributeDataVo, JSONObject.parseObject(formAttributeVo.getConfig())); + int excelRowCount = handler.getExcelRowCount(formAttributeDataVo, formAttributeVo.getConfig()); if (excelRowCount > maxRowCount) { maxRowCount = excelRowCount; } @@ -314,12 +314,12 @@ public class WorkcenterDataExportApi extends PrivateBinaryStreamApiComponentBase ProcessTaskFormAttributeDataVo formAttributeDataVo = processTaskFormAttributeDataMap.get(formAttributeVo.getLabel()); // 因为表头中已经有了当前组件的label，所以如果当前工单表单中没有当前组件或组件值为null，那么使用空串来占位，防止后续组件前移 if (formAttributeDataVo != null && formAttributeDataVo.getData() != null) { - detailedData = handler.dataTransformationForExcel(formAttributeDataVo, formAttributeVo.getConfigObj()); + detailedData = handler.dataTransformationForExcel(formAttributeDataVo, formAttributeVo.getConfig()); } if (detailedData == null) { detailedData = ""; } - int excelHeadLength = handler.getExcelHeadLength(formAttributeVo.getConfigObj()); + int excelHeadLength = handler.getExcelHeadLength(formAttributeVo.getConfig()); // excelHeadLength > 1表示该表单属性为表格类属性，需要生成嵌套表格 if (excelHeadLength > 1 && StringUtils.isNotBlank(detailedData.toString())) { JSONObject jsonObject = (JSONObject) detailedData; diff --git a/src/main/java/neatlogic/module/process/audithandler/handler/FormAuditHandler.java b/src/main/java/neatlogic/module/process/audithandler/handler/FormAuditHandler.java index edd6c7903..055ec4c0a 100644 --- a/src/main/java/neatlogic/module/process/audithandler/handler/FormAuditHandler.java +++ b/src/main/java/neatlogic/module/process/audithandler/handler/FormAuditHandler.java @@ -107,7 +107,7 @@ public class FormAuditHandler implements IProcessTaskStepAuditDetailHandler { for (FormAttributeVo formAttributeVo : defaultSceneFormAttributeList) { String attributeUuid = formAttributeVo.getUuid(); attributeLabelMap.put(attributeUuid, formAttributeVo.getLabel()); - attributeConfigMap.put(attributeUuid, formAttributeVo.getConfigObj()); + attributeConfigMap.put(attributeUuid, formAttributeVo.getConfig()); ProcessTaskFormAttributeDataVo newProcessTaskFormAttributeDataVo = newProcessTaskFormAttributeDataMap.get(attributeUuid); ProcessTaskFormAttributeDataVo oldProcessTaskFormAttributeDataVo = oldProcessTaskFormAttributeDataMap.get(attributeUuid); if (oldProcessTaskFormAttributeDataVo == null && newProcessTaskFormAttributeDataVo == null) { 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 87bd745c5..1e8c8358b 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java @@ -135,8 +135,7 @@ public class ProcessTaskFormAttributeCondition extends ProcessTaskConditionBase attributeDataVo.setData(JSON.toJSONString(value)); } - Object text = formAttributeHandler.valueConversionText(attributeDataVo, - JSON.parseObject(formAttribute.getConfig())); + Object text = formAttributeHandler.valueConversionText(attributeDataVo, formAttribute.getConfig()); if (text instanceof String) { return text; } else if (text instanceof List) { diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/FormParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/FormParamHandler.java index 61c242558..f52697628 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/FormParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/FormParamHandler.java @@ -100,7 +100,7 @@ public class FormParamHandler extends ProcessTaskNotifyParamHandlerBase { attributeDataVo.setAttributeLabel(formAttribute.getLabel()); IFormAttributeDataConversionHandler handler = FormAttributeDataConversionHandlerFactory.getHandler(formAttribute.getHandler()); if (handler != null) { - Object value = handler.dataTransformationForEmail(attributeDataVo, formAttribute.getConfigObj()); + Object value = handler.dataTransformationForEmail(attributeDataVo, formAttribute.getConfig()); attributeExtendedDataList.add(new AttributeExtendedDataVo(attributeDataVo, value)); } } diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java index c74ac1eba..e6f93285b 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java @@ -195,7 +195,7 @@ public class ProcessTaskCreatePublicServiceImpl implements ProcessTaskCreatePubl if (formAttributeHandler == null) { throw new FormAttributeHandlerNotFoundException(formAttributeVo.getHandler()); } - JSONObject config = JSONObject.parseObject(formAttributeVo.getConfig()); + JSONObject config = formAttributeVo.getConfig(); formAttributeData.put("attributeUuid", formAttributeVo.getUuid()); formAttributeData.put("handler", formAttributeVo.getHandler()); Object dataObj = formAttributeData.get("dataList"); diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 813c005bc..2e3c4876b 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -2076,6 +2076,11 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC formMapper.deleteFormAttributeDataByIdList(formAttributeDataIdList); processTaskMapper.deleteProcessTaskFormAttributeByProcessTaskId(processTaskId); } + List extendFormAttributeDataIdList = processTaskMapper.getProcessTaskExtendFormAttributeDataIdListByProcessTaskId(processTaskId); + if (CollectionUtils.isNotEmpty(extendFormAttributeDataIdList)) { + formMapper.deleteFormExtendAttributeDataByIdList(formAttributeDataIdList); + processTaskMapper.deleteProcessTaskExtendFormAttributeByProcessTaskId(processTaskId); + } } /** diff --git a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java index 33eec4c47..33ee6fe45 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java @@ -156,7 +156,7 @@ public class TimerProcessComponent extends ProcessStepHandlerBase { List fromFormAttributeList = fromFormVersion.getFormAttributeList(); for (FormAttributeVo formAttributeVo : fromFormAttributeList) { if (Objects.equals(formAttributeVo.getUuid(), attributeUuid)) { - JSONObject configObj = formAttributeVo.getConfigObj(); + JSONObject configObj = formAttributeVo.getConfig(); if (MapUtils.isNotEmpty(configObj)) { IFormAttributeDataConversionHandler handler = FormAttributeDataConversionHandlerFactory.getHandler(formAttributeVo.getHandler()); if (handler != null) { diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ProcessStepHandlerUtil.java index 49bcf3853..d5d9b50d1 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ProcessStepHandlerUtil.java @@ -988,5 +988,41 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil { formMapper.insertFormAttributeData(dataVo); processTaskMapper.insertProcessTaskFormAttribute(dataVo); } + // 保存表单扩展组件值 + List oldExtendAttributeDataList = processTaskMapper.getProcessTaskExtendFormAttributeDataListByProcessTaskId(processTaskId, null); + Map oldExtendAttributeDataMap = oldExtendAttributeDataList.stream().collect(Collectors.toMap(AttributeDataVo::getAttributeUuid, e -> e)); + JSONArray formExtendAttributeDataList = paramObj.getJSONArray("formExtendAttributeDataList"); + if (CollectionUtils.isNotEmpty(formExtendAttributeDataList)) { + List processTaskFormExtendAttributeList = processTaskMapper.getProcessTaskFormExtendAttributeListByProcessTaskId(processTaskId); + Map processTaskFormExtendAttributeMap = processTaskFormExtendAttributeList.stream().collect(Collectors.toMap(e -> e.getParentUuid() + "#" + e.getKey(), e -> e)); + for (int j = 0; j < formExtendAttributeDataList.size(); j++) { + JSONObject formExtendAttributeDataObj = formExtendAttributeDataList.getJSONObject(j); + if (MapUtils.isEmpty(formExtendAttributeDataObj)) { + continue; + } + String parentUuid = formExtendAttributeDataObj.getString("parentUuid"); + String tag = formExtendAttributeDataObj.getString("tag"); + String key = formExtendAttributeDataObj.getString("key"); + ProcessTaskFormAttributeVo processTaskFormAttributeVo = processTaskFormExtendAttributeMap.get(parentUuid + "#" + key); + if (processTaskFormAttributeVo == null) { + continue; + } + String dataList = formExtendAttributeDataObj.getString("dataList"); + ProcessTaskFormAttributeDataVo processTaskExtendFormAttributeDataVo = new ProcessTaskFormAttributeDataVo(); + AttributeDataVo oldAttributeDataVo = oldExtendAttributeDataMap.get(processTaskFormAttributeVo.getUuid()); + if (oldAttributeDataVo != null) { + processTaskExtendFormAttributeDataVo.setId(oldAttributeDataVo.getId()); + } + processTaskExtendFormAttributeDataVo.setFormUuid(processTaskFormAttributeVo.getFormUuid()); + processTaskExtendFormAttributeDataVo.setHandler(processTaskFormAttributeVo.getHandler()); + processTaskExtendFormAttributeDataVo.setTag(tag); + processTaskExtendFormAttributeDataVo.setAttributeUuid(processTaskFormAttributeVo.getUuid()); + processTaskExtendFormAttributeDataVo.setAttributeLabel(processTaskFormAttributeVo.getLabel()); + processTaskExtendFormAttributeDataVo.setData(dataList); + formMapper.insertFormExtendAttributeData(processTaskExtendFormAttributeDataVo); + processTaskExtendFormAttributeDataVo.setProcessTaskId(processTaskId); + processTaskMapper.insertProcessTaskExtendFormAttribute(processTaskExtendFormAttributeDataVo); + } + } } } diff --git a/src/main/java/neatlogic/module/process/workerpolicy/handler/FormWorkerPolicyHandler.java b/src/main/java/neatlogic/module/process/workerpolicy/handler/FormWorkerPolicyHandler.java index de77b2677..43f68906d 100644 --- a/src/main/java/neatlogic/module/process/workerpolicy/handler/FormWorkerPolicyHandler.java +++ b/src/main/java/neatlogic/module/process/workerpolicy/handler/FormWorkerPolicyHandler.java @@ -92,7 +92,7 @@ public class FormWorkerPolicyHandler implements IWorkerPolicyHandler { if (FormHandler.FORMUSERSELECT.getHandler().equals(processTaskFormAttributeData.getHandler())) { IFormAttributeDataConversionHandler handler = FormAttributeDataConversionHandlerFactory.getHandler(FormHandler.FORMUSERSELECT.getHandler()); if (handler != null) { - JSONObject detailedData = handler.getDetailedData(processTaskFormAttributeData, formAttributeVo.getConfigObj()); + JSONObject detailedData = handler.getDetailedData(processTaskFormAttributeData, formAttributeVo.getConfig()); JSONArray valueList = detailedData.getJSONArray("valueList"); if (CollectionUtils.isNotEmpty(valueList)) { List dataList = valueList.toJavaList(String.class); @@ -126,7 +126,7 @@ public class FormWorkerPolicyHandler implements IWorkerPolicyHandler { } else if (FormHandler.FORMSELECT.getHandler().equals(processTaskFormAttributeData.getHandler())) { IFormAttributeDataConversionHandler handler = FormAttributeDataConversionHandlerFactory.getHandler(FormHandler.FORMSELECT.getHandler()); if (handler != null) { - JSONObject detailedData = handler.getDetailedData(processTaskFormAttributeData, formAttributeVo.getConfigObj()); + JSONObject detailedData = handler.getDetailedData(processTaskFormAttributeData, formAttributeVo.getConfig()); JSONArray valueList = detailedData.getJSONArray("valueList"); if (CollectionUtils.isNotEmpty(valueList)) { List dataList = valueList.toJavaList(String.class); -- Gitee From 23fa5050665279aa5f7a491b416ec6d062de5f7e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 23 Apr 2024 18:11:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1141293256769536]后端-自定义表单标准规范定义 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1141293256769536 --- .../processtask/ProcessTaskDraftSaveApi.java | 40 +++++++++---------- .../ProcessTaskStepDraftSaveApi.java | 26 ++++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java index cf52d3faa..2f8b999a8 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java @@ -42,7 +42,7 @@ public class ProcessTaskDraftSaveApi extends PrivateApiComponentBase { @Override public String getName() { - return "工单上报暂存接口"; + return "nmpap.processtaskdraftsaveapi.getname"; } @Override @@ -61,31 +61,31 @@ public class ProcessTaskDraftSaveApi extends PrivateApiComponentBase { // } // ] @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "工单id"), - @Param(name = "channelUuid", type = ApiParamType.STRING, isRequired = true, desc = "服务uuid"), - @Param(name = "title", type = ApiParamType.STRING, isRequired = true, maxLength = 80, desc = "标题"), - @Param(name = "owner", type = ApiParamType.STRING, desc = "请求人"), - @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "优先级uuid"), - @Param(name = "formAttributeDataList", type = ApiParamType.JSONARRAY, desc = "表单属性数据列表"), - @Param(name = "formExtendAttributeDataList", type = ApiParamType.JSONARRAY, desc = "表单扩展属性数据列表"), - @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "隐藏表单属性列表"), - @Param(name = "readcomponentList", type = ApiParamType.JSONARRAY, desc = "只读表单属性列表"), - @Param(name = "content", type = ApiParamType.STRING, desc = "描述"), - @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "附件id列表"), - @Param(name = "tagList", type = ApiParamType.JSONARRAY, desc = "标签列表"), - @Param(name = "focusUserUuidList", type = ApiParamType.JSONARRAY, desc = "工单关注人列表"), - @Param(name = "handlerStepInfo", type = ApiParamType.JSONOBJECT, desc = "处理器特有的步骤信息"), - @Param(name = "fromProcessTaskId", type = ApiParamType.LONG, desc = "来源工单id，从转报进入上报页时，传fromProcessTaskId"), - @Param(name = "channelTypeRelationId", type = ApiParamType.LONG, desc = "关系类型id，从转报进入上报页时，传channelTypeRelationId"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), + @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "term.itsm.processtaskid"), + @Param(name = "channelUuid", type = ApiParamType.STRING, isRequired = true, desc = "term.itsm.channeluuid"), + @Param(name = "title", type = ApiParamType.STRING, isRequired = true, maxLength = 80, desc = "common.title"), + @Param(name = "owner", type = ApiParamType.STRING, desc = "term.itsm.owner"), + @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "common.priorityuuid"), + @Param(name = "formAttributeDataList", type = ApiParamType.JSONARRAY, desc = "term.itsm.formattributedatalist"), + @Param(name = "formExtendAttributeDataList", type = ApiParamType.JSONARRAY, desc = "term.itsm.formextendattributedatalist"), + @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.hidecomponentlist"), + @Param(name = "readcomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.readcomponentlist"), + @Param(name = "content", type = ApiParamType.STRING, desc = "common.content"), + @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "common.fileidlist"), + @Param(name = "tagList", type = ApiParamType.JSONARRAY, desc = "common.taglist"), + @Param(name = "focusUserUuidList", type = ApiParamType.JSONARRAY, desc = "term.itsm.focususeruuidlist"), + @Param(name = "handlerStepInfo", type = ApiParamType.JSONOBJECT, desc = "term.itsm.handlerstepinfo"), + @Param(name = "fromProcessTaskId", type = ApiParamType.LONG, desc = "term.itsm.fromprocesstaskid", help = "从转报进入上报页时，传fromProcessTaskId"), + @Param(name = "channelTypeRelationId", type = ApiParamType.LONG, desc = "term.itsm.channeltyperelationid", help = "从转报进入上报页时，传channelTypeRelationId"), + @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), @Param(name = "parentProcessTaskStepId", type = ApiParamType.LONG, desc = "nmpap.processtaskdraftgetapi.input.param.desc.parentprocesstaskstepid", help = "创建子流程时，传parentProcessTaskStepId"), @Param(name = "invoke", type = ApiParamType.STRING, desc = "nmpap.processtaskdraftsaveapi.input.param.desc.invoke", help = "subprocess :子流程") }) @Output({ - @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "工单id"), + @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "term.itsm.processtaskid"), @Param(name = "processTaskStepId", type = ApiParamType.LONG, desc = "步骤id") }) - @Description(desc = "工单上报暂存接口") + @Description(desc = "nmpap.processtaskdraftsaveapi.getname") @Override @ResubmitInterval(5) public Object myDoService(JSONObject jsonObj) throws Exception { diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java index 1d04e16b5..eed44de80 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java @@ -46,7 +46,7 @@ public class ProcessTaskStepDraftSaveApi extends PrivateApiComponentBase { @Override public String getName() { - return "工单步骤暂存接口"; + return "nmpap.processtaskstepdraftsaveapi.getname"; } @Override @@ -54,18 +54,18 @@ public class ProcessTaskStepDraftSaveApi extends PrivateApiComponentBase { return null; } - @Input({@Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "步骤id"), - @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "优先级uuid"), - @Param(name = "formAttributeDataList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "表单属性数据列表"), - @Param(name = "formExtendAttributeDataList", type = ApiParamType.JSONARRAY, desc = "表单扩展属性数据列表"), - @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "隐藏表单属性列表"), - @Param(name = "readcomponentList", type = ApiParamType.JSONARRAY, desc = "只读表单属性列表"), - @Param(name = "content", type = ApiParamType.STRING, desc = "描述"), - @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "附件id列表"), - @Param(name = "handlerStepInfo", type = ApiParamType.JSONOBJECT, desc = "处理器特有的步骤信息")}) - @Output({@Param(name = "auditId", type = ApiParamType.LONG, desc = "活动id")}) - @Description(desc = "工单步骤暂存接口") + @Input({@Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "common.priorityuuid"), + @Param(name = "formAttributeDataList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "term.itsm.formattributedatalist"), + @Param(name = "formExtendAttributeDataList", type = ApiParamType.JSONARRAY, desc = "term.itsm.formextendattributedatalist"), + @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.hidecomponentlist"), + @Param(name = "readcomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.readcomponentlist"), + @Param(name = "content", type = ApiParamType.STRING, desc = "common.content"), + @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "common.fileidlist"), + @Param(name = "handlerStepInfo", type = ApiParamType.JSONOBJECT, desc = "term.itsm.handlerstepinfo")}) + @Output({}) + @Description(desc = "nmpap.processtaskstepdraftsaveapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); -- Gitee From a03e0a1234eb5178ec65bbdd18f57970b18b4cc9 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 23 Apr 2024 19:08:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1141293256769536]后端-自定义表单标准规范定义 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1141293256769536 --- .../module/process/api/process/ProcessConditionList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java index 996f765db..ef67689da 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java @@ -52,7 +52,7 @@ public class ProcessConditionList extends PrivateApiComponentBase { return null; } - @Input({@Param(name = "formUuid", type = ApiParamType.STRING, desc = "nmpap.processconditionlist.input.param.desc"), + @Input({@Param(name = "formUuid", type = ApiParamType.STRING, desc = "term.framework.formuuid"), @Param(name = "isAll", type = ApiParamType.INTEGER, rule = "0,1", desc = "term.process.isreturnallattr")}) @Output({@Param(explode = ConditionParamVo[].class, desc = "nmpap.processconditionlist.getname")}) @Description(desc = "nmpap.processconditionlist.getname") -- Gitee