修改mysqlmain增加swagger对像的部分注解

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

@@ -11,6 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lz.modules.flow.entity.EvaluationGroup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
 

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

@@ -11,6 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lz.modules.flow.entity.FlowChart;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface FlowChartMapper extends BaseMapper<FlowChart> {
 
@@ -30,4 +33,5 @@ public interface FlowChartMapper extends BaseMapper<FlowChart> {
 	int deleteFlowChartById(@Param("id")Long id);
 
 
+    List<FlowChart> selectFlowChartByFlowManagerId(@Param("id") Long id);
 }

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

@@ -1,7 +1,9 @@
 package com.lz.modules.flow.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
 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;
 /**
@@ -14,25 +16,34 @@ import java.util.Date;
 
 @Data
 @TableName("lz_evaluation_group")
+@ApiModel(value = "考评组表")
 public class EvaluationGroup implements java.io.Serializable {
     //
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     //
+    @ApiModelProperty(value = "", name = "isDelete")
     private Integer isDelete;
     //
+    @ApiModelProperty(value = "", name = "gmtCreate")
     private Date gmtCreate;
     //
+    @ApiModelProperty(value = "", name = "gmtModified")
     private Date gmtModified;
     //
+    @ApiModelProperty(value = "", name = "name")
     private String name;
     //绩效管理员ID，system_user,id，逗号隔开
+    @ApiModelProperty(value = "绩效管理员ID，system_user,id，逗号隔开", name = "managerIds")
     private Long managerIds;
     //参与考核员工staff_id或者部门id，逗号隔开
+    @ApiModelProperty(value = "参与考核员工staff_id或者部门id，逗号隔开", name = "inIds")
     private Long inIds;
     //0部门，1人员
+    @ApiModelProperty(value = "0部门，1人员", name = "inType")
     private Integer inType;
     //排除人员ids，逗号隔开
+    @ApiModelProperty(value = "排除人员ids，逗号隔开", name = "outIds")
     private Long outIds;
     /**
      *  

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

@@ -1,7 +1,9 @@
 package com.lz.modules.flow.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
 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;
 /**
@@ -14,23 +16,31 @@ import java.util.Date;
 
 @Data
 @TableName("lz_evaluation_start_staff")
+@ApiModel(value = "发起考核考，核组人员对应关系表")
 public class EvaluationStartStaff 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;
     //考核组id
+    @ApiModelProperty(value = "考核组id", name = "evaluationId")
     private Long evaluationId;
     //发起id
+    @ApiModelProperty(value = "发起id", name = "startId")
     private Long startId;
     //人员id
+    @ApiModelProperty(value = "人员id", name = "staffId")
     private Long staffId;
     //0考核人员，1管理人员
+    @ApiModelProperty(value = "0考核人员，1管理人员", name = "type")
     private Integer type;
     /**
      *  

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

@@ -1,7 +1,9 @@
 package com.lz.modules.flow.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
 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;
 /**
@@ -14,23 +16,31 @@ import java.util.Date;
 
 @Data
 @TableName("lz_flow_approval_role")
+@ApiModel(value = "流程审批表")
 public class FlowApprovalRole 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;
     //审批用户id
+    @ApiModelProperty(value = "审批用户id", name = "approvalId")
     private Long approvalId;
     //0表示指定员工，1表示1级主管，2表示二级主管....
+    @ApiModelProperty(value = "0表示指定员工，1表示1级主管，2表示二级主管....", name = "type")
     private Integer type;
     //审批人角色id
+    @ApiModelProperty(value = "审批人角色id", name = "roleId")
     private Long roleId;
     //流程表id
+    @ApiModelProperty(value = "流程表id", name = "flowId")
     private Long flowId;
     /**
      *  

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

@@ -1,7 +1,9 @@
 package com.lz.modules.flow.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
 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;
 /**
@@ -14,29 +16,40 @@ import java.util.Date;
 
 @Data
 @TableName("lz_flow_change")
+@ApiModel(value = "变动记录表")
 public class FlowChange 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;
     //审批人id
+    @ApiModelProperty(value = "审批人id", name = "approvalId")
     private Long approvalId;
     //转向谁id
+    @ApiModelProperty(value = "转向谁id", name = "toApprovalId")
     private Long toApprovalId;
     //谁操作的
+    @ApiModelProperty(value = "谁操作的", name = "optId")
     private Long optId;
     //审批流程id
+    @ApiModelProperty(value = "审批流程id", name = "flowRecordId")
     private Long flowRecordId;
     //记录id
+    @ApiModelProperty(value = "记录id", name = "recordId")
     private Long recordId;
     //员工id
+    @ApiModelProperty(value = "员工id", name = "staffId")
     private Long staffId;
     //0表示转交，1 表示跳过
+    @ApiModelProperty(value = "0表示转交，1 表示跳过", name = "type")
     private Integer type;
     /**
      *  

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

@@ -1,7 +1,9 @@
 package com.lz.modules.flow.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
 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;
 /**
@@ -14,28 +16,41 @@ import java.util.Date;
 
 @Data
 @TableName("lz_flow_chart")
+@ApiModel(value = "流程图，lz_flow的父")
 public class FlowChart implements java.io.Serializable {
     //
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     //
+    @ApiModelProperty(value = "", name = "isDelete")
     private Integer isDelete;
     //
+    @ApiModelProperty(value = "", name = "gmtCreate")
     private Date gmtCreate;
     //
+    @ApiModelProperty(value = "", name = "gmtModified")
     private Date gmtModified;
     //
+    @ApiModelProperty(value = "", name = "name")
     private String name;
     //flow_manager表中id
+    @ApiModelProperty(value = "flow_manager表中id", name = "processId")
     private Long processId;
     //必须授权角色id
+    @ApiModelProperty(value = "必须授权角色id", name = "roleId")
     private Long roleId;
     //可授权角色id
+    @ApiModelProperty(value = "可授权角色id", name = "canRoleId")
     private Long canRoleId;
     //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
@@ -186,6 +201,21 @@ public class FlowChart implements java.io.Serializable {
         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{" +
@@ -199,6 +229,7 @@ public class FlowChart implements java.io.Serializable {
                 ",canRoleId=" + canRoleId +
                 ",status=" + status +
                 ",type=" + type +
+                ",stepIndex=" + stepIndex +
                 "}";
     }
 }

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

@@ -1,7 +1,9 @@
 package com.lz.modules.flow.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
 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;
 /**
@@ -14,23 +16,31 @@ import java.util.Date;
 
 @Data
 @TableName("lz_flow_start")
+@ApiModel(value = "发起考核表")
 public class FlowStart 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;
     //0,表示按月，1表示自定义
+    @ApiModelProperty(value = "0,表示按月，1表示自定义", name = "cycleType")
     private Integer cycleType;
     //开始时间
+    @ApiModelProperty(value = "开始时间", name = "startTime")
     private Date startTime;
     //结束时间
+    @ApiModelProperty(value = "结束时间", name = "endTime")
     private Date endTime;
     //组id
+    @ApiModelProperty(value = "组id", name = "groupIds")
     private Long groupIds;
     /**
      *  

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

@@ -1,11 +1,10 @@
 package com.lz.modules.flow.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
 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.math.BigDecimal;
 import java.util.Date;
 /**
 * <p>
@@ -17,23 +16,31 @@ import java.util.Date;
 
 @Data
 @TableName("lz_result_model")
+@ApiModel(value = "考核模板表")
 public class ResultModel implements java.io.Serializable {
     //
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     //
+    @ApiModelProperty(value = "", name = "isDelete")
     private Integer isDelete;
     //
+    @ApiModelProperty(value = "", name = "gmtCreate")
     private Date gmtCreate;
     //
+    @ApiModelProperty(value = "", name = "gmtModified")
     private Date gmtModified;
     //考核组ID
+    @ApiModelProperty(value = "考核组ID", name = "evaluationGroupId")
     private Long evaluationGroupId;
     //1:业绩 2：文化价值观
+    @ApiModelProperty(value = "1:业绩 2：文化价值观", name = "type")
     private Integer type;
     //权重
+    @ApiModelProperty(value = "权重", name = "weight")
     private BigDecimal weight;
     //考核子项目个数最大限制
+    @ApiModelProperty(value = "考核子项目个数最大限制", name = "maxCount")
     private Integer maxCount;
     /**
      *  

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

@@ -1,11 +1,10 @@
 package com.lz.modules.flow.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
 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.math.BigDecimal;
 import java.util.Date;
 /**
 * <p>
@@ -17,21 +16,28 @@ import java.util.Date;
 
 @Data
 @TableName("lz_result_score")
+@ApiModel(value = "业绩详情评分表")
 public class ResultScore 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;
     //得分
+    @ApiModelProperty(value = "得分", name = "acquireScore")
     private BigDecimal acquireScore;
     //
+    @ApiModelProperty(value = "", name = "detailId")
     private Long detailId;
     //审批人id
+    @ApiModelProperty(value = "审批人id", name = "approvalId")
     private Long approvalId;
     /**
      *  

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

@@ -1,4 +1,9 @@
 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;
 /**
@@ -11,6 +16,7 @@ import java.util.Date;
 
 
 @Data
+@ApiModel(value = "考评组表")
 public class EvaluationGroupReq implements java.io.Serializable {
   
     private int page = 1;
@@ -20,20 +26,28 @@ public class EvaluationGroupReq implements java.io.Serializable {
     //
     private Long id;
     //
+    @ApiModelProperty(value = "", name = "isDelete")
     private Integer isDelete;
     //
+    @ApiModelProperty(value = "", name = "gmtCreate")
     private Date gmtCreate;
     //
+    @ApiModelProperty(value = "", name = "gmtModified")
     private Date gmtModified;
     //
+    @ApiModelProperty(value = "", name = "name")
     private String name;
     //绩效管理员ID，system_user,id，逗号隔开
+    @ApiModelProperty(value = "绩效管理员ID，system_user,id，逗号隔开", name = "managerIds")
     private Long managerIds;
     //参与考核员工staff_id或者部门id，逗号隔开
+    @ApiModelProperty(value = "参与考核员工staff_id或者部门id，逗号隔开", name = "inIds")
     private Long inIds;
     //0部门，1人员
+    @ApiModelProperty(value = "0部门，1人员", name = "inType")
     private Integer inType;
     //排除人员ids，逗号隔开
+    @ApiModelProperty(value = "排除人员ids，逗号隔开", name = "outIds")
     private Long outIds;
     /**
      *  

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

@@ -1,4 +1,9 @@
 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;
 /**
@@ -11,6 +16,7 @@ import java.util.Date;
 
 
 @Data
+@ApiModel(value = "发起考核考，核组人员对应关系表")
 public class EvaluationStartStaffReq implements java.io.Serializable {
   
     private int page = 1;
@@ -20,18 +26,25 @@ public class EvaluationStartStaffReq implements java.io.Serializable {
     //
     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;
     //考核组id
+    @ApiModelProperty(value = "考核组id", name = "evaluationId")
     private Long evaluationId;
     //发起id
+    @ApiModelProperty(value = "发起id", name = "startId")
     private Long startId;
     //人员id
+    @ApiModelProperty(value = "人员id", name = "staffId")
     private Long staffId;
     //0考核人员，1管理人员
+    @ApiModelProperty(value = "0考核人员，1管理人员", name = "type")
     private Integer type;
     /**
      *  

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

@@ -1,4 +1,9 @@
 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;
 /**
@@ -11,6 +16,7 @@ import java.util.Date;
 
 
 @Data
+@ApiModel(value = "流程审批表")
 public class FlowApprovalRoleReq implements java.io.Serializable {
   
     private int page = 1;
@@ -20,18 +26,25 @@ public class FlowApprovalRoleReq implements java.io.Serializable {
     //
     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;
     //审批用户id
+    @ApiModelProperty(value = "审批用户id", name = "approvalId")
     private Long approvalId;
     //0表示指定员工，1表示1级主管，2表示二级主管....
+    @ApiModelProperty(value = "0表示指定员工，1表示1级主管，2表示二级主管....", name = "type")
     private Integer type;
     //审批人角色id
+    @ApiModelProperty(value = "审批人角色id", name = "roleId")
     private Long roleId;
     //流程表id
+    @ApiModelProperty(value = "流程表id", name = "flowId")
     private Long flowId;
     /**
      *  

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

@@ -1,4 +1,9 @@
 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;
 /**
@@ -11,6 +16,7 @@ import java.util.Date;
 
 
 @Data
+@ApiModel(value = "变动记录表")
 public class FlowChangeReq implements java.io.Serializable {
   
     private int page = 1;
@@ -20,24 +26,34 @@ public class FlowChangeReq implements java.io.Serializable {
     //
     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;
     //审批人id
+    @ApiModelProperty(value = "审批人id", name = "approvalId")
     private Long approvalId;
     //转向谁id
+    @ApiModelProperty(value = "转向谁id", name = "toApprovalId")
     private Long toApprovalId;
     //谁操作的
+    @ApiModelProperty(value = "谁操作的", name = "optId")
     private Long optId;
     //审批流程id
+    @ApiModelProperty(value = "审批流程id", name = "flowRecordId")
     private Long flowRecordId;
     //记录id
+    @ApiModelProperty(value = "记录id", name = "recordId")
     private Long recordId;
     //员工id
+    @ApiModelProperty(value = "员工id", name = "staffId")
     private Long staffId;
     //0表示转交，1 表示跳过
+    @ApiModelProperty(value = "0表示转交，1 表示跳过", name = "type")
     private Integer type;
     /**
      *  

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

@@ -1,4 +1,9 @@
 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;
 /**
@@ -11,6 +16,7 @@ import java.util.Date;
 
 
 @Data
+@ApiModel(value = "流程图，lz_flow的父")
 public class FlowChartReq implements java.io.Serializable {
   
     private int page = 1;
@@ -20,23 +26,35 @@ public class FlowChartReq implements java.io.Serializable {
     //
     private Long id;
     //
+    @ApiModelProperty(value = "", name = "isDelete")
     private Integer isDelete;
     //
+    @ApiModelProperty(value = "", name = "gmtCreate")
     private Date gmtCreate;
     //
+    @ApiModelProperty(value = "", name = "gmtModified")
     private Date gmtModified;
     //
+    @ApiModelProperty(value = "", name = "name")
     private String name;
     //flow_manager表中id
+    @ApiModelProperty(value = "flow_manager表中id", name = "processId")
     private Long processId;
     //必须授权角色id
+    @ApiModelProperty(value = "必须授权角色id", name = "roleId")
     private Long roleId;
     //可授权角色id
+    @ApiModelProperty(value = "可授权角色id", name = "canRoleId")
     private Long canRoleId;
     //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
@@ -187,6 +205,21 @@ public class FlowChartReq implements java.io.Serializable {
         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{" +
@@ -200,6 +233,7 @@ public class FlowChartReq implements java.io.Serializable {
                 ",canRoleId=" + canRoleId +
                 ",status=" + status +
                 ",type=" + type +
+                ",stepIndex=" + stepIndex +
                 "}";
     }
 }

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

@@ -1,4 +1,9 @@
 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;
 /**
@@ -11,6 +16,7 @@ import java.util.Date;
 
 
 @Data
+@ApiModel(value = "发起考核表")
 public class FlowStartReq implements java.io.Serializable {
   
     private int page = 1;
@@ -20,18 +26,25 @@ public class FlowStartReq implements java.io.Serializable {
     //
     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;
     //0,表示按月，1表示自定义
+    @ApiModelProperty(value = "0,表示按月，1表示自定义", name = "cycleType")
     private Integer cycleType;
     //开始时间
+    @ApiModelProperty(value = "开始时间", name = "startTime")
     private Date startTime;
     //结束时间
+    @ApiModelProperty(value = "结束时间", name = "endTime")
     private Date endTime;
     //组id
+    @ApiModelProperty(value = "组id", name = "groupIds")
     private Long groupIds;
     /**
      *  

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

@@ -1,7 +1,10 @@
 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.math.BigDecimal;
 import java.util.Date;
 /**
 * <p>
@@ -13,6 +16,7 @@ import java.util.Date;
 
 
 @Data
+@ApiModel(value = "考核模板表")
 public class ResultModelReq implements java.io.Serializable {
   
     private int page = 1;
@@ -22,18 +26,25 @@ public class ResultModelReq implements java.io.Serializable {
     //
     private Long id;
     //
+    @ApiModelProperty(value = "", name = "isDelete")
     private Integer isDelete;
     //
+    @ApiModelProperty(value = "", name = "gmtCreate")
     private Date gmtCreate;
     //
+    @ApiModelProperty(value = "", name = "gmtModified")
     private Date gmtModified;
     //考核组ID
+    @ApiModelProperty(value = "考核组ID", name = "evaluationGroupId")
     private Long evaluationGroupId;
     //1:业绩 2：文化价值观
+    @ApiModelProperty(value = "1:业绩 2：文化价值观", name = "type")
     private Integer type;
     //权重
+    @ApiModelProperty(value = "权重", name = "weight")
     private BigDecimal weight;
     //考核子项目个数最大限制
+    @ApiModelProperty(value = "考核子项目个数最大限制", name = "maxCount")
     private Integer maxCount;
     /**
      *  

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

@@ -1,7 +1,10 @@
 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.math.BigDecimal;
 import java.util.Date;
 /**
 * <p>
@@ -13,6 +16,7 @@ import java.util.Date;
 
 
 @Data
+@ApiModel(value = "业绩详情评分表")
 public class ResultScoreReq implements java.io.Serializable {
   
     private int page = 1;
@@ -22,16 +26,22 @@ public class ResultScoreReq implements java.io.Serializable {
     //
     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;
     //得分
+    @ApiModelProperty(value = "得分", name = "acquireScore")
     private BigDecimal acquireScore;
     //
+    @ApiModelProperty(value = "", name = "detailId")
     private Long detailId;
     //审批人id
+    @ApiModelProperty(value = "审批人id", name = "approvalId")
     private Long approvalId;
     /**
      *  

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

@@ -3,6 +3,8 @@ package com.lz.modules.flow.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lz.modules.flow.entity.EvaluationGroup;
 
+import java.util.List;
+
 /**
 * <p>
 * 考评组表 服务类

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

@@ -3,6 +3,8 @@ package com.lz.modules.flow.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lz.modules.flow.entity.FlowChart;
 
+import java.util.List;
+
 /**
 * <p>
 * 流程图，lz_flow的父 服务类
@@ -30,4 +32,5 @@ public interface FlowChartService extends IService<FlowChart> {
 	int deleteFlowChartById(Long id);
 
 
+	List<FlowChart> selectFlowChartByFlowManagerId(Long id);
 }

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

@@ -7,6 +7,8 @@ import com.lz.modules.flow.service.EvaluationGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * <p>
 * 考评组表 服务类
@@ -60,4 +62,5 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 
 
 
+
 }

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

@@ -7,6 +7,8 @@ import com.lz.modules.flow.service.FlowChartService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * <p>
 * 流程图，lz_flow的父 服务类
@@ -58,6 +60,11 @@ public class FlowChartServiceImpl extends ServiceImpl<FlowChartMapper, FlowChart
 		return flowChartMapper.deleteFlowChartById(id);
 	}
 
+	@Override
+	public List<FlowChart> selectFlowChartByFlowManagerId(Long id){
+		return flowChartMapper.selectFlowChartByFlowManagerId(id);
+	}
+
 
 
 }

src/main/java/com/lz/modules/performance/EvaluationGroupController.java

@@ -6,13 +6,18 @@ import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
 import com.lz.common.utils.StringUtil;
 import com.lz.modules.flow.entity.EvaluationGroup;
+import com.lz.modules.flow.entity.FlowManager;
+import com.lz.modules.flow.req.EvaluationGroupReq;
 import com.lz.modules.flow.service.EvaluationGroupService;
+import com.lz.modules.flow.service.FlowManagerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -27,9 +32,12 @@ public class EvaluationGroupController {
 
 
 
+
+
+
      @RequestMapping("/getById")
-     public R getById(@RequestBody EvaluationGroup evaluationGroup) {
+     public R getById(@RequestBody EvaluationGroupReq evaluationGroupReq) {
-        evaluationGroup = evaluationGroupService.selectEvaluationGroupById(evaluationGroup.getId());
+         EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(evaluationGroupReq.getId());
         return R.ok().put("evaluationGroup",evaluationGroup);
      }
 

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

@@ -5,26 +5,43 @@ 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.flow.entity.EvaluationGroup;
 import com.lz.modules.flow.entity.FlowChart;
+import com.lz.modules.flow.entity.FlowManager;
 import com.lz.modules.flow.service.FlowChartService;
+import com.lz.modules.flow.service.FlowManagerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @RestController
 @RequestMapping("/flowChart")
+@Api(value="流程", tags={"流程接口"})
 public class FlowChartController {
 
 
     @Autowired
     private FlowChartService flowChartService;
 
+    @Autowired
+    private FlowManagerService flowManagerService;
 
+    @GetMapping("/getByFlowManagerId")
+    @ApiOperation("根据Manager Id获取大流程")
+    public R getByFlowManagerId(@RequestParam Long id) {
+        FlowManager flowManager = flowManagerService.selectFlowManagerById(id);
+        if(flowManager != null){
+            List<FlowChart> flowCharts = flowChartService.selectFlowChartByFlowManagerId(flowManager.getId());
+            return R.ok().put("list",flowCharts);
+        }
+        return R.error("无相关流程");
 
+    }
 
 
      @RequestMapping("/getById")

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

@@ -89,5 +89,6 @@
         update lz_evaluation_group set is_delete = 1 where id=#{id} limit 1  
     </update>
 
+
 </mapper>
 

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

@@ -14,12 +14,13 @@
         <result column="can_role_id" property="canRoleId"/>
         <result column="status" property="status"/>
         <result column="type" property="type"/>
+        <result column="step_index" property="stepIndex"/>
     </resultMap>
 
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, process_id AS processId, role_id AS roleId, can_role_id AS canRoleId, status AS status, type AS type
+        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, process_id AS processId, role_id AS roleId, can_role_id AS canRoleId, status AS status, type AS type, step_index AS stepIndex
     </sql>
 
 
@@ -38,6 +39,7 @@
             <if test="canRoleId != null">can_role_id, </if>
             <if test="status != null">status, </if>
             <if test="type != null">type, </if>
+            <if test="stepIndex != null">step_index, </if>
             is_delete,
             gmt_create,
             gmt_modified
@@ -48,6 +50,7 @@
             <if test="canRoleId != null">#{ canRoleId}, </if>
             <if test="status != null">#{ status}, </if>
             <if test="type != null">#{ type}, </if>
+            <if test="stepIndex != null">#{ stepIndex}, </if>
             0,
             now(),
             now()
@@ -66,7 +69,8 @@
             <if test="roleId != null">role_id = #{roleId},</if>
             <if test="canRoleId != null">can_role_id = #{canRoleId},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="type != null">type = #{type}</if>                
+            <if test="type != null">type = #{type},</if>
+            <if test="stepIndex != null">step_index = #{stepIndex}</if>                
         </trim>
         ,gmt_modified = now()
         where id = #{id}
@@ -84,7 +88,8 @@
             role_id = #{roleId},
             can_role_id = #{canRoleId},
             status = #{status},
-            type = #{type}                
+            type = #{type},
+            step_index = #{stepIndex}                
         ,gmt_modified = now()
         where id = #{id}
     </update>
@@ -94,5 +99,9 @@
         update lz_flow_chart set is_delete = 1 where id=#{id} limit 1  
     </update>
 
+    <select id="selectFlowChartByFlowManagerId" resultType="FlowChart" >
+        select * from lz_flow_chart  where process_id=#{id} and is_delete = 0 order by step_index asc
+    </select>
+
 </mapper>
 

src/main/resources/mapper/flow/dao/EvaluationGroupMapper.java

@@ -1,31 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 考评组表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-10-13
-*/
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
-
-
-	EvaluationGroup selectEvaluationGroupById(@Param("id")Long id);
-
-
-	Long insertEvaluationGroup(EvaluationGroup evaluationGroup);
-
-
-	int updateEvaluationGroupById(EvaluationGroup evaluationGroup);
-
-
-	int updateCoverEvaluationGroupById(EvaluationGroup evaluationGroup);
-
-
-	int deleteEvaluationGroupById(@Param("id")Long id);
-
-
-}

