REQ-3769 分组查询增加所属业务参数

workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/category/CategoryGroupVarSearchDto.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 
 @ApiModel("业务分类分组和变量搜索入参模型")
 @Data
@@ -17,8 +16,13 @@ import javax.validation.constraints.NotNull;
 @Builder
 public class CategoryGroupVarSearchDto {
 
-    @NotNull(message = "dictId 不允许为空")
-    @Min(value = 1, message = "字典ID值必须大于等于1")
+    @Min(value = 1, message = "字典ID必须大于0")
     @ApiModelProperty(value = "字典 ID")
     private Long dictId;
+
+    /**
+     * 所属业务code
+     */
+    @ApiModelProperty(value = "所属业务")
+    private String category;
 }

workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryGroupServiceImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -42,12 +43,14 @@ public class CategoryGroupServiceImpl extends ServiceImpl<ExtAxDictGroupMapper,
 
     @Override
     public List<CategoryGroupVarItemVo> searchGroupAndVarList(CategoryGroupVarSearchDto dto) {
-        if (dto.getDictId() == null || dto.getDictId() <= 0) {
-            throw new ServiceException("dictId 不能为空且必须大于0");
+        if ((dto.getDictId() == null || dto.getDictId() <= 0) && StringUtils.isBlank(dto.getCategory())) {
+            throw new ServiceException("dictId和category不能同时为空");
         }
         List<ExtAxDictGroup> extAxDictGroups = this.lambdaQuery()
-                .eq(Objects.nonNull(dto.getDictId()), ExtAxDictGroup::getDictId, dto.getDictId())
-                .eq(ExtAxDictGroup::getIsDelete, TableIsDeleteEnum.NORMAL.value)
+                .eq(Objects.nonNull(dto.getDictId()) && dto.getDictId() > 0, ExtAxDictGroup::getDictId, dto.getDictId())
+                .in((Objects.isNull(dto.getDictId()) || dto.getDictId() <= 0) && StringUtils.isNotBlank(dto.getCategory()),
+                        ExtAxDictGroup::getDictId, String.format("SELECT id FROM ext_ax_dict WHERE value = '%s'", dto.getCategory()))
+                .select(ExtAxDictGroup::getId)
                 .list();
         if (CollectionUtils.isEmpty(extAxDictGroups)) {
             return Collections.emptyList();

workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java

@@ -16,6 +16,8 @@ import cn.axzo.workflow.common.model.request.bpmn.model.BpmnModelSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.BpmnModelUpdateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocCreateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocOrderDTO;
+import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocQueryDTO;
+import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocResetDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocSearchDTO;
 import cn.axzo.workflow.common.model.request.bpmn.model.doc.DocUpdateDTO;
 import cn.axzo.workflow.common.model.request.bpmn.print.PrintFieldQueryDTO;
@@ -856,6 +858,17 @@ public interface WorkflowManageService {
     @InvokeMode(SYNC)
     BpmPageResult<DocBaseVO> docPage(@Validated @RequestBody DocSearchDTO dto);
 
+    /**
+     * 获取指定模板的原始文档列表
+     *
+     * @param dto
+     * @return
+     */
+    @Operation(summary = "根据业务 ID 获取模型文档列表，自动适配公共模板和代运营")
+    @PostMapping(value = "/api/process/model/doc/list")
+    @InvokeMode(SYNC)
+    List<DocBaseVO> docList(DocQueryDTO dto);
+
     /**
      * 添加关联文档
      *
@@ -876,6 +889,17 @@ public interface WorkflowManageService {
     @InvokeMode(SYNC)
     Boolean updateDoc(@Validated @RequestBody DocUpdateDTO dto);
 
+    /**
+     * 克隆关联文档
+     *
+     * @param docId
+     * @return
+     */
+    @Operation(summary = "克隆关联文档")
+    @PostMapping(value = "/api/process/model/doc/clone")
+    @InvokeMode(SYNC)
+    Boolean cloneDoc(@RequestParam("id") Long docId);
+
     /**
      * 删除关联文档
      *
@@ -897,6 +921,17 @@ public interface WorkflowManageService {
     @InvokeMode(SYNC)
     Boolean orderDoc(@Validated @RequestBody DocOrderDTO dto);
 
+    /**
+     * 重置关联文档
+     *
+     * @param dto
+     * @return
+     */
+    @Operation(summary = "重置关联文档配置")
+    @PostMapping(value = "/api/process/model/doc/reset")
+    @InvokeMode(SYNC)
+    Boolean resetDoc(@Validated @RequestBody DocResetDTO dto);
+
     /**
      * 查询管理员
      * @param dto 管理员数据