From ff273e0d0320e959556cee185614547cb1a86516 Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 16 Oct 2020 18:29:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E4=BB=BD?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/common/utils/R.java | 2 +- .../flow/dao/EvaluationGroupMapper.java | 3 + .../modules/flow/dao/ResultModelMapper.java | 5 + .../flow/dao/ResultTagetLibMapper.java | 11 ++ .../modules/flow/entity/EvaluationGroup.java | 6 +- .../lz/modules/flow/entity/ResultModel.java | 35 ++++- .../modules/flow/entity/ResultTagetLib.java | 19 +++ .../flow/model/EvaluationGroupDto.java | 2 +- .../flow/model/EvaluationStartStaffDto.java | 2 +- .../flow/model/FlowApprovalRoleDto.java | 2 +- .../lz/modules/flow/model/FlowChangeDto.java | 2 +- .../lz/modules/flow/model/FlowChartDto.java | 2 +- .../modules/flow/model/FlowChartRoleDto.java | 2 +- .../lz/modules/flow/model/FlowStartDto.java | 2 +- .../flow/model/ResultDimensionDto.java | 2 +- .../lz/modules/flow/model/ResultGradeDto.java | 2 +- .../lz/modules/flow/model/ResultModelDto.java | 40 +++-- .../lz/modules/flow/model/ResultScoreDto.java | 2 +- .../modules/flow/model/ResultTagetLibDto.java | 23 ++- .../modules/flow/req/EvaluationGroupReq.java | 137 ++---------------- .../flow/req/EvaluationStartStaffReq.java | 2 +- .../modules/flow/req/FlowApprovalRoleReq.java | 2 +- .../lz/modules/flow/req/FlowChangeReq.java | 2 +- .../com/lz/modules/flow/req/FlowChartReq.java | 2 +- .../lz/modules/flow/req/FlowChartRoleReq.java | 2 +- .../com/lz/modules/flow/req/FlowStartReq.java | 2 +- .../modules/flow/req/ResultCalculateReq.java | 2 +- .../modules/flow/req/ResultDimensionReq.java | 2 +- .../lz/modules/flow/req/ResultGradeReq.java | 2 +- .../lz/modules/flow/req/ResultModelReq.java | 4 +- .../lz/modules/flow/req/ResultScoreReq.java | 2 +- .../modules/flow/req/ResultTagetLibReq.java | 2 +- .../flow/req/ResultTagetLibSearchReq.java | 114 +++++++++++++++ .../flow/service/EvaluationGroupService.java | 6 +- .../flow/service/ResultModelService.java | 8 +- .../impl/EvaluationGroupServiceImpl.java | 18 ++- .../service/impl/ResultModelServiceImpl.java | 30 +++- .../controller/EvaluationGroupController.java | 28 ++-- .../controller/ResultModelController.java | 35 +++-- .../controller/ResultTagetLibController.java | 37 +++-- .../service/ResultTagetLibService.java | 13 +- .../impl/ResultTagetLibServiceImpl.java | 55 ++++++- .../mapper/flow/EvaluationGroupMapper.xml | 7 + .../mapper/flow/ResultModelMapper.xml | 8 + .../mapper/flow/ResultTagetLibMapper.xml | 15 ++ src/test/java/com/lz/mysql/MysqlMain.java | 6 +- .../com/lz/mysql/MysqlUtilTable2Bean.java | 4 +- 47 files changed, 483 insertions(+), 228 deletions(-) create mode 100644 src/main/java/com/lz/modules/flow/req/ResultTagetLibSearchReq.java diff --git a/src/main/java/com/lz/common/utils/R.java b/src/main/java/com/lz/common/utils/R.java index 2e6741c1..e604cace 100644 --- a/src/main/java/com/lz/common/utils/R.java +++ b/src/main/java/com/lz/common/utils/R.java @@ -24,7 +24,7 @@ public class R extends HashMap { private boolean isSuccess; public R() { - put("code", 0); + put("code", 200); put("msg", "success"); this.isSuccess = true ; } diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java index 71e899ec..62bf47af 100644 --- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java +++ b/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 { int deleteEvaluationGroupById(@Param("id")Long id); + List seleteEvaluationGroupByReq(@Param("page") IPage page, @Param("req") EvaluationGroupReq req); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/dao/ResultModelMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultModelMapper.java index 6475b550..6fb00c52 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultModelMapper.java +++ b/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 { List selectResultModelByGroupId(@Param("id") Long id); + + List selectResultDtoByGroupId(Long id); + + int deleteResultModelByGroupId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java index 66685fee..bc6e8906 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java +++ b/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 { @@ -30,4 +36,9 @@ public interface ResultTagetLibMapper extends BaseMapper { int deleteResultTagetLibById(@Param("id")Long id); + List selectResultTagetLibByModelId(Long id); + + List selectByCondition(@Param("page") IPage page, @Param("req") ResultTagetLibSearchReq req); + + int deleteResultTagetLibByModelId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java b/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java index 31b52fa0..6f35d100 100644 --- a/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java +++ b/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; } 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 84563817..2fb1d8b9 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultModel.java +++ b/src/main/java/com/lz/modules/flow/entity/ResultModel.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; import java.util.Date; /** *

-*

*考核模板表 +*

*考核维度表 * @author quyixiao * @since 2020-10-16 */ @@ -40,13 +40,13 @@ public class ResultModel implements java.io.Serializable { //1:业绩 2：文化价值观 @ApiModelProperty(value = "1:业绩 2：文化价值观", name = "type") private Integer type; - //权重 - @ApiModelProperty(value = "权重", name = "weight") + //权重 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开启 @@ -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 = "order") + private Integer order; /** * * @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 getOrder() { + return order; + } + /** + * 排序 + * @param order + */ + public void setOrder(Integer order) { + this.order = order; + } + @Override public String toString() { return "ResultModel{" + @@ -250,6 +268,7 @@ public class ResultModel implements java.io.Serializable { ",calculateId=" + calculateId + ",gradeStatus=" + gradeStatus + ",gradeGroupId=" + gradeGroupId + + ",order=" + order + "}"; } } \ 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 ca892795..290d6891 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultTagetLib.java +++ b/src/main/java/com/lz/modules/flow/entity/ResultTagetLib.java @@ -43,6 +43,9 @@ public class ResultTagetLib implements java.io.Serializable { //考核标准，关键结果 @ApiModelProperty(value = "考核标准，关键结果", name = "keyResult") private String keyResult; + //排序 + @ApiModelProperty(value = "排序", name = "order") + private Integer order; /** * * @return @@ -163,6 +166,21 @@ public class ResultTagetLib implements java.io.Serializable { this.keyResult = keyResult; } + /** + * 排序 + * @return + */ + public Integer getOrder() { + return order; + } + /** + * 排序 + * @param order + */ + public void setOrder(Integer order) { + this.order = order; + } + @Override public String toString() { return "ResultTagetLib{" + @@ -174,6 +192,7 @@ public class ResultTagetLib implements java.io.Serializable { ",modelId=" + modelId + ",weight=" + weight + ",keyResult=" + keyResult + + ",order=" + order + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/EvaluationGroupDto.java b/src/main/java/com/lz/modules/flow/model/EvaluationGroupDto.java index abf45a43..feb35272 100644 --- a/src/main/java/com/lz/modules/flow/model/EvaluationGroupDto.java +++ b/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") diff --git a/src/main/java/com/lz/modules/flow/model/EvaluationStartStaffDto.java b/src/main/java/com/lz/modules/flow/model/EvaluationStartStaffDto.java index cff7451c..51b58f68 100644 --- a/src/main/java/com/lz/modules/flow/model/EvaluationStartStaffDto.java +++ b/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") diff --git a/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java b/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java index 14f5edac..89a6fd71 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java +++ b/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") diff --git a/src/main/java/com/lz/modules/flow/model/FlowChangeDto.java b/src/main/java/com/lz/modules/flow/model/FlowChangeDto.java index 18193b50..af6d4b26 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowChangeDto.java +++ b/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") diff --git a/src/main/java/com/lz/modules/flow/model/FlowChartDto.java b/src/main/java/com/lz/modules/flow/model/FlowChartDto.java index 878d6835..0fd92594 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowChartDto.java +++ b/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") diff --git a/src/main/java/com/lz/modules/flow/model/FlowChartRoleDto.java b/src/main/java/com/lz/modules/flow/model/FlowChartRoleDto.java index eb43c52b..ee1278f5 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowChartRoleDto.java +++ b/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") diff --git a/src/main/java/com/lz/modules/flow/model/FlowStartDto.java b/src/main/java/com/lz/modules/flow/model/FlowStartDto.java index acec56b9..c4c2f028 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowStartDto.java +++ b/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") diff --git a/src/main/java/com/lz/modules/flow/model/ResultDimensionDto.java b/src/main/java/com/lz/modules/flow/model/ResultDimensionDto.java index 7b85e387..90e43587 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultDimensionDto.java +++ b/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) diff --git a/src/main/java/com/lz/modules/flow/model/ResultGradeDto.java b/src/main/java/com/lz/modules/flow/model/ResultGradeDto.java index 148131ec..a6c8ae64 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultGradeDto.java +++ b/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") 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 243a0994..a89c8ce2 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultModelDto.java +++ b/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; /** *

-*

*考核模板表 +*

*考核维度表 * @author quyixiao * @since 2020-10-16 */ @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; - //权重 - @ApiModelProperty(value = "权重", name = "weight") + //权重 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开启 @@ -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 = "order") + private Integer order; + @ApiModelProperty(value = "已添加的指标", name = "tagetLibs") + private List 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 getOrder() { + return order; + } + /** + * 排序 + * @param order + */ + public void setOrder(Integer order) { + this.order = order; + } + @Override public String toString() { return "ResultModel{" + @@ -189,6 +210,7 @@ public class ResultModelDto { ",calculateId=" + calculateId + ",gradeStatus=" + gradeStatus + ",gradeGroupId=" + gradeGroupId + + ",order=" + order + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java index 0eeac84e..ecc922b1 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java +++ b/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") 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 6e9f6ec9..71ff0655 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultTagetLibDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultTagetLibDto.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; */ @Data -@ApiModel(value = "考核指标库表") +@ApiModel(value = "考核指标库表Dto") public class ResultTagetLibDto { // @ApiModelProperty(value = "", name = "id") @@ -30,6 +30,11 @@ public class ResultTagetLibDto { //考核标准，关键结果 @ApiModelProperty(value = "考核标准，关键结果", name = "keyResult") private String keyResult; + //排序 + @ApiModelProperty(value = "排序", name = "order") + private Integer order; + + /** * * @return @@ -105,6 +110,21 @@ public class ResultTagetLibDto { this.keyResult = keyResult; } + /** + * 排序 + * @return + */ + public Integer getOrder() { + return order; + } + /** + * 排序 + * @param order + */ + public void setOrder(Integer order) { + this.order = order; + } + @Override public String toString() { return "ResultTagetLib{" + @@ -113,6 +133,7 @@ public class ResultTagetLibDto { ",modelId=" + modelId + ",weight=" + weight + ",keyResult=" + keyResult + + ",order=" + order + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/EvaluationGroupReq.java b/src/main/java/com/lz/modules/flow/req/EvaluationGroupReq.java index d329df44..b3de50f3 100644 --- a/src/main/java/com/lz/modules/flow/req/EvaluationGroupReq.java +++ b/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") - private Integer isDelete; + @ApiModelProperty(value = "起始时间", name = "startTime") + private String startTime; // - @ApiModelProperty(value = "", name = "gmtCreate") - private Date gmtCreate; - // - @ApiModelProperty(value = "", name = "gmtModified") - private Date gmtModified; + @ApiModelProperty(value = "结束时间", name = "endTime") + private String endTime; // @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 + - ",gmtCreate=" + gmtCreate + - ",gmtModified=" + gmtModified + + ",startTime=" + startTime + + ",endTime=" + endTime + ",name=" + name + - ",managerIds=" + managerIds + - ",depIds=" + depIds + - ",staffIds=" + staffIds + - ",outIds=" + outIds + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/EvaluationStartStaffReq.java b/src/main/java/com/lz/modules/flow/req/EvaluationStartStaffReq.java index a4093b23..9b69903e 100644 --- a/src/main/java/com/lz/modules/flow/req/EvaluationStartStaffReq.java +++ b/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 = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java b/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java index bb2cb47e..6062b86a 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java +++ b/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 = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/FlowChangeReq.java b/src/main/java/com/lz/modules/flow/req/FlowChangeReq.java index eb91d57d..4ebaf90e 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowChangeReq.java +++ b/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 = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartReq.java index 4264f107..679aa94b 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowChartReq.java +++ b/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 = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartRoleReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartRoleReq.java index fcfc40b1..6bb17f58 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowChartRoleReq.java +++ b/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 = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/FlowStartReq.java b/src/main/java/com/lz/modules/flow/req/FlowStartReq.java index 78515754..885b302c 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowStartReq.java +++ b/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 = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/ResultCalculateReq.java b/src/main/java/com/lz/modules/flow/req/ResultCalculateReq.java index 6cd41821..d3da41eb 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultCalculateReq.java +++ b/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 = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/ResultDimensionReq.java b/src/main/java/com/lz/modules/flow/req/ResultDimensionReq.java index 50135d42..07d68281 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultDimensionReq.java +++ b/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 = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/ResultGradeReq.java b/src/main/java/com/lz/modules/flow/req/ResultGradeReq.java index 74a08981..9d3dfcc1 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultGradeReq.java +++ b/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 = "当前页码") 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 149eb7df..3f14b608 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultModelReq.java +++ b/src/main/java/com/lz/modules/flow/req/ResultModelReq.java @@ -18,7 +18,7 @@ import java.util.Date; @Data -@ApiModel(value = "考核维度表") +@ApiModel(value = "考核维度Req") public class ResultModelReq implements java.io.Serializable { @ApiModelProperty(value = "currPage", name = "当前页码") @@ -50,7 +50,7 @@ public class ResultModelReq implements java.io.Serializable { @ApiModelProperty(value = "1:业绩 2：文化价值观", name = "type") private Integer type; //权重 - @ApiModelProperty(value = "权重", name = "weight") + @ApiModelProperty(value = "权重 0不限权重", name = "weight") private BigDecimal weight; //考核子项目个数最大限制 @ApiModelProperty(value = "考核子项目个数最大限制", name = "maxCount") diff --git a/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java b/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java index 7710ced8..81203bab 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java +++ b/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 = "当前页码") 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 6626891d..37e586d7 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultTagetLibReq.java +++ b/src/main/java/com/lz/modules/flow/req/ResultTagetLibReq.java @@ -18,7 +18,7 @@ import java.util.Date; @Data -@ApiModel(value = "考核指标库表") +@ApiModel(value = "考核指标库Req") public class ResultTagetLibReq implements java.io.Serializable { @ApiModelProperty(value = "currPage", name = "当前页码") diff --git a/src/main/java/com/lz/modules/flow/req/ResultTagetLibSearchReq.java b/src/main/java/com/lz/modules/flow/req/ResultTagetLibSearchReq.java new file mode 100644 index 00000000..b680c706 --- /dev/null +++ b/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; + +/** +*

+* 菜单权限表 +*

*考核指标库表 +* @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 + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java index 003b8f8b..3195f132 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java +++ b/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,7 +32,8 @@ public interface EvaluationGroupService extends IService { int updateCoverEvaluationGroupById(EvaluationGroup evaluationGroup); - int deleteEvaluationGroupById(Long id); + R deleteEvaluationGroupById(Long id); + PageUtils selectEvaluationGroupByReq(EvaluationGroupReq req); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/ResultModelService.java b/src/main/java/com/lz/modules/flow/service/ResultModelService.java index 966dca77..bac12ee6 100644 --- a/src/main/java/com/lz/modules/flow/service/ResultModelService.java +++ b/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 { int updateCoverResultModelById(ResultModel resultModel); - int deleteResultModelById(Long id); + R deleteResultModelById(Long id); List selectResultModelByGroupId(Long id); + + List selectResultDtoByGroupId(Long id); + + R deleteResultModelByGroupId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index 7205839a..dd7ea621 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -1,8 +1,13 @@ 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.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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -56,11 +61,16 @@ public class EvaluationGroupServiceImpl extends ServiceImpl evaluationGroupMapper.seleteEvaluationGroupByReq(page, req)); + return pageUtils; + } } 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 3fc6c58b..d056db60 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 @@ -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 implements ResultModelService { @Autowired private ResultModelMapper resultModelMapper; + @Autowired + private ResultTagetLibService resultTargetLibService; + @Override @@ -56,8 +64,12 @@ public class ResultModelServiceImpl extends ServiceImpl selectResultDtoByGroupId(Long id){ + return resultModelMapper.selectResultDtoByGroupId(id); + } + + @Override + public R deleteResultModelByGroupId(Long id){ + List resultModels = selectResultModelByGroupId(id); + for (ResultModel model:resultModels + ) { + deleteResultModelById(model.getId()); + } + return R.ok(); + } } diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java index c9538ffd..465bda64 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/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 io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import com.lz.modules.flow.service.ResultModelService; +import io.swagger.annotations.*; 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") - public R getById(@RequestBody EvaluationGroupReq evaluationGroupReq) { - EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(evaluationGroupReq.getId()); - return R.ok().put("evaluationGroup",evaluationGroup); + @PostMapping("/getById") + @ApiOperation("获取考核组列表") + @ApiResponses({@ApiResponse(code=200,message = "成功", response=EvaluationGroup.class)}) + 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") - public R list(@RequestBody Long id) { - evaluationGroupService.deleteEvaluationGroupById(id); - return R.ok(); + @GetMapping("/delete") + @ApiOperation("删除考核组") + public R delete(@RequestParam @ApiParam("组id") Long id) { + resultModelService.deleteResultModelByGroupId(id); + return evaluationGroupService.deleteEvaluationGroupById(id); + //return R.ok(); } } 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 702ae151..721eb74c 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java +++ b/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) { - List resultModels = resultModelService.selectResultModelByGroupId(id); - return R.ok().put("data",resultModels); + //List resultModels = resultModelService.selectResultModelByGroupId(id); + List resultModelDtos = resultModelService.selectResultDtoByGroupId(id); + for (ResultModelDto dto:resultModelDtos + ) { + List libDtos = resultTagetLibService.selectResultTagetLibByModelId(dto.getId()); + dto.setTagetLibs(libDtos); + } + return R.ok().put("data",resultModelDtos); } @@ -58,9 +64,10 @@ public class ResultModelController { } - @RequestMapping("/delete") - public R delete(@RequestBody Long id) { - resultModelService.deleteResultModelById(id); - return R.ok(); + @GetMapping("/delete") + @ApiOperation("删除模板") + public R delete(@RequestParam @ApiParam("模板id") Long id) { + return resultModelService.deleteResultModelById(id); + } } diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTagetLibController.java b/src/main/java/com/lz/modules/performance/controller/ResultTagetLibController.java index a07ec3c1..5eabfe52 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultTagetLibController.java +++ b/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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.HashMap; -import java.util.Map; +import org.springframework.web.bind.annotation.*; @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") - public R save(@RequestBody ResultTagetLib resultTagetLib) { - resultTagetLibService.insertResultTagetLib(resultTagetLib); - return R.ok(); + @PostMapping("/save") + @ApiOperation("新增考核指标") + public R save(@RequestBody @ApiParam ResultTagetLib resultTagetLib) { + + return resultTagetLibService.insertResultTagetLib(resultTagetLib); + } - @RequestMapping("/delete") - public R delete(@RequestBody Long id) { + @GetMapping("/delete") + @ApiOperation("删除指标") + public R delete(@RequestParam @ApiParam("指标id") Long id) { resultTagetLibService.deleteResultTagetLibById(id); return R.ok(); } diff --git a/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java b/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java index 8a5ac2c3..bd7958ed 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java +++ b/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; /** *

@@ -18,7 +24,7 @@ public interface ResultTagetLibService extends IService { 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 { int deleteResultTagetLibById(Long id); + List selectResultTagetLibByModelId(Long id); + + PageUtils selectResultTagetLibByReq(ResultTagetLibSearchReq req); + + int deleteResultTagetLibByModelId(Long id); } \ No newline at end of file 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 3616901f..24d407bf 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 @@ -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; + /** *

* 考核指标库表 服务类 @@ -17,12 +27,15 @@ import org.springframework.stereotype.Service; */ @Service +@Slf4j public class ResultTagetLibServiceImpl extends ServiceImpl implements ResultTagetLibService { @Autowired private ResultTagetLibMapper resultTagetLibMapper; + @Autowired + private ResultModelService resultModelService; @Override @@ -33,8 +46,27 @@ public class ResultTagetLibServiceImpl extends ServiceImpl 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 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); + } + } diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml index 75897245..f0159a88 100644 --- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml @@ -89,6 +89,13 @@ update lz_evaluation_group 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 2ffa75f6..eba723d8 100644 --- a/src/main/resources/mapper/flow/ResultModelMapper.xml +++ b/src/main/resources/mapper/flow/ResultModelMapper.xml @@ -108,5 +108,13 @@ select * from lz_result_model where evaluation_group_id=#{id} and is_delete = 0 + + + + update lz_result_model set is_delete = 1 where evaluation_group_id=#{id} + + diff --git a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml index a368cca2..04a145ed 100644 --- a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml +++ b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml @@ -84,5 +84,20 @@ update lz_result_taget_lib set is_delete = 1 where id=#{id} limit 1 + + + + + + update lz_result_taget_lib set is_delete = 1 where model_id=#{id} + + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index ca82a412..04cee285 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -75,7 +75,7 @@ public class MysqlMain { list.add(new TablesBean("lz_result_calculate")); list.add(new TablesBean("lz_result_dimension")); list.add(new TablesBean("lz_result_grade"));*/ - //list.add(new TablesBean("lz_result_model")); + list.add(new TablesBean("lz_result_model")); //list.add(new TablesBean("lz_result_score")); list.add(new TablesBean("lz_result_taget_lib")); @@ -97,7 +97,7 @@ public class MysqlMain { } - for (int i = 0; i < list2.size(); i++) { + /* for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2Contoller.printController(list2.get(i)); } @@ -109,7 +109,7 @@ public class MysqlMain { for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2Service.printService(list2.get(i)); MysqlUtilTable2Service.printServiceImpl(list2.get(i)); - } + }*/ for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2XML.printXMLForMap(list2.get(i)); diff --git a/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java b/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java index 586b8a7d..112749d7 100644 --- a/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java +++ b/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java @@ -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 += "}"; @@ -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 += "}"; From a9a2349cd5b705ae9031426dfc1d02f622fa20b7 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 19 Oct 2020 11:36:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=A1=A8=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 @@ + select * from lz_flow_chart_detail_record where id=#{id} and is_delete = 0 limit 1 + + + + + insert into lz_flow_chart_detail_record( + chart_id, + evaluation_group_id, + status, + opt_ids, + opt_type, + role_ids, + step_type, + is_delete, + gmt_create, + gmt_modified + )values( + #{ chartId}, + #{ evaluationGroupId}, + #{ status}, + #{ optIds}, + #{ optType}, + #{ roleIds}, + #{ stepType}, + 0, + now(), + now() + ) + + + + + update + lz_flow_chart_detail_record + + 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 + 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 lz_flow_chart_detail_record set is_delete = 1 where id=#{id} limit 1 + + + + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 04cee285..7d298621 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -75,9 +75,10 @@ public class MysqlMain { list.add(new TablesBean("lz_result_calculate")); list.add(new TablesBean("lz_result_dimension")); list.add(new TablesBean("lz_result_grade"));*/ - list.add(new TablesBean("lz_result_model")); + //list.add(new TablesBean("lz_result_model")); //list.add(new TablesBean("lz_result_score")); - list.add(new TablesBean("lz_result_taget_lib")); + //list.add(new TablesBean("lz_result_taget_lib")); + list.add(new TablesBean("lz_flow_chart_detail_record")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments(); @@ -97,7 +98,7 @@ public class MysqlMain { } - /* for (int i = 0; i < list2.size(); i++) { + for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2Contoller.printController(list2.get(i)); } @@ -109,7 +110,7 @@ public class MysqlMain { for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2Service.printService(list2.get(i)); MysqlUtilTable2Service.printServiceImpl(list2.get(i)); - }*/ + } for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2XML.printXMLForMap(list2.get(i)); diff --git a/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java b/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java index 112749d7..faf4279c 100644 --- a/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java +++ b/src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java @@ -105,7 +105,7 @@ public class MysqlUtilTable2Bean { sb.append(" @Override\n"); sb.append(" public String toString() {\n"); - sb.append(" return \"" + realName + "{\" +\n"); + sb.append(" return \"" + realName + "Req{\" +\n"); for (FieldBean tb : list) { if (MysqlMain.req_exclude.contains("," + tb.getField() + ",")) { @@ -360,7 +360,7 @@ public class MysqlUtilTable2Bean { sb.append(" @Override\n"); sb.append(" public String toString() {\n"); - sb.append(" return \"" + realName + "{\" +\n"); + sb.append(" return \"" + realName + "Dto{\" +\n"); for (FieldBean tb : list) { if (MysqlMain.dto_exclude.contains("," + tb.getField() + ",")) {