src/main/resources/mapper/flow/dao/EvaluationStartStaffMapper.java

@@ -1,31 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 发起考核考，核组人员对应关系表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-10-13
-*/
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface EvaluationStartStaffMapper extends BaseMapper<EvaluationStartStaff> {
-
-
-	EvaluationStartStaff selectEvaluationStartStaffById(@Param("id")Long id);
-
-
-	Long insertEvaluationStartStaff(EvaluationStartStaff evaluationStartStaff);
-
-
-	int updateEvaluationStartStaffById(EvaluationStartStaff evaluationStartStaff);
-
-
-	int updateCoverEvaluationStartStaffById(EvaluationStartStaff evaluationStartStaff);
-
-
-	int deleteEvaluationStartStaffById(@Param("id")Long id);
-
-
-}

src/main/resources/mapper/flow/dao/FlowApprovalRoleMapper.java

@@ -1,31 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流程审批表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-10-13
-*/
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface FlowApprovalRoleMapper extends BaseMapper<FlowApprovalRole> {
-
-
-	FlowApprovalRole selectFlowApprovalRoleById(@Param("id")Long id);
-
-
-	Long insertFlowApprovalRole(FlowApprovalRole flowApprovalRole);
-
-
-	int updateFlowApprovalRoleById(FlowApprovalRole flowApprovalRole);
-
-
-	int updateCoverFlowApprovalRoleById(FlowApprovalRole flowApprovalRole);
-
-
-	int deleteFlowApprovalRoleById(@Param("id")Long id);
-
-
-}

