From a9a2349cd5b705ae9031426dfc1d02f622fa20b7 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 19 Oct 2020 11:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E8=A1=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/dao/ResultDimensionMapper.java | 4 + .../modules/flow/dao/ResultGradeMapper.java | 5 + .../lz/modules/flow/entity/ResultModel.java | 18 +-- .../modules/flow/entity/ResultTagetLib.java | 18 +-- .../lz/modules/flow/model/ResultModelDto.java | 18 +-- .../modules/flow/model/ResultTagetLibDto.java | 20 ++- .../flow/req/FlowChartDetailProcReq.java | 130 ++++++++++++++++++ .../lz/modules/flow/req/ResultModelReq.java | 37 +++-- .../modules/flow/req/ResultTagetLibReq.java | 23 +++- .../flow/service/ResultDimensionService.java | 3 + .../flow/service/ResultGradeService.java | 4 + .../impl/ResultDimensionServiceImpl.java | 7 + .../service/impl/ResultGradeServiceImpl.java | 8 ++ .../service/impl/ResultModelServiceImpl.java | 2 +- .../controller/FlowChartController.java | 11 +- .../controller/ResultDimensionController.java | 12 +- .../controller/ResultGradeController.java | 15 ++ .../controller/ResultModelController.java | 8 +- .../impl/ResultTagetLibServiceImpl.java | 2 +- .../mapper/flow/ResultDimensionMapper.xml | 4 + .../mapper/flow/ResultGradeMapper.xml | 4 + .../mapper/flow/ResultModelMapper.xml | 13 +- .../mapper/flow/ResultTagetLibMapper.xml | 13 +- 23 files changed, 308 insertions(+), 71 deletions(-) create mode 100644 src/main/java/com/lz/modules/flow/req/FlowChartDetailProcReq.java diff --git a/src/main/java/com/lz/modules/flow/dao/ResultDimensionMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultDimensionMapper.java index efc3f785..81be0b60 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultDimensionMapper.java +++ b/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 { @@ -30,4 +33,5 @@ public interface ResultDimensionMapper extends BaseMapper { int deleteResultDimensionById(@Param("id")Long id); + List selectResultDimensionAll(); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/dao/ResultGradeMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultGradeMapper.java index fbcd4d38..463c0af8 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultGradeMapper.java +++ b/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 { @@ -30,4 +34,5 @@ public interface ResultGradeMapper extends BaseMapper { int deleteResultGradeById(@Param("id")Long id); + List selectResultGradeByGroupId(Long gid); } \ No newline at end of file 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 2fb1d8b9..07305157 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultModel.java +++ b/src/main/java/com/lz/modules/flow/entity/ResultModel.java @@ -12,7 +12,7 @@ import java.util.Date; *

*

*考核维度表 * @author quyixiao -* @since 2020-10-16 +* @since 2020-10-19 */ @Data @@ -56,8 +56,8 @@ public class ResultModel implements java.io.Serializable { @ApiModelProperty(value = "使用的哪个等级。等级组id，lz_result_grade的group_id", name = "gradeGroupId") private Long gradeGroupId; //排序 - @ApiModelProperty(value = "排序", name = "order") - private Integer order; + @ApiModelProperty(value = "排序", name = "orderBy") + private Integer orderBy; /** * * @return @@ -242,15 +242,15 @@ public class ResultModel implements java.io.Serializable { * 排序 * @return */ - public Integer getOrder() { - return order; + public Integer getOrderBy() { + return orderBy; } /** * 排序 - * @param order + * @param orderBy */ - public void setOrder(Integer order) { - this.order = order; + public void setOrderBy(Integer orderBy) { + this.orderBy = orderBy; } @Override @@ -268,7 +268,7 @@ public class ResultModel implements java.io.Serializable { ",calculateId=" + calculateId + ",gradeStatus=" + gradeStatus + ",gradeGroupId=" + gradeGroupId + - ",order=" + order + + ",orderBy=" + orderBy + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/ResultTagetLib.java b/src/main/java/com/lz/modules/flow/entity/ResultTagetLib.java index 290d6891..6380e84e 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultTagetLib.java +++ b/src/main/java/com/lz/modules/flow/entity/ResultTagetLib.java @@ -12,7 +12,7 @@ import java.util.Date; *

*

*考核指标库表 * @author quyixiao -* @since 2020-10-16 +* @since 2020-10-19 */ @Data @@ -44,8 +44,8 @@ public class ResultTagetLib implements java.io.Serializable { @ApiModelProperty(value = "考核标准，关键结果", name = "keyResult") private String keyResult; //排序 - @ApiModelProperty(value = "排序", name = "order") - private Integer order; + @ApiModelProperty(value = "排序", name = "orderBy") + private Integer orderBy; /** * * @return @@ -170,15 +170,15 @@ public class ResultTagetLib implements java.io.Serializable { * 排序 * @return */ - public Integer getOrder() { - return order; + public Integer getOrderBy() { + return orderBy; } /** * 排序 - * @param order + * @param orderBy */ - public void setOrder(Integer order) { - this.order = order; + public void setOrderBy(Integer orderBy) { + this.orderBy = orderBy; } @Override @@ -192,7 +192,7 @@ public class ResultTagetLib implements java.io.Serializable { ",modelId=" + modelId + ",weight=" + weight + ",keyResult=" + keyResult + - ",order=" + order + + ",orderBy=" + orderBy + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/ResultModelDto.java b/src/main/java/com/lz/modules/flow/model/ResultModelDto.java index a89c8ce2..8029ee17 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultModelDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultModelDto.java @@ -10,7 +10,7 @@ import java.util.List; *

*

*考核维度表 * @author quyixiao -* @since 2020-10-16 +* @since 2020-10-19 */ @Data @@ -44,8 +44,8 @@ public class ResultModelDto { @ApiModelProperty(value = "使用的哪个等级。等级组id，lz_result_grade的group_id", name = "gradeGroupId") private Long gradeGroupId; //排序 - @ApiModelProperty(value = "排序", name = "order") - private Integer order; + @ApiModelProperty(value = "排序", name = "orderBy") + private Integer orderBy; @ApiModelProperty(value = "已添加的指标", name = "tagetLibs") private List tagetLibs; /** @@ -187,15 +187,15 @@ public class ResultModelDto { * 排序 * @return */ - public Integer getOrder() { - return order; + public Integer getOrderBy() { + return orderBy; } /** * 排序 - * @param order + * @param orderBy */ - public void setOrder(Integer order) { - this.order = order; + public void setOrderBy(Integer orderBy) { + this.orderBy = orderBy; } @Override @@ -210,7 +210,7 @@ public class ResultModelDto { ",calculateId=" + calculateId + ",gradeStatus=" + gradeStatus + ",gradeGroupId=" + gradeGroupId + - ",order=" + order + + ",orderBy=" + orderBy + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/ResultTagetLibDto.java b/src/main/java/com/lz/modules/flow/model/ResultTagetLibDto.java index 71ff0655..683e9cc1 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultTagetLibDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultTagetLibDto.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; *

*

*考核指标库表 * @author quyixiao -* @since 2020-10-16 +* @since 2020-10-19 */ @Data @@ -31,10 +31,8 @@ public class ResultTagetLibDto { @ApiModelProperty(value = "考核标准，关键结果", name = "keyResult") private String keyResult; //排序 - @ApiModelProperty(value = "排序", name = "order") - private Integer order; - - + @ApiModelProperty(value = "排序", name = "orderBy") + private Integer orderBy; /** * * @return @@ -114,15 +112,15 @@ public class ResultTagetLibDto { * 排序 * @return */ - public Integer getOrder() { - return order; + public Integer getOrderBy() { + return orderBy; } /** * 排序 - * @param order + * @param orderBy */ - public void setOrder(Integer order) { - this.order = order; + public void setOrderBy(Integer orderBy) { + this.orderBy = orderBy; } @Override @@ -133,7 +131,7 @@ public class ResultTagetLibDto { ",modelId=" + modelId + ",weight=" + weight + ",keyResult=" + keyResult + - ",order=" + order + + ",orderBy=" + orderBy + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartDetailProcReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartDetailProcReq.java new file mode 100644 index 00000000..a4fd0a69 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/FlowChartDetailProcReq.java @@ -0,0 +1,130 @@ +package com.lz.modules.flow.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** +*

+* 菜单权限表 +*

*流程图，lz_flow的父 +* @author quyixiao +* @since 2020-10-16 +*/ + + +@Data +@ApiModel(value = "节点小流程详情") +public class FlowChartDetailProcReq implements java.io.Serializable { + + @ApiModelProperty(value = "考核节点id", name = "charId") + private Long charId; + // + + // + @ApiModelProperty(value = "", name = "name") + private String name; + //flow_manager表中id + @ApiModelProperty(value = "flow_manager表中id", name = "processId") + private Long processId; + //是否可允许不启用节点 0不可，1可以 + @ApiModelProperty(value = "是否可允许不启用节点 0不可，1可以", name = "status") + private Integer status; + //1可配置细节，0不可配置细节，一般线下操作。比如执行中 + @ApiModelProperty(value = "1可配置细节，0不可配置细节，一般线下操作。比如执行中", name = "type") + private Integer type; + //执行步骤，第几步，从0开始 + @ApiModelProperty(value = "执行步骤，第几步，从0开始", name = "stepIndex") + private Integer stepIndex; + + + + /** + * + * @return + */ + public String getName() { + return name; + } + /** + * + * @param name + */ + public void setName(String name) { + this.name = name; + } + + /** + * flow_manager表中id + * @return + */ + public Long getProcessId() { + return processId; + } + /** + * flow_manager表中id + * @param processId + */ + public void setProcessId(Long processId) { + this.processId = processId; + } + + /** + * 是否可允许不启用节点 0不可，1可以 + * @return + */ + public Integer getStatus() { + return status; + } + /** + * 是否可允许不启用节点 0不可，1可以 + * @param status + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 1可配置细节，0不可配置细节，一般线下操作。比如执行中 + * @return + */ + public Integer getType() { + return type; + } + /** + * 1可配置细节，0不可配置细节，一般线下操作。比如执行中 + * @param type + */ + public void setType(Integer type) { + this.type = type; + } + + /** + * 执行步骤，第几步，从0开始 + * @return + */ + public Integer getStepIndex() { + return stepIndex; + } + /** + * 执行步骤，第几步，从0开始 + * @param stepIndex + */ + public void setStepIndex(Integer stepIndex) { + this.stepIndex = stepIndex; + } + + @Override + public String toString() { + return "FlowChart{" + + ",charId=" + charId + + ",name=" + name + + ",processId=" + processId + + ",status=" + status + + ",type=" + type + + ",stepIndex=" + stepIndex + + "}"; + } +} \ No newline at end of file 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 3f14b608..ed290649 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultModelReq.java +++ b/src/main/java/com/lz/modules/flow/req/ResultModelReq.java @@ -11,14 +11,14 @@ import java.util.Date; /** *

* 菜单权限表 -*

*考核模板表 +*

*考核维度表 * @author quyixiao -* @since 2020-10-16 +* @since 2020-10-19 */ @Data -@ApiModel(value = "考核维度Req") +@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 = "权重 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 + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/ResultTagetLibReq.java b/src/main/java/com/lz/modules/flow/req/ResultTagetLibReq.java index 37e586d7..84423198 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultTagetLibReq.java +++ b/src/main/java/com/lz/modules/flow/req/ResultTagetLibReq.java @@ -13,12 +13,12 @@ import java.util.Date; * 菜单权限表 *

*考核指标库表 * @author quyixiao -* @since 2020-10-16 +* @since 2020-10-19 */ @Data -@ApiModel(value = "考核指标库Req") +@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 + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/ResultDimensionService.java b/src/main/java/com/lz/modules/flow/service/ResultDimensionService.java index 0a66ae15..f0742704 100644 --- a/src/main/java/com/lz/modules/flow/service/ResultDimensionService.java +++ b/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; + /** *

* 考核维度表 服务类 @@ -30,4 +32,5 @@ public interface ResultDimensionService extends IService { int deleteResultDimensionById(Long id); + List selectResultDimensionAll(); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/ResultGradeService.java b/src/main/java/com/lz/modules/flow/service/ResultGradeService.java index 89479e21..c9afa474 100644 --- a/src/main/java/com/lz/modules/flow/service/ResultGradeService.java +++ b/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; /** *

@@ -30,4 +33,5 @@ public interface ResultGradeService extends IService { int deleteResultGradeById(Long id); + List selectResultGradeByGroupId(Long gid); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultDimensionServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/ResultDimensionServiceImpl.java index 84cf4010..b55f1924 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/ResultDimensionServiceImpl.java +++ b/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; + /** *

* 考核维度表 服务类 @@ -58,6 +60,11 @@ public class ResultDimensionServiceImpl extends ServiceImpl selectResultDimensionAll(){ + return resultDimensionMapper.selectResultDimensionAll(); + } + } diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultGradeServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/ResultGradeServiceImpl.java index 43394855..028690db 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/ResultGradeServiceImpl.java +++ b/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; + /** *

* 等级表 服务类 @@ -58,6 +61,11 @@ public class ResultGradeServiceImpl extends ServiceImpl selectResultGradeByGroupId(Long gid){ + return resultGradeMapper.selectResultGradeByGroupId(gid); + } + } diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java index d056db60..cae3648d 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java @@ -66,7 +66,7 @@ public class ResultModelServiceImpl extends ServiceImpl resultDimensions + = resultDimensionService.selectResultDimensionAll(); + return R.ok().put("data",resultDimensions); } @RequestMapping("/getById") diff --git a/src/main/java/com/lz/modules/performance/controller/ResultGradeController.java b/src/main/java/com/lz/modules/performance/controller/ResultGradeController.java index 87022a34..446770b6 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultGradeController.java +++ b/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 resultGradeDtos = resultGradeService.selectResultGradeByGroupId(1L); + return R.ok().put("data",resultGradeDtos); + } @RequestMapping("/getById") diff --git a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java index 721eb74c..123d7a87 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java @@ -29,7 +29,7 @@ public class ResultModelController { @GetMapping("/getByGroupId") @ApiOperation(value="根据考核组id获取模板列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultModelDto.class)}) - public R getByGroupId(@RequestParam Long id) { + public R getByGroupId(@RequestParam @ApiParam("考核组ID") Long id) { //List resultModels = resultModelService.selectResultModelByGroupId(id); List resultModelDtos = resultModelService.selectResultDtoByGroupId(id); @@ -57,7 +57,7 @@ public class ResultModelController { @PostMapping("/save") - @ApiOperation("新增模板") + @ApiOperation("新增模板中的考核维度") public R save(@RequestBody @ApiParam ResultModel resultModel) { resultModelService.insertResultModel(resultModel); return R.ok().put("data",resultModel); @@ -65,8 +65,8 @@ public class ResultModelController { @GetMapping("/delete") - @ApiOperation("删除模板") - public R delete(@RequestParam @ApiParam("模板id") Long id) { + @ApiOperation("删除模板中的考核维度") + public R delete(@RequestParam @ApiParam("维度id") Long id) { return resultModelService.deleteResultModelById(id); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java index 24d407bf..a002d0f0 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTagetLibServiceImpl.java @@ -105,7 +105,7 @@ public class ResultTagetLibServiceImpl extends ServiceImpl + + diff --git a/src/main/resources/mapper/flow/ResultGradeMapper.xml b/src/main/resources/mapper/flow/ResultGradeMapper.xml index 12efc569..26ef5b5f 100644 --- a/src/main/resources/mapper/flow/ResultGradeMapper.xml +++ b/src/main/resources/mapper/flow/ResultGradeMapper.xml @@ -89,5 +89,9 @@ update lz_result_grade set is_delete = 1 where id=#{id} limit 1 + + diff --git a/src/main/resources/mapper/flow/ResultModelMapper.xml b/src/main/resources/mapper/flow/ResultModelMapper.xml index eba723d8..13061ce1 100644 --- a/src/main/resources/mapper/flow/ResultModelMapper.xml +++ b/src/main/resources/mapper/flow/ResultModelMapper.xml @@ -16,12 +16,13 @@ + - 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 @@ -42,6 +43,7 @@ calculate_id, grade_status, grade_group_id, + order_by, is_delete, gmt_create, gmt_modified @@ -54,6 +56,7 @@ #{ calculateId}, #{ gradeStatus}, #{ gradeGroupId}, + #{ orderBy}, 0, now(), now() @@ -74,7 +77,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} @@ -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} @@ -109,7 +114,7 @@ diff --git a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml index 04a145ed..ae15b55f 100644 --- a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml +++ b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml @@ -12,12 +12,13 @@ + - 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 @@ -34,6 +35,7 @@ model_id, weight, key_result, + order_by, is_delete, gmt_create, gmt_modified @@ -42,6 +44,7 @@ #{ modelId}, #{ weight}, #{ keyResult}, + #{ orderBy}, 0, now(), now() @@ -58,7 +61,8 @@ name = #{name}, model_id = #{modelId}, weight = #{weight}, - key_result = #{keyResult} + key_result = #{keyResult}, + order_by = #{orderBy} ,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} @@ -85,7 +90,7 @@