From 353daceb4181f54ec83a5df66c1f24c0729be429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 26 Oct 2020 17:05:46 +0800 Subject: [PATCH 1/4] fix --- .../enums/ResultFlowProcessEnum.java | 10 ++++++ .../service/impl/ChartResultServiceImpl.java | 35 ++++++++++++++++++- .../mapper/app/ResultRecordMapper.xml | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/enums/ResultFlowProcessEnum.java b/src/main/java/com/lz/modules/performance/enums/ResultFlowProcessEnum.java index 1af5959e..35c082f9 100644 --- a/src/main/java/com/lz/modules/performance/enums/ResultFlowProcessEnum.java +++ b/src/main/java/com/lz/modules/performance/enums/ResultFlowProcessEnum.java @@ -9,6 +9,7 @@ public enum ResultFlowProcessEnum { TARGET(0,"制定目标"), CONFIRM(1,"目标确认"), DO(2,"执行中"), + WRITE(3,"结果值录入"), SCORE(4,"评分"), FINISH(5,"考核结束"), ; @@ -17,6 +18,15 @@ public enum ResultFlowProcessEnum { private String desc; + public static String getDesc(int status){ + for(ResultFlowProcessEnum flowProcessEnum:ResultFlowProcessEnum.values()){ + if(flowProcessEnum.getStatus() == status){ + return flowProcessEnum.getDesc(); + } + } + return ""; + + } ResultFlowProcessEnum(int status, String desc) { this.status = status; diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index 420823cf..ea8114b0 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -10,12 +10,14 @@ import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.service.EvaluationGroupService; import com.lz.modules.flow.service.FlowStartService; +import com.lz.modules.performance.enums.ResultFlowProcessEnum; import com.lz.modules.performance.req.ChartStartsReq; import com.lz.modules.performance.res.ChartStartsRes; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.dao.app.ResultRecordMapper; +import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -53,9 +55,10 @@ public class ChartResultServiceImpl implements ChartResultService { ChartStatisticalRes res; List process = resultRecordService.countNumByFlowProcess(startId); + res = new ChartStatisticalRes(); res.setType(0); - res.setStatisticals(process); + res.setStatisticals(buildProcess(process,startId)); res.setDefaultTime(defaultTime); data.add(res); @@ -140,4 +143,34 @@ public class ChartResultServiceImpl implements ChartResultService { return pages; } + + + //构建流程默认人数 + private List buildProcess(List process,Long startId){ + List data = new ArrayList<>(); + Map map = Maps.newHashMap(); + int count = resultRecordService.count(new QueryWrapper() + .eq("is_delete", 0) + .eq("start_id", startId)); + + ChartStatistical all = new ChartStatistical(); + all.setDesc("参与人数"); + all.setNum(count); + data.add(all); + + for(ChartStatistical statistical:process){ + map.put(ResultFlowProcessEnum.getDesc(Integer.valueOf(statistical.getDesc())),statistical.getNum()); + } + for(ResultFlowProcessEnum flowProcessEnum:ResultFlowProcessEnum.values()){ + ChartStatistical statistical = new ChartStatistical(); + statistical.setDesc(flowProcessEnum.getDesc()); + statistical.setNum(0); + Object o = map.get(flowProcessEnum.getDesc()); + if(o!=null){ + statistical.setNum(Integer.valueOf(o.toString())); + } + data.add(statistical); + } + return data; + } } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 3b056758..961f96ab 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -357,7 +357,7 @@ - + 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 4/4] =?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();