From 4952f1a275408496260523386f43ecedadaa9e2b Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 13 Nov 2020 10:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E8=80=83=E6=A0=B8=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E7=BB=84=E7=9A=84=E6=B5=81=E7=A8=8B=E6=8B=B7?= =?UTF-8?q?=E8=B4=9D=E4=B8=80=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/common/emun/ChartFlowType.java | 35 ++++++++++++++++ src/main/java/com/lz/config/ShiroConfig.java | 4 +- .../controller/ResultRecordController.java | 8 ++-- .../lz/modules/flow/dao/FlowRecordMapper.java | 2 + .../lz/modules/flow/entity/ResultScore.java | 21 +++++++++- .../modules/flow/model/ResultDetailDto.java | 8 ++-- .../lz/modules/flow/model/ResultScoreDto.java | 4 ++ .../lz/modules/flow/req/ResultScoreReq.java | 41 ++++++++++++++++-- .../flow/service/FlowChartService.java | 2 +- .../flow/service/FlowRecordService.java | 2 + .../service/impl/FlowRecordServiceImpl.java | 5 +++ .../service/impl/FlowStartServiceImpl.java | 42 +++++++------------ .../flow/FlowChartDetailRecordMapper.xml | 2 +- .../mapper/flow/FlowRecordMapper.xml | 4 ++ .../mapper/flow/ResultScoreMapper.xml | 11 +++-- 15 files changed, 145 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/lz/common/emun/ChartFlowType.java diff --git a/src/main/java/com/lz/common/emun/ChartFlowType.java b/src/main/java/com/lz/common/emun/ChartFlowType.java new file mode 100644 index 00000000..ff6cfd49 --- /dev/null +++ b/src/main/java/com/lz/common/emun/ChartFlowType.java @@ -0,0 +1,35 @@ +package com.lz.common.emun; + +public enum ChartFlowType { + + START(0, "目标制定"), + CHECK_RESULT(1, "目标确认"), + PROCESS(2, "执行中"), + INPUT_RESULT(3, "结果录入"), + SCORE(4, "评分"), + END(5, "审批节点"), + ; + + ChartFlowType(int code, String namee){ + 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/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 7ea36211..292daac3 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -52,9 +52,6 @@ public class ShiroConfig { Map filterMap = new LinkedHashMap<>(); filterMap.put("/webjars/**", "anon"); filterMap.put("/file/**", "anon"); - filterMap.put("/user/lzstaffrole/role/**", "anon"); - filterMap.put("/user/lzresultrecord/**", "anon"); - filterMap.put("/user/lzstaffrole/listByGroupId/**", "anon"); filterMap.put("/test/**", "anon"); filterMap.put("/druid/**", "anon"); filterMap.put("/app/**", "anon"); @@ -72,6 +69,7 @@ public class ShiroConfig { filterMap.put("/dtlg/jump", "anon"); filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/updateLuck", "anon"); + filterMap.put("/doc.html**", "anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); 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 2b11e14f..d05ca68e 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -1,5 +1,6 @@ package com.lz.modules.app.controller; +import com.lz.common.emun.ChartFlowType; import com.lz.common.emun.WorkMsgTypeEnum; import com.lz.common.utils.*; import com.lz.modules.app.dto.ApprovalDto; @@ -362,7 +363,7 @@ public class ResultRecordController extends AbstractController { flowChartDetailRecordService.selectFlowChartDetailRecordsByFlowProcess(resultRecord.getEvaluationId(), 4);//获取参与评分的人 List staffs = new ArrayList<>(); for (FlowChartDetailRecord record:flowChartDetailRecords - ) { + ) { if(record.getOptType().intValue() == -1){ //自己 StaffEntity staffEntity = new StaffEntity(); @@ -411,7 +412,7 @@ public class ResultRecordController extends AbstractController { List resultRecortModelDtos = new ArrayList<>(); BigDecimal weight = BigDecimal.ZERO; for (ResultModel model:resultModels - ) { + ) { ResultRecortModelDto resultRecortModelDto = new ResultRecortModelDto(); BeanUtils.copyProperties(model, resultRecortModelDto); if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的 @@ -423,7 +424,7 @@ public class ResultRecordController extends AbstractController { List detailDtos = resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType()); for (ResultDetailDto dto:detailDtos - ) { + ) { //下面设置计算公式 dto.setCalculate(setCalculateValue(calculateModels, dto)) ; weight = weight.add(dto.getCheckWeight()); @@ -478,6 +479,7 @@ public class ResultRecordController extends AbstractController { return R.ok().put("data", resultRecordDetailDto); + } //目前支持已生成对象的。不支持当前非对象表中的数据，如果要使用请用常量值 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 a0126aab..4537e655 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -77,4 +77,6 @@ public interface FlowRecordMapper extends BaseMapper { FlowRecord selectFlowRecordByRecordIdMinIdStatus(@Param("resultRecordId") Long resultRecordId, @Param("id") Long id, @Param("status") int status); int batchUpdateExecution(@Param("recordIds")List recordIds,@Param("processId") int processId); + + List selectFlowRecordByRecordIdFlowProcess(@Param("id") Long id, @Param("flowProcess") int flowProcess); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/ResultScore.java b/src/main/java/com/lz/modules/flow/entity/ResultScore.java index dd44b411..f6a322d8 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultScore.java +++ b/src/main/java/com/lz/modules/flow/entity/ResultScore.java @@ -12,7 +12,7 @@ import java.util.Date; *

*

*业绩详情评分表 * @author quyixiao -* @since 2020-11-09 +* @since 2020-11-12 */ @Data @@ -43,6 +43,9 @@ public class ResultScore implements java.io.Serializable { //评分说明 @ApiModelProperty(value = "评分说明", name = "scoreComment") private String scoreComment; + //评分权重 + @ApiModelProperty(value = "评分权重", name = "weight") + private BigDecimal weight; /** * * @return @@ -163,6 +166,21 @@ public class ResultScore implements java.io.Serializable { this.scoreComment = scoreComment; } + /** + * 评分权重 + * @return + */ + public BigDecimal getWeight() { + return weight; + } + /** + * 评分权重 + * @param weight + */ + public void setWeight(BigDecimal weight) { + this.weight = weight; + } + @Override public String toString() { return "ResultScore{" + @@ -174,6 +192,7 @@ public class ResultScore implements java.io.Serializable { ",detailId=" + detailId + ",approvalId=" + approvalId + ",scoreComment=" + scoreComment + + ",weight=" + weight + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java index 93e46b9e..a3dbbbc8 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultDetailDto.java @@ -31,6 +31,10 @@ public class ResultDetailDto { @ApiModelProperty(value = "关键结果", name = "keyResult") private String keyResult; + //评分说明 + @ApiModelProperty(value = "计算公式", name = "calculate") + private String calculate; + //考核权重 @ApiModelProperty(value = "考核权重", name = "checkWeight") private BigDecimal checkWeight; @@ -47,9 +51,7 @@ public class ResultDetailDto { @ApiModelProperty(value = "评分说明", name = "scoreComment") private String scoreComment; - //评分说明 - @ApiModelProperty(value = "计算公式", name = "calculate") - private String calculate; + //优先级，从大到小 @ApiModelProperty(value = "优先级，从小到大", name = "priority") private Integer priority; diff --git a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java index 762b8fb7..29bb213c 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java @@ -36,6 +36,10 @@ public class ResultScoreDto { @ApiModelProperty(value = "所占权重", name = "weight") private BigDecimal weight; + //评分说明 + @ApiModelProperty(value = "计算公式", name = "calculate") + private String calculate; + //评分说明 @ApiModelProperty(value = "评分说明", name = "scoreComment") private String scoreComment; diff --git a/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java b/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java index cf3c1da6..c414e099 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java +++ b/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java @@ -13,12 +13,12 @@ import java.util.Date; * 菜单权限表 *

*业绩详情评分表 * @author quyixiao -* @since 2020-10-16 +* @since 2020-11-12 */ @Data -@ApiModel(value = "业绩详情评分Req") +@ApiModel(value = "业绩详情评分表Req") public class ResultScoreReq implements java.io.Serializable { @ApiModelProperty(value = "currPage", name = "当前页码") @@ -52,6 +52,9 @@ public class ResultScoreReq implements java.io.Serializable { //评分说明 @ApiModelProperty(value = "评分说明", name = "scoreComment") private String scoreComment; + //评分权重 + @ApiModelProperty(value = "评分权重", name = "weight") + private BigDecimal weight; /** * * @return @@ -157,9 +160,39 @@ public class ResultScoreReq implements java.io.Serializable { this.approvalId = approvalId; } + /** + * 评分说明 + * @return + */ + public String getScoreComment() { + return scoreComment; + } + /** + * 评分说明 + * @param scoreComment + */ + public void setScoreComment(String scoreComment) { + this.scoreComment = scoreComment; + } + + /** + * 评分权重 + * @return + */ + public BigDecimal getWeight() { + return weight; + } + /** + * 评分权重 + * @param weight + */ + public void setWeight(BigDecimal weight) { + this.weight = weight; + } + @Override public String toString() { - return "ResultScore{" + + return "ResultScoreReq{" + ",id=" + id + ",isDelete=" + isDelete + ",gmtCreate=" + gmtCreate + @@ -167,6 +200,8 @@ public class ResultScoreReq implements java.io.Serializable { ",acquireScore=" + acquireScore + ",detailId=" + detailId + ",approvalId=" + approvalId + + ",scoreComment=" + scoreComment + + ",weight=" + weight + "}"; } } \ 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 7ad4b0ab..39cffa3c 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowChartService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowChartService.java @@ -41,6 +41,6 @@ public interface FlowChartService extends IService { List selectFlowChartDtoByFlowManagerId(Long id); List selectFlowChartsByGroupId(Long groupId); - + //获取前端可设置的权限 List selectCanSetChartRoleByChartId(Long id); } \ 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 903b71c8..6f5264ff 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -74,4 +74,6 @@ public interface FlowRecordService extends IService { List selectFlowRecordByResultRecordId(Long resultRecordId); FlowRecord selectFlowRecordByRecordIdMinIdStatus(Long resultRecordId, Long id, int i); + + List selectFlowRecordByRecordIdFlowProcess(Long id, int flowProcess); } \ 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 bfd5a6d8..d940cce6 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 @@ -200,5 +200,10 @@ public class FlowRecordServiceImpl extends ServiceImpl selectFlowRecordByRecordIdFlowProcess(Long id, int flowProcess){ + return flowRecordMapper.selectFlowRecordByRecordIdFlowProcess(id,flowProcess); + } + } diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 230044e9..b57d9cee 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -149,8 +149,10 @@ public class FlowStartServiceImpl extends ServiceImpl flowApprovalRoles = new ArrayList<>(); int stepIndex = 0; @@ -545,10 +546,7 @@ public class FlowStartServiceImpl extends ServiceImpl 0){ @@ -600,12 +595,8 @@ public class FlowStartServiceImpl extends ServiceImpl resultDetails = new ArrayList<>(); - List evaluationStartStaffs = new ArrayList<>(); - - - //下面初始化参与人员 for (StaffSimpleInfo staffInfo:staffIds ) { @@ -719,8 +710,6 @@ public class FlowStartServiceImpl extends ServiceImpl 0){//模板里面有添加指标 for (ResultTagetLibDto libDto: modelDto.getTagetLibs()) { @@ -745,9 +734,6 @@ public class FlowStartServiceImpl extends ServiceImpl diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index 75b4f8d1..1e2c003c 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -280,5 +280,9 @@ + + diff --git a/src/main/resources/mapper/flow/ResultScoreMapper.xml b/src/main/resources/mapper/flow/ResultScoreMapper.xml index 4e79556b..fc708796 100644 --- a/src/main/resources/mapper/flow/ResultScoreMapper.xml +++ b/src/main/resources/mapper/flow/ResultScoreMapper.xml @@ -12,12 +12,13 @@ + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, acquire_score AS acquireScore, detail_id AS detailId, approval_id AS approvalId, score_comment AS scoreComment + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, acquire_score AS acquireScore, detail_id AS detailId, approval_id AS approvalId, score_comment AS scoreComment, weight AS weight @@ -34,6 +35,7 @@ detail_id, approval_id, score_comment, + weight, is_delete, gmt_create, gmt_modified @@ -42,6 +44,7 @@ #{ detailId}, #{ approvalId}, #{ scoreComment}, + #{ weight}, 0, now(), now() @@ -58,7 +61,8 @@ acquire_score = #{acquireScore}, detail_id = #{detailId}, approval_id = #{approvalId}, - score_comment = #{scoreComment} + score_comment = #{scoreComment}, + weight = #{weight} ,gmt_modified = now() where id = #{id} @@ -74,7 +78,8 @@ acquire_score = #{acquireScore}, detail_id = #{detailId}, approval_id = #{approvalId}, - score_comment = #{scoreComment} + score_comment = #{scoreComment}, + weight = #{weight} ,gmt_modified = now() where id = #{id}