src/main/resources/mapper/flow/dao/FlowChangeMapper.java

@@ -1,31 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 变动记录表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-10-13
-*/
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface FlowChangeMapper extends BaseMapper<FlowChange> {
-
-
-	FlowChange selectFlowChangeById(@Param("id")Long id);
-
-
-	Long insertFlowChange(FlowChange flowChange);
-
-
-	int updateFlowChangeById(FlowChange flowChange);
-
-
-	int updateCoverFlowChangeById(FlowChange flowChange);
-
-
-	int deleteFlowChangeById(@Param("id")Long id);
-
-
-}

src/main/resources/mapper/flow/dao/FlowChartMapper.java

@@ -1,31 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流程图，lz_flow的父 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-10-13
-*/
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface FlowChartMapper extends BaseMapper<FlowChart> {
-
-
-	FlowChart selectFlowChartById(@Param("id")Long id);
-
-
-	Long insertFlowChart(FlowChart flowChart);
-
-
-	int updateFlowChartById(FlowChart flowChart);
-
-
-	int updateCoverFlowChartById(FlowChart flowChart);
-
-
-	int deleteFlowChartById(@Param("id")Long id);
-
-
-}

src/main/resources/mapper/flow/dao/FlowDepartmentMapper.java

@@ -1,36 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流转关系表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lz.modules.flow.entity.FlowDepartment;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface FlowDepartmentMapper extends BaseMapper<FlowDepartment> {
-
-
-	FlowDepartment selectFlowDepartmentById(@Param("id")Long id);
-
-
-	Long insertFlowDepartment(FlowDepartment flowDepartment);
-
-
-	int updateFlowDepartmentById(FlowDepartment flowDepartment);
-
-
-	int updateCoverFlowDepartmentById(FlowDepartment flowDepartment);
-
-
-	int deleteFlowDepartmentById(@Param("id")Long id);
-
-
-    FlowDepartment selectByStaffId(@Param("staffId") Long staffId);
-
-    FlowDepartment selectByParentId(@Param("parentId") Long parentId);
-}

