，

src/main/java/com/unissoft/mapper/ProcessSubMapper.java

@@ -1,16 +0,0 @@
-package com.unissoft.mapper;
-
-import com.unissoft.model.ProcessSub;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author My SunShine
- * @since 2020-12-17
- */
-public interface ProcessSubMapper extends BaseMapper<ProcessSub> {
-
-}

src/main/java/com/unissoft/mapper/ProcessSubMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.unissoft.mapper.ProcessSubMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.unissoft.model.ProcessSub">
-        <id column="id" property="id" />
-        <result column="zid" property="zid" />
-        <result column="details" property="details" />
-        <result column="title" property="title" />
-        <result column="operation_time" property="operationTime" />
-        <result column="step" property="step" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, zid, details, title, operation_time, step
-    </sql>
-
-</mapper>

src/main/java/com/unissoft/model/ProcessSub.java

@@ -1,102 +0,0 @@
-package com.unissoft.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author My SunShine
- * @since 2020-12-17
- */
-@TableName("process_sub")
-@ApiModel(value="ProcessSub对象", description="")
-public class ProcessSub implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "流程子表")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "主流程id")
-    @TableField("zid")
-    private Integer zid;
-
-    @ApiModelProperty(value = "流程数据选项")
-    @TableField("details")
-    private String details;
-
-    @ApiModelProperty(value = "流程标题")
-    @TableField("title")
-    private String title;
-
-    @TableField("operation_time")
-    private Date operationTime;
-
-    @TableField("step")
-    private Integer step;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-    public Integer getZid() {
-        return zid;
-    }
-
-    public void setZid(Integer zid) {
-        this.zid = zid;
-    }
-    public String getDetails() {
-        return details;
-    }
-
-    public void setDetails(String details) {
-        this.details = details;
-    }
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    public Date getOperationTime() {
-        return operationTime;
-    }
-
-    public void setOperationTime(Date operationTime) {
-        this.operationTime = operationTime;
-    }
-    public Integer getStep() {
-        return step;
-    }
-
-    public void setStep(Integer step) {
-        this.step = step;
-    }
-
-    @Override
-    public String toString() {
-        return "ProcessSub{" +
-            "id=" + id +
-            ", zid=" + zid +
-            ", details=" + details +
-            ", title=" + title +
-            ", operationTime=" + operationTime +
-            ", step=" + step +
-        "}";
-    }
-}

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -423,6 +423,14 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 			QueryWrapper<ProcessSub> ew2 = new QueryWrapper<>();
 			ew2.eq("zid", mainList.get(i).getId());
 			List<ProcessSub> subList = processSubMapper.selectList(ew2);
+			for (int j = 0; j < subList.size(); j++) {
+				for (int k = 0; k < list.size(); k++) {
+					if(subList.get(j).getId().equals(list.get(k).getSubId())){
+						subList.get(j).setOperationTime(list.get(k).getOperationTime());
+						subList.get(j).setSubData(list.get(k).getSubData());
+					}
+				}
+			}
 			HashMap<String, Object> map1 = Maps.newHashMap();
 			map1.put("step", mainList.get(i));//主表数据
 			map1.put("list", subList);//子表数据