添加连接方式

src/main/java/com/dskj/znzn/importData/web/controller/ExecutorHistoryController.java

@@ -3,7 +3,7 @@ package com.dskj.znzn.importData.web.controller;
 import com.dskj.znzn.importData.common.base.PageR;
 import com.dskj.znzn.importData.common.base.R;
 import com.dskj.znzn.importData.web.entity.ExecutorHistory;
-import com.dskj.znzn.importData.web.indata.ListByQueryInData;
+import com.dskj.znzn.importData.web.indata.ListHisotyByQueryInData;
 import com.dskj.znzn.importData.web.indata.SubmitProcessGroupInData;
 import com.dskj.znzn.importData.web.outdata.ExecutorHistoryOutData;
 import com.dskj.znzn.importData.web.service.IExecutorHistoryService;
@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 
 /**
@@ -45,7 +44,7 @@ public class ExecutorHistoryController {
 
     @ApiOperation(value = "获取执行流程记录")
     @PostMapping("listByQuery")
-    public PageR<ExecutorHistoryOutData> listByQuery(@RequestBody ListByQueryInData inData) {
+    public PageR<ExecutorHistoryOutData> listByQuery(@Valid @RequestBody ListHisotyByQueryInData inData) {
         return executorHistoryService.listByQuery(inData);
     }
 }

src/main/java/com/dskj/znzn/importData/web/controller/ProcessGroupController.java

@@ -1,10 +1,12 @@
 package com.dskj.znzn.importData.web.controller;
 
+import com.dskj.znzn.importData.common.base.PageR;
 import com.dskj.znzn.importData.common.base.R;
 import com.dskj.znzn.importData.web.entity.ProcessGroup;
 import com.dskj.znzn.importData.web.indata.AddProcessGroupInData;
 import com.dskj.znzn.importData.web.indata.EditProcessGroupInData;
-import com.dskj.znzn.importData.web.indata.SubmitProcessGroupInData;
+import com.dskj.znzn.importData.web.indata.ListGroupByQueryInData;
+import com.dskj.znzn.importData.web.outdata.ProcessGroupOutData;
 import com.dskj.znzn.importData.web.service.IProcessGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -62,4 +64,10 @@ public class ProcessGroupController {
         return R.ok();
     }
 
+    @ApiOperation(value = "获取所有执行器组")
+    @PostMapping("listByQuery")
+    public PageR<ProcessGroupOutData> listByQuery(@Valid @RequestBody ListGroupByQueryInData inData) {
+        return processGroupService.listByQuery(inData);
+    }
+
 }

src/main/java/com/dskj/znzn/importData/web/entity/ProcessExecutor.java

@@ -34,6 +34,9 @@ public class ProcessExecutor implements Serializable {
     @ApiModelProperty("处理器名称")
     private String name;
 
+    @ApiModelProperty("连接方式,  0:竖向 1:横向")
+    private Integer joinType;
+
     @ApiModelProperty("0:不包含表头 1:包含表头")
     private Integer hasHeader;
 

src/main/java/com/dskj/znzn/importData/web/entity/ProcessGroup.java

@@ -34,8 +34,11 @@ public class ProcessGroup implements Serializable {
     @ApiModelProperty("执行器组名称")
     private String name;
 
+    @ApiModelProperty("0:竖向 1:横向 2:自定义 ")
+    private Integer joinType;
+
     @ApiModelProperty("0:竖向 1:横向,自定义方式用 0,1,0 拼接 ")
-    private String joinType;
+    private String joinTypeStr;
 
     @ApiModelProperty("备注")
     private String remark;

src/main/java/com/dskj/znzn/importData/web/indata/AddProcessGroupInData.java

@@ -22,8 +22,11 @@ public class AddProcessGroupInData {
     @NotNull
     private Integer templateId;
 
+    @ApiModelProperty("0:竖向 1:横向 2:自定义")
+    @NotNull
+    private Integer joinType;
+
     @ApiModelProperty("连接方式数组,  0:竖向 1:横向, 自定义使用 0,1,0 方式拼接")
-    @NotEmpty
     private List<String> joinTypeList;
 
     @ApiModelProperty("执行器数组")

src/main/java/com/dskj/znzn/importData/web/indata/ExecutorHistoryProcessInData.java

@@ -1,6 +1,5 @@
 package com.dskj.znzn.importData.web.indata;
 
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,6 +19,10 @@ public class ExecutorHistoryProcessInData {
     @NotBlank
     private String name;
 
+    @ApiModelProperty("连接方式,  0:竖向 1:横向")
+    @NotNull
+    private Integer joinType;
+
     @ApiModelProperty("执行器读取路径")
     @NotBlank
     private String readPath;

src/main/java/com/dskj/znzn/importData/web/indata/ListGroupByQueryInData.java

@@ -0,0 +1,22 @@
+package com.dskj.znzn.importData.web.indata;
+
+import com.dskj.znzn.importData.common.base.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel
+public class ListGroupByQueryInData extends PageInfo {
+
+    @ApiModelProperty("执行器组ID")
+    private Integer processGroupId;
+
+    @ApiModelProperty("执行器名称")
+    private String executorProcessName;
+
+    @ApiModelProperty("0:竖向 1:横向 2:自定义")
+    private Integer joinType;
+}

src/main/java/com/dskj/znzn/importData/web/indata/ListByQueryInData.java → src/main/java/com/dskj/znzn/importData/web/indata/ListHisotyByQueryInData.java

@@ -9,13 +9,13 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel
-public class ListByQueryInData extends PageInfo {
+public class ListHisotyByQueryInData extends PageInfo {
 
     @ApiModelProperty("执行器组ID")
     private Integer processGroupId;
 
-    @ApiModelProperty("执行器名称")
-    private String executorProcessName;
+    @ApiModelProperty("纪录名称")
+    private String historyName;
 
     @ApiModelProperty("0:竖向 1:横向 2:自定义")
     private Integer joinType;

src/main/java/com/dskj/znzn/importData/web/indata/ProcessExecutorInData.java

@@ -17,12 +17,15 @@ public class ProcessExecutorInData {
     @NotBlank
     private String name;
 
-    @ApiModelProperty("0:不包含表头 1:包含表头")
-    private Integer hasHeader;
+//    @ApiModelProperty("0:不包含表头 1:包含表头")
+//    private Integer hasHeader;
 
     @ApiModelProperty("已知的字段")
     @NotEmpty
-    private List<String>knownFieldsList;
+    private List<String> knownFieldsList;
+
+    @ApiModelProperty("连接方式,  0:竖向 1:横向")
+    private Integer joinType;
 
     @ApiModelProperty("映射关系")
     @NotEmpty

src/main/java/com/dskj/znzn/importData/web/mapper/ExecutorHistoryMapper.java

@@ -3,13 +3,12 @@ package com.dskj.znzn.importData.web.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dskj.znzn.importData.web.entity.ExecutorHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dskj.znzn.importData.web.indata.ListByQueryInData;
+import com.dskj.znzn.importData.web.indata.ListGroupByQueryInData;
+import com.dskj.znzn.importData.web.indata.ListHisotyByQueryInData;
 import com.dskj.znzn.importData.web.outdata.ExecutorHistoryOutData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * @author 魏志亮
  * @since 2024-11-25
@@ -17,5 +16,5 @@ import java.util.List;
 @Mapper
 public interface ExecutorHistoryMapper extends BaseMapper<ExecutorHistory> {
 
-    IPage<ExecutorHistoryOutData> listByQuery(IPage<?> page, @Param("inData") ListByQueryInData inData);
+    IPage<ExecutorHistoryOutData> listByQuery(IPage<?> page, @Param("inData") ListHisotyByQueryInData inData);
 }

src/main/java/com/dskj/znzn/importData/web/mapper/ProcessGroupMapper.java

@@ -1,7 +1,10 @@
 package com.dskj.znzn.importData.web.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dskj.znzn.importData.web.entity.ProcessGroup;
+import com.dskj.znzn.importData.web.indata.ListGroupByQueryInData;
+import com.dskj.znzn.importData.web.outdata.ProcessGroupOutData;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ProcessGroupMapper extends BaseMapper<ProcessGroup> {
 
+    IPage<ProcessGroupOutData> listByQuery(IPage ipage,ListGroupByQueryInData inData);
 }

src/main/java/com/dskj/znzn/importData/web/outdata/ExecutorHistoryOutData.java

@@ -19,7 +19,7 @@ public class ExecutorHistoryOutData extends ExecutorHistory {
     @ApiModelProperty("模板名称")
     private String templateName;
 
-    @ApiModelProperty("0:竖向 1:横向,自定义方式用 0,1,0 拼接 ")
+    @ApiModelProperty("0:竖向 1:横向 2:自定义")
     private Integer joinType;
 
     @ApiModelProperty("处理器")

src/main/java/com/dskj/znzn/importData/web/outdata/ProcessExecutorOutData.java

@@ -23,6 +23,9 @@ public class ProcessExecutorOutData {
     @ApiModelProperty("处理器名称")
     private String name;
 
+    @ApiModelProperty("连接方式,  0:竖向 1:横向")
+    private Integer joinType;
+
     @ApiModelProperty("已知字段")
     private String knownFields;
 

src/main/java/com/dskj/znzn/importData/web/outdata/ProcessGroupOutData.java

@@ -0,0 +1,38 @@
+package com.dskj.znzn.importData.web.outdata;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class ProcessGroupOutData {
+
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("模板ID")
+    private Integer templateId;
+
+    @ApiModelProperty("执行器组名称")
+    private String name;
+
+    @ApiModelProperty("0:竖向 1:横向 2:自定义 ")
+    private Integer joinType;
+
+    @ApiModelProperty("0:竖向 1:横向,自定义方式用 0,1,0 拼接 ")
+    private String joinTypeStr;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("0:不可用 1:可用")
+    private Integer status;
+
+    @ApiModelProperty("模板名称")
+    private String templateName;
+
+}

src/main/java/com/dskj/znzn/importData/web/service/IExecutorHistoryService.java

@@ -3,7 +3,8 @@ package com.dskj.znzn.importData.web.service;
 import com.dskj.znzn.importData.common.base.PageR;
 import com.dskj.znzn.importData.web.entity.ExecutorHistory;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.dskj.znzn.importData.web.indata.ListByQueryInData;
+import com.dskj.znzn.importData.web.indata.ListGroupByQueryInData;
+import com.dskj.znzn.importData.web.indata.ListHisotyByQueryInData;
 import com.dskj.znzn.importData.web.indata.SubmitProcessGroupInData;
 import com.dskj.znzn.importData.web.outdata.ExecutorHistoryOutData;
 
@@ -26,5 +27,5 @@ public interface IExecutorHistoryService extends IService<ExecutorHistory> {
      * @param inData 查询条件
      * @return
      */
