From 1217c67b32bec70ea61f0c24415e169fa794cb51 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 26 Oct 2020 18:52:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=84=BF=E7=AB=A5?= =?UTF-8?q?=E7=9D=A1=E8=A2=8B=20t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 6 +--- .../app/controller/TestController.java | 14 ++++++++ .../com/lz/modules/app/dto/ApprovalDto.java | 1 + .../lz/modules/flow/dao/FlowRecordMapper.java | 2 ++ .../flow/service/FlowRecordService.java | 2 ++ .../service/impl/FlowRecordServiceImpl.java | 5 +++ .../app/impl/ResultRecordServiceImpl.java | 34 ++++++++++++------- .../mapper/flow/FlowRecordMapper.xml | 4 ++- 8 files changed, 49 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index df3820e9..38cad552 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -652,6 +652,7 @@ public class ResultRecordController extends AbstractController { */ @RequestMapping("/new/approval") public R approval(ApprovalDto approvalDto) { + approvalDto.setLoginUserId(approvalDto.getLoginUserId()); return resultRecordService.newApproval(approvalDto); } @@ -660,9 +661,4 @@ public class ResultRecordController extends AbstractController { - - - - - } diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index 33210f66..0b96c350 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -6,6 +6,7 @@ import com.dingtalk.api.response.OapiCrmAuthGroupMemberListResponse; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.app.dao.DepartmentsDao; +import com.lz.modules.app.dto.ApprovalDto; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; @@ -261,8 +262,21 @@ public class TestController { @RequestMapping("/test/resultrecord") public void resultRecorcd(Long resultRecordId) throws Exception{ R r = resultRecordService.initFlowRecord(resultRecordId); + } + + /** + * 删除 + */ + // http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1 + @RequestMapping("/new/approval") + public R approval(Long resultRecordId,Integer status ) { + ApprovalDto approvalDto = new ApprovalDto(); + approvalDto.setResultRecordId(resultRecordId); + approvalDto.setStatus(status); + return resultRecordService.newApproval(approvalDto); + } diff --git a/src/main/java/com/lz/modules/app/dto/ApprovalDto.java b/src/main/java/com/lz/modules/app/dto/ApprovalDto.java index 99445590..f5c8a9cd 100644 --- a/src/main/java/com/lz/modules/app/dto/ApprovalDto.java +++ b/src/main/java/com/lz/modules/app/dto/ApprovalDto.java @@ -7,4 +7,5 @@ public class ApprovalDto { private Long resultRecordId; private Integer status; //1 提交审批,审批通过,2 撤回,3 催办,5 驳回，6 申述，7 流程终止 private Long loginUserId; + private String menuName; //按钮名称 } diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java index c6b13553..7739ceca 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -62,4 +62,6 @@ public interface FlowRecordMapper extends BaseMapper { List selectFlowRecordByRecordIdStatus(@Param("resultRecordId") Long resultRecordId, @Param("status") Integer status); + + FlowRecord selectFlowRecordByRecordIdAndFlowId(@Param("resultRecordId") Long resultRecordId, @Param("flowId") Long flowId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java index 16aeecc4..3bb55b2b 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -61,4 +61,6 @@ public interface FlowRecordService extends IService { void insertFlowRecords(List flowRecords); List selectFlowRecordByRecordIdStatus(Long resultRecordId,Integer status); + + FlowRecord selectFlowRecordByRecordIdAndFlowId(Long resultRecordId, Long id); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java index 56b0e944..66904608 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java @@ -168,4 +168,9 @@ public class FlowRecordServiceImpl extends ServiceImpl selectFlowRecordByRecordIdStatus(Long resultRecordId,Integer status) { return flowRecordMapper.selectFlowRecordByRecordIdStatus(resultRecordId,status); } + + @Override + public FlowRecord selectFlowRecordByRecordIdAndFlowId(Long resultRecordId, Long flowId) { + return flowRecordMapper.selectFlowRecordByRecordIdAndFlowId(resultRecordId,flowId); + } } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 4cddc7c0..26ae8c27 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -818,21 +818,27 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 1); + if(flowRecords!=null && flowRecords.size()>0){ + return R.error("领导己经审批，不能撤回"); + } + return newReject(approvalDto); + } + private R newSubmit(ApprovalDto approvalDto) { List flowRecords = flowRecordService.selectFlowRecordByRecordId(approvalDto.getResultRecordId()); ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId()); @@ -869,12 +875,16 @@ public class ResultRecordServiceImpl extends ServiceImpl select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and status = #{status} - + From cbd67d402ba161c2392ff0325361d6226f694116 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 26 Oct 2020 19:03:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 4 --- .../com/lz/modules/app/dto/ApprovalDto.java | 1 + .../modules/sys/entity/app/ResultComment.java | 36 +++++++++++++++++-- .../app/impl/ResultRecordServiceImpl.java | 16 +++++++-- .../mapper/app/ResultCommentMapper.xml | 11 ++++-- src/test/java/com/lz/mysql/MysqlMain.java | 2 +- 6 files changed, 57 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 38cad552..3fe8202b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -654,11 +654,7 @@ public class ResultRecordController extends AbstractController { public R approval(ApprovalDto approvalDto) { approvalDto.setLoginUserId(approvalDto.getLoginUserId()); return resultRecordService.newApproval(approvalDto); - } - - - } diff --git a/src/main/java/com/lz/modules/app/dto/ApprovalDto.java b/src/main/java/com/lz/modules/app/dto/ApprovalDto.java index f5c8a9cd..04629587 100644 --- a/src/main/java/com/lz/modules/app/dto/ApprovalDto.java +++ b/src/main/java/com/lz/modules/app/dto/ApprovalDto.java @@ -8,4 +8,5 @@ public class ApprovalDto { private Integer status; //1 提交审批,审批通过,2 撤回,3 催办,5 驳回，6 申述，7 流程终止 private Long loginUserId; private String menuName; //按钮名称 + private String comment; } diff --git a/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java b/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java index 754160f5..d9eff989 100644 --- a/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java +++ b/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java @@ -1,41 +1,55 @@ package com.lz.modules.sys.entity.app; -import com.baomidou.mybatisplus.annotation.IdType; 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-09-21 +* @since 2020-10-26 */ @Data @TableName("lz_result_comment") +@ApiModel(value = "业绩评论表") public class ResultComment implements java.io.Serializable { // @TableId(value = "id", type = IdType.AUTO) private Long id; //是否删除状态，1：删除，0：有效 + @ApiModelProperty(value = "是否删除状态，1：删除，0：有效", name = "isDelete") private Integer isDelete; //创建时间 + @ApiModelProperty(value = "创建时间", name = "gmtCreate") private Date gmtCreate; //最后修改时间 + @ApiModelProperty(value = "最后修改时间", name = "gmtModified") private Date gmtModified; //记录id + @ApiModelProperty(value = "记录id", name = "recordId") private Long recordId; //评论用户id + @ApiModelProperty(value = "评论用户id", name = "staffId") private Long staffId; //评论内容 + @ApiModelProperty(value = "评论内容", name = "comment") private String comment; //评论用户名称 + @ApiModelProperty(value = "评论用户名称", name = "staffName") private String staffName; //状态 + @ApiModelProperty(value = "状态", name = "status") private Integer status; //流程id + @ApiModelProperty(value = "流程id", name = "flowRecordId") private Long flowRecordId; + //操作名称 + @ApiModelProperty(value = "操作名称", name = "optDesc") + private String optDesc; /** * * @return @@ -186,6 +200,21 @@ public class ResultComment implements java.io.Serializable { this.flowRecordId = flowRecordId; } + /** + * 操作名称 + * @return + */ + public String getOptDesc() { + return optDesc; + } + /** + * 操作名称 + * @param optDesc + */ + public void setOptDesc(String optDesc) { + this.optDesc = optDesc; + } + @Override public String toString() { return "ResultComment{" + @@ -199,6 +228,7 @@ public class ResultComment implements java.io.Serializable { ",staffName=" + staffName + ",status=" + status + ",flowRecordId=" + flowRecordId + + ",optDesc=" + optDesc + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 26ae8c27..b6731bf0 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -31,6 +31,7 @@ import com.lz.modules.performance.req.AssessDetailReq; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.entity.SysUserEntity; +import com.lz.modules.sys.entity.app.ResultComment; import com.lz.modules.sys.entity.app.ResultDetail; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultCommentService; @@ -839,6 +840,17 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByRecordId(approvalDto.getResultRecordId()); ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId()); @@ -864,6 +876,7 @@ public class ResultRecordServiceImpl extends ServiceImpl + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, record_id AS recordId, staff_id AS staffId, comment AS comment, staff_name AS staffName, status AS status, flow_record_id AS flowRecordId + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, record_id AS recordId, staff_id AS staffId, comment AS comment, staff_name AS staffName, status AS status, flow_record_id AS flowRecordId, opt_desc AS optDesc @@ -38,6 +39,7 @@ staff_name, status, flow_record_id, + opt_desc, is_delete, gmt_create, gmt_modified @@ -48,6 +50,7 @@ #{ staffName}, #{ status}, #{ flowRecordId}, + #{ optDesc}, 0, now(), now() @@ -66,7 +69,8 @@ comment = #{comment}, staff_name = #{staffName}, status = #{status}, - flow_record_id = #{flowRecordId} + flow_record_id = #{flowRecordId}, + opt_desc = #{optDesc} ,gmt_modified = now() where id = #{id} @@ -84,7 +88,8 @@ comment = #{comment}, staff_name = #{staffName}, status = #{status}, - flow_record_id = #{flowRecordId} + flow_record_id = #{flowRecordId}, + opt_desc = #{optDesc} ,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 b9a6be0a..94d28ea8 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -96,7 +96,7 @@ public class MysqlMain { //list.add(new TablesBean("lz_flow_chart_detail_record")); //list.add(new TablesBean("lz_flow_approval_role")); - list.add(new TablesBean("lz_flow_chart")); + list.add(new TablesBean("lz_result_comment")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();