src/main/resources/mapper/flow/dao/FlowManagerMapper.java

@@ -1,39 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流程管理表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-09-22
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lz.modules.flow.entity.FlowManager;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface FlowManagerMapper extends BaseMapper<FlowManager> {
-
-
-	FlowManager selectFlowManagerById(@Param("id") Long id);
-
-
-	Long insertFlowManager(FlowManager flowManager);
-
-
-	int updateFlowManagerById(FlowManager flowManager);
-
-
-	int updateCoverFlowManagerById(FlowManager flowManager);
-
-
-	int deleteFlowManagerById(@Param("id") Long id);
-
-
-	List<FlowManager> selectByCondition(@Param("page") IPage page, @Param("params") Map<String, Object> params);
-}

src/main/resources/mapper/flow/dao/FlowMapper.java

@@ -1,37 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流转表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lz.modules.flow.entity.Flow;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface FlowMapper extends BaseMapper<Flow> {
-
-
-	Flow selectFlowById(@Param("id")Long id);
-
-
-	Long insertFlow(Flow flow);
-
-
-	int updateFlowById(Flow flow);
-
-
-	int updateCoverFlowById(Flow flow);
-
-
-	int deleteFlowById(@Param("id")Long id);
-
-
-    List<Flow> selectByFlowId(@Param("flowId") Long flowId);
-}