-    PageR<ExecutorHistoryOutData> listByQuery(ListByQueryInData inData);
+    PageR<ExecutorHistoryOutData> listByQuery(ListHisotyByQueryInData inData);
 }

src/main/java/com/dskj/znzn/importData/web/service/IProcessGroupService.java

@@ -1,9 +1,12 @@
 package com.dskj.znzn.importData.web.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dskj.znzn.importData.common.base.PageR;
 import com.dskj.znzn.importData.web.entity.ProcessGroup;
 import com.dskj.znzn.importData.web.indata.AddProcessGroupInData;
 import com.dskj.znzn.importData.web.indata.EditProcessGroupInData;
+import com.dskj.znzn.importData.web.indata.ListGroupByQueryInData;
+import com.dskj.znzn.importData.web.outdata.ProcessGroupOutData;
 
 import java.util.List;
 
@@ -53,4 +56,10 @@ public interface IProcessGroupService extends IService<ProcessGroup> {
      */
     void copyProcessGroup(Integer processGroupId);
 
+    /**
+     * 查询执行器组
+     *
+     * @param inData 查询条件
+     */
+    PageR<ProcessGroupOutData> listByQuery(ListGroupByQueryInData inData);
 }

src/main/java/com/dskj/znzn/importData/web/service/impl/ExecutorHistoryServiceImpl.java

