Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

src/main/java/com/lz/common/utils/R.java

@@ -24,7 +24,7 @@ public class R extends HashMap<String, Object> {
 	private boolean isSuccess;
 
 	public R() {
-		put("code", 0);
+		put("code", 200);
 		put("msg", "success");
 		this.isSuccess = true ;
 	}

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

@@ -8,7 +8,9 @@ package com.lz.modules.flow.dao;
 * @since 2020-10-13
 */
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lz.modules.flow.entity.EvaluationGroup;
+import com.lz.modules.flow.req.EvaluationGroupReq;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,4 +35,5 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
 	int deleteEvaluationGroupById(@Param("id")Long id);
 
 
+	List<EvaluationGroup> seleteEvaluationGroupByReq(@Param("page") IPage page, @Param("req") EvaluationGroupReq req);
 }

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

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

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

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

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

@@ -9,8 +9,12 @@ package com.lz.modules.flow.dao;
 */
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lz.modules.flow.entity.ResultGrade;
+import com.lz.modules.flow.model.ResultGradeDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface ResultGradeMapper extends BaseMapper<ResultGrade> {
 
@@ -30,4 +34,5 @@ public interface ResultGradeMapper extends BaseMapper<ResultGrade> {
 	int deleteResultGradeById(@Param("id")Long id);
 
 
+	List<ResultGradeDto> selectResultGradeByGroupId(Long gid);
 }

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

@@ -9,6 +9,7 @@ package com.lz.modules.flow.dao;
 */
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lz.modules.flow.entity.ResultModel;
+import com.lz.modules.flow.model.ResultModelDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -34,4 +35,8 @@ public interface ResultModelMapper extends BaseMapper<ResultModel> {
 
 
     List<ResultModel> selectResultModelByGroupId(@Param("id") Long id);
+
+    List<ResultModelDto> selectResultDtoByGroupId(Long id);
+
+	int deleteResultModelByGroupId(Long id);
 }

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

@@ -8,9 +8,15 @@ package com.lz.modules.flow.dao;
 * @since 2020-10-16
 */
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lz.modules.flow.entity.ResultTagetLib;
+import com.lz.modules.flow.model.ResultTagetLibDto;
+import com.lz.modules.flow.req.ResultTagetLibSearchReq;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface ResultTagetLibMapper extends BaseMapper<ResultTagetLib> {
 
@@ -30,4 +36,9 @@ public interface ResultTagetLibMapper extends BaseMapper<ResultTagetLib> {
 	int deleteResultTagetLibById(@Param("id")Long id);
 
 
+    List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id);
+
+    List<ResultTagetLibDto> selectByCondition(@Param("page") IPage page, @Param("req") ResultTagetLibSearchReq req);
+
+	int deleteResultTagetLibByModelId(Long id);
 }

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

@@ -34,7 +34,7 @@ public class EvaluationGroup implements java.io.Serializable {
     private String name;
     //绩效管理员ID，system_user,id，逗号隔开
     @ApiModelProperty(value = "绩效管理员ID，system_user,id，逗号隔开", name = "managerIds")
-    private Long managerIds;
+    private String managerIds;
     //参与部门id，逗号隔开
     @ApiModelProperty(value = "参与部门id，逗号隔开", name = "depIds")
     private String depIds;
@@ -123,14 +123,14 @@ public class EvaluationGroup implements java.io.Serializable {
      * 绩效管理员ID，system_user,id，逗号隔开 
      * @return
      */
-    public Long getManagerIds() {
+    public String getManagerIds() {
         return managerIds;
     }
     /**
      * 绩效管理员ID，system_user,id，逗号隔开 
      * @param managerIds
      */
-    public void setManagerIds(Long managerIds) {
+    public void setManagerIds(String managerIds) {
         this.managerIds = managerIds;
     }
 

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

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

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

@@ -10,9 +10,9 @@ import java.math.BigDecimal;
 import java.util.Date;
 /**
 * <p>
-* </p>*考核模板表
+* </p>*考核维度表
 * @author quyixiao
-* @since 2020-10-16
+* @since 2020-10-19
 */
 
 @Data
@@ -40,13 +40,13 @@ public class ResultModel implements java.io.Serializable {
     //1:业绩 2：文化价值观
     @ApiModelProperty(value = "1:业绩 2：文化价值观", name = "type")
     private Integer type;
-    //权重
+    //权重 0不限权重
-    @ApiModelProperty(value = "权重", name = "weight")
+    @ApiModelProperty(value = "权重 0不限权重", name = "weight")
     private BigDecimal weight;
     //考核子项目个数最大限制
     @ApiModelProperty(value = "考核子项目个数最大限制", name = "maxCount")
     private Integer maxCount;
-    //lz_result_calculate 的id
+    //lz_result_calculate 的id，计算法方法id
     @ApiModelProperty(value = "lz_result_calculate 的id，计算法方法id", name = "calculateId")
     private Long calculateId;
     //等级开关0关闭，1开启
@@ -55,6 +55,9 @@ public class ResultModel implements java.io.Serializable {
     //使用的哪个等级。等级组id，lz_result_grade的group_id
     @ApiModelProperty(value = "使用的哪个等级。等级组id，lz_result_grade的group_id", name = "gradeGroupId")
     private Long gradeGroupId;
+    //排序
+    @ApiModelProperty(value = "排序", name = "orderBy")
+    private Integer orderBy;
     /**
      *  
      * @return
@@ -161,14 +164,14 @@ public class ResultModel implements java.io.Serializable {
     }
 
     /**
-     * 权重 
+     * 权重 0不限权重 
      * @return
      */
     public BigDecimal getWeight() {
         return weight;
     }
     /**
-     * 权重 
+     * 权重 0不限权重 
      * @param weight
      */
     public void setWeight(BigDecimal weight) {
@@ -191,14 +194,14 @@ public class ResultModel implements java.io.Serializable {
     }
 
     /**
-     * lz_result_calculate 的id 
+     * lz_result_calculate 的id，计算法方法id 
      * @return
      */
     public Long getCalculateId() {
         return calculateId;
     }
     /**
-     * lz_result_calculate 的id 
+     * lz_result_calculate 的id，计算法方法id 
      * @param calculateId
      */
     public void setCalculateId(Long calculateId) {
@@ -235,6 +238,21 @@ public class ResultModel implements java.io.Serializable {
         this.gradeGroupId = gradeGroupId;
     }
 
+    /**
+     * 排序 
+     * @return
+     */
+    public Integer getOrderBy() {
+        return orderBy;
+    }
+    /**
+     * 排序 
+     * @param orderBy
+     */
+    public void setOrderBy(Integer orderBy) {
+        this.orderBy = orderBy;
+    }
+
     @Override
     public String toString() {
         return "ResultModel{" +
@@ -250,6 +268,7 @@ public class ResultModel implements java.io.Serializable {
                 ",calculateId=" + calculateId +
                 ",gradeStatus=" + gradeStatus +
                 ",gradeGroupId=" + gradeGroupId +
+                ",orderBy=" + orderBy +
                 "}";
     }
 }

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

@@ -12,7 +12,7 @@ import java.util.Date;
 * <p>
 * </p>*考核指标库表
 * @author quyixiao
-* @since 2020-10-16
+* @since 2020-10-19
 */
 
 @Data
@@ -43,6 +43,9 @@ public class ResultTagetLib implements java.io.Serializable {
     //考核标准，关键结果
     @ApiModelProperty(value = "考核标准，关键结果", name = "keyResult")
     private String keyResult;
+    //排序
+    @ApiModelProperty(value = "排序", name = "orderBy")
+    private Integer orderBy;
     /**
      *  
      * @return
@@ -163,6 +166,21 @@ public class ResultTagetLib implements java.io.Serializable {
         this.keyResult = keyResult;
     }
 
+    /**
+     * 排序 
+     * @return
+     */
+    public Integer getOrderBy() {
+        return orderBy;
+    }
+    /**
+     * 排序 
+     * @param orderBy
+     */
+    public void setOrderBy(Integer orderBy) {
+        this.orderBy = orderBy;
+    }
+
     @Override
     public String toString() {
         return "ResultTagetLib{" +
@@ -174,6 +192,7 @@ public class ResultTagetLib implements java.io.Serializable {
                 ",modelId=" + modelId +
                 ",weight=" + weight +
                 ",keyResult=" + keyResult +
+                ",orderBy=" + orderBy +
                 "}";
     }
 }

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

@@ -10,7 +10,7 @@ import lombok.Data;
 */
 
 @Data
-@ApiModel(value = "考评组表")
+@ApiModel(value = "考评组Dto")
 public class EvaluationGroupDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

@@ -10,7 +10,7 @@ import lombok.Data;
 */
 
 @Data
-@ApiModel(value = "发起考核考，核组人员对应关系表")
+@ApiModel(value = "发起考核考，核组人员对应关系Dto")
 public class EvaluationStartStaffDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

@@ -10,7 +10,7 @@ import lombok.Data;
 */
 
 @Data
-@ApiModel(value = "流程审批表")
+@ApiModel(value = "流程审批Dto")
 public class FlowApprovalRoleDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

@@ -10,7 +10,7 @@ import lombok.Data;
 */
 
 @Data
-@ApiModel(value = "变动记录表")
+@ApiModel(value = "变动记录Dto")
 public class FlowChangeDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

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

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

@@ -10,7 +10,7 @@ import lombok.Data;
 */
 
 @Data
-@ApiModel(value = "流程图，lz_flow的父")
+@ApiModel(value = "流程图Dto")
 public class FlowChartDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

@@ -10,7 +10,7 @@ import lombok.Data;
 */
 
 @Data
-@ApiModel(value = "流程节点权限对应关系表")
+@ApiModel(value = "流程节点权限对应关系Dto")
 public class FlowChartRoleDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

@@ -11,7 +11,7 @@ import java.util.Date;
 */
 
 @Data
-@ApiModel(value = "发起考核表")
+@ApiModel(value = "发起考核Dto")
 public class FlowStartDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

@@ -18,7 +18,7 @@ import java.util.Date;
 */
 
 @Data
-@ApiModel(value = "考核维度")
+@ApiModel(value = "考核维度Dto")
 public class ResultDimensionDto implements java.io.Serializable {
     //
     @TableId(value = "id", type = IdType.AUTO)

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

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
 */
 
 @Data
-@ApiModel(value = "等级表")
+@ApiModel(value = "等级Dto")
 public class ResultGradeDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

@@ -4,16 +4,17 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
 * <p>
-* </p>*考核模板表
+* </p>*考核维度表
 * @author quyixiao
-* @since 2020-10-16
+* @since 2020-10-19
 */
 
 @Data
-@ApiModel(value = "考核维度表")
+@ApiModel(value = "考核维度表Dto")
 public class ResultModelDto {
     //
     @ApiModelProperty(value = "", name = "id")
@@ -27,13 +28,13 @@ public class ResultModelDto {
     //1:业绩 2：文化价值观
     @ApiModelProperty(value = "1:业绩 2：文化价值观", name = "type")
     private Integer type;
-    //权重
+    //权重 0不限权重
-    @ApiModelProperty(value = "权重", name = "weight")
+    @ApiModelProperty(value = "权重 0不限权重", name = "weight")
     private BigDecimal weight;
     //考核子项目个数最大限制
     @ApiModelProperty(value = "考核子项目个数最大限制", name = "maxCount")
     private Integer maxCount;
-    //lz_result_calculate 的id
+    //lz_result_calculate 的id，计算法方法id
     @ApiModelProperty(value = "lz_result_calculate 的id，计算法方法id", name = "calculateId")
     private Long calculateId;
     //等级开关0关闭，1开启
@@ -42,6 +43,11 @@ public class ResultModelDto {
     //使用的哪个等级。等级组id，lz_result_grade的group_id
     @ApiModelProperty(value = "使用的哪个等级。等级组id，lz_result_grade的group_id", name = "gradeGroupId")
     private Long gradeGroupId;
+    //排序
+    @ApiModelProperty(value = "排序", name = "orderBy")
+    private Integer orderBy;
+    @ApiModelProperty(value = "已添加的指标", name = "tagetLibs")
+    private List<ResultTagetLibDto> tagetLibs;
     /**
      *  
      * @return
@@ -103,14 +109,14 @@ public class ResultModelDto {
     }
 
     /**
-     * 权重 
+     * 权重 0不限权重 
      * @return
      */
     public BigDecimal getWeight() {
         return weight;
     }
     /**
-     * 权重 
+     * 权重 0不限权重 
      * @param weight
      */
     public void setWeight(BigDecimal weight) {
@@ -133,14 +139,14 @@ public class ResultModelDto {
     }
 
     /**
-     * lz_result_calculate 的id 
+     * lz_result_calculate 的id，计算法方法id 
      * @return
      */
     public Long getCalculateId() {
         return calculateId;
     }
     /**
-     * lz_result_calculate 的id 
+     * lz_result_calculate 的id，计算法方法id 
      * @param calculateId
      */
     public void setCalculateId(Long calculateId) {
@@ -177,6 +183,21 @@ public class ResultModelDto {
         this.gradeGroupId = gradeGroupId;
     }
 
+    /**
+     * 排序 
+     * @return
+     */
+    public Integer getOrderBy() {
+        return orderBy;
+    }
+    /**
+     * 排序 
+     * @param orderBy
+     */
+    public void setOrderBy(Integer orderBy) {
+        this.orderBy = orderBy;
+    }
+
     @Override
     public String toString() {
         return "ResultModel{" +
@@ -189,6 +210,7 @@ public class ResultModelDto {
                 ",calculateId=" + calculateId +
                 ",gradeStatus=" + gradeStatus +
                 ",gradeGroupId=" + gradeGroupId +
+                ",orderBy=" + orderBy +
                 "}";
     }
 }

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

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
 */
 
 @Data
-@ApiModel(value = "业绩详情评分表")
+@ApiModel(value = "业绩详情评分Dto")
 public class ResultScoreDto {
     //
     @ApiModelProperty(value = "", name = "id")

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

@@ -9,11 +9,11 @@ import java.math.BigDecimal;
 * <p>
 * </p>*考核指标库表
 * @author quyixiao
-* @since 2020-10-16
+* @since 2020-10-19
 */
 
 @Data
-@ApiModel(value = "考核指标库表")
+@ApiModel(value = "考核指标库表Dto")
 public class ResultTagetLibDto {
     //
     @ApiModelProperty(value = "", name = "id")
@@ -30,6 +30,9 @@ public class ResultTagetLibDto {
     //考核标准，关键结果
     @ApiModelProperty(value = "考核标准，关键结果", name = "keyResult")
     private String keyResult;
+    //排序
+    @ApiModelProperty(value = "排序", name = "orderBy")
+    private Integer orderBy;
     /**
      *  
      * @return
@@ -105,6 +108,21 @@ public class ResultTagetLibDto {
         this.keyResult = keyResult;
     }
 
+    /**
+     * 排序 
+     * @return
+     */
+    public Integer getOrderBy() {
+        return orderBy;
+    }
+    /**
+     * 排序 
+     * @param orderBy
+     */
+    public void setOrderBy(Integer orderBy) {
+        this.orderBy = orderBy;
+    }
+
     @Override
     public String toString() {
         return "ResultTagetLib{" +
@@ -113,6 +131,7 @@ public class ResultTagetLibDto {
                 ",modelId=" + modelId +
                 ",weight=" + weight +
                 ",keyResult=" + keyResult +
+                ",orderBy=" + orderBy +
                 "}";
     }
 }

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "考评组表")
+@ApiModel(value = "考评组搜索Req")
 public class EvaluationGroupReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")
@@ -30,29 +30,16 @@ public class EvaluationGroupReq implements java.io.Serializable {
     //
     private Long id;
     //
-    @ApiModelProperty(value = "", name = "isDelete")
+    @ApiModelProperty(value = "起始时间", name = "startTime")
-    private Integer isDelete;
+    private String startTime;
     //
-    @ApiModelProperty(value = "", name = "gmtCreate")
+    @ApiModelProperty(value = "结束时间", name = "endTime")
-    private Date gmtCreate;
+    private String endTime;
-    //
-    @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;
-    //参与部门id，逗号隔开
-    @ApiModelProperty(value = "参与部门id，逗号隔开", name = "depIds")
-    private Long depIds;
-    //参与考核员工staff_id，逗号隔开
-    @ApiModelProperty(value = "参与考核员工staff_id，逗号隔开", name = "staffIds")
-    private Long staffIds;
-    //排除人员ids，逗号隔开
-    @ApiModelProperty(value = "排除人员ids，逗号隔开", name = "outIds")
-    private Long outIds;
     /**
      *  
      * @return
@@ -68,50 +55,7 @@ public class EvaluationGroupReq implements java.io.Serializable {
         this.id = id;
     }
 
-    /**
-     *  
-     * @return
-     */
-    public Integer getIsDelete() {
-        return isDelete;
-    }
-    /**
-     *  
-     * @param isDelete
-     */
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
 
-    /**
-     *  
-     * @return
-     */
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-    /**
-     *  
-     * @param gmtCreate
-     */
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    /**
-     *  
-     * @return
-     */
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-    /**
-     *  
-     * @param gmtModified
-     */
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
 
     /**
      *  
@@ -128,78 +72,15 @@ public class EvaluationGroupReq implements java.io.Serializable {
         this.name = name;
     }
 
-    /**
-     * 绩效管理员ID，system_user,id，逗号隔开 
-     * @return
-     */
-    public Long getManagerIds() {
-        return managerIds;
-    }
-    /**
-     * 绩效管理员ID，system_user,id，逗号隔开 
-     * @param managerIds
-     */
-    public void setManagerIds(Long managerIds) {
-        this.managerIds = managerIds;
-    }
 
-    /**
-     * 参与部门id，逗号隔开 
-     * @return
-     */
-    public Long getDepIds() {
-        return depIds;
-    }
-    /**
-     * 参与部门id，逗号隔开 
-     * @param depIds
-     */
-    public void setDepIds(Long depIds) {
-        this.depIds = depIds;
-    }
-
-    /**
-     * 参与考核员工staff_id，逗号隔开 
-     * @return
-     */
-    public Long getStaffIds() {
-        return staffIds;
-    }
-    /**
-     * 参与考核员工staff_id，逗号隔开 
-     * @param staffIds
-     */
-    public void setStaffIds(Long staffIds) {
-        this.staffIds = staffIds;
-    }
-
-    /**
-     * 排除人员ids，逗号隔开 
-     * @return
-     */
-    public Long getOutIds() {
-        return outIds;
-    }
-    /**
-     * 排除人员ids，逗号隔开 
-     * @param outIds
-     */
-    public void setOutIds(Long outIds) {
-        this.outIds = outIds;
-    }
 
     @Override
     public String toString() {
         return "EvaluationGroup{" +
                 ",id=" + id +
-                ",isDelete=" + isDelete +
+                ",startTime=" + startTime +
-                ",gmtCreate=" + gmtCreate +
+                ",endTime=" + endTime +
-                ",gmtModified=" + gmtModified +
                 ",name=" + name +
-                ",managerIds=" + managerIds +
-                ",depIds=" + depIds +
-                ",staffIds=" + staffIds +
-                ",outIds=" + outIds +
                 "}";
     }
 }

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "发起考核考，核组人员对应关系表")
+@ApiModel(value = "发起考核考，核组人员对应关系Req")
 public class EvaluationStartStaffReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "流程审批表")
+@ApiModel(value = "流程审批Req")
 public class FlowApprovalRoleReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "变动记录表")
+@ApiModel(value = "变动记录Req")
 public class FlowChangeReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

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

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "流程图，lz_flow的父")
+@ApiModel(value = "流程图Req")
 public class FlowChartReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "流程节点权限对应关系表")
+@ApiModel(value = "流程节点权限对应关系Req")
 public class FlowChartRoleReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "发起考核表")
+@ApiModel(value = "发起考核Req")
 public class FlowStartReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "模板计算公式")
+@ApiModel(value = "模板计算公式Req")
 public class ResultCalculateReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "考核维度表")
+@ApiModel(value = "考核维度Req")
 public class ResultDimensionReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -18,7 +18,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "等级表")
+@ApiModel(value = "等级Req")
 public class ResultGradeReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -11,14 +11,14 @@ import java.util.Date;
 /**
 * <p>
 * 菜单权限表
-* </p>*考核模板表
+* </p>*考核维度表
 * @author quyixiao
-* @since 2020-10-16
+* @since 2020-10-19
 */
 
 
 @Data
-@ApiModel(value = "考核维度表")
+@ApiModel(value = "考核维度表Req")
 public class ResultModelReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")
@@ -49,13 +49,13 @@ public class ResultModelReq implements java.io.Serializable {
     //1:业绩 2：文化价值观
     @ApiModelProperty(value = "1:业绩 2：文化价值观", name = "type")
     private Integer type;
-    //权重
+    //权重 0不限权重
-    @ApiModelProperty(value = "权重", name = "weight")
+    @ApiModelProperty(value = "权重 0不限权重", name = "weight")
     private BigDecimal weight;
     //考核子项目个数最大限制
     @ApiModelProperty(value = "考核子项目个数最大限制", name = "maxCount")
     private Integer maxCount;
-    //lz_result_calculate 的id
+    //lz_result_calculate 的id，计算法方法id
     @ApiModelProperty(value = "lz_result_calculate 的id，计算法方法id", name = "calculateId")
     private Long calculateId;
     //等级开关0关闭，1开启
@@ -64,6 +64,9 @@ public class ResultModelReq implements java.io.Serializable {
     //使用的哪个等级。等级组id，lz_result_grade的group_id
     @ApiModelProperty(value = "使用的哪个等级。等级组id，lz_result_grade的group_id", name = "gradeGroupId")
     private Long gradeGroupId;
+    //排序
+    @ApiModelProperty(value = "排序", name = "orderBy")
+    private Integer orderBy;
     /**
      *  
      * @return
@@ -170,14 +173,14 @@ public class ResultModelReq implements java.io.Serializable {
     }
 
     /**
-     * 权重 
+     * 权重 0不限权重 
      * @return
      */
     public BigDecimal getWeight() {
         return weight;
     }
     /**
-     * 权重 
+     * 权重 0不限权重 
      * @param weight
      */
     public void setWeight(BigDecimal weight) {
@@ -200,14 +203,14 @@ public class ResultModelReq implements java.io.Serializable {
     }
 
     /**
-     * lz_result_calculate 的id 
+     * lz_result_calculate 的id，计算法方法id 
      * @return
      */
     public Long getCalculateId() {
         return calculateId;
     }
     /**
-     * lz_result_calculate 的id 
+     * lz_result_calculate 的id，计算法方法id 
      * @param calculateId
      */
     public void setCalculateId(Long calculateId) {
@@ -244,6 +247,21 @@ public class ResultModelReq implements java.io.Serializable {
         this.gradeGroupId = gradeGroupId;
     }
 
+    /**
+     * 排序 
+     * @return
+     */
+    public Integer getOrderBy() {
+        return orderBy;
+    }
+    /**
+     * 排序 
+     * @param orderBy
+     */
+    public void setOrderBy(Integer orderBy) {
+        this.orderBy = orderBy;
+    }
+
     @Override
     public String toString() {
         return "ResultModel{" +
@@ -259,6 +277,7 @@ public class ResultModelReq implements java.io.Serializable {
                 ",calculateId=" + calculateId +
                 ",gradeStatus=" + gradeStatus +
                 ",gradeGroupId=" + gradeGroupId +
+                ",orderBy=" + orderBy +
                 "}";
     }
 }

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

@@ -18,7 +18,7 @@ import java.util.Date;
 
 
 @Data
-@ApiModel(value = "业绩详情评分表")
+@ApiModel(value = "业绩详情评分Req")
 public class ResultScoreReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")

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

@@ -13,12 +13,12 @@ import java.util.Date;
 * 菜单权限表
 * </p>*考核指标库表
 * @author quyixiao
-* @since 2020-10-16
+* @since 2020-10-19
 */
 
 
 @Data
-@ApiModel(value = "考核指标库表")
+@ApiModel(value = "考核指标库表Req")
 public class ResultTagetLibReq implements java.io.Serializable {
   
     @ApiModelProperty(value = "currPage", name = "当前页码")
@@ -52,6 +52,9 @@ public class ResultTagetLibReq implements java.io.Serializable {
     //考核标准，关键结果
     @ApiModelProperty(value = "考核标准，关键结果", name = "keyResult")
     private String keyResult;
+    //排序
+    @ApiModelProperty(value = "排序", name = "orderBy")
+    private Integer orderBy;
     /**
      *  
      * @return
@@ -172,6 +175,21 @@ public class ResultTagetLibReq implements java.io.Serializable {
         this.keyResult = keyResult;
     }
 
+    /**
+     * 排序 
+     * @return
+     */
+    public Integer getOrderBy() {
+        return orderBy;
+    }
+    /**
+     * 排序 
+     * @param orderBy
+     */
+    public void setOrderBy(Integer orderBy) {
+        this.orderBy = orderBy;
+    }
+
     @Override
     public String toString() {
         return "ResultTagetLib{" +
@@ -183,6 +201,7 @@ public class ResultTagetLibReq implements java.io.Serializable {
                 ",modelId=" + modelId +
                 ",weight=" + weight +
                 ",keyResult=" + keyResult +
+                ",orderBy=" + orderBy +
                 "}";
     }
 }

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

@@ -0,0 +1,114 @@
+package com.lz.modules.flow.req;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* <p>
+* 菜单权限表
+* </p>*考核指标库表
+* @author quyixiao
+* @since 2020-10-16
+*/
+
+
+@Data
+@ApiModel(value = "搜索指标Req")
+public class ResultTagetLibSearchReq implements java.io.Serializable {
+  
+    @ApiModelProperty(value = "currPage", name = "当前页码")
+    private int currPage = 1;
+    @ApiModelProperty(value = "pageSize", name = "每页返回条数")
+    private int pageSize = 10;
+
+    //
+    private Long id;
+    //
+
+    //指标名称
+    @ApiModelProperty(value = "指标名称", name = "name")
+    private String name;
+    //考核维度ID，result_model。如果id为0表示为指标库数据，其他地方可选
+    @ApiModelProperty(value = "考核维度ID，result_model。如果id为0表示为指标库数据，其他地方可选", name = "modelId")
+    private Long modelId;
+    //权重
+    @ApiModelProperty(value = "权重", name = "weight")
+    private BigDecimal weight;
+
+    /**
+     *  
+     * @return
+     */
+    public Long getId() {
+        return id;
+    }
+    /**
+     *  
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+
+
+    /**
+     * 指标名称 
+     * @return
+     */
+    public String getName() {
+        return name;
+    }
+    /**
+     * 指标名称 
+     * @param name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 考核维度ID，result_model。如果id为0表示为指标库数据，其他地方可选 
+     * @return
+     */
+    public Long getModelId() {
+        return modelId;
+    }
+    /**
+     * 考核维度ID，result_model。如果id为0表示为指标库数据，其他地方可选 
+     * @param modelId
+     */
+    public void setModelId(Long modelId) {
+        this.modelId = modelId;
+    }
+
+    /**
+     * 权重 
+     * @return
+     */
+    public BigDecimal getWeight() {
+        return weight;
+    }
+    /**
+     * 权重 
+     * @param weight
+     */
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
+
+
+    @Override
+    public String toString() {
+        return "ResultTagetLib{" +
+                ",id=" + id +
+                ",name=" + name +
+                ",modelId=" + modelId +
+                ",weight=" + weight +
+                "}";
+    }
+}

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

@@ -1,7 +1,10 @@
 package com.lz.modules.flow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.lz.common.utils.PageUtils;
+import com.lz.common.utils.R;
 import com.lz.modules.flow.entity.EvaluationGroup;
+import com.lz.modules.flow.req.EvaluationGroupReq;
 
 import java.util.List;
 
@@ -29,10 +32,11 @@ public interface EvaluationGroupService extends IService<EvaluationGroup> {
 	int updateCoverEvaluationGroupById(EvaluationGroup evaluationGroup);
 
 
-	int deleteEvaluationGroupById(Long id);
+	R deleteEvaluationGroupById(Long id);
 
 	//获取参与考核的所有人员
 	List<String> selectAllStaffIdsByGroupId(Long id);
 
 
+	PageUtils selectEvaluationGroupByReq(EvaluationGroupReq req);
 }

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

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

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

@@ -3,6 +3,8 @@ package com.lz.modules.flow.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lz.modules.flow.entity.ResultDimension;
 
+import java.util.List;
+
 /**
 * <p>
 * 考核维度表 服务类
@@ -30,4 +32,5 @@ public interface ResultDimensionService extends IService<ResultDimension> {
 	int deleteResultDimensionById(Long id);
 
 
+    List<ResultDimension> selectResultDimensionAll();
 }

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

@@ -2,6 +2,9 @@ package com.lz.modules.flow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lz.modules.flow.entity.ResultGrade;
+import com.lz.modules.flow.model.ResultGradeDto;
+
+import java.util.List;
 
 /**
 * <p>
@@ -30,4 +33,5 @@ public interface ResultGradeService extends IService<ResultGrade> {
 	int deleteResultGradeById(Long id);
 
 
+	List<ResultGradeDto> selectResultGradeByGroupId(Long gid);
 }

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

@@ -1,7 +1,9 @@
 package com.lz.modules.flow.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.lz.common.utils.R;
 import com.lz.modules.flow.entity.ResultModel;
+import com.lz.modules.flow.model.ResultModelDto;
 
 import java.util.List;
 
@@ -29,8 +31,12 @@ public interface ResultModelService extends IService<ResultModel> {
 	int updateCoverResultModelById(ResultModel resultModel);
 
 
-	int deleteResultModelById(Long id);
+	R deleteResultModelById(Long id);
 
 
     List<ResultModel> selectResultModelByGroupId(Long id);
+
+    List<ResultModelDto> selectResultDtoByGroupId(Long id);
+
+	R deleteResultModelByGroupId(Long id);
 }

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

@@ -1,9 +1,14 @@
 package com.lz.modules.flow.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lz.common.utils.ISelect;
+import com.lz.common.utils.PageUtils;
+import com.lz.common.utils.R;
 import com.lz.modules.app.service.StaffService;
 import com.lz.modules.flow.dao.EvaluationGroupMapper;
 import com.lz.modules.flow.entity.EvaluationGroup;
+import com.lz.modules.flow.req.EvaluationGroupReq;
 import com.lz.modules.flow.service.EvaluationGroupService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,8 +65,16 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 
 
 	@Override
-	public int deleteEvaluationGroupById(Long id){
+	public R deleteEvaluationGroupById(Long id){
-		return evaluationGroupMapper.deleteEvaluationGroupById(id);
+		evaluationGroupMapper.deleteEvaluationGroupById(id);
+		return R.ok();
+	}
+
+	@Override
+	public PageUtils selectEvaluationGroupByReq(EvaluationGroupReq req){
+		PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize())
+				.doSelect(page -> evaluationGroupMapper.seleteEvaluationGroupByReq(page, req));
+		return pageUtils;
 	}
 
 

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

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

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

@@ -7,6 +7,8 @@ import com.lz.modules.flow.service.ResultDimensionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * <p>
 * 考核维度表 服务类
@@ -58,6 +60,11 @@ public class ResultDimensionServiceImpl extends ServiceImpl<ResultDimensionMappe
 		return resultDimensionMapper.deleteResultDimensionById(id);
 	}
 
+	@Override
+	public List<ResultDimension> selectResultDimensionAll(){
+		return resultDimensionMapper.selectResultDimensionAll();
+	}
+
 
 
 }

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

@@ -3,10 +3,13 @@ package com.lz.modules.flow.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lz.modules.flow.dao.ResultGradeMapper;
 import com.lz.modules.flow.entity.ResultGrade;
+import com.lz.modules.flow.model.ResultGradeDto;
 import com.lz.modules.flow.service.ResultGradeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * <p>
 * 等级表 服务类
@@ -58,6 +61,11 @@ public class ResultGradeServiceImpl extends ServiceImpl<ResultGradeMapper, Resul
 		return resultGradeMapper.deleteResultGradeById(id);
 	}
 
+	@Override
+	public List<ResultGradeDto> selectResultGradeByGroupId(Long gid){
+		return resultGradeMapper.selectResultGradeByGroupId(gid);
+	}
+
 
 
 }

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

@@ -1,9 +1,13 @@
 package com.lz.modules.flow.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lz.common.utils.R;
 import com.lz.modules.flow.dao.ResultModelMapper;
 import com.lz.modules.flow.entity.ResultModel;
+import com.lz.modules.flow.model.ResultModelDto;
 import com.lz.modules.flow.service.ResultModelService;
+import com.lz.modules.performance.service.ResultTagetLibService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,12 +23,16 @@ import java.util.List;
 */
 
 @Service
+@Slf4j
 public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, ResultModel> implements ResultModelService {
 
 
     @Autowired
 	private ResultModelMapper resultModelMapper;
 
+    @Autowired
+	private ResultTagetLibService resultTargetLibService;
+
 
 
 	@Override
@@ -56,8 +64,12 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 
 
 	@Override
-	public int deleteResultModelById(Long id){
+	public R deleteResultModelById(Long id){
-		return resultModelMapper.deleteResultModelById(id);
+		//
+		log.info("删除考核模板维度{}", id);
+		resultTargetLibService.deleteResultTagetLibByModelId(id);
+		resultModelMapper.deleteResultModelById(id);
+		return R.ok();
 	}
 
 	@Override
@@ -65,6 +77,20 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 		return resultModelMapper.selectResultModelByGroupId(id);
 	}
 
+	@Override
+	public List<ResultModelDto> selectResultDtoByGroupId(Long id){
+		return resultModelMapper.selectResultDtoByGroupId(id);
+	}
+
+	@Override
+	public R deleteResultModelByGroupId(Long id){
+		List<ResultModel> resultModels = selectResultModelByGroupId(id);
+		for (ResultModel model:resultModels
+			 ) {
+			deleteResultModelById(model.getId());
+		}
+		return R.ok();
+	}
 
 
 }

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

@@ -7,12 +7,12 @@ 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.entity.ResultModel;
 import com.lz.modules.flow.req.EvaluationGroupReq;
 import com.lz.modules.flow.service.EvaluationGroupService;
 import com.lz.modules.flow.service.FlowManagerService;
-import io.swagger.annotations.Api;
+import com.lz.modules.flow.service.ResultModelService;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,15 +31,19 @@ public class EvaluationGroupController {
 
 
 
+    @Autowired
+    private ResultModelService resultModelService;
 
 
 
 
 
-     @RequestMapping("/getById")
+     @PostMapping("/getById")
-     public R getById(@RequestBody EvaluationGroupReq evaluationGroupReq) {
+     @ApiOperation("获取考核组列表")
-         EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(evaluationGroupReq.getId());
+     @ApiResponses({@ApiResponse(code=200,message = "成功", response=EvaluationGroup.class)})
-        return R.ok().put("evaluationGroup",evaluationGroup);
+     public R getById(@RequestBody @ApiParam EvaluationGroupReq req) {
+         PageUtils pageUtils = evaluationGroupService.selectEvaluationGroupByReq(req);
+        return R.ok().put("data",pageUtils);
      }
 
 
@@ -58,9 +62,11 @@ public class EvaluationGroupController {
      }
 
 
-    @RequestMapping("/delete")
+    @GetMapping("/delete")
-    public R list(@RequestBody Long id) {
+    @ApiOperation("删除考核组")
-        evaluationGroupService.deleteEvaluationGroupById(id);
+    public R delete(@RequestParam @ApiParam("组id") Long id) {
-        return R.ok();
+        resultModelService.deleteResultModelByGroupId(id);
+        return evaluationGroupService.deleteEvaluationGroupById(id);
+        //return R.ok();
      }
 }

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

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

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

@@ -6,9 +6,12 @@ import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
 import com.lz.common.utils.StringUtil;
 import com.lz.modules.flow.entity.ResultDimension;
+import com.lz.modules.flow.model.ResultDimensionDto;
 import com.lz.modules.flow.service.ResultDimensionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,11 +19,12 @@ 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("/resultDimension")
-@Api(tags = "维度类型")
+@Api(tags = "考核维度类型")
 public class ResultDimensionController {
 
 
@@ -31,9 +35,11 @@ public class ResultDimensionController {
 
     @GetMapping("/getDimensions")
     @ApiOperation("获取维度类型")
+    @ApiResponses({@ApiResponse(code = 200, message = "成功", response = ResultDimensionDto.class)})
     public R getDimensions() {
-        //resultDimension = resultDimensionService.selectResultDimensionById(resultDimension.getId());
+        List<ResultDimension> resultDimensions
-        return R.ok();//.put("resultDimension",resultDimension);
+         = resultDimensionService.selectResultDimensionAll();
+        return R.ok().put("data",resultDimensions);
     }
 
      @RequestMapping("/getById")

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

@@ -6,17 +6,25 @@ import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
 import com.lz.common.utils.StringUtil;
 import com.lz.modules.flow.entity.ResultGrade;
+import com.lz.modules.flow.model.ResultGradeDto;
 import com.lz.modules.flow.service.ResultGradeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 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("/resultGrade")
+@Api(tags = "考核等级")
 public class ResultGradeController {
 
 
@@ -25,6 +33,13 @@ public class ResultGradeController {
 
 
 
+    @GetMapping("/get375")
+    @ApiOperation("获取3.75分等级列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "成功", response = ResultGradeDto.class)})
+    public R get375() {
+        List<ResultGradeDto> resultGradeDtos = resultGradeService.selectResultGradeByGroupId(1L);
+        return R.ok().put("data",resultGradeDtos);
+    }
 
 
      @RequestMapping("/getById")

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

@@ -1,38 +1,44 @@
 package com.lz.modules.performance.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
-import com.lz.common.utils.StringUtil;
 import com.lz.modules.flow.entity.ResultModel;
-import com.lz.modules.flow.model.FlowChartRoleDto;
+import com.lz.modules.flow.model.ResultModelDto;
+import com.lz.modules.flow.model.ResultTagetLibDto;
 import com.lz.modules.flow.service.ResultModelService;
+import com.lz.modules.performance.service.ResultTagetLibService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/resultModel")
-@Api(tags = "模板相关")
+@Api(tags = "考核模板相关")
 public class ResultModelController {
 
 
     @Autowired
     private ResultModelService resultModelService;
 
+    @Autowired
+    private ResultTagetLibService resultTagetLibService;
+
 
     @GetMapping("/getByGroupId")
     @ApiOperation(value="根据考核组id获取模板列表")
-    @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultModel.class)})
+    @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultModelDto.class)})
-    public R getByGroupId(@RequestParam Long id) {
+    public R getByGroupId(@RequestParam @ApiParam("考核组ID") Long id) {
 
-        List<ResultModel> resultModels = resultModelService.selectResultModelByGroupId(id);
+        //List<ResultModel> resultModels = resultModelService.selectResultModelByGroupId(id);
-        return R.ok().put("data",resultModels);
+        List<ResultModelDto> resultModelDtos = resultModelService.selectResultDtoByGroupId(id);
+        for (ResultModelDto dto:resultModelDtos
+             ) {
+            List<ResultTagetLibDto> libDtos = resultTagetLibService.selectResultTagetLibByModelId(dto.getId());
+            dto.setTagetLibs(libDtos);
+        }
+        return R.ok().put("data",resultModelDtos);
     }
 
 
@@ -51,16 +57,17 @@ public class ResultModelController {
 
 
      @PostMapping("/save")
-     @ApiOperation("新增模板")
+     @ApiOperation("新增模板中的考核维度")
      public R save(@RequestBody @ApiParam ResultModel resultModel) {
          resultModelService.insertResultModel(resultModel);
          return R.ok().put("data",resultModel);
      }
 
 
-    @RequestMapping("/delete")
+    @GetMapping("/delete")
-    public R delete(@RequestBody Long id) {
+    @ApiOperation("删除模板中的考核维度")
-        resultModelService.deleteResultModelById(id);
+    public R delete(@RequestParam @ApiParam("维度id") Long id) {
-        return R.ok();
+        return resultModelService.deleteResultModelById(id);
+
      }
 }

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

@@ -1,22 +1,19 @@
 package com.lz.modules.performance.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
-import com.lz.common.utils.StringUtil;
 import com.lz.modules.flow.entity.ResultTagetLib;
+import com.lz.modules.flow.model.ResultTagetLibDto;
+import com.lz.modules.flow.req.ResultTagetLibSearchReq;
 import com.lz.modules.performance.service.ResultTagetLibService;
+import io.swagger.annotations.*;
 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.Map;
 
 @RestController
 @RequestMapping("/resultTagetLib")
+@Api(tags = "考核指标相关")
 public class ResultTagetLibController {
 
 
@@ -27,6 +24,15 @@ public class ResultTagetLibController {
 
 
 
+    @PostMapping("/GetTargetLibs")
+    @ApiOperation("搜索指标库")
+    @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultTagetLibDto.class)})
+    public R GetTargetLibs(@RequestBody @ApiParam ResultTagetLibSearchReq req) {
+        PageUtils pageUtils = resultTagetLibService.selectResultTagetLibByReq(req);
+        return R.ok().put("data",pageUtils);
+    }
+
+
      @RequestMapping("/getById")
      public R getById(@RequestBody ResultTagetLib resultTagetLib) {
         resultTagetLib = resultTagetLibService.selectResultTagetLibById(resultTagetLib.getId());
@@ -41,15 +47,18 @@ public class ResultTagetLibController {
      }
 
 
-     @RequestMapping("/save")
+     @PostMapping("/save")
-        public R save(@RequestBody ResultTagetLib resultTagetLib) {
+     @ApiOperation("新增考核指标")
-        resultTagetLibService.insertResultTagetLib(resultTagetLib);
+     public R save(@RequestBody @ApiParam ResultTagetLib resultTagetLib) {
-        return R.ok();
+
+        return resultTagetLibService.insertResultTagetLib(resultTagetLib);
+
      }
 
 
-    @RequestMapping("/delete")
+    @GetMapping("/delete")
-    public R delete(@RequestBody Long id) {
+    @ApiOperation("删除指标")
+    public R delete(@RequestParam @ApiParam("指标id") Long id) {
         resultTagetLibService.deleteResultTagetLibById(id);
         return R.ok();
      }

src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java

@@ -1,7 +1,13 @@
 package com.lz.modules.performance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.lz.common.utils.PageUtils;
+import com.lz.common.utils.R;
 import com.lz.modules.flow.entity.ResultTagetLib;
+import com.lz.modules.flow.model.ResultTagetLibDto;
+import com.lz.modules.flow.req.ResultTagetLibSearchReq;
+
+import java.util.List;
 
 /**
 * <p>
@@ -18,7 +24,7 @@ public interface ResultTagetLibService extends IService<ResultTagetLib> {
 	ResultTagetLib selectResultTagetLibById(Long id);
 
 
-	Long insertResultTagetLib(ResultTagetLib resultTagetLib);
+	R insertResultTagetLib(ResultTagetLib resultTagetLib);
 
 
 	int updateResultTagetLibById(ResultTagetLib resultTagetLib);
@@ -30,4 +36,9 @@ public interface ResultTagetLibService extends IService<ResultTagetLib> {
 	int deleteResultTagetLibById(Long id);
 
 
+    List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id);
+
+    PageUtils selectResultTagetLibByReq(ResultTagetLibSearchReq req);
+
+	int deleteResultTagetLibByModelId(Long id);
 }

src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java

@@ -1,12 +1,22 @@
 package com.lz.modules.performance.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lz.common.utils.PageUtils;
+import com.lz.common.utils.R;
 import com.lz.modules.flow.dao.ResultTagetLibMapper;
+import com.lz.modules.flow.entity.ResultModel;
 import com.lz.modules.flow.entity.ResultTagetLib;
+import com.lz.modules.flow.model.ResultTagetLibDto;
+import com.lz.modules.flow.req.ResultTagetLibSearchReq;
+import com.lz.modules.flow.service.ResultModelService;
 import com.lz.modules.performance.service.ResultTagetLibService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
 * <p>
 * 考核指标库表 服务类
@@ -17,12 +27,15 @@ import org.springframework.stereotype.Service;
 */
 
 @Service
+@Slf4j
 public class ResultTagetLibServiceImpl extends ServiceImpl<ResultTagetLibMapper, ResultTagetLib> implements ResultTagetLibService {
 
 
     @Autowired
 	private ResultTagetLibMapper resultTagetLibMapper;
 
+	@Autowired
+	private ResultModelService resultModelService;
 
 
 	@Override
@@ -33,8 +46,27 @@ public class ResultTagetLibServiceImpl extends ServiceImpl<ResultTagetLibMapper,
 
 
 	@Override
-	public Long insertResultTagetLib(ResultTagetLib resultTagetLib){
+	public R insertResultTagetLib(ResultTagetLib resultTagetLib){
-		return resultTagetLibMapper.insertResultTagetLib(resultTagetLib);
+		log.info("新增指标{}", resultTagetLib);
+		if(resultTagetLib.getModelId().intValue() != 0){
+			//判断当前添加的权重有没有可能超过限制公共指标不做限制
+			ResultModel resultModel = resultModelService.selectResultModelById(resultTagetLib.getModelId());
+			if(resultModel == null){
+				return R.error("找不到相关考核模板");
+			}
+			List<ResultTagetLibDto> resultTagetLibDtos = selectResultTagetLibByModelId(resultModel.getId());
+			BigDecimal weight = BigDecimal.ZERO;
+			for(int i = 0; i < resultTagetLibDtos.size(); i++){
+				ResultTagetLibDto dto = resultTagetLibDtos.get(i);
+				weight = weight.add(dto.getWeight());
+			}
+			weight = weight.add(resultTagetLib.getWeight());
+			if(weight.compareTo(resultModel.getWeight()) > 0){
+				return R.error("权重之和不能超过" + (resultModel.getWeight().multiply(new BigDecimal(100)) + "%" ));
+			}
+		}
+		resultTagetLibMapper.insertResultTagetLib(resultTagetLib);
+		return R.ok().put("data", resultTagetLib);
 	}
 
 
@@ -58,6 +90,25 @@ public class ResultTagetLibServiceImpl extends ServiceImpl<ResultTagetLibMapper,
 		return resultTagetLibMapper.deleteResultTagetLibById(id);
 	}
 
+	@Override
+	public List<ResultTagetLibDto> selectResultTagetLibByModelId(Long id){
+		return resultTagetLibMapper.selectResultTagetLibByModelId(id);
+	}
+
+	@Override
+	public PageUtils selectResultTagetLibByReq(ResultTagetLibSearchReq req){
+		PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect(
+				page -> resultTagetLibMapper.selectByCondition(page, req)
+		);
+		return pageUtils;
+	}
+
+	@Override
+	public int deleteResultTagetLibByModelId(Long id){
+		log.info("删除模板下面的指标，模板维度id={}", id);
+		return resultTagetLibMapper.deleteResultTagetLibByModelId(id);
+	}
+
 
 
 }

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

@@ -89,6 +89,13 @@
         update lz_evaluation_group set is_delete = 1 where id=#{id} limit 1  
     </update>
 
+    <select id="seleteEvaluationGroupByReq" resultType="EvaluationGroup" >
+        select * from lz_evaluation_group  where is_delete = 0
+        <if test="req.startTime != null"><![CDATA[and gmt_create > #{req.startTime}]]></if>
+        <if test="req.endTime != null"><![CDATA[and gmt_create < #{req.endTime}]]></if>
+        <if test="req.name != null and req.name != ''">and name like concat('%', #{req.name} '%') </if>
+    </select>
+
 
 </mapper>
 

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

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

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

@@ -69,5 +69,9 @@
         update lz_result_dimension set is_delete = 1 where id=#{id} limit 1  
     </update>
 
+    <select id="selectResultDimensionAll" resultType="ResultDimension" >
+        select * from lz_result_dimension  where is_delete = 0
+    </select>
+
 </mapper>
 

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

@@ -89,5 +89,9 @@
         update lz_result_grade set is_delete = 1 where id=#{id} limit 1  
     </update>
 
+    <select id="selectResultGradeByGroupId" resultType="com.lz.modules.flow.model.ResultGradeDto" >
+        select * from lz_result_grade  where group_id=#{gid} and is_delete = 0
+    </select>
+
 </mapper>
 

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

@@ -16,12 +16,13 @@
         <result column="calculate_id" property="calculateId"/>
         <result column="grade_status" property="gradeStatus"/>
         <result column="grade_group_id" property="gradeGroupId"/>
+        <result column="order_by" property="orderBy"/>
     </resultMap>
 
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, evaluation_group_id AS evaluationGroupId, type AS type, weight AS weight, max_count AS maxCount, calculate_id AS calculateId, grade_status AS gradeStatus, grade_group_id AS gradeGroupId
+        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, evaluation_group_id AS evaluationGroupId, type AS type, weight AS weight, max_count AS maxCount, calculate_id AS calculateId, grade_status AS gradeStatus, grade_group_id AS gradeGroupId, order_by AS orderBy
     </sql>
 
 
@@ -42,6 +43,7 @@
             <if test="calculateId != null">calculate_id, </if>
             <if test="gradeStatus != null">grade_status, </if>
             <if test="gradeGroupId != null">grade_group_id, </if>
+            <if test="orderBy != null">order_by, </if>
             is_delete,
             gmt_create,
             gmt_modified
@@ -54,6 +56,7 @@
             <if test="calculateId != null">#{ calculateId}, </if>
             <if test="gradeStatus != null">#{ gradeStatus}, </if>
             <if test="gradeGroupId != null">#{ gradeGroupId}, </if>
+            <if test="orderBy != null">#{ orderBy}, </if>
             0,
             now(),
             now()
@@ -74,7 +77,8 @@
             <if test="maxCount != null">max_count = #{maxCount},</if>
             <if test="calculateId != null">calculate_id = #{calculateId},</if>
             <if test="gradeStatus != null">grade_status = #{gradeStatus},</if>
-            <if test="gradeGroupId != null">grade_group_id = #{gradeGroupId}</if>                
+            <if test="gradeGroupId != null">grade_group_id = #{gradeGroupId},</if>
+            <if test="orderBy != null">order_by = #{orderBy}</if>                
         </trim>
         ,gmt_modified = now()
         where id = #{id}
@@ -94,7 +98,8 @@
             max_count = #{maxCount},
             calculate_id = #{calculateId},
             grade_status = #{gradeStatus},
-            grade_group_id = #{gradeGroupId}                
+            grade_group_id = #{gradeGroupId},
+            order_by = #{orderBy}                
         ,gmt_modified = now()
         where id = #{id}
     </update>
@@ -108,5 +113,13 @@
         select * from lz_result_model  where evaluation_group_id=#{id} and is_delete = 0
     </select>
 
+    <select id="selectResultDtoByGroupId" resultType="com.lz.modules.flow.model.ResultModelDto" >
+        select * from lz_result_model  where evaluation_group_id=#{id} and is_delete = 0 order by order_by desc
+    </select>
+
+    <update id="deleteResultModelByGroupId" parameterType="java.lang.Long">
+        update lz_result_model set is_delete = 1 where evaluation_group_id=#{id}
+    </update>
+
 </mapper>
 

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

@@ -12,12 +12,13 @@
         <result column="model_id" property="modelId"/>
         <result column="weight" property="weight"/>
         <result column="key_result" property="keyResult"/>
+        <result column="order_by" property="orderBy"/>
     </resultMap>
 
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, model_id AS modelId, weight AS weight, key_result AS keyResult
+        id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, model_id AS modelId, weight AS weight, key_result AS keyResult, order_by AS orderBy
     </sql>
 
 
@@ -34,6 +35,7 @@
             <if test="modelId != null">model_id, </if>
             <if test="weight != null">weight, </if>
             <if test="keyResult != null">key_result, </if>
+            <if test="orderBy != null">order_by, </if>
             is_delete,
             gmt_create,
             gmt_modified
@@ -42,6 +44,7 @@
             <if test="modelId != null">#{ modelId}, </if>
             <if test="weight != null">#{ weight}, </if>
             <if test="keyResult != null">#{ keyResult}, </if>
+            <if test="orderBy != null">#{ orderBy}, </if>
             0,
             now(),
             now()
@@ -58,7 +61,8 @@
             <if test="name != null">name = #{name},</if>
             <if test="modelId != null">model_id = #{modelId},</if>
             <if test="weight != null">weight = #{weight},</if>
-            <if test="keyResult != null">key_result = #{keyResult}</if>                
+            <if test="keyResult != null">key_result = #{keyResult},</if>
+            <if test="orderBy != null">order_by = #{orderBy}</if>                
         </trim>
         ,gmt_modified = now()
         where id = #{id}
@@ -74,7 +78,8 @@
             name = #{name},
             model_id = #{modelId},
             weight = #{weight},
-            key_result = #{keyResult}                
+            key_result = #{keyResult},
+            order_by = #{orderBy}                
         ,gmt_modified = now()
         where id = #{id}
     </update>
@@ -84,5 +89,20 @@
         update lz_result_taget_lib set is_delete = 1 where id=#{id} limit 1  
     </update>
 
+    <select id="selectResultTagetLibByModelId" resultType="com.lz.modules.flow.model.ResultTagetLibDto" >
+        select * from lz_result_taget_lib  where model_id=#{id} and is_delete = 0 order by order_by desc
+    </select>
+
+    <select id="selectByCondition" resultType="ResultTagetLib" >
+        select * from lz_result_taget_lib  where is_delete = 0
+        <if test="req.name != null and req.name != ''">and name like CONCAT('%', req.name, '%')</if>
+        <if test="req.modelId != null">and model_id = #{req.modelId} </if>
+        <if test="req.weight != null">and weight = #{req.weight} </if>
+    </select>
+
+    <update id="deleteResultTagetLibByModelId" parameterType="java.lang.Long">
+        update lz_result_taget_lib set is_delete = 1 where model_id=#{id}
+    </update>
+
 </mapper>
 

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

@@ -77,7 +77,8 @@ public class MysqlMain {
         list.add(new TablesBean("lz_result_grade"));*/
         //list.add(new TablesBean("lz_result_model"));
         //list.add(new TablesBean("lz_result_score"));
-        list.add(new TablesBean("lz_result_taget_lib"));
+        //list.add(new TablesBean("lz_result_taget_lib"));
+        list.add(new TablesBean("lz_flow_chart_detail_record"));
 
         List<TablesBean> list2 = new ArrayList<TablesBean>();
         Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();

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

@@ -105,7 +105,7 @@ public class MysqlUtilTable2Bean {
 
         sb.append("    @Override\n");
         sb.append("    public String toString() {\n");
-        sb.append("        return \"" + realName + "{\" +\n");
+        sb.append("        return \"" + realName + "Req{\" +\n");
 
         for (FieldBean tb : list) {
             if (MysqlMain.req_exclude.contains("," + tb.getField() + ",")) {
@@ -148,7 +148,7 @@ public class MysqlUtilTable2Bean {
 
 
             content += "@Data\n";
-            content += "@ApiModel(value = \"" + tableBean.getComment() + "\")\n";
+            content += "@ApiModel(value = \"" + tableBean.getComment() + "Req\")\n";
             content += "public class " + realName + "Req implements java.io.Serializable {\n" + bf.toString();
             content += sb.toString();
             content += "}";
@@ -360,7 +360,7 @@ public class MysqlUtilTable2Bean {
 
         sb.append("    @Override\n");
         sb.append("    public String toString() {\n");
-        sb.append("        return \"" + realName + "{\" +\n");
+        sb.append("        return \"" + realName + "Dto{\" +\n");
 
         for (FieldBean tb : list) {
             if (MysqlMain.dto_exclude.contains("," + tb.getField() + ",")) {
@@ -395,7 +395,7 @@ public class MysqlUtilTable2Bean {
 
             content += "\n";
             content += "@Data\n";
-            content += "@ApiModel(value = \"" + tableBean.getComment() + "\")\n";
+            content += "@ApiModel(value = \"" + tableBean.getComment() + "Dto\")\n";
             content += "public class " + realName + "Dto {\n" + bf.toString();
             content += sb.toString();
             content += "}";