From e6ba9b16356318c169de1201a6d19469229ea35f Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 09:41:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/common/emun/ChartOptType.java | 38 ++++++++++++++ .../java/com/lz/modules/app/dao/StaffDao.java | 2 + .../lz/modules/app/dto/StaffSimpleDto.java | 39 +++++++++++++++ .../lz/modules/app/service/StaffService.java | 7 ++- .../app/service/impl/StaffServiceImpl.java | 5 ++ .../flow/dao/FlowChartDetailRecordMapper.java | 5 ++ .../flow/entity/FlowChartDetailRecord.java | 31 +++++++++--- .../flow/model/FlowChartDetailRecordDto.java | 49 +++++++++++-------- .../flow/req/FlowChartDetailRecordReq.java | 31 +++++++++--- .../service/FlowChartDetailRecordService.java | 4 ++ .../FlowChartDetailRecordServiceImpl.java | 8 +++ .../controller/FlowChartController.java | 49 +++++++++++++++++-- .../flow/FlowChartDetailRecordMapper.xml | 15 ++++-- .../resources/mapper/generator/StaffDao.xml | 8 +++ 14 files changed, 249 insertions(+), 42 deletions(-) create mode 100644 src/main/java/com/lz/common/emun/ChartOptType.java create mode 100644 src/main/java/com/lz/modules/app/dto/StaffSimpleDto.java diff --git a/src/main/java/com/lz/common/emun/ChartOptType.java b/src/main/java/com/lz/common/emun/ChartOptType.java new file mode 100644 index 00000000..2c5081b8 --- /dev/null +++ b/src/main/java/com/lz/common/emun/ChartOptType.java @@ -0,0 +1,38 @@ +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, "七级管理人员"), + ; + + ChartOptType(int code, String name){ + this.code = code; + this.name = name; + } + private int code; + private String name; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/java/com/lz/modules/app/dao/StaffDao.java b/src/main/java/com/lz/modules/app/dao/StaffDao.java index b83a7aca..17deb7d5 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java @@ -80,4 +80,6 @@ public interface StaffDao extends BaseMapper { List selectAll(); List getPositionByStaffIds(@Param("req") ReportListReq req, @Param("staffIds") List staffIds, @Param("page") IPage page); + + List selectStaffSimpleInfoByIds(@Param("ids") List ids); } diff --git a/src/main/java/com/lz/modules/app/dto/StaffSimpleDto.java b/src/main/java/com/lz/modules/app/dto/StaffSimpleDto.java new file mode 100644 index 00000000..787ccb75 --- /dev/null +++ b/src/main/java/com/lz/modules/app/dto/StaffSimpleDto.java @@ -0,0 +1,39 @@ +package com.lz.modules.app.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 员工基本信息 + * + * @author fumeiai + * @email fumeiai@linzikg.com + * @date 2020-04-29 20:59:20 + */ +@Data +@ApiModel("人员简单信息Dto") +public class StaffSimpleDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 员工Id + */ + @ApiModelProperty(value = "员工id", name = "id") + private Long id; + + + /** + * 员工姓名 + */ + @ApiModelProperty(value = "姓名", name = "name") + private String name; + /** + * 职位 + */ + @ApiModelProperty(value = "职位", name = "position") + private String position; + +} diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java index d93963fb..3cd8461d 100644 --- a/src/main/java/com/lz/modules/app/service/StaffService.java +++ b/src/main/java/com/lz/modules/app/service/StaffService.java @@ -3,10 +3,7 @@ package com.lz.modules.app.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; -import com.lz.modules.app.dto.GraphicsStatisticalDto; -import com.lz.modules.app.dto.StaffBaseInfoDto; -import com.lz.modules.app.dto.StaffDto; -import com.lz.modules.app.dto.StaffStatisticalDto; +import com.lz.modules.app.dto.*; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.equipment.entity.model.FindByNameModel; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; @@ -85,5 +82,7 @@ public interface StaffService extends IService { List staffsByAllDeparmentIds(List deparmentIds); List selectAll(); + + List selectStaffSimpleInfoByIds(List ids); } diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index fd753452..784f951a 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -453,6 +453,11 @@ public class StaffServiceImpl extends ServiceImpl impleme } + @Override + public List selectStaffSimpleInfoByIds(List ids){ + return staffDao.selectStaffSimpleInfoByIds(ids); + } + } 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 9eeab0c2..a62553d6 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java @@ -9,8 +9,12 @@ package com.lz.modules.flow.dao; */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.flow.entity.FlowChartDetailRecord; +import com.lz.modules.flow.model.FlowChartDetailRecordDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; + @Mapper public interface FlowChartDetailRecordMapper extends BaseMapper { @@ -30,4 +34,5 @@ public interface FlowChartDetailRecordMapper extends BaseMapper selectFlowChartDetailRecordByGroupIdAndChartId(@Param("groupId") Long groupId, @Param("chartId") Long chartId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/FlowChartDetailRecord.java b/src/main/java/com/lz/modules/flow/entity/FlowChartDetailRecord.java index 8129affb..6cf10374 100644 --- a/src/main/java/com/lz/modules/flow/entity/FlowChartDetailRecord.java +++ b/src/main/java/com/lz/modules/flow/entity/FlowChartDetailRecord.java @@ -40,16 +40,19 @@ public class FlowChartDetailRecord implements java.io.Serializable { private Integer status; //操作者id集合，逗号隔开，当opt_type为0时才有值 @ApiModelProperty(value = "操作者id集合，逗号隔开，当opt_type为0时才有值", name = "optIds") - private Long 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 Long roleIds; + private String roleIds; //步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） @ApiModelProperty(value = "步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）", name = "stepType") private Integer stepType; + //第几步从0开始，按照有小到排序 + @ApiModelProperty(value = "第几步从0开始，按照有小到排序", name = "stepIndex") + private Integer stepIndex; /** * * @return @@ -159,14 +162,14 @@ public class FlowChartDetailRecord implements java.io.Serializable { * 操作者id集合，逗号隔开，当opt_type为0时才有值 * @return */ - public Long getOptIds() { + public String getOptIds() { return optIds; } /** * 操作者id集合，逗号隔开，当opt_type为0时才有值 * @param optIds */ - public void setOptIds(Long optIds) { + public void setOptIds(String optIds) { this.optIds = optIds; } @@ -189,14 +192,14 @@ public class FlowChartDetailRecord implements java.io.Serializable { * role id集合，逗号隔开 * @return */ - public Long getRoleIds() { + public String getRoleIds() { return roleIds; } /** * role id集合，逗号隔开 * @param roleIds */ - public void setRoleIds(Long roleIds) { + public void setRoleIds(String roleIds) { this.roleIds = roleIds; } @@ -215,6 +218,21 @@ public class FlowChartDetailRecord implements java.io.Serializable { this.stepType = stepType; } + /** + * 第几步从0开始，按照有小到排序 + * @return + */ + public Integer getStepIndex() { + return stepIndex; + } + /** + * 第几步从0开始，按照有小到排序 + * @param stepIndex + */ + public void setStepIndex(Integer stepIndex) { + this.stepIndex = stepIndex; + } + @Override public String toString() { return "FlowChartDetailRecord{" + @@ -229,6 +247,7 @@ public class FlowChartDetailRecord implements java.io.Serializable { ",optType=" + optType + ",roleIds=" + roleIds + ",stepType=" + stepType + + ",stepIndex=" + stepIndex + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/FlowChartDetailRecordDto.java b/src/main/java/com/lz/modules/flow/model/FlowChartDetailRecordDto.java index 96b6820f..71b48106 100644 --- a/src/main/java/com/lz/modules/flow/model/FlowChartDetailRecordDto.java +++ b/src/main/java/com/lz/modules/flow/model/FlowChartDetailRecordDto.java @@ -1,7 +1,11 @@ package com.lz.modules.flow.model; +import com.lz.modules.app.dto.StaffSimpleDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.List; + /** *

*

*考核模板流程记录表 @@ -25,17 +29,20 @@ public class FlowChartDetailRecordDto { @ApiModelProperty(value = "0关闭，1开启", name = "status") private Integer status; //操作者id集合，逗号隔开，当opt_type为0时才有值 - @ApiModelProperty(value = "操作者id集合，逗号隔开，当opt_type为0时才有值", name = "optIds") - private Long optIds; + @ApiModelProperty(value = "人员集合，如果人员中途离职，第二次返回会自动去掉", name = "staffs") + private List staffs; //-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 Long roleIds; + private String roleIds; //步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） @ApiModelProperty(value = "步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）", name = "stepType") private Integer stepType; + //第几步从0开始，按照有小到排序 + @ApiModelProperty(value = "第几步从0开始，按照有小到排序", name = "stepIndex") + private Integer stepIndex; /** * * @return @@ -96,20 +103,6 @@ public class FlowChartDetailRecordDto { this.status = status; } - /** - * 操作者id集合，逗号隔开，当opt_type为0时才有值 - * @return - */ - public Long getOptIds() { - return optIds; - } - /** - * 操作者id集合，逗号隔开，当opt_type为0时才有值 - * @param optIds - */ - public void setOptIds(Long optIds) { - this.optIds = optIds; - } /** * -1考核人员自己，0人员id，1一级主管，2二级主管.... @@ -130,14 +123,14 @@ public class FlowChartDetailRecordDto { * role id集合，逗号隔开 * @return */ - public Long getRoleIds() { + public String getRoleIds() { return roleIds; } /** * role id集合，逗号隔开 * @param roleIds */ - public void setRoleIds(Long roleIds) { + public void setRoleIds(String roleIds) { this.roleIds = roleIds; } @@ -156,6 +149,21 @@ public class FlowChartDetailRecordDto { this.stepType = stepType; } + /** + * 第几步从0开始，按照有小到排序 + * @return + */ + public Integer getStepIndex() { + return stepIndex; + } + /** + * 第几步从0开始，按照有小到排序 + * @param stepIndex + */ + public void setStepIndex(Integer stepIndex) { + this.stepIndex = stepIndex; + } + @Override public String toString() { return "FlowChartDetailRecordDto{" + @@ -163,10 +171,11 @@ public class FlowChartDetailRecordDto { ",chartId=" + chartId + ",evaluationGroupId=" + evaluationGroupId + ",status=" + status + - ",optIds=" + optIds + + ",staffs=" + staffs + ",optType=" + optType + ",roleIds=" + roleIds + ",stepType=" + stepType + + ",stepIndex=" + stepIndex + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordReq.java b/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordReq.java index 57aa2ba9..3178975d 100644 --- a/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordReq.java +++ b/src/main/java/com/lz/modules/flow/req/FlowChartDetailRecordReq.java @@ -49,16 +49,19 @@ public class FlowChartDetailRecordReq implements java.io.Serializable { private Integer status; //操作者id集合，逗号隔开，当opt_type为0时才有值 @ApiModelProperty(value = "操作者id集合，逗号隔开，当opt_type为0时才有值", name = "optIds") - private Long 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 Long roleIds; + private String roleIds; //步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以） @ApiModelProperty(value = "步骤类型0：依次，1或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可以）", name = "stepType") private Integer stepType; + //第几步从0开始，按照有小到排序 + @ApiModelProperty(value = "第几步从0开始，按照有小到排序", name = "stepIndex") + private Integer stepIndex; /** * * @return @@ -168,14 +171,14 @@ public class FlowChartDetailRecordReq implements java.io.Serializable { * 操作者id集合，逗号隔开，当opt_type为0时才有值 * @return */ - public Long getOptIds() { + public String getOptIds() { return optIds; } /** * 操作者id集合，逗号隔开，当opt_type为0时才有值 * @param optIds */ - public void setOptIds(Long optIds) { + public void setOptIds(String optIds) { this.optIds = optIds; } @@ -198,14 +201,14 @@ public class FlowChartDetailRecordReq implements java.io.Serializable { * role id集合，逗号隔开 * @return */ - public Long getRoleIds() { + public String getRoleIds() { return roleIds; } /** * role id集合，逗号隔开 * @param roleIds */ - public void setRoleIds(Long roleIds) { + public void setRoleIds(String roleIds) { this.roleIds = roleIds; } @@ -224,6 +227,21 @@ public class FlowChartDetailRecordReq implements java.io.Serializable { this.stepType = stepType; } + /** + * 第几步从0开始，按照有小到排序 + * @return + */ + public Integer getStepIndex() { + return stepIndex; + } + /** + * 第几步从0开始，按照有小到排序 + * @param stepIndex + */ + public void setStepIndex(Integer stepIndex) { + this.stepIndex = stepIndex; + } + @Override public String toString() { return "FlowChartDetailRecordReq{" + @@ -238,6 +256,7 @@ public class FlowChartDetailRecordReq implements java.io.Serializable { ",optType=" + optType + ",roleIds=" + roleIds + ",stepType=" + stepType + + ",stepIndex=" + stepIndex + "}"; } } \ 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 c857159c..b5d920d8 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java @@ -2,6 +2,9 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.flow.entity.FlowChartDetailRecord; +import com.lz.modules.flow.model.FlowChartDetailRecordDto; + +import java.util.List; /** *

@@ -30,4 +33,5 @@ public interface FlowChartDetailRecordService extends IService selectFlowChartDetailRecordByGroupIdAndChartId(Long groupId, Long chartId); } \ 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 969aeada..f752db2e 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 @@ -3,10 +3,13 @@ package com.lz.modules.flow.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.modules.flow.dao.FlowChartDetailRecordMapper; import com.lz.modules.flow.entity.FlowChartDetailRecord; +import com.lz.modules.flow.model.FlowChartDetailRecordDto; import com.lz.modules.flow.service.FlowChartDetailRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 考核模板流程记录表 服务类 @@ -58,6 +61,11 @@ public class FlowChartDetailRecordServiceImpl extends ServiceImpl selectFlowChartDetailRecordByGroupIdAndChartId(Long groupId, Long chartId){ + return flowChartDetailRecordMapper.selectFlowChartDetailRecordByGroupIdAndChartId(groupId, chartId); + } + 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 d5549f2a..6fd8141b 100644 --- a/src/main/java/com/lz/modules/performance/controller/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -1,19 +1,30 @@ package com.lz.modules.performance.controller; +import com.lz.common.emun.ChartOptType; import com.lz.common.utils.R; +import com.lz.modules.app.dto.StaffSimpleDto; +import com.lz.modules.app.service.StaffService; 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.FlowChartRoleDto; import com.lz.modules.flow.service.FlowChartDetailRecordService; import com.lz.modules.flow.service.FlowChartService; import com.lz.modules.flow.service.FlowManagerService; 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.Arrays; import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; @RestController @RequestMapping("/flowChart") @@ -30,6 +41,9 @@ public class FlowChartController { @Autowired private FlowChartDetailRecordService flowChartDetailRecordService; + @Autowired + private StaffService staffService; + @GetMapping("/getByFlowManagerId") @ApiOperation("根据Manager Id获取大流程节点") @ApiImplicitParam(name = "id",value = "流程id，绩效请传1", required = true, dataType = "String",paramType = "query") @@ -71,11 +85,40 @@ public class FlowChartController { @PostMapping("/saveDetailProc") @ApiOperation("保存流程节点小流程") @ApiResponses({@ApiResponse(code = 200, message = "成功", response = FlowChartDetailRecord.class)}) - public R saveDetailProc(@RequestBody @ApiParam FlowChartDetailRecord flowChartDetailProc) { - flowChartDetailRecordService.insertFlowChartDetailRecord(flowChartDetailProc); - return R.ok().put("data", flowChartDetailProc); + public R saveDetailProc(@RequestBody @ApiParam FlowChartDetailRecord flowChartDetailRecord) { + flowChartDetailRecordService.insertFlowChartDetailRecord(flowChartDetailRecord); + return R.ok().put("data", flowChartDetailRecord); } + @GetMapping("/getDetailProc") + @ApiOperation("获取已保存的考核节点详情") + @ApiResponses({@ApiResponse(code = 200, message = "成功", response = FlowChartDetailRecordDto.class)}) + public R getDetailProc(@RequestParam @ApiParam("考核组id") Long groupId, @RequestParam @ApiParam("节点id") Long chartId) { + List flowChartDetailRecords = flowChartDetailRecordService.selectFlowChartDetailRecordByGroupIdAndChartId(groupId, chartId); + List flowChartDetailRecordDtos = new ArrayList<>(); + for (FlowChartDetailRecord record:flowChartDetailRecords + ) { + FlowChartDetailRecordDto dto = new FlowChartDetailRecordDto(); + BeanUtils.copyProperties(record, dto); + if(record.getOptType().intValue() == ChartOptType.APPOINT.getCode() + && record.getOptIds() != null + && record.getOptIds().length() > 0){ + List ids = Arrays.stream(record.getOptIds().split(",")).map(new Function() { + @Override + public Long apply(String s) { + return Long.parseLong(s); + } + }).collect(Collectors.toList()); + + //指定人员，搜索人员信息 + List staffSimpleDtos = staffService.selectStaffSimpleInfoByIds(ids); + dto.setStaffs(staffSimpleDtos); + } + flowChartDetailRecordDtos.add(dto); + } + return R.ok().put("data", flowChartDetailRecordDtos); + } + @RequestMapping("/delete") public R list(@RequestBody Long id) { diff --git a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml index aa4f1bab..a0c8e4a6 100644 --- a/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartDetailRecordMapper.xml @@ -15,12 +15,13 @@ + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, chart_id AS chartId, evaluation_group_id AS evaluationGroupId, status AS status, opt_ids AS optIds, opt_type AS optType, role_ids AS roleIds, step_type AS stepType + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, chart_id AS chartId, evaluation_group_id AS evaluationGroupId, status AS status, opt_ids AS optIds, opt_type AS optType, role_ids AS roleIds, step_type AS stepType, step_index AS stepIndex @@ -40,6 +41,7 @@ opt_type, role_ids, step_type, + step_index, is_delete, gmt_create, gmt_modified @@ -51,6 +53,7 @@ #{ optType}, #{ roleIds}, #{ stepType}, + #{ stepIndex}, 0, now(), now() @@ -70,7 +73,8 @@ opt_ids = #{optIds}, opt_type = #{optType}, role_ids = #{roleIds}, - step_type = #{stepType} + step_type = #{stepType}, + step_index = #{stepIndex} ,gmt_modified = now() where id = #{id} @@ -89,7 +93,8 @@ opt_ids = #{optIds}, opt_type = #{optType}, role_ids = #{roleIds}, - step_type = #{stepType} + step_type = #{stepType}, + step_index = #{stepIndex} ,gmt_modified = now() where id = #{id} @@ -99,5 +104,9 @@ update lz_flow_chart_detail_record set is_delete = 1 where id=#{id} limit 1 + + diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 408f8036..1f175480 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -461,4 +461,12 @@ and name LIKE CONCAT('%',#{req.staffName},'%') + +