diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java index 6de3a0ea..71e899ec 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java +++ b/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 { diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java index 7a1fa3b9..a1c6c209 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java +++ b/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 { @@ -30,4 +33,5 @@ public interface FlowChartMapper extends BaseMapper { int deleteFlowChartById(@Param("id")Long id); + List selectFlowChartByFlowManagerId(@Param("id") Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java b/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java index 85c2ec62..486344bc 100644 --- a/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/entity/EvaluationStartStaff.java b/src/main/java/com/lz/modules/flow/entity/EvaluationStartStaff.java index 40498084..9e431549 100644 --- a/src/main/java/com/lz/modules/flow/entity/EvaluationStartStaff.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java b/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java index ef55d42a..6ed7c8e6 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/entity/FlowChange.java b/src/main/java/com/lz/modules/flow/entity/FlowChange.java index ae53045b..8f03e4f4 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowChange.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/entity/FlowChart.java b/src/main/java/com/lz/modules/flow/entity/FlowChart.java index e759643a..7d91b679 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowChart.java +++ b/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 + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/FlowStart.java b/src/main/java/com/lz/modules/flow/entity/FlowStart.java index 027561f9..0a631f81 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowStart.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/entity/ResultModel.java b/src/main/java/com/lz/modules/flow/entity/ResultModel.java index b8d47bfa..6a13c00b 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultModel.java +++ b/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; /** *

@@ -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; /** * diff --git a/src/main/java/com/lz/modules/flow/entity/ResultScore.java b/src/main/java/com/lz/modules/flow/entity/ResultScore.java index b18d12f3..fe5614e0 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultScore.java +++ b/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; /** *

@@ -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; /** * diff --git a/src/main/java/com/lz/modules/flow/req/EvaluationGroupReq.java b/src/main/java/com/lz/modules/flow/req/EvaluationGroupReq.java index 52eaaf2a..2131d5e5 100644 --- a/src/main/java/com/lz/modules/flow/req/EvaluationGroupReq.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/req/EvaluationStartStaffReq.java b/src/main/java/com/lz/modules/flow/req/EvaluationStartStaffReq.java index 46dae18e..3ce856b6 100644 --- a/src/main/java/com/lz/modules/flow/req/EvaluationStartStaffReq.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java b/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java index e515e8b7..6ed77f22 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/req/FlowChangeReq.java b/src/main/java/com/lz/modules/flow/req/FlowChangeReq.java index bb9c3774..b5b83f5e 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowChangeReq.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartReq.java index 81323db7..940883d9 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowChartReq.java +++ b/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 + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/FlowStartReq.java b/src/main/java/com/lz/modules/flow/req/FlowStartReq.java index 719b0235..b47cb3e4 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowStartReq.java +++ b/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; /** * diff --git a/src/main/java/com/lz/modules/flow/req/ResultModelReq.java b/src/main/java/com/lz/modules/flow/req/ResultModelReq.java index f62e88f1..ae9378ae 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultModelReq.java +++ b/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; /** *

@@ -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; /** * diff --git a/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java b/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java index 4eaadae6..bcece495 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java +++ b/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; /** *

@@ -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; /** * diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java index b7007dc7..003b8f8b 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java +++ b/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; + /** *

* 考评组表 服务类 diff --git a/src/main/java/com/lz/modules/flow/service/FlowChartService.java b/src/main/java/com/lz/modules/flow/service/FlowChartService.java index 8cd0ef9c..07c35098 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowChartService.java +++ b/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; + /** *

* 流程图,lz_flow的父 服务类 @@ -30,4 +32,5 @@ public interface FlowChartService extends IService { int deleteFlowChartById(Long id); + List selectFlowChartByFlowManagerId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index 6364f6ea..7205839a 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/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; + /** *

* 考评组表 服务类 @@ -60,4 +62,5 @@ public class EvaluationGroupServiceImpl extends ServiceImpl * 流程图,lz_flow的父 服务类 @@ -58,6 +60,11 @@ public class FlowChartServiceImpl extends ServiceImpl selectFlowChartByFlowManagerId(Long id){ + return flowChartMapper.selectFlowChartByFlowManagerId(id); + } + } diff --git a/src/main/java/com/lz/modules/performance/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/EvaluationGroupController.java index 7a9e1182..423e4282 100644 --- a/src/main/java/com/lz/modules/performance/EvaluationGroupController.java +++ b/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) { - evaluationGroup = evaluationGroupService.selectEvaluationGroupById(evaluationGroup.getId()); + public R getById(@RequestBody EvaluationGroupReq evaluationGroupReq) { + EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(evaluationGroupReq.getId()); return R.ok().put("evaluationGroup",evaluationGroup); } diff --git a/src/main/java/com/lz/modules/performance/FlowChartController.java b/src/main/java/com/lz/modules/performance/FlowChartController.java index 4a267920..73708fcb 100644 --- a/src/main/java/com/lz/modules/performance/FlowChartController.java +++ b/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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; 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 flowCharts = flowChartService.selectFlowChartByFlowManagerId(flowManager.getId()); + return R.ok().put("list",flowCharts); + } + return R.error("无相关流程"); + } @RequestMapping("/getById") diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml index c418b629..73ce1096 100644 --- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml @@ -89,5 +89,6 @@ update lz_evaluation_group set is_delete = 1 where id=#{id} limit 1 + diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml index 20b7d932..6cec4b6e 100644 --- a/src/main/resources/mapper/flow/FlowChartMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartMapper.xml @@ -14,12 +14,13 @@ + - 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 @@ -38,6 +39,7 @@ can_role_id, status, type, + step_index, is_delete, gmt_create, gmt_modified @@ -48,6 +50,7 @@ #{ canRoleId}, #{ status}, #{ type}, + #{ stepIndex}, 0, now(), now() @@ -66,7 +69,8 @@ role_id = #{roleId}, can_role_id = #{canRoleId}, status = #{status}, - type = #{type} + type = #{type}, + step_index = #{stepIndex} ,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} @@ -94,5 +99,9 @@ update lz_flow_chart set is_delete = 1 where id=#{id} limit 1 + + diff --git a/src/main/resources/mapper/flow/dao/EvaluationGroupMapper.java b/src/main/resources/mapper/flow/dao/EvaluationGroupMapper.java deleted file mode 100644 index 48f7de7d..00000000 --- a/src/main/resources/mapper/flow/dao/EvaluationGroupMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 考评组表 服务类 -*

-* -* @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 selectEvaluationGroupById(@Param("id")Long id); - - - Long insertEvaluationGroup(EvaluationGroup evaluationGroup); - - - int updateEvaluationGroupById(EvaluationGroup evaluationGroup); - - - int updateCoverEvaluationGroupById(EvaluationGroup evaluationGroup); - - - int deleteEvaluationGroupById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/EvaluationStartStaffMapper.java b/src/main/resources/mapper/flow/dao/EvaluationStartStaffMapper.java deleted file mode 100644 index 016ba4df..00000000 --- a/src/main/resources/mapper/flow/dao/EvaluationStartStaffMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 发起考核考,核组人员对应关系表 服务类 -*

-* -* @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 selectEvaluationStartStaffById(@Param("id")Long id); - - - Long insertEvaluationStartStaff(EvaluationStartStaff evaluationStartStaff); - - - int updateEvaluationStartStaffById(EvaluationStartStaff evaluationStartStaff); - - - int updateCoverEvaluationStartStaffById(EvaluationStartStaff evaluationStartStaff); - - - int deleteEvaluationStartStaffById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowApprovalRoleMapper.java b/src/main/resources/mapper/flow/dao/FlowApprovalRoleMapper.java deleted file mode 100644 index 1fdb6273..00000000 --- a/src/main/resources/mapper/flow/dao/FlowApprovalRoleMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流程审批表 服务类 -*

-* -* @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 selectFlowApprovalRoleById(@Param("id")Long id); - - - Long insertFlowApprovalRole(FlowApprovalRole flowApprovalRole); - - - int updateFlowApprovalRoleById(FlowApprovalRole flowApprovalRole); - - - int updateCoverFlowApprovalRoleById(FlowApprovalRole flowApprovalRole); - - - int deleteFlowApprovalRoleById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowChangeMapper.java b/src/main/resources/mapper/flow/dao/FlowChangeMapper.java deleted file mode 100644 index 09cd75ec..00000000 --- a/src/main/resources/mapper/flow/dao/FlowChangeMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 变动记录表 服务类 -*

-* -* @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 selectFlowChangeById(@Param("id")Long id); - - - Long insertFlowChange(FlowChange flowChange); - - - int updateFlowChangeById(FlowChange flowChange); - - - int updateCoverFlowChangeById(FlowChange flowChange); - - - int deleteFlowChangeById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowChartMapper.java b/src/main/resources/mapper/flow/dao/FlowChartMapper.java deleted file mode 100644 index b5b31e3d..00000000 --- a/src/main/resources/mapper/flow/dao/FlowChartMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流程图,lz_flow的父 服务类 -*

-* -* @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 selectFlowChartById(@Param("id")Long id); - - - Long insertFlowChart(FlowChart flowChart); - - - int updateFlowChartById(FlowChart flowChart); - - - int updateCoverFlowChartById(FlowChart flowChart); - - - int deleteFlowChartById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowDepartmentMapper.java b/src/main/resources/mapper/flow/dao/FlowDepartmentMapper.java deleted file mode 100644 index f5f10237..00000000 --- a/src/main/resources/mapper/flow/dao/FlowDepartmentMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流转关系表 服务类 -*

-* -* @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 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); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowManagerMapper.java b/src/main/resources/mapper/flow/dao/FlowManagerMapper.java deleted file mode 100644 index 4673dfa3..00000000 --- a/src/main/resources/mapper/flow/dao/FlowManagerMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流程管理表 服务类 -*

-* -* @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 selectFlowManagerById(@Param("id") Long id); - - - Long insertFlowManager(FlowManager flowManager); - - - int updateFlowManagerById(FlowManager flowManager); - - - int updateCoverFlowManagerById(FlowManager flowManager); - - - int deleteFlowManagerById(@Param("id") Long id); - - - List selectByCondition(@Param("page") IPage page, @Param("params") Map params); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowMapper.java b/src/main/resources/mapper/flow/dao/FlowMapper.java deleted file mode 100644 index 5889418e..00000000 --- a/src/main/resources/mapper/flow/dao/FlowMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流转表 服务类 -*

-* -* @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 selectFlowById(@Param("id")Long id); - - - Long insertFlow(Flow flow); - - - int updateFlowById(Flow flow); - - - int updateCoverFlowById(Flow flow); - - - int deleteFlowById(@Param("id")Long id); - - - List selectByFlowId(@Param("flowId") Long flowId); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowRecordMapper.java b/src/main/resources/mapper/flow/dao/FlowRecordMapper.java deleted file mode 100644 index 99a4bd10..00000000 --- a/src/main/resources/mapper/flow/dao/FlowRecordMapper.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流转记录表 服务类 -*

-* -* @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 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 selectFlowRecordByRecordId(@Param("recordId") Long recordId); - - List selectFlowRecordByResultRecordIdFlowId(@Param("recordId") Long recordId); - - List selectFlowRecordByFlowId(@Param("recordId") Long recordId); - - FlowRecord selectLastFlowNoStatusRecordByRecordId(@Param("recordId") Long recordId); - - List selectFlowRecordByResultRecordIdType(@Param("resultRecordId") Long resultRecordId, @Param("type") Integer type); - - List selectFlowRecordByResultRecordIdTypeStatus(@Param("recordResultId") Long recordResultId, @Param("type") Integer type, @Param("status") int status); - - Long copyFlowRecord(FlowRecord flowRecord); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowRelationMapper.java b/src/main/resources/mapper/flow/dao/FlowRelationMapper.java deleted file mode 100644 index ae8ec3c5..00000000 --- a/src/main/resources/mapper/flow/dao/FlowRelationMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流转关系表 服务类 -*

-* -* @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 selectFlowRelationById(@Param("id")Long id); - - - Long insertFlowRelation(FlowRelation flowRelation); - - - int updateFlowRelationById(FlowRelation flowRelation); - - - int updateCoverFlowRelationById(FlowRelation flowRelation); - - - int deleteFlowRelationById(@Param("id")Long id); - - - List selectFlowRelationAll(); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/FlowStartMapper.java b/src/main/resources/mapper/flow/dao/FlowStartMapper.java deleted file mode 100644 index 2e5225df..00000000 --- a/src/main/resources/mapper/flow/dao/FlowStartMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 发起考核表 服务类 -*

-* -* @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 selectFlowStartById(@Param("id")Long id); - - - Long insertFlowStart(FlowStart flowStart); - - - int updateFlowStartById(FlowStart flowStart); - - - int updateCoverFlowStartById(FlowStart flowStart); - - - int deleteFlowStartById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/RecordAuthMapper.java b/src/main/resources/mapper/flow/dao/RecordAuthMapper.java deleted file mode 100644 index 363735fd..00000000 --- a/src/main/resources/mapper/flow/dao/RecordAuthMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 审批权限表 服务类 -*

-* -* @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 selectRecordAuthById(@Param("id")Long id); - - - Long insertRecordAuth(RecordAuth recordAuth); - - - int updateRecordAuthById(RecordAuth recordAuth); - - - int updateCoverRecordAuthById(RecordAuth recordAuth); - - - int deleteRecordAuthById(@Param("id")Long id); - - - List selectAuthInfo(@Param("roleId") Long roleId); - - List selectAll(); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/RecordFileMapper.java b/src/main/resources/mapper/flow/dao/RecordFileMapper.java deleted file mode 100644 index 56bd83ee..00000000 --- a/src/main/resources/mapper/flow/dao/RecordFileMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 文件上传表 服务类 -*

-* -* @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 selectRecordFileById(@Param("id") Long id); - - - Long insertRecordFile(RecordFile recordFile); - - - int updateRecordFileById(RecordFile recordFile); - - - int updateCoverRecordFileById(RecordFile recordFile); - - - int deleteRecordFileById(@Param("id") Long id); - - - List selectByCondition(@Param("page") IPage page , @Param("req") ResultDetailReq req); - - int selectRecordFileCountByRecordId(@Param("recordId") Long recordId); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/RecordRoleAuthMapper.java b/src/main/resources/mapper/flow/dao/RecordRoleAuthMapper.java deleted file mode 100644 index b023085f..00000000 --- a/src/main/resources/mapper/flow/dao/RecordRoleAuthMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 权限角色表 服务类 -*

-* -* @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 selectRecordRoleAuthById(@Param("id")Long id); - - - Long insertRecordRoleAuth(RecordRoleAuth recordRoleAuth); - - - int updateRecordRoleAuthById(RecordRoleAuth recordRoleAuth); - - - int updateCoverRecordRoleAuthById(RecordRoleAuth recordRoleAuth); - - - int deleteRecordRoleAuthById(@Param("id")Long id); - - - List queryMenuIdList(@Param("roleId") Long roleId); - - List selectByRoleId(@Param("roleId") Long roleId); - - void deleteRecordRoleAuth(@Param("id") Long id); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/RecordRoleMapper.java b/src/main/resources/mapper/flow/dao/RecordRoleMapper.java deleted file mode 100644 index ab79d537..00000000 --- a/src/main/resources/mapper/flow/dao/RecordRoleMapper.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 记录表 服务类 -*

-* -* @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 selectRecordRoleById(@Param("id")Long id); - - - Long insertRecordRole(RecordRole recordRole); - - - int updateRecordRoleById(RecordRole recordRole); - - - int updateCoverRecordRoleById(RecordRole recordRole); - - - int deleteRecordRoleById(@Param("id")Long id); - - List selectByCondition(@Param("page") IPage page, @Param("params") Map params); - - List selectAll(); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/ResultModelMapper.java b/src/main/resources/mapper/flow/dao/ResultModelMapper.java deleted file mode 100644 index 10025523..00000000 --- a/src/main/resources/mapper/flow/dao/ResultModelMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 考核模板表 服务类 -*

-* -* @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 selectResultModelById(@Param("id")Long id); - - - Long insertResultModel(ResultModel resultModel); - - - int updateResultModelById(ResultModel resultModel); - - - int updateCoverResultModelById(ResultModel resultModel); - - - int deleteResultModelById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/ResultScoreMapper.java b/src/main/resources/mapper/flow/dao/ResultScoreMapper.java deleted file mode 100644 index 496f008b..00000000 --- a/src/main/resources/mapper/flow/dao/ResultScoreMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 业绩详情评分表 服务类 -*

-* -* @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 selectResultScoreById(@Param("id")Long id); - - - Long insertResultScore(ResultScore resultScore); - - - int updateResultScoreById(ResultScore resultScore); - - - int updateCoverResultScoreById(ResultScore resultScore); - - - int deleteResultScoreById(@Param("id")Long id); - - -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/StaffRoleDepartmentMapper.java b/src/main/resources/mapper/flow/dao/StaffRoleDepartmentMapper.java deleted file mode 100644 index 50399f31..00000000 --- a/src/main/resources/mapper/flow/dao/StaffRoleDepartmentMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流转关系表 服务类 -*

-* -* @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 selectStaffRoleDepartmentById(@Param("id")Long id); - - - Long insertStaffRoleDepartment(StaffRoleDepartment staffRoleDepartment); - - - int updateStaffRoleDepartmentById(StaffRoleDepartment staffRoleDepartment); - - - int updateCoverStaffRoleDepartmentById(StaffRoleDepartment staffRoleDepartment); - - - int deleteStaffRoleDepartmentById(@Param("id")Long id); - - - List selectStaffRoleDepartmentByStaffRoleId(@Param("staffRoleId") Long staffRoleId); - - StaffRoleDepartment selectStaffRoleDepartmentByDepartmentId(@Param("departmentId") Long departmentId); - - StaffRoleDepartment selectStaffRoleDepartmentByDepartmentIdRoleIds(@Param("departmentId") Long departmentId, @Param("ids") List ids); - - void deleteStaffRoleDepartment(@Param("id") Long id); - - List selectStaffRoleDepartmentByStaffRoleIdDepartments(@Param("staffRoleId") Long staffRoleId, @Param("departments") List departments); -} \ No newline at end of file diff --git a/src/main/resources/mapper/flow/dao/StaffRoleMapper.java b/src/main/resources/mapper/flow/dao/StaffRoleMapper.java deleted file mode 100644 index b236701a..00000000 --- a/src/main/resources/mapper/flow/dao/StaffRoleMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lz.modules.flow.dao; -/** -*

-* 流转关系表 服务类 -*

-* -* @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 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 selectByRole(@Param("departmentLevel") String departmentLevel); - - List selectByCondition(@Param("page") IPage page, @Param("params") Map params); -} \ No newline at end of file diff --git a/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java b/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java index d546013a..27d26931 100644 --- a/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java +++ b/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.annotations.TableName;\n"; - content += "import com.baomidou.mybatisplus.enums.IdType;\n"; + content += "import com.baomidou.mybatisplus.annotation.TableId;\n"; + content += "import com.baomidou.mybatisplus.annotation.TableName;\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.annotations.TableName;\n"; - content += "import com.baomidou.mybatisplus.enums.IdType;\n"; + content += "import com.baomidou.mybatisplus.annotation.TableId;\n"; + content += "import com.baomidou.mybatisplus.annotation.TableName;\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 += "}";