From cadab4891af3f263a40941e0e22275b49c8a59e8 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 21 Oct 2020 20:50:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98=E6=88=92?= =?UTF-8?q?=E6=8E=89=E5=B0=8F=E6=B5=81=E7=A8=8B=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E8=80=83=E6=A0=B8=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E4=B8=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/common/emun/ChartOptType.java | 22 +-- .../config/DynamicDataSourceConfig.java | 19 +++ .../flow/dao/FlowChartDetailRecordMapper.java | 4 + .../lz/modules/flow/dao/FlowChartMapper.java | 3 + .../flow/dao/ResultTagetLibMapper.java | 4 + .../modules/flow/entity/FlowApprovalRole.java | 21 ++- .../flow/model/FlowApprovalRoleDto.java | 25 +++- .../lz/modules/flow/model/FlowChartDto.java | 6 + .../modules/flow/req/FlowApprovalRoleReq.java | 25 +++- .../req/FlowChartDetailRecordListReq.java | 88 +++++++++++ .../req/FlowChartDetailRecordSimpleReq.java | 135 +++++++++++++++++ .../flow/req/ResultModelDetailReq.java | 99 +++++++++++++ .../modules/flow/req/ResultModelItemReq.java | 139 ++++++++++++++++++ .../flow/req/ResultTagetLibItemReq.java | 114 ++++++++++++++ .../service/FlowChartDetailRecordService.java | 4 + .../flow/service/FlowChartService.java | 3 + .../FlowChartDetailRecordServiceImpl.java | 10 ++ .../service/impl/FlowChartServiceImpl.java | 6 + .../controller/FlowChartController.java | 46 +++++- .../controller/FlowStartController.java | 15 +- .../controller/ResultModelController.java | 56 +++++++ .../service/ResultTagetLibService.java | 4 + .../impl/ResultTagetLibServiceImpl.java | 10 ++ .../mapper/flow/FlowApprovalRoleMapper.xml | 11 +- .../flow/FlowChartDetailRecordMapper.xml | 49 +++++- .../resources/mapper/flow/FlowChartMapper.xml | 4 + .../mapper/flow/ResultTagetLibMapper.xml | 36 +++++ src/test/java/com/lz/mysql/MysqlMain.java | 3 +- 28 files changed, 934 insertions(+), 27 deletions(-) create mode 100644 src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordListReq.java create mode 100644 src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordSimpleReq.java create mode 100644 src/main/java/com/lz/modules/flow/req/ResultModelDetailReq.java create mode 100644 src/main/java/com/lz/modules/flow/req/ResultModelItemReq.java create mode 100644 src/main/java/com/lz/modules/flow/req/ResultTagetLibItemReq.java diff --git a/src/main/java/com/lz/common/emun/ChartOptType.java b/src/main/java/com/lz/common/emun/ChartOptType.java index 2c5081b8..8d7c64f0 100644 --- a/src/main/java/com/lz/common/emun/ChartOptType.java +++ b/src/main/java/com/lz/common/emun/ChartOptType.java @@ -2,23 +2,25 @@ package com.lz.common.emun; public enum ChartOptType { - SELF(-1, "考核人自己"), - APPOINT(0, "指定人员"), - MANAGER_1(1, "一级管理人员"), - MANAGER_2(2, "二级管理人员"), - MANAGER_3(3, "三级管理人员"), - MANAGER_4(4, "四级管理人员"), - MANAGER_5(5, "五级管理人员"), - MANAGER_6(6, "六级管理人员"), - MANAGER_7(7, "七级管理人员"), + SELF(-1, "考核人自己", "me"), + APPOINT(0, "指定人员", "other"), + MANAGER_1(1, "一级管理人员", "1_manager"), + MANAGER_2(2, "二级管理人员", "2_manager"), + MANAGER_3(3, "三级管理人员", "3_manager"), + MANAGER_4(4, "四级管理人员", "4_manager"), + MANAGER_5(5, "五级管理人员", "5_manager"), + MANAGER_6(6, "六级管理人员", "6_manager"), + MANAGER_7(7, "七级管理人员", "7_manager"), ; - ChartOptType(int code, String name){ + ChartOptType(int code, String name, String type){ this.code = code; this.name = name; + this.type = type; } private int code; private String name; + private String type; public int getCode() { return code; diff --git a/src/main/java/com/lz/datasource/config/DynamicDataSourceConfig.java b/src/main/java/com/lz/datasource/config/DynamicDataSourceConfig.java index 6a227b87..d4f6c20a 100644 --- a/src/main/java/com/lz/datasource/config/DynamicDataSourceConfig.java +++ b/src/main/java/com/lz/datasource/config/DynamicDataSourceConfig.java @@ -9,6 +9,8 @@ package com.lz.datasource.config; import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallFilter; import com.lz.datasource.properties.DataSourceProperties; import com.lz.datasource.properties.DynamicDataSourceProperties; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +18,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; import java.util.HashMap; import java.util.Map; @@ -60,4 +63,20 @@ public class DynamicDataSourceConfig { return targetDataSources; } + @Bean(name = "wallConfig") + WallConfig wallFilterConfig(){ + WallConfig wc = new WallConfig (); + wc.setMultiStatementAllow(true); + return wc; + } + + @Bean(name = "wallFilter") + @DependsOn("wallConfig") + WallFilter wallFilter(WallConfig wallConfig){ + WallFilter wfilter = new WallFilter (); + wfilter.setConfig(wallConfig); + return wfilter; + } + + } diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java index dc4c4c2f..516a5809 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java @@ -37,4 +37,8 @@ public interface FlowChartDetailRecordMapper extends BaseMapper selectFlowChartDetailRecordByGroupIdAndChartId(@Param("groupId") Long groupId, @Param("chartId") Long chartId); List selectFlowChartDetailRecordByGroupId(Long groupId); + + int insertFlowChartDetailRecords(List inserts); + + int updateCoverFlowChartDetailRecordByIds(List updaes); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java index 00808a97..520814be 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowChartMapper.java @@ -9,6 +9,7 @@ package com.lz.modules.flow.dao; */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.flow.entity.FlowChart; +import com.lz.modules.flow.model.FlowChartDto; import com.lz.modules.flow.model.FlowChartRoleDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -37,4 +38,6 @@ public interface FlowChartMapper extends BaseMapper { List selectFlowChartByFlowManagerId(@Param("id") Long id); List selectChartRoleByChartId(Long id); + + List selectFlowChartDtoByFlowManagerId(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 bc6e8906..9823f341 100644 --- a/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/ResultTagetLibMapper.java @@ -41,4 +41,8 @@ public interface ResultTagetLibMapper extends BaseMapper { List selectByCondition(@Param("page") IPage page, @Param("req") ResultTagetLibSearchReq req); int deleteResultTagetLibByModelId(Long id); + + int insertResultTagetLibs(@Param("list") List inserts); + + int updateResultTagetLibByIds(@Param("list") List inserts); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java b/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java index a955a49a..ce8738e1 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java +++ b/src/main/java/com/lz/modules/flow/entity/FlowApprovalRole.java @@ -10,7 +10,7 @@ import java.util.Date; *

*

*流程审批表 * @author quyixiao -* @since 2020-10-15 +* @since 2020-10-21 */ @Data @@ -44,6 +44,9 @@ public class FlowApprovalRole implements java.io.Serializable { //步骤类型0：依次，1：或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可） @ApiModelProperty(value = "步骤类型0：依次，1：或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可）", name = "stepType") private Integer stepType; + //-1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + @ApiModelProperty(value = "-1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管....", name = "approvalType") + private Integer approvalType; /** * * @return @@ -179,6 +182,21 @@ public class FlowApprovalRole implements java.io.Serializable { this.stepType = stepType; } + /** + * -1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + * @return + */ + public Integer getApprovalType() { + return approvalType; + } + /** + * -1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + * @param approvalType + */ + public void setApprovalType(Integer approvalType) { + this.approvalType = approvalType; + } + @Override public String toString() { return "FlowApprovalRole{" + @@ -191,6 +209,7 @@ public class FlowApprovalRole implements java.io.Serializable { ",roleId=" + roleId + ",flowId=" + flowId + ",stepType=" + stepType + + ",approvalType=" + approvalType + "}"; } } \ No newline at end of file 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 89a6fd71..9b4cc87c 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java +++ b/src/main/java/com/lz/modules/flow/model/FlowApprovalRoleDto.java @@ -6,11 +6,11 @@ import lombok.Data; *

*

*流程审批表 * @author quyixiao -* @since 2020-10-15 +* @since 2020-10-21 */ @Data -@ApiModel(value = "流程审批Dto") +@ApiModel(value = "流程审批表Dto") public class FlowApprovalRoleDto { // @ApiModelProperty(value = "", name = "id") @@ -30,6 +30,9 @@ public class FlowApprovalRoleDto { //步骤类型0：依次，1：或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可） @ApiModelProperty(value = "步骤类型0：依次，1：或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可）", name = "stepType") private Integer stepType; + //-1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + @ApiModelProperty(value = "-1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管....", name = "approvalType") + private Integer approvalType; /** * * @return @@ -120,15 +123,31 @@ public class FlowApprovalRoleDto { this.stepType = stepType; } + /** + * -1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + * @return + */ + public Integer getApprovalType() { + return approvalType; + } + /** + * -1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + * @param approvalType + */ + public void setApprovalType(Integer approvalType) { + this.approvalType = approvalType; + } + @Override public String toString() { - return "FlowApprovalRole{" + + return "FlowApprovalRoleDto{" + ",id=" + id + ",approvalId=" + approvalId + ",type=" + type + ",roleId=" + roleId + ",flowId=" + flowId + ",stepType=" + stepType + + ",approvalType=" + approvalType + "}"; } } \ No newline at end of file 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 0fd92594..19118515 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowChartDto.java +++ b/src/main/java/com/lz/modules/flow/model/FlowChartDto.java @@ -2,6 +2,9 @@ package com.lz.modules.flow.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.List; + /** *

*

*流程图，lz_flow的父 @@ -30,6 +33,9 @@ public class FlowChartDto { //执行步骤，第几步，从0开始 @ApiModelProperty(value = "执行步骤，第几步，从0开始", name = "stepIndex") private Integer stepIndex; + + @ApiModelProperty(value = "节点权限列表", name = "roleDtos") + private List roleDtos; /** * * @return 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 6062b86a..9aac1742 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java +++ b/src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java @@ -11,12 +11,12 @@ import java.util.Date; * 菜单权限表 *

*流程审批表 * @author quyixiao -* @since 2020-10-16 +* @since 2020-10-21 */ @Data -@ApiModel(value = "流程审批Req") +@ApiModel(value = "流程审批表Req") public class FlowApprovalRoleReq implements java.io.Serializable { @ApiModelProperty(value = "currPage", name = "当前页码") @@ -53,6 +53,9 @@ public class FlowApprovalRoleReq implements java.io.Serializable { //步骤类型0：依次，1：或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可） @ApiModelProperty(value = "步骤类型0：依次，1：或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可）", name = "stepType") private Integer stepType; + //-1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + @ApiModelProperty(value = "-1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管....", name = "approvalType") + private Integer approvalType; /** * * @return @@ -188,9 +191,24 @@ public class FlowApprovalRoleReq implements java.io.Serializable { this.stepType = stepType; } + /** + * -1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + * @return + */ + public Integer getApprovalType() { + return approvalType; + } + /** + * -1考核人员自己，0指定人员id，此时approval_id有值，1一级主管，2二级主管.... + * @param approvalType + */ + public void setApprovalType(Integer approvalType) { + this.approvalType = approvalType; + } + @Override public String toString() { - return "FlowApprovalRole{" + + return "FlowApprovalRoleReq{" + ",id=" + id + ",isDelete=" + isDelete + ",gmtCreate=" + gmtCreate + @@ -200,6 +218,7 @@ public class FlowApprovalRoleReq implements java.io.Serializable { ",roleId=" + roleId + ",flowId=" + flowId + ",stepType=" + stepType + + ",approvalType=" + approvalType + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordListReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordListReq.java new file mode 100644 index 00000000..e7da07c4 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordListReq.java @@ -0,0 +1,88 @@ +package com.lz.modules.flow.req; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** +*

+*

*考核模板流程记录表 +* @author quyixiao +* @since 2020-10-19 +*/ + +@Data +@ApiModel(value = "考核模板流程记录表ListDto") +public class FlowChartDetailRecordListReq { + // + @ApiModelProperty(value = "结点id，必传", name = "id") + private Long id; + //考核组ID + @ApiModelProperty(value = "考核组ID", name = "evaluationGroupId") + private Long evaluationGroupId; + //0关闭，1开启 + @ApiModelProperty(value = "0关闭，1开启", name = "status") + private Integer status; + + @ApiModelProperty(value = "小结点列表", name = "recordSimpleDtos") + private List recordSimpleDtos; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + + + /** + * 考核组ID + * @return + */ + public Long getEvaluationGroupId() { + return evaluationGroupId; + } + /** + * 考核组ID + * @param evaluationGroupId + */ + public void setEvaluationGroupId(Long evaluationGroupId) { + this.evaluationGroupId = evaluationGroupId; + } + + /** + * 0关闭，1开启 + * @return + */ + public Integer getStatus() { + return status; + } + /** + * 0关闭，1开启 + * @param status + */ + public void setStatus(Integer status) { + this.status = status; + } + + + + + @Override + public String toString() { + return "FlowChartDetailRecordDto{" + + ",id=" + id + + ",evaluationGroupId=" + evaluationGroupId + + ",status=" + status + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordSimpleReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordSimpleReq.java new file mode 100644 index 00000000..440b8561 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordSimpleReq.java @@ -0,0 +1,135 @@ +package com.lz.modules.flow.req; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +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-21 +*/ + +@Data +@ApiModel(value = "考核模板流程记录表SimpleDto") +public class FlowChartDetailRecordSimpleReq implements java.io.Serializable { + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "是否删除0或者不传，不删除，1删除", name = "isDelete") + private Integer isDelete; + //操作者id集合，逗号隔开，当opt_type为0时才有值 + @ApiModelProperty(value = "操作者id集合，逗号隔开，当opt_type为0时才有值", name = "optIds") + private String optIds; + //-1考核人员自己，0人员id，1一级主管，2二级主管.... + @ApiModelProperty(value = "-1考核人员自己，0人员id，1一级主管，2二级主管....", name = "optType") + private Integer optType; + //role id集合，逗号隔开 + @ApiModelProperty(value = "role id集合，逗号隔开", name = "roleIds") + private String roleIds; + //步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） + @ApiModelProperty(value = "步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）", name = "stepType") + private Integer stepType; + + //权重，评分时所占权重 + @ApiModelProperty(value = "权重，评分时所占权重", name = "weight") + private BigDecimal weight; + + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + + + /** + * 操作者id集合，逗号隔开，当opt_type为0时才有值 + * @return + */ + public String getOptIds() { + return optIds; + } + /** + * 操作者id集合，逗号隔开，当opt_type为0时才有值 + * @param optIds + */ + public void setOptIds(String optIds) { + this.optIds = optIds; + } + + /** + * -1考核人员自己，0人员id，1一级主管，2二级主管.... + * @return + */ + public Integer getOptType() { + return optType; + } + /** + * -1考核人员自己，0人员id，1一级主管，2二级主管.... + * @param optType + */ + public void setOptType(Integer optType) { + this.optType = optType; + } + + /** + * role id集合，逗号隔开 + * @return + */ + public String getRoleIds() { + return roleIds; + } + /** + * role id集合，逗号隔开 + * @param roleIds + */ + public void setRoleIds(String roleIds) { + this.roleIds = roleIds; + } + + /** + * 步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） + * @return + */ + public Integer getStepType() { + return stepType; + } + /** + * 步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） + * @param stepType + */ + public void setStepType(Integer stepType) { + this.stepType = stepType; + } + + + + @Override + public String toString() { + return "FlowChartDetailRecord{" + + ",id=" + id + + ",optIds=" + optIds + + ",optType=" + optType + + ",roleIds=" + roleIds + + ",stepType=" + stepType + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/ResultModelDetailReq.java b/src/main/java/com/lz/modules/flow/req/ResultModelDetailReq.java new file mode 100644 index 00000000..fa03d2dd --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/ResultModelDetailReq.java @@ -0,0 +1,99 @@ +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; +import java.util.List; + +/** +*

+* 菜单权限表 +*

*考核维度表 +* @author quyixiao +* @since 2020-10-19 +*/ + + +@Data +@ApiModel(value = "考核维模板详细Req") +public class ResultModelDetailReq implements java.io.Serializable { + + + + //lz_result_calculate 的id，计算法方法id + @ApiModelProperty(value = "lz_result_calculate 的id，计算法方法id", name = "calculateId") + private Long calculateId; + //等级开关0关闭，1开启 + @ApiModelProperty(value = "等级开关0关闭，1开启", name = "gradeStatus") + private Integer gradeStatus; + //使用的哪个等级。等级组id，lz_result_grade的group_id + @ApiModelProperty(value = "使用的哪个等级。等级组id，lz_result_grade的group_id", name = "gradeGroupId") + private Long gradeGroupId; + @ApiModelProperty(value = "考核维度", name = "modelItems") + private List modelItems; + + //考核组ID + @ApiModelProperty(value = "考核组ID", name = "evaluationGroupId") + private Long evaluationGroupId; + + + + /** + * lz_result_calculate 的id，计算法方法id + * @return + */ + public Long getCalculateId() { + return calculateId; + } + /** + * lz_result_calculate 的id，计算法方法id + * @param calculateId + */ + public void setCalculateId(Long calculateId) { + this.calculateId = calculateId; + } + + /** + * 等级开关0关闭，1开启 + * @return + */ + public Integer getGradeStatus() { + return gradeStatus; + } + /** + * 等级开关0关闭，1开启 + * @param gradeStatus + */ + public void setGradeStatus(Integer gradeStatus) { + this.gradeStatus = gradeStatus; + } + + /** + * 使用的哪个等级。等级组id，lz_result_grade的group_id + * @return + */ + public Long getGradeGroupId() { + return gradeGroupId; + } + /** + * 使用的哪个等级。等级组id，lz_result_grade的group_id + * @param gradeGroupId + */ + public void setGradeGroupId(Long gradeGroupId) { + this.gradeGroupId = gradeGroupId; + } + + + + @Override + public String toString() { + return "ResultModel{" + + ",calculateId=" + calculateId + + ",gradeStatus=" + gradeStatus + + ",gradeGroupId=" + gradeGroupId + + ",evaluationGroupId=" + evaluationGroupId + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/ResultModelItemReq.java b/src/main/java/com/lz/modules/flow/req/ResultModelItemReq.java new file mode 100644 index 00000000..f7d5dc5b --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/ResultModelItemReq.java @@ -0,0 +1,139 @@ +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; +import java.util.List; + +/** +*

+* 菜单权限表 +*

*考核维度表 +* @author quyixiao +* @since 2020-10-19 +*/ + + +@Data +@ApiModel(value = "考核维度表ItemReq") +public class ResultModelItemReq implements java.io.Serializable { + + + // + private Long id; + // + + @ApiModelProperty(value = "是否删除0或者不传，不删除，1删除", name = "isDelete") + private Integer isDelete; + //维度名称 + @ApiModelProperty(value = "维度名称", name = "name") + private String name; + + //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; + + @ApiModelProperty(value = "考核指标", name = "tagetLibItems") + private List tagetLibItems; + //lz_result_calculate 的id，计算法方法id + + + /** + * + * @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; + } + + + /** + * 1:业绩 2：文化价值观 + * @return + */ + public Integer getType() { + return type; + } + /** + * 1:业绩 2：文化价值观 + * @param type + */ + public void setType(Integer type) { + this.type = type; + } + + /** + * 权重 0不限权重 + * @return + */ + public BigDecimal getWeight() { + return weight; + } + /** + * 权重 0不限权重 + * @param weight + */ + public void setWeight(BigDecimal weight) { + this.weight = weight; + } + + /** + * 考核子项目个数最大限制 + * @return + */ + public Integer getMaxCount() { + return maxCount; + } + /** + * 考核子项目个数最大限制 + * @param maxCount + */ + public void setMaxCount(Integer maxCount) { + this.maxCount = maxCount; + } + + + + @Override + public String toString() { + return "ResultModel{" + + ",id=" + id + + ",name=" + name + + ",type=" + type + + ",weight=" + weight + + ",maxCount=" + maxCount + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/ResultTagetLibItemReq.java b/src/main/java/com/lz/modules/flow/req/ResultTagetLibItemReq.java new file mode 100644 index 00000000..339ab8a2 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/ResultTagetLibItemReq.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-19 +*/ + + +@Data +@ApiModel(value = "考核指标库表ItemReq") +public class ResultTagetLibItemReq implements java.io.Serializable { + + + private Long id; + // + @ApiModelProperty(value = "是否删除0或者不传，不删除，1删除", name = "isDelete") + private Integer isDelete; + + //指标名称 + @ApiModelProperty(value = "指标名称", name = "name") + private String name; + + //权重 + @ApiModelProperty(value = "权重", name = "weight") + private BigDecimal weight; + //考核标准，关键结果 + @ApiModelProperty(value = "考核标准，关键结果", name = "keyResult") + private String keyResult; + + /** + * + * @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; + } + + + + /** + * 权重 + * @return + */ + public BigDecimal getWeight() { + return weight; + } + /** + * 权重 + * @param weight + */ + public void setWeight(BigDecimal weight) { + this.weight = weight; + } + + /** + * 考核标准，关键结果 + * @return + */ + public String getKeyResult() { + return keyResult; + } + /** + * 考核标准，关键结果 + * @param keyResult + */ + public void setKeyResult(String keyResult) { + this.keyResult = keyResult; + } + + + + @Override + public String toString() { + return "ResultTagetLib{" + + ",id=" + id + + ",name=" + name + + ",weight=" + weight + + ",keyResult=" + keyResult + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java index ac7fe043..2e637958 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java @@ -36,4 +36,8 @@ public interface FlowChartDetailRecordService extends IService selectFlowChartDetailRecordByGroupIdAndChartId(Long groupId, Long chartId); List selectFlowChartDetailRecordByGroupId(Long groupId); + + int insertFlowChartDetailRecords(List inserts); + + int updateCoverFlowChartDetailRecordByIds(List updaes); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowChartService.java b/src/main/java/com/lz/modules/flow/service/FlowChartService.java index 3a3a359a..8aa7d683 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowChartService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowChartService.java @@ -2,6 +2,7 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.flow.entity.FlowChart; +import com.lz.modules.flow.model.FlowChartDto; import com.lz.modules.flow.model.FlowChartRoleDto; import java.util.List; @@ -36,4 +37,6 @@ public interface FlowChartService extends IService { List selectFlowChartByFlowManagerId(Long id); List selectChartRoleByChartId(Long id); + + List selectFlowChartDtoByFlowManagerId(Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java index 6a96c45b..d4b62623 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java @@ -71,6 +71,16 @@ public class FlowChartDetailRecordServiceImpl extends ServiceImpl inserts){ + return flowChartDetailRecordMapper.insertFlowChartDetailRecords(inserts); + } + + @Override + public int updateCoverFlowChartDetailRecordByIds(List updaes){ + return flowChartDetailRecordMapper.updateCoverFlowChartDetailRecordByIds(updaes); + } + diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java index d94d0fc3..0c52b9bd 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowChartServiceImpl.java @@ -3,6 +3,7 @@ package com.lz.modules.flow.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.modules.flow.dao.FlowChartMapper; import com.lz.modules.flow.entity.FlowChart; +import com.lz.modules.flow.model.FlowChartDto; import com.lz.modules.flow.model.FlowChartRoleDto; import com.lz.modules.flow.service.FlowChartService; import org.springframework.beans.factory.annotation.Autowired; @@ -71,6 +72,11 @@ public class FlowChartServiceImpl extends ServiceImpl selectFlowChartDtoByFlowManagerId(Long id){ + return flowChartMapper.selectFlowChartDtoByFlowManagerId(id); + } + } diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java index bc7128bf..2fe68112 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -9,7 +9,10 @@ import com.lz.modules.flow.entity.FlowChart; import com.lz.modules.flow.entity.FlowChartDetailRecord; import com.lz.modules.flow.entity.FlowManager; import com.lz.modules.flow.model.FlowChartDetailRecordDto; +import com.lz.modules.flow.model.FlowChartDto; import com.lz.modules.flow.model.FlowChartRoleDto; +import com.lz.modules.flow.req.FlowChartDetailRecordListReq; +import com.lz.modules.flow.req.FlowChartDetailRecordSimpleReq; import com.lz.modules.flow.service.FlowChartDetailRecordService; import com.lz.modules.flow.service.FlowChartService; import com.lz.modules.flow.service.FlowManagerService; @@ -47,12 +50,18 @@ public class FlowChartController { @GetMapping("/getByFlowManagerId") @ApiOperation("根据Manager Id获取大流程节点") @ApiImplicitParam(name = "id",value = "流程id，绩效请传1", required = true, dataType = "String",paramType = "query") - @ApiResponses({@ApiResponse(code = 200,message = "成功",response = FlowChart.class)}) + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = FlowChartDto.class)}) public R getByFlowManagerId(@RequestParam Long id) { FlowManager flowManager = flowManagerService.selectFlowManagerById(id); if(flowManager != null){ - List flowCharts = flowChartService.selectFlowChartByFlowManagerId(flowManager.getId()); - return R.ok().put("data",flowCharts); + List flowChartDtos = flowChartService.selectFlowChartDtoByFlowManagerId(flowManager.getId()); + for (FlowChartDto dto:flowChartDtos + ) { + List flowCharts = flowChartService.selectChartRoleByChartId(dto.getId()); + dto.setRoleDtos(flowCharts); + } + + return R.ok().put("data",flowChartDtos); } return R.error("无相关流程"); } @@ -93,6 +102,37 @@ public class FlowChartController { return R.ok().put("data", flowChartDetailRecord); } + @PostMapping("/saveDetailProcs") + @ApiOperation("保存流程节点小流程列表") + @ApiResponses({@ApiResponse(code = 200, message = "成功", response = FlowChartDetailRecord.class)}) + public R saveDetailProcs(@RequestBody @ApiParam FlowChartDetailRecordListReq flowChartDetailRecordListReq) { + List inserts = new ArrayList<>(); + List updaes = new ArrayList<>(); + int index = 0; + for (FlowChartDetailRecordSimpleReq req:flowChartDetailRecordListReq.getRecordSimpleDtos() + ) { + FlowChartDetailRecord flowChartDetailRecord = new FlowChartDetailRecord(); + BeanUtils.copyProperties(req, flowChartDetailRecord); + flowChartDetailRecord.setChartId(flowChartDetailRecordListReq.getId()); + flowChartDetailRecord.setEvaluationGroupId(flowChartDetailRecordListReq.getEvaluationGroupId()); + flowChartDetailRecord.setStepIndex(index); + if(flowChartDetailRecord.getId() != null && flowChartDetailRecord.getId().intValue() > 0){ + updaes.add(flowChartDetailRecord); + }else{ + inserts.add(flowChartDetailRecord); + } + index++; + } + if(inserts.size() > 0){ + flowChartDetailRecordService.insertFlowChartDetailRecords(inserts); + } + if(updaes.size() > 0){ + flowChartDetailRecordService.updateBatchById(updaes);//.updateCoverFlowChartDetailRecordByIds(updaes); + } + + return R.ok(); + } + @PostMapping("/updateDetailProc") public R updateDetailProc(@RequestBody @ApiParam FlowChartDetailRecord flowChartDetailRecord) { flowChartDetailRecordService.updateFlowChartDetailRecordById(flowChartDetailRecord); diff --git a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java index d0c4996a..9239bb75 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -155,13 +155,24 @@ public class FlowStartController { flowApprovalRole.setApprovalId(Long.getLong(id)); flowApprovalRole.setStepType(flowChartDetailRecord.getStepType()); flowApprovalRole.setRoleId(Long.getLong(roleId)); + flowApprovalRole.setApprovalType(flowChartDetailRecord.getOptType()); flowApprovalRoles.add(flowApprovalRole); - } + } + }else{ + String[] roleIds = flowChartDetailRecord.getRoleIds().split(","); + for (String roleId:roleIds + ) { + FlowApprovalRole flowApprovalRole = new FlowApprovalRole(); + flowApprovalRole.setFlowId(flow.getId()); + flowApprovalRole.setStepType(flowChartDetailRecord.getStepType()); + flowApprovalRole.setRoleId(Long.getLong(roleId)); + flowApprovalRole.setApprovalType(flowChartDetailRecord.getOptType()); + flowApprovalRoles.add(flowApprovalRole); } } - + //插入记录 } for (EvaluationStartStaff startStaff:evaluationStartStaffs 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 e58d3127..d631bedf 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java @@ -3,14 +3,20 @@ package com.lz.modules.performance.controller; import com.lz.common.utils.R; import com.lz.modules.flow.entity.ResultModel; +import com.lz.modules.flow.entity.ResultTagetLib; import com.lz.modules.flow.model.ResultModelDto; import com.lz.modules.flow.model.ResultTagetLibDto; +import com.lz.modules.flow.req.ResultModelDetailReq; +import com.lz.modules.flow.req.ResultModelItemReq; +import com.lz.modules.flow.req.ResultTagetLibItemReq; import com.lz.modules.flow.service.ResultModelService; import com.lz.modules.performance.service.ResultTagetLibService; import io.swagger.annotations.*; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; @RestController @@ -26,6 +32,8 @@ public class ResultModelController { private ResultTagetLibService resultTagetLibService; + + @GetMapping("/getByGroupId") @ApiOperation(value="根据考核组id获取模板列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultModelDto.class)}) @@ -66,6 +74,54 @@ public class ResultModelController { return R.ok().put("data",resultModel); } + @PostMapping("/saveDetail") + @ApiOperation("保存模板中的考核维度及指标") + public R saveDetail(@RequestBody @ApiParam ResultModelDetailReq resultModelDetailReq) { + + + int resultModelOrderBy = 0; + for (ResultModelItemReq itemReq: + resultModelDetailReq.getModelItems()) { + ResultModel resultModel = new ResultModel(); + BeanUtils.copyProperties(itemReq, resultModel); + resultModel.setCalculateId(resultModelDetailReq.getCalculateId()); + resultModel.setGradeGroupId(resultModelDetailReq.getGradeGroupId()); + resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus()); + resultModel.setEvaluationGroupId(resultModelDetailReq.getEvaluationGroupId()); + resultModel.setOrderBy(resultModelOrderBy); + if(resultModel.getId() != null && resultModel.getId().intValue() > 0){ + resultModelService.updateResultModelById(resultModel); + }else{ + resultModelService.insertResultModel(resultModel); + } + int libOrderBy = 0; + List inserts = new ArrayList<>(); + List updates = new ArrayList<>(); + for (ResultTagetLibItemReq req:itemReq.getTagetLibItems() + ) { + ResultTagetLib resultTagetLib = new ResultTagetLib(); + BeanUtils.copyProperties(req, resultTagetLib); + resultTagetLib.setModelId(resultModel.getId()); + resultTagetLib.setOrderBy(libOrderBy); + if(resultTagetLib.getId() != null && resultTagetLib.getId().intValue() > 0){ + updates.add(resultTagetLib); + }else{ + inserts.add(resultTagetLib); + } + + libOrderBy++; + } + if(inserts.size() > 0){ + resultTagetLibService.insertResultTagetLibs(inserts); + } + if(updates.size() > 0){ + resultTagetLibService.updateBatchById(updates); + } + resultModelOrderBy++; + } + return R.ok(); + } + @GetMapping("/delete") @ApiOperation("删除模板中的考核维度") 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 bd7958ed..8c4d1851 100644 --- a/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java +++ b/src/main/java/com/lz/modules/performance/service/ResultTagetLibService.java @@ -41,4 +41,8 @@ public interface ResultTagetLibService extends IService { PageUtils selectResultTagetLibByReq(ResultTagetLibSearchReq req); int deleteResultTagetLibByModelId(Long id); + + int insertResultTagetLibs(List inserts); + + int updateResultTagetLibByIds(List inserts); } \ 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 a002d0f0..d78c8013 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 @@ -109,6 +109,16 @@ public class ResultTagetLibServiceImpl extends ServiceImpl inserts){ + return resultTagetLibMapper.insertResultTagetLibs(inserts); + } + + @Override + public int updateResultTagetLibByIds(List inserts){ + return resultTagetLibMapper.updateResultTagetLibByIds(inserts); + } + } diff --git a/src/main/resources/mapper/flow/FlowApprovalRoleMapper.xml b/src/main/resources/mapper/flow/FlowApprovalRoleMapper.xml index 1c75be20..953d2640 100644 --- a/src/main/resources/mapper/flow/FlowApprovalRoleMapper.xml +++ b/src/main/resources/mapper/flow/FlowApprovalRoleMapper.xml @@ -13,12 +13,13 @@ + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, approval_id AS approvalId, type AS type, role_id AS roleId, flow_id AS flowId, step_type AS stepType + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, approval_id AS approvalId, type AS type, role_id AS roleId, flow_id AS flowId, step_type AS stepType, approval_type AS approvalType @@ -36,6 +37,7 @@ role_id, flow_id, step_type, + approval_type, is_delete, gmt_create, gmt_modified @@ -45,6 +47,7 @@ #{ roleId}, #{ flowId}, #{ stepType}, + #{ approvalType}, 0, now(), now() @@ -62,7 +65,8 @@ type = #{type}, role_id = #{roleId}, flow_id = #{flowId}, - step_type = #{stepType} + step_type = #{stepType}, + approval_type = #{approvalType} ,gmt_modified = now() where id = #{id} @@ -79,7 +83,8 @@ type = #{type}, role_id = #{roleId}, flow_id = #{flowId}, - step_type = #{stepType} + step_type = #{stepType}, + approval_type = #{approvalType} ,gmt_modified = now() where id = #{id} diff --git a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml index 1ff2848a..f3896936 100644 --- a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml @@ -113,9 +113,56 @@ select * from lz_flow_chart_detail_record where evaluation_group_id=#{groupId} and chart_id = #{chartId} and is_delete = 0 order by step_index desc - select * from lz_flow_chart_detail_record where evaluation_group_id=#{groupId} and is_delete = 0 order by step_index desc + + insert into lz_flow_chart_detail_record( + chart_id, + evaluation_group_id, + status, + opt_ids, + opt_type, + role_ids, + step_type, + step_index, + weight + )values + + #{ item.chartId}, + #{ item.evaluationGroupId}, + #{ item.status}, + #{ item.optIds}, + #{ item.optType}, + #{ item.roleIds}, + #{ item.stepType}, + #{ item.stepIndex}, + #{ item.weight} + + + + + + + update + lz_flow_chart_detail_record + set + is_delete = #{item.isDelete}, + chart_id = #{ item.chartId}, + evaluation_group_id = #{ item.evaluationGroupId}, + status = #{ item.status}, + opt_ids = #{ item.optIds}, + opt_type = #{ item.optType}, + role_ids = #{ item.roleIds}, + step_type = #{ item.stepType}, + step_index = #{ item.stepIndex}, + weight = #{ item.weight} + ,gmt_modified = now() + where id = #{item.id} + + ; + + diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml index c965ecff..805a0347 100644 --- a/src/main/resources/mapper/flow/FlowChartMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartMapper.xml @@ -97,5 +97,9 @@ SELECT crole.id as id, crole.chart_id as chart_id, crole.role_id as role_id, role.name as role_name, crole.type as type FROM lz_flow_chart_role crole left join lz_record_role role on role.id=crole.role_id where crole.chart_id=#{id} + + diff --git a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml index ae15b55f..666f0d4c 100644 --- a/src/main/resources/mapper/flow/ResultTagetLibMapper.xml +++ b/src/main/resources/mapper/flow/ResultTagetLibMapper.xml @@ -104,5 +104,41 @@ update lz_result_taget_lib set is_delete = 1 where model_id=#{id} + + insert into lz_result_taget_lib( + name, + model_id, + weight, + key_result, + order_by + )values + + + #{ item.name}, + #{ item.modelId}, + #{ item.weight}, + #{ item.keyResult}, + #{ item.orderBy} + + + + + + + update + lz_result_taget_lib + set + is_delete = #{item.isDelete}, + name = #{item.name}, + model_id = #{item.modelId}, + weight = #{item.weight}, + key_result = #{item.keyResult}, + order_by = #{item.orderBy} + ,gmt_modified = now() + where id = #{item.id} + + ; + + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index d2efcf66..6f73b049 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -78,7 +78,8 @@ public class MysqlMain { //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_flow_chart_detail_record")); + //list.add(new TablesBean("lz_flow_chart_detail_record")); + list.add(new TablesBean("lz_flow_approval_role")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();