From 739ac9bfd5b83cfabc90b14f286fd6cc5027e5e4 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 14 Oct 2020 18:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E6=96=B0?= =?UTF-8?q?=E8=A1=A8=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 1 + .../flow/dao/ResultCalculateMapper.java | 33 +++ .../flow/dao/ResultDimensionMapper.java | 33 +++ .../modules/flow/dao/ResultGradeMapper.java | 33 +++ .../modules/flow/entity/EvaluationGroup.java | 18 +- .../modules/flow/entity/ResultCalculate.java | 178 +++++++++++++++ .../modules/flow/entity/ResultDimension.java | 121 +++++++++++ .../lz/modules/flow/entity/ResultGrade.java | 199 +++++++++++++++++ .../lz/modules/flow/entity/ResultModel.java | 21 +- .../modules/flow/req/ResultCalculateReq.java | 182 ++++++++++++++++ .../modules/flow/req/ResultDimensionReq.java | 125 +++++++++++ .../lz/modules/flow/req/ResultGradeReq.java | 203 ++++++++++++++++++ .../lz/modules/flow/req/ResultModelReq.java | 21 +- .../service/ResultCalculateServiceImpl.java | 63 ++++++ .../flow/service/ResultDimensionService.java | 33 +++ .../flow/service/ResultGradeService.java | 33 +++ .../service/impl/ResultCalculateService.java | 33 +++ .../impl/ResultDimensionServiceImpl.java | 63 ++++++ .../service/impl/ResultGradeServiceImpl.java | 63 ++++++ .../controller/EvaluationGroupController.java | 2 +- .../controller/ResultCalculateController.java | 56 +++++ .../controller/ResultDimensionController.java | 56 +++++ .../controller/ResultGradeController.java | 56 +++++ .../mapper/flow/ResultCalculateMapper.xml | 88 ++++++++ .../mapper/flow/ResultDimensionMapper.xml | 73 +++++++ .../mapper/flow/ResultGradeMapper.xml | 93 ++++++++ .../mapper/flow/ResultModelMapper.xml | 11 +- src/test/java/com/lz/mysql/MysqlMain.java | 4 +- .../lz/mysql/MysqlUtilTable2Contoller.java | 10 +- 29 files changed, 1883 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/lz/modules/flow/dao/ResultCalculateMapper.java create mode 100644 src/main/java/com/lz/modules/flow/dao/ResultDimensionMapper.java create mode 100644 src/main/java/com/lz/modules/flow/dao/ResultGradeMapper.java create mode 100644 src/main/java/com/lz/modules/flow/entity/ResultCalculate.java create mode 100644 src/main/java/com/lz/modules/flow/entity/ResultDimension.java create mode 100644 src/main/java/com/lz/modules/flow/entity/ResultGrade.java create mode 100644 src/main/java/com/lz/modules/flow/req/ResultCalculateReq.java create mode 100644 src/main/java/com/lz/modules/flow/req/ResultDimensionReq.java create mode 100644 src/main/java/com/lz/modules/flow/req/ResultGradeReq.java create mode 100644 src/main/java/com/lz/modules/flow/service/ResultCalculateServiceImpl.java create mode 100644 src/main/java/com/lz/modules/flow/service/ResultDimensionService.java create mode 100644 src/main/java/com/lz/modules/flow/service/ResultGradeService.java create mode 100644 src/main/java/com/lz/modules/flow/service/impl/ResultCalculateService.java create mode 100644 src/main/java/com/lz/modules/flow/service/impl/ResultDimensionServiceImpl.java create mode 100644 src/main/java/com/lz/modules/flow/service/impl/ResultGradeServiceImpl.java create mode 100644 src/main/java/com/lz/modules/performance/controller/ResultCalculateController.java create mode 100644 src/main/java/com/lz/modules/performance/controller/ResultDimensionController.java create mode 100644 src/main/java/com/lz/modules/performance/controller/ResultGradeController.java create mode 100644 src/main/resources/mapper/flow/ResultCalculateMapper.xml create mode 100644 src/main/resources/mapper/flow/ResultDimensionMapper.xml create mode 100644 src/main/resources/mapper/flow/ResultGradeMapper.xml diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index b1686f6c..37d16f21 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -70,6 +70,7 @@ public class ShiroConfig { filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/updateLuck", "anon"); filterMap.put("/flowChart/**", "anon"); + filterMap.put("/evaluationGroup/**", "anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); diff --git a/src/main/java/com/lz/modules/flow/dao/ResultCalculateMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultCalculateMapper.java new file mode 100644 index 00000000..4cf5e571 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/dao/ResultCalculateMapper.java @@ -0,0 +1,33 @@ +package com.lz.modules.flow.dao; +/** +*

+* 模板计算公式 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.modules.flow.entity.ResultCalculate; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface ResultCalculateMapper extends BaseMapper { + + + ResultCalculate selectResultCalculateById(@Param("id")Long id); + + + Long insertResultCalculate(ResultCalculate resultCalculate); + + + int updateResultCalculateById(ResultCalculate resultCalculate); + + + int updateCoverResultCalculateById(ResultCalculate resultCalculate); + + + int deleteResultCalculateById(@Param("id")Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/dao/ResultDimensionMapper.java b/src/main/java/com/lz/modules/flow/dao/ResultDimensionMapper.java new file mode 100644 index 00000000..efc3f785 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/dao/ResultDimensionMapper.java @@ -0,0 +1,33 @@ +package com.lz.modules.flow.dao; +/** +*

+* 考核维度表 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ +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; +@Mapper +public interface ResultDimensionMapper extends BaseMapper { + + + ResultDimension selectResultDimensionById(@Param("id")Long id); + + + Long insertResultDimension(ResultDimension resultDimension); + + + int updateResultDimensionById(ResultDimension resultDimension); + + + int updateCoverResultDimensionById(ResultDimension resultDimension); + + + int deleteResultDimensionById(@Param("id")Long id); + + +} \ 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 new file mode 100644 index 00000000..fbcd4d38 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/dao/ResultGradeMapper.java @@ -0,0 +1,33 @@ +package com.lz.modules.flow.dao; +/** +*

+* 等级表 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.modules.flow.entity.ResultGrade; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface ResultGradeMapper extends BaseMapper { + + + ResultGrade selectResultGradeById(@Param("id")Long id); + + + Long insertResultGrade(ResultGrade resultGrade); + + + int updateResultGradeById(ResultGrade resultGrade); + + + int updateCoverResultGradeById(ResultGrade resultGrade); + + + int deleteResultGradeById(@Param("id")Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java b/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java index 486344bc..88ced955 100644 --- a/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java +++ b/src/main/java/com/lz/modules/flow/entity/EvaluationGroup.java @@ -35,16 +35,16 @@ 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; //参与考核员工staff_id或者部门id，逗号隔开 @ApiModelProperty(value = "参与考核员工staff_id或者部门id，逗号隔开", name = "inIds") - private Long inIds; + private String inIds; //0部门，1人员 @ApiModelProperty(value = "0部门，1人员", name = "inType") private Integer inType; //排除人员ids，逗号隔开 @ApiModelProperty(value = "排除人员ids，逗号隔开", name = "outIds") - private Long outIds; + private String outIds; /** * * @return @@ -124,14 +124,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; } @@ -139,14 +139,14 @@ public class EvaluationGroup implements java.io.Serializable { * 参与考核员工staff_id或者部门id，逗号隔开 * @return */ - public Long getInIds() { + public String getInIds() { return inIds; } /** * 参与考核员工staff_id或者部门id，逗号隔开 * @param inIds */ - public void setInIds(Long inIds) { + public void setInIds(String inIds) { this.inIds = inIds; } @@ -169,14 +169,14 @@ public class EvaluationGroup implements java.io.Serializable { * 排除人员ids，逗号隔开 * @return */ - public Long getOutIds() { + public String getOutIds() { return outIds; } /** * 排除人员ids，逗号隔开 * @param outIds */ - public void setOutIds(Long outIds) { + public void setOutIds(String outIds) { this.outIds = outIds; } diff --git a/src/main/java/com/lz/modules/flow/entity/ResultCalculate.java b/src/main/java/com/lz/modules/flow/entity/ResultCalculate.java new file mode 100644 index 00000000..d0cef232 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/entity/ResultCalculate.java @@ -0,0 +1,178 @@ +package com.lz.modules.flow.entity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; +/** +*

+* 菜单权限表 +*

*模板计算公式 +* @author quyixiao +* @since 2020-10-14 +*/ + +@Data +@TableName("lz_result_calculate") +@ApiModel(value = "模板计算公式") +public class ResultCalculate implements java.io.Serializable { + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + // + @ApiModelProperty(value = "", name = "isDelete") + private Integer isDelete; + // + @ApiModelProperty(value = "", name = "gmtCreate") + private Date gmtCreate; + // + @ApiModelProperty(value = "", name = "gmtModified") + private Date gmtModified; + //公式名称 + @ApiModelProperty(value = "公式名称", name = "name") + private String name; + //计算公式：表明.字段名[+|-|*|/]表明.字段名... + @ApiModelProperty(value = "计算公式：表明.字段名[+|-|*|/]表明.字段名...", name = "calculate") + private String calculate; + //备注说明 + @ApiModelProperty(value = "备注说明", name = "remark") + private String remark; + //业务id，用域区分公式使用地方 + @ApiModelProperty(value = "业务id，用域区分公式使用地方", name = "businessId") + private Long businessId; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + 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; + } + + /** + * 公式名称 + * @return + */ + public String getName() { + return name; + } + /** + * 公式名称 + * @param name + */ + public void setName(String name) { + this.name = name; + } + + /** + * 计算公式：表明.字段名[+|-|*|/]表明.字段名... + * @return + */ + public String getCalculate() { + return calculate; + } + /** + * 计算公式：表明.字段名[+|-|*|/]表明.字段名... + * @param calculate + */ + public void setCalculate(String calculate) { + this.calculate = calculate; + } + + /** + * 备注说明 + * @return + */ + public String getRemark() { + return remark; + } + /** + * 备注说明 + * @param remark + */ + public void setRemark(String remark) { + this.remark = remark; + } + + /** + * 业务id，用域区分公式使用地方 + * @return + */ + public Long getBusinessId() { + return businessId; + } + /** + * 业务id，用域区分公式使用地方 + * @param businessId + */ + public void setBusinessId(Long businessId) { + this.businessId = businessId; + } + + @Override + public String toString() { + return "ResultCalculate{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",name=" + name + + ",calculate=" + calculate + + ",remark=" + remark + + ",businessId=" + businessId + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/ResultDimension.java b/src/main/java/com/lz/modules/flow/entity/ResultDimension.java new file mode 100644 index 00000000..1c2cfbf8 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/entity/ResultDimension.java @@ -0,0 +1,121 @@ +package com.lz.modules.flow.entity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; +/** +*

+* 菜单权限表 +*

*考核维度表 +* @author quyixiao +* @since 2020-10-14 +*/ + +@Data +@TableName("lz_result_dimension") +@ApiModel(value = "考核维度表") +public class ResultDimension implements java.io.Serializable { + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + // + @ApiModelProperty(value = "", name = "isDelete") + private Integer isDelete; + // + @ApiModelProperty(value = "", name = "gmtCreate") + private Date gmtCreate; + // + @ApiModelProperty(value = "", name = "gmtModified") + private Date gmtModified; + //维度名称 + @ApiModelProperty(value = "维度名称", name = "name") + private String name; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + 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; + } + + /** + * 维度名称 + * @return + */ + public String getName() { + return name; + } + /** + * 维度名称 + * @param name + */ + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return "ResultDimension{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",name=" + name + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/ResultGrade.java b/src/main/java/com/lz/modules/flow/entity/ResultGrade.java new file mode 100644 index 00000000..d99d6aa0 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/entity/ResultGrade.java @@ -0,0 +1,199 @@ +package com.lz.modules.flow.entity; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +/** +*

+* 菜单权限表 +*

*等级表 +* @author quyixiao +* @since 2020-10-14 +*/ + +@Data +@TableName("lz_result_grade") +@ApiModel(value = "等级表") +public class ResultGrade implements java.io.Serializable { + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + // + @ApiModelProperty(value = "", name = "isDelete") + private Integer isDelete; + // + @ApiModelProperty(value = "", name = "gmtCreate") + private Date gmtCreate; + // + @ApiModelProperty(value = "", name = "gmtModified") + private Date gmtModified; + //等级名称，展示名称 + @ApiModelProperty(value = "等级名称，展示名称", name = "name") + private String name; + //最小分值>= + @ApiModelProperty(value = "最小分值>=", name = "minScore") + private BigDecimal minScore; + //最大分值< + @ApiModelProperty(value = "最大分值<", name = "maxScore") + private BigDecimal maxScore; + //固定、默认分值，当选择改级时所要打的分数 + @ApiModelProperty(value = "固定、默认分值，当选择改级时所要打的分数", name = "score") + private BigDecimal score; + //组id，用于区分一组 + @ApiModelProperty(value = "组id，用于区分一组", name = "groupId") + private Long groupId; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + 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; + } + + /** + * 等级名称，展示名称 + * @return + */ + public String getName() { + return name; + } + /** + * 等级名称，展示名称 + * @param name + */ + public void setName(String name) { + this.name = name; + } + + /** + * 最小分值>= + * @return + */ + public BigDecimal getMinScore() { + return minScore; + } + /** + * 最小分值>= + * @param minScore + */ + public void setMinScore(BigDecimal minScore) { + this.minScore = minScore; + } + + /** + * 最大分值< + * @return + */ + public BigDecimal getMaxScore() { + return maxScore; + } + /** + * 最大分值< + * @param maxScore + */ + public void setMaxScore(BigDecimal maxScore) { + this.maxScore = maxScore; + } + + /** + * 固定、默认分值，当选择改级时所要打的分数 + * @return + */ + public BigDecimal getScore() { + return score; + } + /** + * 固定、默认分值，当选择改级时所要打的分数 + * @param score + */ + public void setScore(BigDecimal score) { + this.score = score; + } + + /** + * 组id，用于区分一组 + * @return + */ + public Long getGroupId() { + return groupId; + } + /** + * 组id，用于区分一组 + * @param groupId + */ + public void setGroupId(Long groupId) { + this.groupId = groupId; + } + + @Override + public String toString() { + return "ResultGrade{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",name=" + name + + ",minScore=" + minScore + + ",maxScore=" + maxScore + + ",score=" + score + + ",groupId=" + groupId + + "}"; + } +} \ 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 947b3f76..395ae93c 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultModel.java +++ b/src/main/java/com/lz/modules/flow/entity/ResultModel.java @@ -13,7 +13,7 @@ import java.util.Date; * 菜单权限表 *

*考核模板表 * @author quyixiao -* @since 2020-10-13 +* @since 2020-10-14 */ @Data @@ -44,6 +44,9 @@ public class ResultModel implements java.io.Serializable { //考核子项目个数最大限制 @ApiModelProperty(value = "考核子项目个数最大限制", name = "maxCount") private Integer maxCount; + //lz_result_calculate 的id + @ApiModelProperty(value = "lz_result_calculate 的id", name = "calculateId") + private Long calculateId; /** * * @return @@ -164,6 +167,21 @@ public class ResultModel implements java.io.Serializable { this.maxCount = maxCount; } + /** + * lz_result_calculate 的id + * @return + */ + public Long getCalculateId() { + return calculateId; + } + /** + * lz_result_calculate 的id + * @param calculateId + */ + public void setCalculateId(Long calculateId) { + this.calculateId = calculateId; + } + @Override public String toString() { return "ResultModel{" + @@ -175,6 +193,7 @@ public class ResultModel implements java.io.Serializable { ",type=" + type + ",weight=" + weight + ",maxCount=" + maxCount + + ",calculateId=" + calculateId + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/ResultCalculateReq.java b/src/main/java/com/lz/modules/flow/req/ResultCalculateReq.java new file mode 100644 index 00000000..261d5d75 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/ResultCalculateReq.java @@ -0,0 +1,182 @@ +package com.lz.modules.flow.req; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; +/** +*

+* 菜单权限表 +*

*模板计算公式 +* @author quyixiao +* @since 2020-10-14 +*/ + + +@Data +@ApiModel(value = "模板计算公式") +public class ResultCalculateReq implements java.io.Serializable { + + private int page = 1; + private int rows = 10; + private String sort; + private String order; + // + private Long id; + // + @ApiModelProperty(value = "", name = "isDelete") + private Integer isDelete; + // + @ApiModelProperty(value = "", name = "gmtCreate") + private Date gmtCreate; + // + @ApiModelProperty(value = "", name = "gmtModified") + private Date gmtModified; + //公式名称 + @ApiModelProperty(value = "公式名称", name = "name") + private String name; + //计算公式：表明.字段名[+|-|*|/]表明.字段名... + @ApiModelProperty(value = "计算公式：表明.字段名[+|-|*|/]表明.字段名...", name = "calculate") + private String calculate; + //备注说明 + @ApiModelProperty(value = "备注说明", name = "remark") + private String remark; + //业务id，用域区分公式使用地方 + @ApiModelProperty(value = "业务id，用域区分公式使用地方", name = "businessId") + private Long businessId; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + 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; + } + + /** + * 公式名称 + * @return + */ + public String getName() { + return name; + } + /** + * 公式名称 + * @param name + */ + public void setName(String name) { + this.name = name; + } + + /** + * 计算公式：表明.字段名[+|-|*|/]表明.字段名... + * @return + */ + public String getCalculate() { + return calculate; + } + /** + * 计算公式：表明.字段名[+|-|*|/]表明.字段名... + * @param calculate + */ + public void setCalculate(String calculate) { + this.calculate = calculate; + } + + /** + * 备注说明 + * @return + */ + public String getRemark() { + return remark; + } + /** + * 备注说明 + * @param remark + */ + public void setRemark(String remark) { + this.remark = remark; + } + + /** + * 业务id，用域区分公式使用地方 + * @return + */ + public Long getBusinessId() { + return businessId; + } + /** + * 业务id，用域区分公式使用地方 + * @param businessId + */ + public void setBusinessId(Long businessId) { + this.businessId = businessId; + } + + @Override + public String toString() { + return "ResultCalculate{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",name=" + name + + ",calculate=" + calculate + + ",remark=" + remark + + ",businessId=" + businessId + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/ResultDimensionReq.java b/src/main/java/com/lz/modules/flow/req/ResultDimensionReq.java new file mode 100644 index 00000000..cc118414 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/ResultDimensionReq.java @@ -0,0 +1,125 @@ +package com.lz.modules.flow.req; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; +/** +*

+* 菜单权限表 +*

*考核维度表 +* @author quyixiao +* @since 2020-10-14 +*/ + + +@Data +@ApiModel(value = "考核维度表") +public class ResultDimensionReq implements java.io.Serializable { + + private int page = 1; + private int rows = 10; + private String sort; + private String order; + // + private Long id; + // + @ApiModelProperty(value = "", name = "isDelete") + private Integer isDelete; + // + @ApiModelProperty(value = "", name = "gmtCreate") + private Date gmtCreate; + // + @ApiModelProperty(value = "", name = "gmtModified") + private Date gmtModified; + //维度名称 + @ApiModelProperty(value = "维度名称", name = "name") + private String name; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + 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; + } + + /** + * 维度名称 + * @return + */ + public String getName() { + return name; + } + /** + * 维度名称 + * @param name + */ + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return "ResultDimension{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",name=" + name + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/ResultGradeReq.java b/src/main/java/com/lz/modules/flow/req/ResultGradeReq.java new file mode 100644 index 00000000..bf68a9a1 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/ResultGradeReq.java @@ -0,0 +1,203 @@ +package com.lz.modules.flow.req; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +/** +*

+* 菜单权限表 +*

*等级表 +* @author quyixiao +* @since 2020-10-14 +*/ + + +@Data +@ApiModel(value = "等级表") +public class ResultGradeReq implements java.io.Serializable { + + private int page = 1; + private int rows = 10; + private String sort; + private String order; + // + private Long id; + // + @ApiModelProperty(value = "", name = "isDelete") + private Integer isDelete; + // + @ApiModelProperty(value = "", name = "gmtCreate") + private Date gmtCreate; + // + @ApiModelProperty(value = "", name = "gmtModified") + private Date gmtModified; + //等级名称，展示名称 + @ApiModelProperty(value = "等级名称，展示名称", name = "name") + private String name; + //最小分值>= + @ApiModelProperty(value = "最小分值>=", name = "minScore") + private BigDecimal minScore; + //最大分值< + @ApiModelProperty(value = "最大分值<", name = "maxScore") + private BigDecimal maxScore; + //固定、默认分值，当选择改级时所要打的分数 + @ApiModelProperty(value = "固定、默认分值，当选择改级时所要打的分数", name = "score") + private BigDecimal score; + //组id，用于区分一组 + @ApiModelProperty(value = "组id，用于区分一组", name = "groupId") + private Long groupId; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + 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; + } + + /** + * 等级名称，展示名称 + * @return + */ + public String getName() { + return name; + } + /** + * 等级名称，展示名称 + * @param name + */ + public void setName(String name) { + this.name = name; + } + + /** + * 最小分值>= + * @return + */ + public BigDecimal getMinScore() { + return minScore; + } + /** + * 最小分值>= + * @param minScore + */ + public void setMinScore(BigDecimal minScore) { + this.minScore = minScore; + } + + /** + * 最大分值< + * @return + */ + public BigDecimal getMaxScore() { + return maxScore; + } + /** + * 最大分值< + * @param maxScore + */ + public void setMaxScore(BigDecimal maxScore) { + this.maxScore = maxScore; + } + + /** + * 固定、默认分值，当选择改级时所要打的分数 + * @return + */ + public BigDecimal getScore() { + return score; + } + /** + * 固定、默认分值，当选择改级时所要打的分数 + * @param score + */ + public void setScore(BigDecimal score) { + this.score = score; + } + + /** + * 组id，用于区分一组 + * @return + */ + public Long getGroupId() { + return groupId; + } + /** + * 组id，用于区分一组 + * @param groupId + */ + public void setGroupId(Long groupId) { + this.groupId = groupId; + } + + @Override + public String toString() { + return "ResultGrade{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",name=" + name + + ",minScore=" + minScore + + ",maxScore=" + maxScore + + ",score=" + score + + ",groupId=" + groupId + + "}"; + } +} \ 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 aefc19ab..43d1a8b6 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultModelReq.java +++ b/src/main/java/com/lz/modules/flow/req/ResultModelReq.java @@ -13,7 +13,7 @@ import java.util.Date; * 菜单权限表 *

*考核模板表 * @author quyixiao -* @since 2020-10-13 +* @since 2020-10-14 */ @@ -48,6 +48,9 @@ public class ResultModelReq implements java.io.Serializable { //考核子项目个数最大限制 @ApiModelProperty(value = "考核子项目个数最大限制", name = "maxCount") private Integer maxCount; + //lz_result_calculate 的id + @ApiModelProperty(value = "lz_result_calculate 的id", name = "calculateId") + private Long calculateId; /** * * @return @@ -168,6 +171,21 @@ public class ResultModelReq implements java.io.Serializable { this.maxCount = maxCount; } + /** + * lz_result_calculate 的id + * @return + */ + public Long getCalculateId() { + return calculateId; + } + /** + * lz_result_calculate 的id + * @param calculateId + */ + public void setCalculateId(Long calculateId) { + this.calculateId = calculateId; + } + @Override public String toString() { return "ResultModel{" + @@ -179,6 +197,7 @@ public class ResultModelReq implements java.io.Serializable { ",type=" + type + ",weight=" + weight + ",maxCount=" + maxCount + + ",calculateId=" + calculateId + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/ResultCalculateServiceImpl.java b/src/main/java/com/lz/modules/flow/service/ResultCalculateServiceImpl.java new file mode 100644 index 00000000..77534471 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/service/ResultCalculateServiceImpl.java @@ -0,0 +1,63 @@ +package com.lz.modules.flow.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.modules.flow.dao.ResultCalculateMapper; +import com.lz.modules.flow.entity.ResultCalculate; +import com.lz.modules.flow.service.impl.ResultCalculateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** +*

+* 模板计算公式 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ + +@Service +public class ResultCalculateServiceImpl extends ServiceImpl implements ResultCalculateService { + + + @Autowired + private ResultCalculateMapper resultCalculateMapper; + + + + @Override + public ResultCalculate selectResultCalculateById(Long id){ + return resultCalculateMapper.selectResultCalculateById(id); + } + + + + @Override + public Long insertResultCalculate(ResultCalculate resultCalculate){ + return resultCalculateMapper.insertResultCalculate(resultCalculate); + } + + + + @Override + public int updateResultCalculateById(ResultCalculate resultCalculate){ + return resultCalculateMapper.updateResultCalculateById(resultCalculate); + } + + + + @Override + public int updateCoverResultCalculateById(ResultCalculate resultCalculate){ + return resultCalculateMapper.updateCoverResultCalculateById(resultCalculate); + } + + + + @Override + public int deleteResultCalculateById(Long id){ + return resultCalculateMapper.deleteResultCalculateById(id); + } + + + +} diff --git a/src/main/java/com/lz/modules/flow/service/ResultDimensionService.java b/src/main/java/com/lz/modules/flow/service/ResultDimensionService.java new file mode 100644 index 00000000..0a66ae15 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/service/ResultDimensionService.java @@ -0,0 +1,33 @@ +package com.lz.modules.flow.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.flow.entity.ResultDimension; + +/** +*

+* 考核维度表 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ +public interface ResultDimensionService extends IService { + + + + ResultDimension selectResultDimensionById(Long id); + + + Long insertResultDimension(ResultDimension resultDimension); + + + int updateResultDimensionById(ResultDimension resultDimension); + + + int updateCoverResultDimensionById(ResultDimension resultDimension); + + + int deleteResultDimensionById(Long id); + + +} \ 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 new file mode 100644 index 00000000..89479e21 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/service/ResultGradeService.java @@ -0,0 +1,33 @@ +package com.lz.modules.flow.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.flow.entity.ResultGrade; + +/** +*

+* 等级表 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ +public interface ResultGradeService extends IService { + + + + ResultGrade selectResultGradeById(Long id); + + + Long insertResultGrade(ResultGrade resultGrade); + + + int updateResultGradeById(ResultGrade resultGrade); + + + int updateCoverResultGradeById(ResultGrade resultGrade); + + + int deleteResultGradeById(Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultCalculateService.java b/src/main/java/com/lz/modules/flow/service/impl/ResultCalculateService.java new file mode 100644 index 00000000..21e38a4c --- /dev/null +++ b/src/main/java/com/lz/modules/flow/service/impl/ResultCalculateService.java @@ -0,0 +1,33 @@ +package com.lz.modules.flow.service.impl; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.flow.entity.ResultCalculate; + +/** +*

+* 模板计算公式 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ +public interface ResultCalculateService extends IService { + + + + ResultCalculate selectResultCalculateById(Long id); + + + Long insertResultCalculate(ResultCalculate resultCalculate); + + + int updateResultCalculateById(ResultCalculate resultCalculate); + + + int updateCoverResultCalculateById(ResultCalculate resultCalculate); + + + int deleteResultCalculateById(Long id); + + +} \ 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 new file mode 100644 index 00000000..84cf4010 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/service/impl/ResultDimensionServiceImpl.java @@ -0,0 +1,63 @@ +package com.lz.modules.flow.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.modules.flow.dao.ResultDimensionMapper; +import com.lz.modules.flow.entity.ResultDimension; +import com.lz.modules.flow.service.ResultDimensionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** +*

+* 考核维度表 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ + +@Service +public class ResultDimensionServiceImpl extends ServiceImpl implements ResultDimensionService { + + + @Autowired + private ResultDimensionMapper resultDimensionMapper; + + + + @Override + public ResultDimension selectResultDimensionById(Long id){ + return resultDimensionMapper.selectResultDimensionById(id); + } + + + + @Override + public Long insertResultDimension(ResultDimension resultDimension){ + return resultDimensionMapper.insertResultDimension(resultDimension); + } + + + + @Override + public int updateResultDimensionById(ResultDimension resultDimension){ + return resultDimensionMapper.updateResultDimensionById(resultDimension); + } + + + + @Override + public int updateCoverResultDimensionById(ResultDimension resultDimension){ + return resultDimensionMapper.updateCoverResultDimensionById(resultDimension); + } + + + + @Override + public int deleteResultDimensionById(Long id){ + return resultDimensionMapper.deleteResultDimensionById(id); + } + + + +} 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 new file mode 100644 index 00000000..43394855 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/service/impl/ResultGradeServiceImpl.java @@ -0,0 +1,63 @@ +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.service.ResultGradeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** +*

+* 等级表 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ + +@Service +public class ResultGradeServiceImpl extends ServiceImpl implements ResultGradeService { + + + @Autowired + private ResultGradeMapper resultGradeMapper; + + + + @Override + public ResultGrade selectResultGradeById(Long id){ + return resultGradeMapper.selectResultGradeById(id); + } + + + + @Override + public Long insertResultGrade(ResultGrade resultGrade){ + return resultGradeMapper.insertResultGrade(resultGrade); + } + + + + @Override + public int updateResultGradeById(ResultGrade resultGrade){ + return resultGradeMapper.updateResultGradeById(resultGrade); + } + + + + @Override + public int updateCoverResultGradeById(ResultGrade resultGrade){ + return resultGradeMapper.updateCoverResultGradeById(resultGrade); + } + + + + @Override + public int deleteResultGradeById(Long id){ + return resultGradeMapper.deleteResultGradeById(id); + } + + + +} 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 23d16023..c9538ffd 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -54,7 +54,7 @@ public class EvaluationGroupController { @ApiOperation("新增考核组") public R save(@RequestBody @ApiParam EvaluationGroup evaluationGroup) { evaluationGroupService.insertEvaluationGroup(evaluationGroup); - return R.ok(); + return R.ok().put("data", evaluationGroup); } diff --git a/src/main/java/com/lz/modules/performance/controller/ResultCalculateController.java b/src/main/java/com/lz/modules/performance/controller/ResultCalculateController.java new file mode 100644 index 00000000..9fbb7ea4 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/controller/ResultCalculateController.java @@ -0,0 +1,56 @@ +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.ResultCalculate; +import com.lz.modules.flow.service.impl.ResultCalculateService; +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; + +@RestController +@RequestMapping("/resultCalculate") +public class ResultCalculateController { + + + @Autowired + private ResultCalculateService resultCalculateService; + + + + + + @RequestMapping("/getById") + public R getById(@RequestBody ResultCalculate resultCalculate) { + resultCalculate = resultCalculateService.selectResultCalculateById(resultCalculate.getId()); + return R.ok().put("resultCalculate",resultCalculate); + } + + + @RequestMapping("/update") + public R update(@RequestBody ResultCalculate resultCalculate) { + resultCalculateService.updateResultCalculateById(resultCalculate); + return R.ok(); + } + + + @RequestMapping("/save") + public R save(@RequestBody ResultCalculate resultCalculate) { + resultCalculateService.insertResultCalculate(resultCalculate); + return R.ok(); + } + + + @RequestMapping("/delete") + public R list(@RequestBody Long id) { + resultCalculateService.deleteResultCalculateById(id); + return R.ok(); + } +} diff --git a/src/main/java/com/lz/modules/performance/controller/ResultDimensionController.java b/src/main/java/com/lz/modules/performance/controller/ResultDimensionController.java new file mode 100644 index 00000000..ea89c0d5 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/controller/ResultDimensionController.java @@ -0,0 +1,56 @@ +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.ResultDimension; +import com.lz.modules.flow.service.ResultDimensionService; +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; + +@RestController +@RequestMapping("/resultDimension") +public class ResultDimensionController { + + + @Autowired + private ResultDimensionService resultDimensionService; + + + + + + @RequestMapping("/getById") + public R getById(@RequestBody ResultDimension resultDimension) { + resultDimension = resultDimensionService.selectResultDimensionById(resultDimension.getId()); + return R.ok().put("resultDimension",resultDimension); + } + + + @RequestMapping("/update") + public R update(@RequestBody ResultDimension resultDimension) { + resultDimensionService.updateResultDimensionById(resultDimension); + return R.ok(); + } + + + @RequestMapping("/save") + public R save(@RequestBody ResultDimension resultDimension) { + resultDimensionService.insertResultDimension(resultDimension); + return R.ok(); + } + + + @RequestMapping("/delete") + public R list(@RequestBody Long id) { + resultDimensionService.deleteResultDimensionById(id); + return R.ok(); + } +} diff --git a/src/main/java/com/lz/modules/performance/controller/ResultGradeController.java b/src/main/java/com/lz/modules/performance/controller/ResultGradeController.java new file mode 100644 index 00000000..babe9093 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/controller/ResultGradeController.java @@ -0,0 +1,56 @@ +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.ResultGrade; +import com.lz.modules.flow.service.ResultGradeService; +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; + +@RestController +@RequestMapping("/resultGrade") +public class ResultGradeController { + + + @Autowired + private ResultGradeService resultGradeService; + + + + + + @RequestMapping("/getById") + public R getById(@RequestBody ResultGrade resultGrade) { + resultGrade = resultGradeService.selectResultGradeById(resultGrade.getId()); + return R.ok().put("resultGrade",resultGrade); + } + + + @RequestMapping("/update") + public R update(@RequestBody ResultGrade resultGrade) { + resultGradeService.updateResultGradeById(resultGrade); + return R.ok(); + } + + + @RequestMapping("/save") + public R save(@RequestBody ResultGrade resultGrade) { + resultGradeService.insertResultGrade(resultGrade); + return R.ok(); + } + + + @RequestMapping("/delete") + public R list(@RequestBody Long id) { + resultGradeService.deleteResultGradeById(id); + return R.ok(); + } +} diff --git a/src/main/resources/mapper/flow/ResultCalculateMapper.xml b/src/main/resources/mapper/flow/ResultCalculateMapper.xml new file mode 100644 index 00000000..1b7638f4 --- /dev/null +++ b/src/main/resources/mapper/flow/ResultCalculateMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, calculate AS calculate, remark AS remark, business_id AS businessId + + + + + + + + + + insert into lz_result_calculate( + name, + calculate, + remark, + business_id, + is_delete, + gmt_create, + gmt_modified + )values( + #{ name}, + #{ calculate}, + #{ remark}, + #{ businessId}, + 0, + now(), + now() + ) + + + + + update + lz_result_calculate + + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name}, + calculate = #{calculate}, + remark = #{remark}, + business_id = #{businessId} + + ,gmt_modified = now() + where id = #{id} + + + + + update + lz_result_calculate + set + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name}, + calculate = #{calculate}, + remark = #{remark}, + business_id = #{businessId} + ,gmt_modified = now() + where id = #{id} + + + + + update lz_result_calculate set is_delete = 1 where id=#{id} limit 1 + + + + diff --git a/src/main/resources/mapper/flow/ResultDimensionMapper.xml b/src/main/resources/mapper/flow/ResultDimensionMapper.xml new file mode 100644 index 00000000..b718a032 --- /dev/null +++ b/src/main/resources/mapper/flow/ResultDimensionMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name + + + + + + + + + + insert into lz_result_dimension( + name, + is_delete, + gmt_create, + gmt_modified + )values( + #{ name}, + 0, + now(), + now() + ) + + + + + update + lz_result_dimension + + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name} + + ,gmt_modified = now() + where id = #{id} + + + + + update + lz_result_dimension + set + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name} + ,gmt_modified = now() + where id = #{id} + + + + + update lz_result_dimension set is_delete = 1 where id=#{id} limit 1 + + + + diff --git a/src/main/resources/mapper/flow/ResultGradeMapper.xml b/src/main/resources/mapper/flow/ResultGradeMapper.xml new file mode 100644 index 00000000..12efc569 --- /dev/null +++ b/src/main/resources/mapper/flow/ResultGradeMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, min_score AS minScore, max_score AS maxScore, score AS score, group_id AS groupId + + + + + + + + + + insert into lz_result_grade( + name, + min_score, + max_score, + score, + group_id, + is_delete, + gmt_create, + gmt_modified + )values( + #{ name}, + #{ minScore}, + #{ maxScore}, + #{ score}, + #{ groupId}, + 0, + now(), + now() + ) + + + + + update + lz_result_grade + + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name}, + min_score = #{minScore}, + max_score = #{maxScore}, + score = #{score}, + group_id = #{groupId} + + ,gmt_modified = now() + where id = #{id} + + + + + update + lz_result_grade + set + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + name = #{name}, + min_score = #{minScore}, + max_score = #{maxScore}, + score = #{score}, + group_id = #{groupId} + ,gmt_modified = now() + where id = #{id} + + + + + 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 811d7400..7f90402d 100644 --- a/src/main/resources/mapper/flow/ResultModelMapper.xml +++ b/src/main/resources/mapper/flow/ResultModelMapper.xml @@ -12,12 +12,13 @@ + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, evaluation_group_id AS evaluationGroupId, type AS type, weight AS weight, max_count AS maxCount + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, evaluation_group_id AS evaluationGroupId, type AS type, weight AS weight, max_count AS maxCount, calculate_id AS calculateId @@ -34,6 +35,7 @@ type, weight, max_count, + calculate_id, is_delete, gmt_create, gmt_modified @@ -42,6 +44,7 @@ #{ type}, #{ weight}, #{ maxCount}, + #{ calculateId}, 0, now(), now() @@ -58,7 +61,8 @@ evaluation_group_id = #{evaluationGroupId}, type = #{type}, weight = #{weight}, - max_count = #{maxCount} + max_count = #{maxCount}, + calculate_id = #{calculateId} ,gmt_modified = now() where id = #{id} @@ -74,7 +78,8 @@ evaluation_group_id = #{evaluationGroupId}, type = #{type}, weight = #{weight}, - max_count = #{maxCount} + max_count = #{maxCount}, + calculate_id = #{calculateId} ,gmt_modified = now() where id = #{id} diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index ac6b170b..21bdce13 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -63,8 +63,8 @@ public class MysqlMain { } List list = new ArrayList(); - list.add(new TablesBean("lz_flow_chart")); - list.add(new TablesBean("lz_flow_chart_role")); + list.add(new TablesBean("lz_result_dimension")); + list.add(new TablesBean("lz_result_grade")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments(); diff --git a/src/test/java/com/lz/mysql/MysqlUtilTable2Contoller.java b/src/test/java/com/lz/mysql/MysqlUtilTable2Contoller.java index da0d251f..27fd6728 100644 --- a/src/test/java/com/lz/mysql/MysqlUtilTable2Contoller.java +++ b/src/test/java/com/lz/mysql/MysqlUtilTable2Contoller.java @@ -55,7 +55,7 @@ public class MysqlUtilTable2Contoller { content.append(" @RequestMapping(\"/getById\")\n"); content.append(" public R getById(@RequestBody " + tableBean.getSpaceName() + " " + tableBean.getJavaName() + ") {\n"); - content.append(" " + tableBean.getJavaName() + " = " + tableBean.getJavaName() + "service.select" + tableBean.getSpaceName() + "ById(" + tableBean.getJavaName() + ".getId());\n"); + content.append(" " + tableBean.getJavaName() + " = " + tableBean.getJavaName() + "Service.select" + tableBean.getSpaceName() + "ById(" + tableBean.getJavaName() + ".getId());\n"); content.append(" return R.ok().put(\"" + tableBean.getJavaName() + "\"," + tableBean.getJavaName() + ");\n"); content.append(" }\n"); @@ -65,21 +65,21 @@ public class MysqlUtilTable2Contoller { content.append("\n"); content.append(" @RequestMapping(\"/update\")\n"); content.append(" public R update(@RequestBody " + tableBean.getSpaceName() + " " + tableBean.getJavaName() + ") {\n"); - content.append(" " + tableBean.getJavaName() + "service.update" + tableBean.getSpaceName() + "ById(" + tableBean.getJavaName() + ");\n"); + content.append(" " + tableBean.getJavaName() + "Service.update" + tableBean.getSpaceName() + "ById(" + tableBean.getJavaName() + ");\n"); content.append(" return R.ok();\n"); content.append(" }\n"); content.append("\n"); content.append("\n"); content.append(" @RequestMapping(\"/save\")\n"); content.append(" public R save(@RequestBody " + tableBean.getSpaceName() + " " + tableBean.getJavaName() + ") {\n"); - content.append(" " + tableBean.getJavaName() + "service.insert" + tableBean.getSpaceName() + "(" + tableBean.getJavaName() + ");\n"); + content.append(" " + tableBean.getJavaName() + "Service.insert" + tableBean.getSpaceName() + "(" + tableBean.getJavaName() + ");\n"); content.append(" return R.ok();\n"); content.append(" }\n"); content.append("\n"); content.append("\n"); content.append(" @RequestMapping(\"/delete\")\n"); - content.append(" public R list(@MultiRequestBody Long id) {\n"); - content.append(" " + tableBean.getJavaName() + "service.delete" + tableBean.getSpaceName() + "ById(id);\n"); + content.append(" public R list(@RequestBody Long id) {\n"); + content.append(" " + tableBean.getJavaName() + "Service.delete" + tableBean.getSpaceName() + "ById(id);\n"); content.append(" return R.ok();\n"); content.append(" }\n"); content.append("}\n");