src/main/resources/mapper/flow/dao/FlowRecordMapper.java

@@ -1,53 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流转记录表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lz.modules.flow.entity.FlowRecord;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
-
-
-	FlowRecord selectFlowRecordById(@Param("id")Long id);
-
-
-	Long insertFlowRecord(FlowRecord flowRecord);
-
-
-	int updateFlowRecordById(FlowRecord flowRecord);
-
-
-	int updateCoverFlowRecordById(FlowRecord flowRecord);
-
-
-	int deleteFlowRecordById(@Param("id")Long id);
-
-
-    FlowRecord selectLastFlowRecordByRecordId(@Param("recordId") Long recordId);
-
-    FlowRecord selectNotApprovalStaffIdFlowRecords(@Param("recordId") Long recordId);
-
-	List<FlowRecord> selectFlowRecordByRecordId(@Param("recordId") Long recordId);
-
-	List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(@Param("recordId") Long recordId);
-
-	List<FlowRecord> selectFlowRecordByFlowId(@Param("recordId") Long recordId);
-
-	FlowRecord selectLastFlowNoStatusRecordByRecordId(@Param("recordId") Long recordId);
-
-	List<FlowRecord> selectFlowRecordByResultRecordIdType(@Param("resultRecordId") Long resultRecordId, @Param("type") Integer type);
-
-    List<FlowRecord> selectFlowRecordByResultRecordIdTypeStatus(@Param("recordResultId") Long recordResultId, @Param("type") Integer type, @Param("status") int status);
-
-	Long copyFlowRecord(FlowRecord flowRecord);
-}