@@ -1,13 +1,13 @@
 package com.dskj.znzn.importData.web.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dskj.znzn.importData.common.base.PageR;
 import com.dskj.znzn.importData.web.entity.ExecutorHistory;
 import com.dskj.znzn.importData.web.indata.ExecutorHistoryProcessInData;
-import com.dskj.znzn.importData.web.indata.ListByQueryInData;
+import com.dskj.znzn.importData.web.indata.ListGroupByQueryInData;
+import com.dskj.znzn.importData.web.indata.ListHisotyByQueryInData;
 import com.dskj.znzn.importData.web.indata.SubmitProcessGroupInData;
 import com.dskj.znzn.importData.web.mapper.ExecutorHistoryMapper;
 import com.dskj.znzn.importData.web.outdata.ExecutorHistoryOutData;
@@ -42,7 +42,7 @@ public class ExecutorHistoryServiceImpl extends ServiceImpl<ExecutorHistoryMappe
     }
 
     @Override
-    public PageR<ExecutorHistoryOutData> listByQuery(ListByQueryInData inData) {
+    public PageR<ExecutorHistoryOutData> listByQuery(ListHisotyByQueryInData inData) {
         Page<ExecutorHistoryOutData> page = Page.of(inData.getPageNo(), inData.getPageSize());
         IPage<ExecutorHistoryOutData> pageInfo = executorHistoryMapper.listByQuery(page, inData);
         List<ExecutorHistoryOutData> datas = pageInfo.getRecords();

src/main/java/com/dskj/znzn/importData/web/service/impl/ProcessExecutorServiceImpl.java

@@ -73,7 +73,7 @@ public class ProcessExecutorServiceImpl extends ServiceImpl<ProcessExecutorMappe
                         }
                     } else {
                         for (Integer key : obj.keySet()) {
-                            obj.computeIfAbsent(key, k -> "缺失列名" + (k + 1));
+                            obj.computeIfAbsent(key, k -> "缺失列名" + k);
                         }
                         data.add(obj);
                     }
