增加节点小流程记录表

src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java

@@ -0,0 +1,33 @@
+package com.lz.modules.flow.dao;
+/**
+* <p>
+* 考核模板流程记录表 服务类
+* </p>
+*
+* @author quyixiao
+* @since 2020-10-19
+*/
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lz.modules.flow.entity.FlowChartDetailRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+@Mapper
+public interface FlowChartDetailRecordMapper extends BaseMapper<FlowChartDetailRecord> {
+
+
+	FlowChartDetailRecord selectFlowChartDetailRecordById(@Param("id")Long id);
+
+
+	Long insertFlowChartDetailRecord(FlowChartDetailRecord flowChartDetailRecord);
+
+
+	int updateFlowChartDetailRecordById(FlowChartDetailRecord flowChartDetailRecord);
+
+
+	int updateCoverFlowChartDetailRecordById(FlowChartDetailRecord flowChartDetailRecord);
+
+
+	int deleteFlowChartDetailRecordById(@Param("id")Long id);
+
+
+}

src/main/java/com/lz/modules/flow/entity/FlowChartDetailRecord.java

@@ -0,0 +1,234 @@
+package com.lz.modules.flow.entity;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+/**
+* <p>
+* </p>*考核模板流程记录表
+* @author quyixiao
+* @since 2020-10-19
+*/
+
+@Data
+@TableName("lz_flow_chart_detail_record")
+@ApiModel(value = "考核模板流程记录表")
+public class FlowChartDetailRecord implements java.io.Serializable {
+    //
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    //是否删除状态，1：删除，0：有效
+    @ApiModelProperty(value = "是否删除状态，1：删除，0：有效", name = "isDelete")
+    private Integer isDelete;
+    //创建时间
+    @ApiModelProperty(value = "创建时间", name = "gmtCreate")
+    private Date gmtCreate;
+    //最后修改时间
+    @ApiModelProperty(value = "最后修改时间", name = "gmtModified")
+    private Date gmtModified;
+    //flow_chart_id ,流程图表id
+    @ApiModelProperty(value = "flow_chart_id ,流程图表id", name = "chartId")
+    private Long chartId;
+    //考核组ID
+    @ApiModelProperty(value = "考核组ID", name = "evaluationGroupId")
+    private Long evaluationGroupId;
+    //0关闭，1开启
+    @ApiModelProperty(value = "0关闭，1开启", name = "status")
+    private Integer status;
+    //操作者id集合，逗号隔开，当opt_type为0时才有值
+    @ApiModelProperty(value = "操作者id集合，逗号隔开，当opt_type为0时才有值", name = "optIds")
+    private Long optIds;
+    //-1考核人员自己，0人员id，1一级主管，2二级主管....
+    @ApiModelProperty(value = "-1考核人员自己，0人员id，1一级主管，2二级主管....", name = "optType")
+    private Integer optType;
+    //role id集合，逗号隔开
+    @ApiModelProperty(value = "role id集合，逗号隔开", name = "roleIds")
+    private Long roleIds;
+    //步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）
+    @ApiModelProperty(value = "步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）", name = "stepType")
+    private Integer stepType;
+    /**
+     *  
+     * @return
+     */
+    public Long getId() {
+        return id;
+    }
+    /**
+     *  
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 是否删除状态，1：删除，0：有效 
+     * @return
+     */
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+    /**
+     * 是否删除状态，1：删除，0：有效 
+     * @param isDelete
+     */
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    /**
+     * 创建时间 
+     * @return
+     */
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+    /**
+     * 创建时间 
+     * @param gmtCreate
+     */
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    /**
+     * 最后修改时间 
+     * @return
+     */
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+    /**
+     * 最后修改时间 
+     * @param gmtModified
+     */
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    /**
+     * flow_chart_id ,流程图表id 
+     * @return
+     */
+    public Long getChartId() {
+        return chartId;
+    }
+    /**
+     * flow_chart_id ,流程图表id 
+     * @param chartId
+     */
+    public void setChartId(Long chartId) {
+        this.chartId = chartId;
+    }
+
+    /**
+     * 考核组ID 
+     * @return
+     */
+    public Long getEvaluationGroupId() {
+        return evaluationGroupId;
+    }
+    /**
+     * 考核组ID 
+     * @param evaluationGroupId
+     */
+    public void setEvaluationGroupId(Long evaluationGroupId) {
+        this.evaluationGroupId = evaluationGroupId;
+    }
+
+    /**
+     * 0关闭，1开启 
+     * @return
+     */
+    public Integer getStatus() {
+        return status;
+    }
+    /**
+     * 0关闭，1开启 
+     * @param status
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 操作者id集合，逗号隔开，当opt_type为0时才有值 
+     * @return
+     */
+    public Long getOptIds() {
+        return optIds;
+    }
+    /**
+     * 操作者id集合，逗号隔开，当opt_type为0时才有值 
+     * @param optIds
+     */
+    public void setOptIds(Long optIds) {
+        this.optIds = optIds;
+    }
+
+    /**
+     * -1考核人员自己，0人员id，1一级主管，2二级主管.... 
+     * @return
+     */
+    public Integer getOptType() {
+        return optType;
+    }
+    /**
+     * -1考核人员自己，0人员id，1一级主管，2二级主管.... 
+     * @param optType
+     */
+    public void setOptType(Integer optType) {
+        this.optType = optType;
+    }
+
+    /**
+     * role id集合，逗号隔开 
+     * @return
+     */
+    public Long getRoleIds() {
+        return roleIds;
+    }
+    /**
+     * role id集合，逗号隔开 
+     * @param roleIds
+     */
+    public void setRoleIds(Long roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    /**
+     * 步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） 
+     * @return
+     */
+    public Integer getStepType() {
+        return stepType;
+    }
+    /**
+     * 步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） 
+     * @param stepType
+     */
+    public void setStepType(Integer stepType) {
+        this.stepType = stepType;
+    }
+
+    @Override
+    public String toString() {
+        return "FlowChartDetailRecord{" +
+                ",id=" + id +
+                ",isDelete=" + isDelete +
+                ",gmtCreate=" + gmtCreate +
+                ",gmtModified=" + gmtModified +
+                ",chartId=" + chartId +
+                ",evaluationGroupId=" + evaluationGroupId +
+                ",status=" + status +
+                ",optIds=" + optIds +
+                ",optType=" + optType +
+                ",roleIds=" + roleIds +
+                ",stepType=" + stepType +
+                "}";
+    }
+}

src/main/java/com/lz/modules/flow/model/FlowChartDetailRecordDto.java

@@ -0,0 +1,172 @@
+package com.lz.modules.flow.model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+* <p>
+* </p>*考核模板流程记录表
+* @author quyixiao
+* @since 2020-10-19
+*/
+
+@Data
+@ApiModel(value = "考核模板流程记录表Dto")
+public class FlowChartDetailRecordDto {
+    //
+    @ApiModelProperty(value = "", name = "id")
+    private Long id;
+    //flow_chart_id ,流程图表id
+    @ApiModelProperty(value = "flow_chart_id ,流程图表id", name = "chartId")
+    private Long chartId;
+    //考核组ID
+    @ApiModelProperty(value = "考核组ID", name = "evaluationGroupId")
+    private Long evaluationGroupId;
+    //0关闭，1开启
+    @ApiModelProperty(value = "0关闭，1开启", name = "status")
+    private Integer status;
+    //操作者id集合，逗号隔开，当opt_type为0时才有值
+    @ApiModelProperty(value = "操作者id集合，逗号隔开，当opt_type为0时才有值", name = "optIds")
+    private Long optIds;
+    //-1考核人员自己，0人员id，1一级主管，2二级主管....
+    @ApiModelProperty(value = "-1考核人员自己，0人员id，1一级主管，2二级主管....", name = "optType")
+    private Integer optType;
+    //role id集合，逗号隔开
+    @ApiModelProperty(value = "role id集合，逗号隔开", name = "roleIds")
+    private Long roleIds;
+    //步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）
+    @ApiModelProperty(value = "步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）", name = "stepType")
+    private Integer stepType;
+    /**
+     *  
+     * @return
+     */
+    public Long getId() {
+        return id;
+    }
+    /**
+     *  
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * flow_chart_id ,流程图表id 
+     * @return
+     */
+    public Long getChartId() {
+        return chartId;
+    }
+    /**
+     * flow_chart_id ,流程图表id 
+     * @param chartId
+     */
+    public void setChartId(Long chartId) {
+        this.chartId = chartId;
+    }
+
+    /**
+     * 考核组ID 
+     * @return
+     */
+    public Long getEvaluationGroupId() {
+        return evaluationGroupId;
+    }
+    /**
+     * 考核组ID 
+     * @param evaluationGroupId
+     */
+    public void setEvaluationGroupId(Long evaluationGroupId) {
+        this.evaluationGroupId = evaluationGroupId;
+    }
+
+    /**
+     * 0关闭，1开启 
+     * @return
+     */
+    public Integer getStatus() {
+        return status;
+    }
+    /**
+     * 0关闭，1开启 
+     * @param status
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 操作者id集合，逗号隔开，当opt_type为0时才有值 
+     * @return
+     */
+    public Long getOptIds() {
+        return optIds;
+    }
+    /**
+     * 操作者id集合，逗号隔开，当opt_type为0时才有值 
+     * @param optIds
+     */
+    public void setOptIds(Long optIds) {
+        this.optIds = optIds;
+    }
+
+    /**
+     * -1考核人员自己，0人员id，1一级主管，2二级主管.... 
+     * @return
+     */
+    public Integer getOptType() {
+        return optType;
+    }
+    /**
+     * -1考核人员自己，0人员id，1一级主管，2二级主管.... 
+     * @param optType
+     */
+    public void setOptType(Integer optType) {
+        this.optType = optType;
+    }
+
+    /**
+     * role id集合，逗号隔开 
+     * @return
+     */
+    public Long getRoleIds() {
+        return roleIds;
+    }
+    /**
+     * role id集合，逗号隔开 
+     * @param roleIds
+     */
+    public void setRoleIds(Long roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    /**
+     * 步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） 
+     * @return
+     */
+    public Integer getStepType() {
+        return stepType;
+    }
+    /**
+     * 步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） 
+     * @param stepType
+     */
+    public void setStepType(Integer stepType) {
+        this.stepType = stepType;
+    }
+
+    @Override
+    public String toString() {
+        return "FlowChartDetailRecordDto{" +
+                ",id=" + id +
+                ",chartId=" + chartId +
+                ",evaluationGroupId=" + evaluationGroupId +
+                ",status=" + status +
+                ",optIds=" + optIds +
+                ",optType=" + optType +
+                ",roleIds=" + roleIds +
+                ",stepType=" + stepType +
+                "}";
+    }
+}

src/main/java/com/lz/modules/flow/req/FlowChartDetailProcReq.java

@@ -1,130 +0,0 @@
-package com.lz.modules.flow.req;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
-* <p>
-* 菜单权限表
-* </p>*流程图，lz_flow的父
-* @author quyixiao
-* @since 2020-10-16
-*/
-
-
-@Data
-@ApiModel(value = "节点小流程详情")
-public class FlowChartDetailProcReq implements java.io.Serializable {
-
-    @ApiModelProperty(value = "考核节点id", name = "charId")
-    private Long charId;
-    //
-
-    //
-    @ApiModelProperty(value = "", name = "name")
-    private String name;
-    //flow_manager表中id
-    @ApiModelProperty(value = "flow_manager表中id", name = "processId")
-    private Long processId;
-    //是否可允许不启用节点 0不可，1可以
-    @ApiModelProperty(value = "是否可允许不启用节点 0不可，1可以", name = "status")
-    private Integer status;
-    //1可配置细节，0不可配置细节，一般线下操作。比如执行中
-    @ApiModelProperty(value = "1可配置细节，0不可配置细节，一般线下操作。比如执行中", name = "type")
-    private Integer type;
-    //执行步骤，第几步，从0开始
-    @ApiModelProperty(value = "执行步骤，第几步，从0开始", name = "stepIndex")
-    private Integer stepIndex;
-
-
-
-    /**
-     *  
-     * @return
-     */
-    public String getName() {
-        return name;
-    }
-    /**
-     *  
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * flow_manager表中id 
-     * @return
-     */
-    public Long getProcessId() {
-        return processId;
-    }
-    /**
-     * flow_manager表中id 
-     * @param processId
-     */
-    public void setProcessId(Long processId) {
-        this.processId = processId;
-    }
-
-    /**
-     * 是否可允许不启用节点 0不可，1可以 
-     * @return
-     */
-    public Integer getStatus() {
-        return status;
-    }
-    /**
-     * 是否可允许不启用节点 0不可，1可以 
-     * @param status
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * 1可配置细节，0不可配置细节，一般线下操作。比如执行中 
-     * @return
-     */
-    public Integer getType() {
-        return type;
-    }
-    /**
-     * 1可配置细节，0不可配置细节，一般线下操作。比如执行中 
-     * @param type
-     */
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    /**
-     * 执行步骤，第几步，从0开始 
-     * @return
-     */
-    public Integer getStepIndex() {
-        return stepIndex;
-    }
-    /**
-     * 执行步骤，第几步，从0开始 
-     * @param stepIndex
-     */
-    public void setStepIndex(Integer stepIndex) {
-        this.stepIndex = stepIndex;
-    }
-
-    @Override
-    public String toString() {
-        return "FlowChart{" +
-                ",charId=" + charId +
-                ",name=" + name +
-                ",processId=" + processId +
-                ",status=" + status +
-                ",type=" + type +
-                ",stepIndex=" + stepIndex +
-                "}";
-    }
-}

src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordReq.java

@@ -0,0 +1,243 @@
+package com.lz.modules.flow.req;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+/**
+* <p>
+* 菜单权限表
+* </p>*考核模板流程记录表
+* @author quyixiao
+* @since 2020-10-19
+*/
+
+
+@Data
+@ApiModel(value = "考核模板流程记录表Req")
+public class FlowChartDetailRecordReq implements java.io.Serializable {
+  
+    @ApiModelProperty(value = "currPage", name = "当前页码")
+    private int currPage = 1;
+    @ApiModelProperty(value = "pageSize", name = "每页返回条数")
+    private int pageSize = 10;
+    @ApiModelProperty(value = "sort", name = "类型")
+    private String sort;
+    @ApiModelProperty(value = "order", name = "排序")
+    private String order;
+    //
+    private Long id;
+    //是否删除状态，1：删除，0：有效
+    @ApiModelProperty(value = "是否删除状态，1：删除，0：有效", name = "isDelete")
+    private Integer isDelete;
+    //创建时间
+    @ApiModelProperty(value = "创建时间", name = "gmtCreate")
+    private Date gmtCreate;
+    //最后修改时间
+    @ApiModelProperty(value = "最后修改时间", name = "gmtModified")
+    private Date gmtModified;
+    //flow_chart_id ,流程图表id
+    @ApiModelProperty(value = "flow_chart_id ,流程图表id", name = "chartId")
+    private Long chartId;
+    //考核组ID
+    @ApiModelProperty(value = "考核组ID", name = "evaluationGroupId")
+    private Long evaluationGroupId;
+    //0关闭，1开启
+    @ApiModelProperty(value = "0关闭，1开启", name = "status")
+    private Integer status;
+    //操作者id集合，逗号隔开，当opt_type为0时才有值
+    @ApiModelProperty(value = "操作者id集合，逗号隔开，当opt_type为0时才有值", name = "optIds")
+    private Long optIds;
+    //-1考核人员自己，0人员id，1一级主管，2二级主管....
+    @ApiModelProperty(value = "-1考核人员自己，0人员id，1一级主管，2二级主管....", name = "optType")
+    private Integer optType;
+    //role id集合，逗号隔开
+    @ApiModelProperty(value = "role id集合，逗号隔开", name = "roleIds")
+    private Long roleIds;
+    //步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）
+    @ApiModelProperty(value = "步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）", name = "stepType")
+    private Integer stepType;
+    /**
+     *  
+     * @return
+     */
+    public Long getId() {
+        return id;
+    }
+    /**
+     *  
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 是否删除状态，1：删除，0：有效 
+     * @return
+     */
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+    /**
+     * 是否删除状态，1：删除，0：有效 
+     * @param isDelete
+     */
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    /**
+     * 创建时间 
+     * @return
+     */
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+    /**
+     * 创建时间 
+     * @param gmtCreate
+     */
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    /**
+     * 最后修改时间 
+     * @return
+     */
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+    /**
+     * 最后修改时间 
+     * @param gmtModified
+     */
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    /**
+     * flow_chart_id ,流程图表id 
+     * @return
+     */
+    public Long getChartId() {
+        return chartId;
+    }
+    /**
+     * flow_chart_id ,流程图表id 
+     * @param chartId
+     */
+    public void setChartId(Long chartId) {
+        this.chartId = chartId;
+    }
+
+    /**
+     * 考核组ID 
+     * @return
+     */
+    public Long getEvaluationGroupId() {
+        return evaluationGroupId;
+    }
+    /**
+     * 考核组ID 
+     * @param evaluationGroupId
+     */
+    public void setEvaluationGroupId(Long evaluationGroupId) {
+        this.evaluationGroupId = evaluationGroupId;
+    }
+
+    /**
+     * 0关闭，1开启 
+     * @return
+     */
+    public Integer getStatus() {
+        return status;
+    }
+    /**
+     * 0关闭，1开启 
+     * @param status
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 操作者id集合，逗号隔开，当opt_type为0时才有值 
+     * @return
+     */
+    public Long getOptIds() {
+        return optIds;
+    }
+    /**
+     * 操作者id集合，逗号隔开，当opt_type为0时才有值 
+     * @param optIds
+     */
+    public void setOptIds(Long optIds) {
+        this.optIds = optIds;
+    }
+
+    /**
+     * -1考核人员自己，0人员id，1一级主管，2二级主管.... 
+     * @return
+     */
+    public Integer getOptType() {
+        return optType;
+    }
+    /**
+     * -1考核人员自己，0人员id，1一级主管，2二级主管.... 
+     * @param optType
+     */
+    public void setOptType(Integer optType) {
+        this.optType = optType;
+    }
+
+    /**
+     * role id集合，逗号隔开 
+     * @return
+     */
+    public Long getRoleIds() {
+        return roleIds;
+    }
+    /**
+     * role id集合，逗号隔开 
+     * @param roleIds
+     */
+    public void setRoleIds(Long roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    /**
+     * 步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） 
+     * @return
+     */
+    public Integer getStepType() {
+        return stepType;
+    }
+    /**
+     * 步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） 
+     * @param stepType
+     */
+    public void setStepType(Integer stepType) {
+        this.stepType = stepType;
+    }
+
+    @Override
+    public String toString() {
+        return "FlowChartDetailRecordReq{" +
+                ",id=" + id +
+                ",isDelete=" + isDelete +
+                ",gmtCreate=" + gmtCreate +
+                ",gmtModified=" + gmtModified +
+                ",chartId=" + chartId +
+                ",evaluationGroupId=" + evaluationGroupId +
+                ",status=" + status +
+                ",optIds=" + optIds +
+                ",optType=" + optType +
+                ",roleIds=" + roleIds +
+                ",stepType=" + stepType +
+                "}";
+    }
+}

src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java

@@ -0,0 +1,33 @@
+package com.lz.modules.flow.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lz.modules.flow.entity.FlowChartDetailRecord;
+
+/**
+* <p>
+* 考核模板流程记录表 服务类
+* </p>
+*
+* @author quyixiao
+* @since 2020-10-19
+*/
+public interface FlowChartDetailRecordService extends IService<FlowChartDetailRecord> {
+
+
+
+	FlowChartDetailRecord selectFlowChartDetailRecordById(Long id);
+
+
+	Long insertFlowChartDetailRecord(FlowChartDetailRecord flowChartDetailRecord);
+
+
+	int updateFlowChartDetailRecordById(FlowChartDetailRecord flowChartDetailRecord);
+
+
+	int updateCoverFlowChartDetailRecordById(FlowChartDetailRecord flowChartDetailRecord);
+
+
+	int deleteFlowChartDetailRecordById(Long id);
+
+
+}

src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java

@@ -0,0 +1,65 @@
+package com.lz.modules.flow.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lz.modules.flow.dao.FlowChartDetailRecordMapper;
+import com.lz.modules.flow.entity.FlowChartDetailRecord;
+import com.lz.modules.flow.service.FlowChartDetailRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+* <p>
+* 考核模板流程记录表 服务类
+* </p>
+*
+* @author quyixiao
+* @since 2020-10-19
+*/
+
+@Service
+public class FlowChartDetailRecordServiceImpl extends ServiceImpl<FlowChartDetailRecordMapper, FlowChartDetailRecord> implements FlowChartDetailRecordService {
+
+
+    @Autowired
+	private FlowChartDetailRecordMapper flowChartDetailRecordMapper;
+
+
+
+	@Override
+	public FlowChartDetailRecord selectFlowChartDetailRecordById(Long id){
+		return flowChartDetailRecordMapper.selectFlowChartDetailRecordById(id);
+	}
+
+
+
+	@Override
+	public Long insertFlowChartDetailRecord(FlowChartDetailRecord flowChartDetailRecord){
+		return flowChartDetailRecordMapper.insertFlowChartDetailRecord(flowChartDetailRecord);
+	}
+
+
+
+	@Override
+	public int updateFlowChartDetailRecordById(FlowChartDetailRecord flowChartDetailRecord){
+		return flowChartDetailRecordMapper.updateFlowChartDetailRecordById(flowChartDetailRecord);
+	}
+
+
+
+	@Override
+	public int updateCoverFlowChartDetailRecordById(FlowChartDetailRecord flowChartDetailRecord){
+		return flowChartDetailRecordMapper.updateCoverFlowChartDetailRecordById(flowChartDetailRecord);
+	}
+
+
+
+	@Override
+	public int deleteFlowChartDetailRecordById(Long id){
+		return flowChartDetailRecordMapper.deleteFlowChartDetailRecordById(id);
+	}
+
+
+
+
+
+}

src/main/java/com/lz/modules/performance/controller/FlowChartController.java

@@ -1,24 +1,19 @@
 package com.lz.modules.performance.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
-import com.lz.common.utils.StringUtil;
-import com.lz.modules.equipment.entity.model.FindEmployeeResModel;
-import com.lz.modules.flow.entity.EvaluationGroup;
 import com.lz.modules.flow.entity.FlowChart;
+import com.lz.modules.flow.entity.FlowChartDetailRecord;
 import com.lz.modules.flow.entity.FlowManager;
 import com.lz.modules.flow.model.FlowChartRoleDto;
+import com.lz.modules.flow.service.FlowChartDetailRecordService;
 import com.lz.modules.flow.service.FlowChartService;
 import com.lz.modules.flow.service.FlowManagerService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/flowChart")
@@ -32,6 +27,9 @@ public class FlowChartController {
     @Autowired
     private FlowManagerService flowManagerService;
 
+    @Autowired
+    private FlowChartDetailRecordService flowChartDetailRecordService;
+
     @GetMapping("/getByFlowManagerId")
     @ApiOperation("根据Manager Id获取大流程节点")
     @ApiImplicitParam(name = "id",value = "流程id，绩效请传1", required = true, dataType = "String",paramType = "query")
@@ -70,11 +68,12 @@ public class FlowChartController {
      }
 
 
-     @RequestMapping("/saveDetailProc")
+     @PostMapping("/saveDetailProc")
-     @ApiOperation("根据id保存节点中流程")
+     @ApiOperation("保存流程节点小流程")
-     public R saveDetailProc(@RequestBody FlowChart flowChart) {
+     @ApiResponses({@ApiResponse(code = 200, message = "成功", response = FlowChartDetailRecord.class)})
-         flowChartService.insertFlowChart(flowChart);
+     public R saveDetailProc(@RequestBody @ApiParam FlowChartDetailRecord flowChartDetailProc) {
-        return R.ok();
+        flowChartDetailRecordService.insertFlowChartDetailRecord(flowChartDetailProc);
+        return R.ok().put("data", flowChartDetailProc);
      }
 
 

src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml

@@ -0,0 +1,103 @@
+<?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.lz.modules.flow.dao.FlowChartDetailRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lz.modules.flow.entity.FlowChartDetailRecord">
+        <id column="id" property="id"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="chart_id" property="chartId"/>
+        <result column="evaluation_group_id" property="evaluationGroupId"/>
+        <result column="status" property="status"/>
+        <result column="opt_ids" property="optIds"/>
+        <result column="opt_type" property="optType"/>
+        <result column="role_ids" property="roleIds"/>
+        <result column="step_type" property="stepType"/>
+    </resultMap>
+
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, chart_id AS chartId, evaluation_group_id AS evaluationGroupId, status AS status, opt_ids AS optIds, opt_type AS optType, role_ids AS roleIds, step_type AS stepType
+    </sql>
+
+
+
+
+    <select id="selectFlowChartDetailRecordById" resultType="FlowChartDetailRecord" >
+        select * from lz_flow_chart_detail_record  where id=#{id} and is_delete = 0 limit 1 
+    </select>
+
+
+    <insert id="insertFlowChartDetailRecord" parameterType="FlowChartDetailRecord" useGeneratedKeys="true" keyProperty="id" >
+        insert into lz_flow_chart_detail_record(
+            <if test="chartId != null">chart_id, </if>
+            <if test="evaluationGroupId != null">evaluation_group_id, </if>
+            <if test="status != null">status, </if>
+            <if test="optIds != null">opt_ids, </if>
+            <if test="optType != null">opt_type, </if>
+            <if test="roleIds != null">role_ids, </if>
+            <if test="stepType != null">step_type, </if>
+            is_delete,
+            gmt_create,
+            gmt_modified
+        )values(
+            <if test="chartId != null">#{ chartId}, </if>
+            <if test="evaluationGroupId != null">#{ evaluationGroupId}, </if>
+            <if test="status != null">#{ status}, </if>
+            <if test="optIds != null">#{ optIds}, </if>
+            <if test="optType != null">#{ optType}, </if>
+            <if test="roleIds != null">#{ roleIds}, </if>
+            <if test="stepType != null">#{ stepType}, </if>
+            0,
+            now(),
+            now()
+        )
+    </insert>
+
+
+    <update id="updateFlowChartDetailRecordById" parameterType="FlowChartDetailRecord" >
+        update
+            lz_flow_chart_detail_record
+        <trim prefix="set" suffixOverrides=",">
+            <if test="isDelete != null">is_delete = #{isDelete},</if>
+            <if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
+            <if test="chartId != null">chart_id = #{chartId},</if>
+            <if test="evaluationGroupId != null">evaluation_group_id = #{evaluationGroupId},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="optIds != null">opt_ids = #{optIds},</if>
+            <if test="optType != null">opt_type = #{optType},</if>
+            <if test="roleIds != null">role_ids = #{roleIds},</if>
+            <if test="stepType != null">step_type = #{stepType}</if>                
+        </trim>
+        ,gmt_modified = now()
+        where id = #{id}
+    </update>
+
+
+    <update id="updateCoverFlowChartDetailRecordById" parameterType="FlowChartDetailRecord" >
+        update
+            lz_flow_chart_detail_record    
+        set     
+            is_delete = #{isDelete},
+            gmt_create = #{gmtCreate},
+            chart_id = #{chartId},
+            evaluation_group_id = #{evaluationGroupId},
+            status = #{status},
+            opt_ids = #{optIds},
+            opt_type = #{optType},
+            role_ids = #{roleIds},
+            step_type = #{stepType}                
+        ,gmt_modified = now()
+        where id = #{id}
+    </update>
+
+
+    <update id="deleteFlowChartDetailRecordById" parameterType="java.lang.Long">
+        update lz_flow_chart_detail_record set is_delete = 1 where id=#{id} limit 1  
+    </update>
+
+</mapper>
+

src/test/java/com/lz/mysql/MysqlMain.java

@@ -75,9 +75,10 @@ public class MysqlMain {
         list.add(new TablesBean("lz_result_calculate"));
         list.add(new TablesBean("lz_result_dimension"));
         list.add(new TablesBean("lz_result_grade"));*/
-        list.add(new TablesBean("lz_result_model"));
+        //list.add(new TablesBean("lz_result_model"));
         //list.add(new TablesBean("lz_result_score"));
-        list.add(new TablesBean("lz_result_taget_lib"));
+        //list.add(new TablesBean("lz_result_taget_lib"));
+        list.add(new TablesBean("lz_flow_chart_detail_record"));
 
         List<TablesBean> list2 = new ArrayList<TablesBean>();
         Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();
@@ -97,7 +98,7 @@ public class MysqlMain {
         }
 
 
-       /* for (int i = 0; i < list2.size(); i++) {
+        for (int i = 0; i < list2.size(); i++) {
             MysqlUtilTable2Contoller.printController(list2.get(i));
         }
 
@@ -109,7 +110,7 @@ public class MysqlMain {
         for (int i = 0; i < list2.size(); i++) {
             MysqlUtilTable2Service.printService(list2.get(i));
             MysqlUtilTable2Service.printServiceImpl(list2.get(i));
-        }*/
+        }
 
         for (int i = 0; i < list2.size(); i++) {
             MysqlUtilTable2XML.printXMLForMap(list2.get(i));

src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java

@@ -105,7 +105,7 @@ public class MysqlUtilTable2Bean {
 
         sb.append("    @Override\n");
         sb.append("    public String toString() {\n");
-        sb.append("        return \"" + realName + "{\" +\n");
+        sb.append("        return \"" + realName + "Req{\" +\n");
 
         for (FieldBean tb : list) {
             if (MysqlMain.req_exclude.contains("," + tb.getField() + ",")) {
@@ -360,7 +360,7 @@ public class MysqlUtilTable2Bean {
 
         sb.append("    @Override\n");
         sb.append("    public String toString() {\n");
-        sb.append("        return \"" + realName + "{\" +\n");
+        sb.append("        return \"" + realName + "Dto{\" +\n");
 
         for (FieldBean tb : list) {
             if (MysqlMain.dto_exclude.contains("," + tb.getField() + ",")) {