From 4fcc47e9fe727471cf21a4de381978170c2ef4e4 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 14 Oct 2020 09:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=92=8C=E6=9D=83=E9=99=90=E5=85=B3=E7=B3=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/flow/dao/FlowChartRoleMapper.java | 33 ++++ .../com/lz/modules/flow/entity/FlowChart.java | 40 +---- .../lz/modules/flow/entity/FlowChartRole.java | 159 +++++++++++++++++ .../com/lz/modules/flow/req/FlowChartReq.java | 40 +---- .../lz/modules/flow/req/FlowChartRoleReq.java | 163 ++++++++++++++++++ .../flow/service/FlowChartRoleService.java | 33 ++++ .../impl/FlowChartRoleServiceImpl.java | 63 +++++++ .../controller/EvaluationGroupController.java | 14 +- .../controller/FlowChartController.java | 13 +- .../controller/FlowChartRoleController.java | 56 ++++++ .../resources/mapper/flow/FlowChartMapper.xml | 12 +- .../mapper/flow/FlowChartRoleMapper.xml | 83 +++++++++ src/test/java/com/lz/mysql/MysqlMain.java | 8 +- 13 files changed, 610 insertions(+), 107 deletions(-) create mode 100644 src/main/java/com/lz/modules/flow/dao/FlowChartRoleMapper.java create mode 100644 src/main/java/com/lz/modules/flow/entity/FlowChartRole.java create mode 100644 src/main/java/com/lz/modules/flow/req/FlowChartRoleReq.java create mode 100644 src/main/java/com/lz/modules/flow/service/FlowChartRoleService.java create mode 100644 src/main/java/com/lz/modules/flow/service/impl/FlowChartRoleServiceImpl.java create mode 100644 src/main/java/com/lz/modules/performance/controller/FlowChartRoleController.java create mode 100644 src/main/resources/mapper/flow/FlowChartRoleMapper.xml diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartRoleMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartRoleMapper.java new file mode 100644 index 00000000..adfde442 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/dao/FlowChartRoleMapper.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.FlowChartRole; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper +public interface FlowChartRoleMapper extends BaseMapper { + + + FlowChartRole selectFlowChartRoleById(@Param("id")Long id); + + + Long insertFlowChartRole(FlowChartRole flowChartRole); + + + int updateFlowChartRoleById(FlowChartRole flowChartRole); + + + int updateCoverFlowChartRoleById(FlowChartRole flowChartRole); + + + int deleteFlowChartRoleById(@Param("id")Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/FlowChart.java b/src/main/java/com/lz/modules/flow/entity/FlowChart.java index 7d91b679..819f7800 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowChart.java +++ b/src/main/java/com/lz/modules/flow/entity/FlowChart.java @@ -11,7 +11,7 @@ import java.util.Date; * 菜单权限表 *

*流程图，lz_flow的父 * @author quyixiao -* @since 2020-10-13 +* @since 2020-10-14 */ @Data @@ -36,12 +36,6 @@ public class FlowChart implements java.io.Serializable { //flow_manager表中id @ApiModelProperty(value = "flow_manager表中id", name = "processId") private Long processId; - //必须授权角色id - @ApiModelProperty(value = "必须授权角色id", name = "roleId") - private Long roleId; - //可授权角色id - @ApiModelProperty(value = "可授权角色id", name = "canRoleId") - private Long canRoleId; //0启用，1不启用 @ApiModelProperty(value = "0启用，1不启用", name = "status") private Integer status; @@ -141,36 +135,6 @@ public class FlowChart implements java.io.Serializable { this.processId = processId; } - /** - * 必须授权角色id - * @return - */ - public Long getRoleId() { - return roleId; - } - /** - * 必须授权角色id - * @param roleId - */ - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - /** - * 可授权角色id - * @return - */ - public Long getCanRoleId() { - return canRoleId; - } - /** - * 可授权角色id - * @param canRoleId - */ - public void setCanRoleId(Long canRoleId) { - this.canRoleId = canRoleId; - } - /** * 0启用，1不启用 * @return @@ -225,8 +189,6 @@ public class FlowChart implements java.io.Serializable { ",gmtModified=" + gmtModified + ",name=" + name + ",processId=" + processId + - ",roleId=" + roleId + - ",canRoleId=" + canRoleId + ",status=" + status + ",type=" + type + ",stepIndex=" + stepIndex + diff --git a/src/main/java/com/lz/modules/flow/entity/FlowChartRole.java b/src/main/java/com/lz/modules/flow/entity/FlowChartRole.java new file mode 100644 index 00000000..08b0fa3f --- /dev/null +++ b/src/main/java/com/lz/modules/flow/entity/FlowChartRole.java @@ -0,0 +1,159 @@ +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_flow_chart_role") +@ApiModel(value = "流程节点权限对应关系表") +public class FlowChartRole 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; + //flow_chart表中id + @ApiModelProperty(value = "flow_chart表中id", name = "chartId") + private Long chartId; + //必须授权角色id + @ApiModelProperty(value = "必须授权角色id", name = "roleId") + private Long roleId; + //1默认权限，必带权限，0可选权限 + @ApiModelProperty(value = "1默认权限，必带权限，0可选权限", name = "type") + private Integer type; + /** + * + * @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; + } + + /** + * flow_chart表中id + * @return + */ + public Long getChartId() { + return chartId; + } + /** + * flow_chart表中id + * @param chartId + */ + public void setChartId(Long chartId) { + this.chartId = chartId; + } + + /** + * 必须授权角色id + * @return + */ + public Long getRoleId() { + return roleId; + } + /** + * 必须授权角色id + * @param roleId + */ + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + /** + * 1默认权限，必带权限，0可选权限 + * @return + */ + public Integer getType() { + return type; + } + /** + * 1默认权限，必带权限，0可选权限 + * @param type + */ + public void setType(Integer type) { + this.type = type; + } + + @Override + public String toString() { + return "FlowChartRole{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",chartId=" + chartId + + ",roleId=" + roleId + + ",type=" + type + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartReq.java index 940883d9..5a92d426 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowChartReq.java +++ b/src/main/java/com/lz/modules/flow/req/FlowChartReq.java @@ -11,7 +11,7 @@ import java.util.Date; * 菜单权限表 *

*流程图，lz_flow的父 * @author quyixiao -* @since 2020-10-13 +* @since 2020-10-14 */ @@ -40,12 +40,6 @@ public class FlowChartReq implements java.io.Serializable { //flow_manager表中id @ApiModelProperty(value = "flow_manager表中id", name = "processId") private Long processId; - //必须授权角色id - @ApiModelProperty(value = "必须授权角色id", name = "roleId") - private Long roleId; - //可授权角色id - @ApiModelProperty(value = "可授权角色id", name = "canRoleId") - private Long canRoleId; //0启用，1不启用 @ApiModelProperty(value = "0启用，1不启用", name = "status") private Integer status; @@ -145,36 +139,6 @@ public class FlowChartReq implements java.io.Serializable { this.processId = processId; } - /** - * 必须授权角色id - * @return - */ - public Long getRoleId() { - return roleId; - } - /** - * 必须授权角色id - * @param roleId - */ - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - /** - * 可授权角色id - * @return - */ - public Long getCanRoleId() { - return canRoleId; - } - /** - * 可授权角色id - * @param canRoleId - */ - public void setCanRoleId(Long canRoleId) { - this.canRoleId = canRoleId; - } - /** * 0启用，1不启用 * @return @@ -229,8 +193,6 @@ public class FlowChartReq implements java.io.Serializable { ",gmtModified=" + gmtModified + ",name=" + name + ",processId=" + processId + - ",roleId=" + roleId + - ",canRoleId=" + canRoleId + ",status=" + status + ",type=" + type + ",stepIndex=" + stepIndex + diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartRoleReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartRoleReq.java new file mode 100644 index 00000000..0c9d76de --- /dev/null +++ b/src/main/java/com/lz/modules/flow/req/FlowChartRoleReq.java @@ -0,0 +1,163 @@ +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 FlowChartRoleReq 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; + //flow_chart表中id + @ApiModelProperty(value = "flow_chart表中id", name = "chartId") + private Long chartId; + //必须授权角色id + @ApiModelProperty(value = "必须授权角色id", name = "roleId") + private Long roleId; + //1默认权限，必带权限，0可选权限 + @ApiModelProperty(value = "1默认权限，必带权限，0可选权限", name = "type") + private Integer type; + /** + * + * @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; + } + + /** + * flow_chart表中id + * @return + */ + public Long getChartId() { + return chartId; + } + /** + * flow_chart表中id + * @param chartId + */ + public void setChartId(Long chartId) { + this.chartId = chartId; + } + + /** + * 必须授权角色id + * @return + */ + public Long getRoleId() { + return roleId; + } + /** + * 必须授权角色id + * @param roleId + */ + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + /** + * 1默认权限，必带权限，0可选权限 + * @return + */ + public Integer getType() { + return type; + } + /** + * 1默认权限，必带权限，0可选权限 + * @param type + */ + public void setType(Integer type) { + this.type = type; + } + + @Override + public String toString() { + return "FlowChartRole{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",gmtCreate=" + gmtCreate + + ",gmtModified=" + gmtModified + + ",chartId=" + chartId + + ",roleId=" + roleId + + ",type=" + type + + "}"; + } +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowChartRoleService.java b/src/main/java/com/lz/modules/flow/service/FlowChartRoleService.java new file mode 100644 index 00000000..86f55fd3 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/service/FlowChartRoleService.java @@ -0,0 +1,33 @@ +package com.lz.modules.flow.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.flow.entity.FlowChartRole; + +/** +*

+* 流程节点权限对应关系表 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ +public interface FlowChartRoleService extends IService { + + + + FlowChartRole selectFlowChartRoleById(Long id); + + + Long insertFlowChartRole(FlowChartRole flowChartRole); + + + int updateFlowChartRoleById(FlowChartRole flowChartRole); + + + int updateCoverFlowChartRoleById(FlowChartRole flowChartRole); + + + int deleteFlowChartRoleById(Long id); + + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowChartRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowChartRoleServiceImpl.java new file mode 100644 index 00000000..cbf4f854 --- /dev/null +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowChartRoleServiceImpl.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.FlowChartRoleMapper; +import com.lz.modules.flow.entity.FlowChartRole; +import com.lz.modules.flow.service.FlowChartRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** +*

+* 流程节点权限对应关系表 服务类 +*

+* +* @author quyixiao +* @since 2020-10-14 +*/ + +@Service +public class FlowChartRoleServiceImpl extends ServiceImpl implements FlowChartRoleService { + + + @Autowired + private FlowChartRoleMapper flowChartRoleMapper; + + + + @Override + public FlowChartRole selectFlowChartRoleById(Long id){ + return flowChartRoleMapper.selectFlowChartRoleById(id); + } + + + + @Override + public Long insertFlowChartRole(FlowChartRole flowChartRole){ + return flowChartRoleMapper.insertFlowChartRole(flowChartRole); + } + + + + @Override + public int updateFlowChartRoleById(FlowChartRole flowChartRole){ + return flowChartRoleMapper.updateFlowChartRoleById(flowChartRole); + } + + + + @Override + public int updateCoverFlowChartRoleById(FlowChartRole flowChartRole){ + return flowChartRoleMapper.updateCoverFlowChartRoleById(flowChartRole); + } + + + + @Override + public int deleteFlowChartRoleById(Long id){ + return flowChartRoleMapper.deleteFlowChartRoleById(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 20c40a12..23d16023 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -10,11 +10,11 @@ import com.lz.modules.flow.entity.FlowManager; import com.lz.modules.flow.req.EvaluationGroupReq; import com.lz.modules.flow.service.EvaluationGroupService; import com.lz.modules.flow.service.FlowManagerService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import 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.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; @@ -22,6 +22,7 @@ import java.util.Map; @RestController @RequestMapping("/evaluationGroup") +@Api(tags="考核组") public class EvaluationGroupController { @@ -49,8 +50,9 @@ public class EvaluationGroupController { } - @RequestMapping("/save") - public R save(@RequestBody EvaluationGroup evaluationGroup) { + @PostMapping("/save") + @ApiOperation("新增考核组") + public R save(@RequestBody @ApiParam EvaluationGroup evaluationGroup) { evaluationGroupService.insertEvaluationGroup(evaluationGroup); return R.ok(); } 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 ee0d8e74..5f4212f1 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -5,13 +5,13 @@ import com.alibaba.fastjson.JSONObject; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; +import com.lz.modules.equipment.entity.model.FindEmployeeResModel; import com.lz.modules.flow.entity.EvaluationGroup; import com.lz.modules.flow.entity.FlowChart; import com.lz.modules.flow.entity.FlowManager; import com.lz.modules.flow.service.FlowChartService; import com.lz.modules.flow.service.FlowManagerService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,6 +33,8 @@ public class FlowChartController { @GetMapping("/getByFlowManagerId") @ApiOperation("根据Manager Id获取大流程") + @ApiImplicitParam(name = "id",value = "流程id", required = true, dataType = "String",paramType = "query") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = FlowChart.class)}) public R getByFlowManagerId(@RequestParam Long id) { FlowManager flowManager = flowManagerService.selectFlowManagerById(id); if(flowManager != null){ @@ -40,12 +42,13 @@ public class FlowChartController { return R.ok().put("list",flowCharts); } return R.error("无相关流程"); - } - @RequestMapping("/getById") - public R getById(@RequestBody FlowChart flowChart) { + @PostMapping("/getById") + @ApiOperation("获取流程节点") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = FlowChart.class)}) + public R getById(@RequestBody @ApiParam FlowChart flowChart) { flowChart = flowChartService.selectFlowChartById(flowChart.getId()); return R.ok().put("flowChart",flowChart); } diff --git a/src/main/java/com/lz/modules/performance/controller/FlowChartRoleController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartRoleController.java new file mode 100644 index 00000000..3bee766e --- /dev/null +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartRoleController.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.FlowChartRole; +import com.lz.modules.flow.service.FlowChartRoleService; +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("/flowChartRole") +public class FlowChartRoleController { + + + @Autowired + private FlowChartRoleService flowChartRoleService; + + + + + + @RequestMapping("/getById") + public R getById(@RequestBody FlowChartRole flowChartRole) { + flowChartRole = flowChartRoleService.selectFlowChartRoleById(flowChartRole.getId()); + return R.ok().put("flowChartRole",flowChartRole); + } + + + @RequestMapping("/update") + public R update(@RequestBody FlowChartRole flowChartRole) { + flowChartRoleService.updateFlowChartRoleById(flowChartRole); + return R.ok(); + } + + + @RequestMapping("/save") + public R save(@RequestBody FlowChartRole flowChartRole) { + flowChartRoleService.insertFlowChartRole(flowChartRole); + return R.ok(); + } + + + @RequestMapping("/delete") + public R list(@RequestBody Long id) { + flowChartRoleService.deleteFlowChartRoleById(id); + return R.ok(); + } +} diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml index c5ba938c..d1e2e8ec 100644 --- a/src/main/resources/mapper/flow/FlowChartMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartMapper.xml @@ -10,8 +10,6 @@ - - @@ -20,7 +18,7 @@ - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, process_id AS processId, role_id AS roleId, can_role_id AS canRoleId, status AS status, type AS type, step_index AS stepIndex + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, process_id AS processId, status AS status, type AS type, step_index AS stepIndex @@ -35,8 +33,6 @@ insert into lz_flow_chart( name, process_id, - role_id, - can_role_id, status, type, step_index, @@ -46,8 +42,6 @@ )values( #{ name}, #{ processId}, - #{ roleId}, - #{ canRoleId}, #{ status}, #{ type}, #{ stepIndex}, @@ -66,8 +60,6 @@ gmt_create = #{gmtCreate}, name = #{name}, process_id = #{processId}, - role_id = #{roleId}, - can_role_id = #{canRoleId}, status = #{status}, type = #{type}, step_index = #{stepIndex} @@ -85,8 +77,6 @@ gmt_create = #{gmtCreate}, name = #{name}, process_id = #{processId}, - role_id = #{roleId}, - can_role_id = #{canRoleId}, status = #{status}, type = #{type}, step_index = #{stepIndex} diff --git a/src/main/resources/mapper/flow/FlowChartRoleMapper.xml b/src/main/resources/mapper/flow/FlowChartRoleMapper.xml new file mode 100644 index 00000000..58511742 --- /dev/null +++ b/src/main/resources/mapper/flow/FlowChartRoleMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, chart_id AS chartId, role_id AS roleId, type AS type + + + + + + + + + + insert into lz_flow_chart_role( + chart_id, + role_id, + type, + is_delete, + gmt_create, + gmt_modified + )values( + #{ chartId}, + #{ roleId}, + #{ type}, + 0, + now(), + now() + ) + + + + + update + lz_flow_chart_role + + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + chart_id = #{chartId}, + role_id = #{roleId}, + type = #{type} + + ,gmt_modified = now() + where id = #{id} + + + + + update + lz_flow_chart_role + set + is_delete = #{isDelete}, + gmt_create = #{gmtCreate}, + chart_id = #{chartId}, + role_id = #{roleId}, + type = #{type} + ,gmt_modified = now() + where id = #{id} + + + + + update lz_flow_chart_role set is_delete = 1 where id=#{id} limit 1 + + + + diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index dba88d7b..ac6b170b 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -63,14 +63,8 @@ public class MysqlMain { } List list = new ArrayList(); - list.add(new TablesBean("lz_evaluation_group")); - list.add(new TablesBean("lz_evaluation_start_staff")); - list.add(new TablesBean("lz_flow_approval_role")); - list.add(new TablesBean("lz_flow_change")); list.add(new TablesBean("lz_flow_chart")); - list.add(new TablesBean("lz_flow_start")); - list.add(new TablesBean("lz_result_model")); - list.add(new TablesBean("lz_result_score")); + list.add(new TablesBean("lz_flow_chart_role")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();