src/main/resources/mapper/flow/dao/FlowRelationMapper.java

@@ -1,37 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流转关系表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lz.modules.flow.entity.FlowRelation;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface FlowRelationMapper extends BaseMapper<FlowRelation> {
-
-
-	FlowRelation selectFlowRelationById(@Param("id")Long id);
-
-
-	Long insertFlowRelation(FlowRelation flowRelation);
-
-
-	int updateFlowRelationById(FlowRelation flowRelation);
-
-
-	int updateCoverFlowRelationById(FlowRelation flowRelation);
-
-
-	int deleteFlowRelationById(@Param("id")Long id);
-
-
-    List<FlowRelation> selectFlowRelationAll();
-}

src/main/resources/mapper/flow/dao/FlowStartMapper.java

@@ -1,31 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 发起考核表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-10-13
-*/
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface FlowStartMapper extends BaseMapper<FlowStart> {
-
-
-	FlowStart selectFlowStartById(@Param("id")Long id);
-
-
-	Long insertFlowStart(FlowStart flowStart);
-
-
-	int updateFlowStartById(FlowStart flowStart);
-
-
-	int updateCoverFlowStartById(FlowStart flowStart);
-
-
-	int deleteFlowStartById(@Param("id")Long id);
-
-
-}

src/main/resources/mapper/flow/dao/RecordAuthMapper.java

