diff --git a/src/main/java/neatlogic/module/process/api/channel/ChannelSaveApi.java b/src/main/java/neatlogic/module/process/api/channel/ChannelSaveApi.java index 4236b774966daa7023c4e2be8f7155ac9a1079a7..50078ffa07ec94ab0ca0b6bd9a6da0d70f2679e6 100644 --- a/src/main/java/neatlogic/module/process/api/channel/ChannelSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/channel/ChannelSaveApi.java @@ -74,9 +74,7 @@ public class ChannelSaveApi extends PrivateApiComponentBase { @Param(name = "icon", type = ApiParamType.STRING, desc = "图标"), @Param(name = "color", type = ApiParamType.STRING, desc = "颜色"), @Param(name = "sla", type = ApiParamType.INTEGER, desc = "时效(单位：小时)"), - @Param(name = "allowDesc", type = ApiParamType.ENUM, desc = "是否显示上报页描述", rule = "0,1"), - @Param(name = "isActiveHelp", type = ApiParamType.ENUM, desc = "是否激活描述", rule = "0,1"), - @Param(name = "help", type = ApiParamType.STRING, desc = "描述帮助"), + @Param(name = "contentHelp", type = ApiParamType.STRING, desc = "工单上报页描述占位符"), @Param(name = "isNeedPriority", type = ApiParamType.INTEGER, isRequired = true, desc = "是否显示优先级"), @Param(name = "defaultPriorityUuid", type = ApiParamType.STRING, desc = "默认优先级uuid"), @Param(name = "priorityUuidList", type = ApiParamType.JSONARRAY, desc = "关联优先级列表"), diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessReferenceListApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessReferenceListApi.java index 6bcc4a8b08fea0ee0fb4ba69ff9635b90648947f..fd8b9a370fee2f26c37ccab21e2ea67f496066ad 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessReferenceListApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessReferenceListApi.java @@ -1,28 +1,25 @@ package neatlogic.module.process.api.process; -import java.util.ArrayList; -import java.util.List; - +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; -import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.framework.process.dto.ChannelTypeVo; -import neatlogic.framework.restful.constvalue.OperationTypeEnum; +import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.restful.annotation.*; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; - +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.service.CatalogService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.alibaba.fastjson.JSONObject; - -import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.dto.ChannelVo; +import java.util.ArrayList; +import java.util.List; @Service @AuthAction(action = PROCESS_BASE.class) @OperationType(type = OperationTypeEnum.SEARCH) @@ -75,7 +72,6 @@ public class ProcessReferenceListApi extends PrivateApiComponentBase { channelVo.setChannelTypeVo(channelTypeVo.clone()); boolean effectiveAuthority = catalogService.channelIsAuthority(channelVo.getUuid(), UserContext.get().getUserUuid(true)); channelVo.setEffectiveAuthority(effectiveAuthority); - channelVo.setAllowDesc(null); channelVo.setParentUuid(null); channelVo.setChannelTypeUuid(null); channelVo.setColor(null); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java index 454bd2772fca3dc39eb2ccb6297bababf95dc533..4bc2c3ab2163144ed2cd0cc99d9d541c95fe4d86 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftGetApi.java @@ -285,6 +285,10 @@ public class ProcessTaskDraftGetApi extends PrivateApiComponentBase { private ProcessTaskVo getProcessTaskVoByProcessTaskId(Long processTaskId) throws Exception { ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); + ChannelVo channel = channelMapper.getChannelByUuid(processTaskVo.getChannelUuid()); + if (channel == null) { + throw new ChannelNotFoundException(processTaskVo.getChannelUuid()); + } processTaskService.setProcessTaskDetail(processTaskVo); String owner = processTaskVo.getOwner(); if (StringUtils.isNotBlank(owner)) { @@ -293,6 +297,7 @@ public class ProcessTaskDraftGetApi extends PrivateApiComponentBase { } ProcessTaskStepVo startProcessTaskStepVo = processTaskService.getStartProcessTaskStepByProcessTaskId(processTaskId); + startProcessTaskStepVo.setContentHelp(channel.getContentHelp()); processTaskVo.setStartProcessTaskStep(startProcessTaskStepVo); processTaskService.setTemporaryData(processTaskVo, startProcessTaskStepVo); return processTaskVo; @@ -466,6 +471,7 @@ public class ProcessTaskDraftGetApi extends PrivateApiComponentBase { startProcessTaskStepVo.setIsNeedContent((Integer) JSONPath.read(startProcessStepVo.getConfig(), "isNeedContent")); startProcessTaskStepVo.setIsNeedUploadFile((Integer) JSONPath.read(startProcessStepVo.getConfig(), "isNeedUploadFile")); startProcessTaskStepVo.setFormSceneUuid((String) JSONPath.read(startProcessStepVo.getConfig(), "formSceneUuid")); + startProcessTaskStepVo.setContentHelp(channel.getContentHelp()); processTaskVo.setStartProcessTaskStep(startProcessTaskStepVo); processTaskService.setProcessTaskFormInfo(processTaskVo); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.xml index 44bc4b9da28e1f2b4e562cfbc621c25be838377d..031964def1ada67a00f4163bf73181d0d138472f 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/ChannelMapper.xml @@ -159,9 +159,7 @@ `desc`, `sort`, `sla`, - `allow_desc` AS allowDesc, - `help`, - `is_active_help` AS isActiveHelp, + `content_help` AS contentHelp, `channel_type_uuid` AS channelTypeUuid, `support`, `config` AS configStr @@ -227,9 +225,7 @@ `desc`, `sort`, `sla`, - `allow_desc` AS allowDesc, - `help`, - `is_active_help` AS isActiveHelp, + `content_help` AS contentHelp, `channel_type_uuid` AS channelTypeUuid, `support`, `config` AS configStr @@ -248,9 +244,7 @@ c.`desc`, c.`sort`, c.`sla`, - c.`allow_desc` AS allowDesc, - c.`help`, - c.`is_active_help` AS isActiveHelp, + c.`content_help` AS contentHelp, c.`channel_type_uuid` AS channelTypeUuid, c.`support`, c.`config` AS configStr @@ -270,9 +264,7 @@ c.`desc`, c.`sort`, c.`sla`, - c.`allow_desc` AS allowDesc, - c.`help`, - c.`is_active_help` AS isActiveHelp, + c.`content_help` AS contentHelp, c.`channel_type_uuid` AS channelTypeUuid, cp.`process_uuid` AS processUuid, cw.`worktime_uuid` AS worktimeUuid @@ -298,8 +290,7 @@ `color`, `sort`, `sla`, - `allow_desc` AS allowDesc, - `is_active_help` AS isActiveHelp, + `content_help` AS contentHelp, `channel_type_uuid` AS channelTypeUuid, `support`, `config` AS configStr @@ -698,9 +689,7 @@ `desc`, `sort`, `sla`, - `allow_desc`, - `help`, - `is_active_help`, + `content_help`, `channel_type_uuid`, `support`, `config`) @@ -713,9 +702,7 @@ #{desc}, #{sort}, #{sla}, - #{allowDesc}, - #{help}, - #{isActiveHelp}, + #{contentHelp}, #{channelTypeUuid}, #{support}, #{configStr}) diff --git a/src/main/resources/neatlogic/resources/process/changelog/2024-07-12/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/process/changelog/2024-07-12/neatlogic_tenant.sql new file mode 100644 index 0000000000000000000000000000000000000000..fe437d73276178fed30aeeee1532ce0909c99b37 --- /dev/null +++ b/src/main/resources/neatlogic/resources/process/changelog/2024-07-12/neatlogic_tenant.sql @@ -0,0 +1,4 @@ +ALTER TABLE `neatlogic_develop`.`channel` +DROP COLUMN `allow_desc`, + DROP COLUMN `is_active_help`, + CHANGE `help` `content_help` LONGTEXT CHARSET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '工单上报页描述文本占位符'; \ No newline at end of file diff --git a/src/main/resources/neatlogic/resources/process/changelog/2024-07-12/version.json b/src/main/resources/neatlogic/resources/process/changelog/2024-07-12/version.json new file mode 100644 index 0000000000000000000000000000000000000000..601cb76d151c57f77992ba2d0d07b418086a65f7 --- /dev/null +++ b/src/main/resources/neatlogic/resources/process/changelog/2024-07-12/version.json @@ -0,0 +1,10 @@ +{ + "content":[ + { + "type":"新增功能", + "detail":[ + {"msg":"1.服务上报文本框加placeholder"} + ] + } + ] +} diff --git a/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql b/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql index e19e07fbe2fbe751151e017d964d79dff607a706..850772df090bffac6b7a33a0898fe825fc975c1a 100644 --- a/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql +++ b/src/main/resources/neatlogic/resources/process/sqlscript/ddl.sql @@ -41,9 +41,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( `desc` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '描述', `sort` int NOT NULL COMMENT '排序', `sla` int NULL DEFAULT NULL COMMENT 'sla', - `allow_desc` int NULL DEFAULT NULL COMMENT '是否显示上报页描述', - `help` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '描述帮助', - `is_active_help` int NULL DEFAULT NULL COMMENT '是否激活描述帮助', + `content_help` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '描述帮助', `channel_type_uuid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务类型uuid', `support` enum('all','pc','mobile') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'all' COMMENT '使用范围', `config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '配置信息',