@@ -104,7 +104,7 @@ public class ProcessExecutorServiceImpl extends ServiceImpl<ProcessExecutorMappe
             Set<Integer> keys = data.stream().map(Map::keySet).flatMap(Collection::stream).collect(Collectors.toSet());
             Map<Integer, Object> obj = new LinkedHashMap<>(keys.size());
             for (Integer key : keys) {
-                obj.computeIfAbsent(key, k -> "无列名" + (k + 1));
+                obj.computeIfAbsent(key, k -> "无列名" + k);
             }
             data.add(0, obj);
         }
@@ -142,6 +142,7 @@ public class ProcessExecutorServiceImpl extends ServiceImpl<ProcessExecutorMappe
             ProcessExecutorOutData outData = new ProcessExecutorOutData();
             outData.setId(processExecutor.getId());
             outData.setName(processExecutor.getName());
+            outData.setJoinType(processExecutor.getJoinType());
             outData.setGroupId(processExecutor.getGroupId());
             outData.setKnownFields(processExecutor.getKnownFields());
             outData.setMappingFieldList(mappingFieldService.getByProcessId(processExecutor.getId()));

src/main/java/com/dskj/znzn/importData/web/service/impl/ProcessGroupServiceImpl.java

@@ -3,18 +3,23 @@ package com.dskj.znzn.importData.web.service.impl;
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dskj.znzn.importData.common.base.PageR;
 import com.dskj.znzn.importData.common.exception.BusinessException;
 import com.dskj.znzn.importData.web.entity.MappingField;
 import com.dskj.znzn.importData.web.entity.ProcessExecutor;
 import com.dskj.znzn.importData.web.entity.ProcessGroup;
 import com.dskj.znzn.importData.web.indata.*;
 import com.dskj.znzn.importData.web.mapper.ProcessGroupMapper;