@@ -1,40 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 审批权限表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lz.modules.flow.entity.RecordAuth;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface RecordAuthMapper extends BaseMapper<RecordAuth> {
-
-
-	RecordAuth selectRecordAuthById(@Param("id")Long id);
-
-
-	Long insertRecordAuth(RecordAuth recordAuth);
-
-
-	int updateRecordAuthById(RecordAuth recordAuth);
-
-
-	int updateCoverRecordAuthById(RecordAuth recordAuth);
-
-
-	int deleteRecordAuthById(@Param("id")Long id);
-
-
-	List<RecordAuth> selectAuthInfo(@Param("roleId") Long roleId);
-
-	List<RecordAuth> selectAll();
-}

src/main/resources/mapper/flow/dao/RecordFileMapper.java

@@ -1,41 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 文件上传表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-25
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lz.modules.flow.entity.RecordFile;
-import com.lz.modules.flow.req.ResultDetailReq;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface RecordFileMapper extends BaseMapper<RecordFile> {
-
-
-	RecordFile selectRecordFileById(@Param("id") Long id);
-
-
-	Long insertRecordFile(RecordFile recordFile);
-
-
-	int updateRecordFileById(RecordFile recordFile);
-
-
-	int updateCoverRecordFileById(RecordFile recordFile);
-
-
-	int deleteRecordFileById(@Param("id") Long id);
-
-
-    List<RecordFile> selectByCondition(@Param("page") IPage page , @Param("req") ResultDetailReq req);
-
-    int selectRecordFileCountByRecordId(@Param("recordId") Long recordId);
-}

src/main/resources/mapper/flow/dao/RecordRoleAuthMapper.java

@@ -1,41 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 权限角色表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lz.modules.flow.entity.RecordRoleAuth;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface RecordRoleAuthMapper extends BaseMapper<RecordRoleAuth> {
-
-
-	RecordRoleAuth selectRecordRoleAuthById(@Param("id")Long id);
-
-
-	Long insertRecordRoleAuth(RecordRoleAuth recordRoleAuth);
-
-
-	int updateRecordRoleAuthById(RecordRoleAuth recordRoleAuth);
-
-
-	int updateCoverRecordRoleAuthById(RecordRoleAuth recordRoleAuth);
-
-
-	int deleteRecordRoleAuthById(@Param("id")Long id);
-
-
-    List<Long> queryMenuIdList(@Param("roleId") Long roleId);
-
-	List<RecordRoleAuth> selectByRoleId(@Param("roleId") Long roleId);
-
-	void deleteRecordRoleAuth(@Param("id") Long id);
-}

src/main/resources/mapper/flow/dao/RecordRoleMapper.java

@@ -1,40 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 记录表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lz.modules.flow.entity.RecordRole;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface RecordRoleMapper extends BaseMapper<RecordRole> {
-
-
-	RecordRole selectRecordRoleById(@Param("id")Long id);
-
-
-	Long insertRecordRole(RecordRole recordRole);
-
-
-	int updateRecordRoleById(RecordRole recordRole);
-
-
-	int updateCoverRecordRoleById(RecordRole recordRole);
-
-
-	int deleteRecordRoleById(@Param("id")Long id);
-
-    List<RecordRole> selectByCondition(@Param("page") IPage page, @Param("params") Map<String, Object> params);
-
-	List<RecordRole> selectAll();
-}

src/main/resources/mapper/flow/dao/ResultModelMapper.java

@@ -1,31 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 考核模板表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-10-13
-*/
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface ResultModelMapper extends BaseMapper<ResultModel> {
-
-
-	ResultModel selectResultModelById(@Param("id")Long id);
-
-
-	Long insertResultModel(ResultModel resultModel);
-
-
-	int updateResultModelById(ResultModel resultModel);
-
-
-	int updateCoverResultModelById(ResultModel resultModel);
-
-
-	int deleteResultModelById(@Param("id")Long id);
-
-
-}

src/main/resources/mapper/flow/dao/ResultScoreMapper.java

@@ -1,31 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 业绩详情评分表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-10-13
-*/
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface ResultScoreMapper extends BaseMapper<ResultScore> {
-
-
-	ResultScore selectResultScoreById(@Param("id")Long id);
-
-
-	Long insertResultScore(ResultScore resultScore);
-
-
-	int updateResultScoreById(ResultScore resultScore);
-
-
-	int updateCoverResultScoreById(ResultScore resultScore);
-
-
-	int deleteResultScoreById(@Param("id")Long id);
-
-
-}

src/main/resources/mapper/flow/dao/StaffRoleDepartmentMapper.java