+import com.dskj.znzn.importData.web.outdata.ProcessGroupOutData;
 import com.dskj.znzn.importData.web.service.IMappingFieldService;
 import com.dskj.znzn.importData.web.service.IProcessExecutorService;
 import com.dskj.znzn.importData.web.service.IProcessGroupService;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +40,8 @@ public class ProcessGroupServiceImpl extends ServiceImpl<ProcessGroupMapper, Pro
 
     private final IMappingFieldService mappingFieldService;
 
+    private final ProcessGroupMapper processGroupMapper;
+
 
     @Override
     public List<ProcessGroup> getByTemplateId(Integer templateId) {
@@ -52,9 +59,9 @@ public class ProcessGroupServiceImpl extends ServiceImpl<ProcessGroupMapper, Pro
         ProcessGroup group = new ProcessGroup();
         group.setTemplateId(inData.getTemplateId());
         group.setName(inData.getName());
-
+        group.setJoinType(inData.getJoinType());
         if (null != inData.getJoinTypeList() && !inData.getJoinTypeList().isEmpty()) {
-            group.setJoinType(String.join(",", inData.getJoinTypeList()));
+            group.setJoinTypeStr(String.join(",", inData.getJoinTypeList()));
         }
 
         save(group);
@@ -77,17 +84,20 @@ public class ProcessGroupServiceImpl extends ServiceImpl<ProcessGroupMapper, Pro
         if (null == group) {
             throw new BusinessException("执行器组不存在");
         }
-        int count = inData.getProcessExecutorInDataList().size();
-        int joinTypeCount = null == inData.getJoinTypeList() ? 0 : inData.getJoinTypeList().size();
+        if (group.getJoinType() == 2) {
+            int count = inData.getProcessExecutorInDataList().size();
+            int joinTypeCount = null == inData.getJoinTypeList() ? 0 : inData.getJoinTypeList().size();
 
-        if (count - 1 != joinTypeCount) {
-            throw new BusinessException("执行器数量和连接方式数量不一致");
+            if (count - 1 != joinTypeCount) {
+                throw new BusinessException("执行器数量和连接方式数量不一致");
+            }
         }
 
         ProcessGroup update = new ProcessGroup();
         update.setId(group.getId());
+        update.setJoinType(inData.getJoinType());
         if (inData.getJoinTypeList() != null) {
-            update.setJoinType(String.join(",", inData.getJoinTypeList()));
+            update.setJoinTypeStr(String.join(",", inData.getJoinTypeList()));
         }
         update.setName(inData.getName());
         updateById(update);
@@ -110,7 +120,7 @@ public class ProcessGroupServiceImpl extends ServiceImpl<ProcessGroupMapper, Pro
                 ProcessExecutor process = new ProcessExecutor();
                 process.setGroupId(group.getId());
                 process.setName(processExecutorInData.getName());
-                process.setHasHeader(processExecutorInData.getHasHeader());
+                process.setJoinType(processExecutorInData.getJoinType() == null ? group.getJoinType() : processExecutorInData.getJoinType());
                 process.setKnownFields(String.join(",", process.getKnownFields()));
                 process.setStatus(1);
                 processExecutorService.save(process);
@@ -150,7 +160,8 @@ public class ProcessGroupServiceImpl extends ServiceImpl<ProcessGroupMapper, Pro
         AddProcessGroupInData inData = new AddProcessGroupInData();
         inData.setName(group.getName() + System.currentTimeMillis());
         inData.setTemplateId(group.getTemplateId());
-        inData.setJoinTypeList(Arrays.asList(group.getJoinType().split(",")));
+        inData.setJoinType(group.getJoinType());
+        inData.setJoinTypeList(Arrays.asList(group.getJoinTypeStr().split(",")));
 
         List<ProcessExecutorInData> processList = new ArrayList<>();
         List<ProcessExecutor> processExecutorList = processExecutorService.getByProcessGroupId(group.getId());
@@ -158,7 +169,8 @@ public class ProcessGroupServiceImpl extends ServiceImpl<ProcessGroupMapper, Pro
         for (ProcessExecutor processExecutor : processExecutorList) {
             ProcessExecutorInData processExecutorInData = new ProcessExecutorInData();
             processExecutorInData.setName(processExecutor.getName());
-            processExecutorInData.setHasHeader(processExecutor.getHasHeader());
+//            processExecutorInData.setHasHeader(processExecutor.getHasHeader());
+            processExecutorInData.setJoinType(processExecutor.getJoinType());
             processExecutorInData.setKnownFieldsList(Arrays.asList(processExecutor.getKnownFields().split(",")));
 
             List<MappingFieldInData> mappingFieldInDataList = new ArrayList<>();
@@ -181,4 +193,12 @@ public class ProcessGroupServiceImpl extends ServiceImpl<ProcessGroupMapper, Pro
         inData.setProcessExecutorInDataList(processList);
         saveProceeGroup(inData);
     }
+
+    @Override
+    public PageR<ProcessGroupOutData> listByQuery(ListGroupByQueryInData inData) {
+        Page<ProcessGroup> page = Page.of(inData.getPageNo(), inData.getPageSize());
+
+        IPage<ProcessGroupOutData> pageInfo = processGroupMapper.listByQuery(page,inData);
+        return PageR.page(pageInfo);
+    }
 }

src/main/resources/mapper/ExecutorHistoryMapper.xml

@@ -14,16 +14,11 @@
         <if test="inData.processGroupId != null">
             and t.process_group_id = #{inData.processGroupId}
         </if>
-        <if test="inData.executorProcessName != null and inData.executorProcessName != ''">
-            and c.name like concat('%',#{inData.executorProcessName},'%')
+        <if test="inData.historyName != null and inData.historyName != ''">
+            and t.name like concat('%',#{inData.historyName},'%')
         </if>
         <if test="inData.joinType != null">
-            <if test="inData.joinType == 2">
-                and a.join_type not in (0,1)
-            </if>
-            <if test="inData.joinType != 2">
-                and a.join_type = #{inData.joinType}
-            </if>
+            and a.join_type = #{inData.joinType}
         </if>
         <if test="inData.execStatus != null">
             and t.exec_status = #{inData.execStatus}

src/main/resources/mapper/ProcessGroupMapper.xml

@@ -11,4 +11,25 @@
 <!--          and t1.`status` = 1-->
 
 <!--    </select>-->
+
+
+    <select id="listByQuery" resultType="com.dskj.znzn.importData.web.outdata.ProcessGroupOutData">
+        SELECT distinct a.*,
+        b.`name` as 'templateName'
+        from process_group a
+        LEFT JOIN base_template b on a.template_id = b.id
+        LEFT JOIN process_executor c on a.id = c.group_id
+        where 1=1  and a.status = 1 and b.status != 0
+        <if test="inData.processGroupId != null">
+            and a.id = #{inData.processGroupId}
+        </if>
+        <if test="inData.executorProcessName != null and inData.executorProcessName != ''">
+            and a.name like concat('%',#{inData.executorProcessName},'%')
+        </if>
+        <if test="inData.joinType != null">
+            and a.join_type = #{inData.joinType}
+        </if>
+        order by a.update_time desc
+    </select>
+
 </mapper>