@@ -1,45 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流转关系表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lz.modules.flow.entity.StaffRoleDepartment;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface StaffRoleDepartmentMapper extends BaseMapper<StaffRoleDepartment> {
-
-
-	StaffRoleDepartment selectStaffRoleDepartmentById(@Param("id")Long id);
-
-
-	Long insertStaffRoleDepartment(StaffRoleDepartment staffRoleDepartment);
-
-
-	int updateStaffRoleDepartmentById(StaffRoleDepartment staffRoleDepartment);
-
-
-	int updateCoverStaffRoleDepartmentById(StaffRoleDepartment staffRoleDepartment);
-
-
-	int deleteStaffRoleDepartmentById(@Param("id")Long id);
-
-
-    List<StaffRoleDepartment> selectStaffRoleDepartmentByStaffRoleId(@Param("staffRoleId") Long staffRoleId);
-
-    StaffRoleDepartment selectStaffRoleDepartmentByDepartmentId(@Param("departmentId") Long departmentId);
-
-	StaffRoleDepartment selectStaffRoleDepartmentByDepartmentIdRoleIds(@Param("departmentId") Long departmentId, @Param("ids") List<Long> ids);
-
-	void deleteStaffRoleDepartment(@Param("id") Long id);
-
-    List<StaffRoleDepartment> selectStaffRoleDepartmentByStaffRoleIdDepartments(@Param("staffRoleId") Long staffRoleId, @Param("departments") List<String> departments);
-}

src/main/resources/mapper/flow/dao/StaffRoleMapper.java

@@ -1,43 +0,0 @@
-package com.lz.modules.flow.dao;
-/**
-* <p>
-* 流转关系表 服务类
-* </p>
-*
-* @author quyixiao
-* @since 2020-08-18
-*/
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lz.modules.flow.entity.StaffRole;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface StaffRoleMapper extends BaseMapper<StaffRole> {
-
-
-	StaffRole selectStaffRoleById(@Param("id")Long id);
-
-
-	Long insertStaffRole(StaffRole staffRole);
-
-
-	int updateStaffRoleById(StaffRole staffRole);
-
-
-	int updateCoverStaffRoleById(StaffRole staffRole);
-
-
-	int deleteStaffRoleById(@Param("id")Long id);
-
-
-    StaffRole selectByStaffId(@Param("staffId") Long staffId);
-
-	List<StaffRole> selectByRole(@Param("departmentLevel") String departmentLevel);
-
-    List<StaffRole> selectByCondition(@Param("page") IPage page, @Param("params") Map<String, Object> params);
-}

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

@@ -3,6 +3,8 @@ package com.lz.mysql;
 
 
 
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -43,6 +45,8 @@ public class MysqlUtilTable2Bean {
             temp += "    //" + tb.getComment() + "\n";
             if (i == 0) {
 
+            }else{
+                temp += "    @ApiModelProperty(value = \"" + tb.getComment() + "\", name = \"" + tb.getJavaCode() + "\")\n";
             }
             temp += "    private " + tb.getJavaType() + " " + tb.getJavaCode() + ";";
             i++;
@@ -102,9 +106,11 @@ public class MysqlUtilTable2Bean {
         try {
 
             String content = "package " + MysqlMain.package_name + ";\n";
-            content += "import com.baomidou.mybatisplus.annotations.TableId;\n";
+            content += "import com.baomidou.mybatisplus.annotation.TableId;\n";
-            content += "import com.baomidou.mybatisplus.annotations.TableName;\n";
+            content += "import com.baomidou.mybatisplus.annotation.TableName;\n";
-            content += "import com.baomidou.mybatisplus.enums.IdType;\n";
+            content += "import com.baomidou.mybatisplus.annotation.IdType;\n";
+            content += "import io.swagger.annotations.ApiModel;\n";
+            content += "import io.swagger.annotations.ApiModelProperty;\n";
             content += "import lombok.Data;\n";
 
 
@@ -129,6 +135,7 @@ public class MysqlUtilTable2Bean {
 
 
             content += "@Data\n";
+            content += "@ApiModel(value = \"" + tableBean.getComment() + "\")\n";
             content += "public class " + realName + "Req implements java.io.Serializable {\n" + bf.toString();
             content += sb.toString();
             content += "}";
@@ -169,6 +176,8 @@ public class MysqlUtilTable2Bean {
             temp += "    //" + tb.getComment() + "\n";
             if (i == 0) {
                 temp += "    @TableId(value = \"" + tb.getField() + "\", type = IdType.AUTO)\n";
+            }else{
+                temp += "    @ApiModelProperty(value = \"" + tb.getComment() + "\", name = \"" + tb.getJavaCode() + "\")\n";
             }
             temp += "    private " + tb.getJavaType() + " " + tb.getJavaCode() + ";";
             i++;
@@ -226,9 +235,11 @@ public class MysqlUtilTable2Bean {
         try {
 
             String content = "package " + MysqlMain.package_name + ";\n";
-            content += "import com.baomidou.mybatisplus.annotations.TableId;\n";
+            content += "import com.baomidou.mybatisplus.annotation.TableId;\n";
-            content += "import com.baomidou.mybatisplus.annotations.TableName;\n";
+            content += "import com.baomidou.mybatisplus.annotation.TableName;\n";
-            content += "import com.baomidou.mybatisplus.enums.IdType;\n";
+            content += "import com.baomidou.mybatisplus.annotation.IdType;\n";
+            content += "import io.swagger.annotations.ApiModel;\n";
+            content += "import io.swagger.annotations.ApiModelProperty;\n";
             content += "import lombok.Data;\n";
 
 
@@ -250,6 +261,7 @@ public class MysqlUtilTable2Bean {
             content += "\n";
             content += "@Data\n";
             content += "@TableName(" + "\"" + tableBean.getTableName() + "\")\n";
+            content += "@ApiModel(value = \"" + tableBean.getComment() + "\")\n";
             content += "public class " + realName + " implements java.io.Serializable {\n" + bf.toString();
             content += sb.toString();
             content += "}";