From a34d67a2313d6467a748deda0ebbfb428b09b4ba 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, 9 Nov 2020 16:46:06 +0800 Subject: [PATCH 1/5] fix --- .../controller/ReportResultController.java | 10 ---------- .../lz/modules/app/resp/OwnResultResp.java | 9 +++++++-- .../controller/ChartController.java | 20 ++++++++++++++----- .../sys/dao/app/ResultRecordMapper.java | 2 +- .../sys/service/app/ResultRecordService.java | 2 +- .../app/impl/ResultRecordServiceImpl.java | 4 ++-- .../mapper/app/ResultRecordMapper.xml | 10 ++++++++-- 7 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ReportResultController.java b/src/main/java/com/lz/modules/app/controller/ReportResultController.java index 580e8a2e..0d493bea 100644 --- a/src/main/java/com/lz/modules/app/controller/ReportResultController.java +++ b/src/main/java/com/lz/modules/app/controller/ReportResultController.java @@ -117,16 +117,6 @@ public class ReportResultController extends AbstractController{ } - @RequestMapping("/own/result") - public R ownResult(Long userId){ - if(userId == null){ - //如果id为空，查询自己信息 - userId = getUserId(); - } - List ownResultResp = resultRecordService.ownResult(userId, ResultRecordStatusEnum.AGREE.getStatus()); - return R.ok().put("data",ownResultResp); - } - } diff --git a/src/main/java/com/lz/modules/app/resp/OwnResultResp.java b/src/main/java/com/lz/modules/app/resp/OwnResultResp.java index 75d99562..210e36c7 100644 --- a/src/main/java/com/lz/modules/app/resp/OwnResultResp.java +++ b/src/main/java/com/lz/modules/app/resp/OwnResultResp.java @@ -1,5 +1,7 @@ package com.lz.modules.app.resp; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -10,9 +12,12 @@ import java.math.BigDecimal; * @Date: 2020/9/14 10:07 */ @Data +@ApiModel("个人成长曲线实体") public class OwnResultResp { - //月份 - private String monthTime; + //绩效 + @ApiModelProperty("绩效类型") + private String name; //最后得分 + @ApiModelProperty("最后得分") private BigDecimal lastScore; } diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java index 1cbc1293..64d25b01 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; +import com.lz.modules.app.enums.ResultRecordStatusEnum; +import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.equipment.entity.model.BasePage; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.FlowStart; @@ -15,6 +17,7 @@ import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.res.ResultRankListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.controller.AbstractController; +import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +39,8 @@ public class ChartController extends AbstractController{ private ChartResultService chartResultService; @Autowired private FlowStartMapper flowStartMapper; + @Autowired + private ResultRecordService resultRecordService; @GetMapping("chart/result") @ApiOperation("获取绩效报表统计") @@ -84,11 +89,16 @@ public class ChartController extends AbstractController{ - @PostMapping("chart/test") - public R chartTest(){ - List starts = flowStartMapper.selectList(new QueryWrapper().in("group_ids", Collections.EMPTY_LIST)); - System.out.println(); - return null; + @RequestMapping("/own/result") + @ApiOperation("获取个人成长曲线") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = OwnResultResp.class)}) + public R ownResult(Long userId){ + if(userId == null){ + //如果id为空，查询自己信息 + userId = getUserId(); + } + List ownResultResps = resultRecordService.ownResult(null); + return R.ok().put("data",ownResultResps); } diff --git a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java index aa80000b..135d0210 100644 --- a/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java +++ b/src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java @@ -61,7 +61,7 @@ public interface ResultRecordMapper extends BaseMapper { List selectResultRecordByIds(@Param("recordIds") List recordIds); - List ownResult(@Param("userId") Long userId, @Param("status") int status); + List ownResult(@Param("staffId") Long staffId); List staffDistribution(@Param("monthTime") String monthTime,@Param("staffIds") List staffIds); diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index 24001402..d631d887 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -77,7 +77,7 @@ public interface ResultRecordService extends IService { void sendWorkMSG(StaffEntity mySelf, StaffEntity toSelf, WorkMsgTypeEnum workMsgTypeEnum , Long recordResultId, int count); - List ownResult(Long userId, int status); + List ownResult(Long staffId); /** * 人员等级排布 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 2e6a569b..49c4e33c 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 @@ -738,8 +738,8 @@ public class ResultRecordServiceImpl extends ServiceImpl ownResult(Long userId, int status) { - return resultRecordMapper.ownResult(userId,status); + public List ownResult(Long staffId) { + return resultRecordMapper.ownResult(staffId); } @Override diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index a5ddf451..aac875cf 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -281,8 +281,14 @@ + SELECT all_score,name FROM lz_result_record r + LEFT JOIN lz_flow_start f + ON r.start_id = f.id + where r.is_delete = 0 and f.is_delete = 0 and flow_process = 5 and staff_id = #{staffId} + order by start_id desc + + + - select * from lz_result_score where id=#{id} and is_delete = 0 limit 1 + select * from lz_result_score where id=#{id} and is_delete = 0 limit 1 insert into lz_result_score( - acquire_score, - detail_id, - approval_id, - is_delete, - gmt_create, - gmt_modified + acquire_score, + detail_id, + approval_id, + score_comment, + is_delete, + gmt_create, + gmt_modified )values( - #{ acquireScore}, - #{ detailId}, - #{ approvalId}, - 0, - now(), - now() + #{ acquireScore}, + #{ detailId}, + #{ approvalId}, + #{ scoreComment}, + 0, + now(), + now() ) update - lz_result_score + lz_result_score is_delete = #{isDelete}, gmt_create = #{gmtCreate}, acquire_score = #{acquireScore}, detail_id = #{detailId}, - approval_id = #{approvalId} + approval_id = #{approvalId}, + score_comment = #{scoreComment} ,gmt_modified = now() where id = #{id} @@ -63,13 +67,14 @@ update - lz_result_score - set + lz_result_score + set is_delete = #{isDelete}, gmt_create = #{gmtCreate}, acquire_score = #{acquireScore}, detail_id = #{detailId}, - approval_id = #{approvalId} + approval_id = #{approvalId}, + score_comment = #{scoreComment} ,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 d8784020..c89a36a3 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -126,7 +126,7 @@ public class MysqlMain { List list = new ArrayList(); - list.add(new TablesBean("lz_flow_record")); + list.add(new TablesBean("lz_result_score")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments(); From 4a9e85f69694325859343bc39e1a6e81253c4e2d Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 9 Nov 2020 18:10:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E5=88=86=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 3 +++ 1 file changed, 3 insertions(+) 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 c6cb60f4..67735c6a 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -592,6 +592,7 @@ public class ResultRecordController extends AbstractController { public R saveDetail(@RequestBody @ApiParam ResultRecordDetailDto dto) { ResultRecord resultRecord = new ResultRecord(); BeanUtils.copyProperties(dto, resultRecord); + resultRecord.setAllScore(resultRecord.getLastScore()); List inserts = new ArrayList<>(); List updates = new ArrayList<>(); @@ -668,6 +669,8 @@ public class ResultRecordController extends AbstractController { resultScoreService.updateBatchById(updateScores); } + resultRecordService.updateCoverResultRecordById(resultRecord); + return R.ok(); From 711134b0221e1156e8437235d29f56b838b70a1b Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 9 Nov 2020 19:11:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E8=80=83=E8=AF=84=E7=BB=84=E6=97=B6=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=9A=84=E4=B8=BAnull=E6=B2=A1=E6=9C=89=E6=9B=B4i=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E5=8E=9F=E6=9D=A5=E7=9A=84null=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 2 +- .../controller/EvaluationGroupController.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 1fe3d0c6..70d6ba95 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -71,7 +71,7 @@ public class ShiroConfig { filterMap.put("/dtlg/jump", "anon"); filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/updateLuck", "anon"); - filterMap.put("/**", "oauth2"); + filterMap.put("/**", "anon"); shiroFilter.setFilterChainDefinitionMap(filterMap); return shiroFilter; 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 81425007..062646c4 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -135,6 +135,18 @@ public class EvaluationGroupController { EvaluationGroup evaluationGroup1 = evaluationGroupService.selectEvaluationGroupByName(evaluationGroup.getName()); if(evaluationGroup.getId() != null && evaluationGroup.getId().intValue() > 0){ if(evaluationGroup1 == null || evaluationGroup1.getId().equals(evaluationGroup.getId())){ + if(evaluationGroup.getDepIds() == null){ + evaluationGroup.setDepIds(""); + } + if(evaluationGroup.getStaffIds() == null){ + evaluationGroup.setStaffIds(""); + } + if(evaluationGroup.getManagerIds() == null){ + evaluationGroup.setManagerIds(""); + } + if(evaluationGroup.getOutIds() == null){ + evaluationGroup.setOutIds(""); + } evaluationGroupService.updateEvaluationGroupById(evaluationGroup); }else { return R.error("已经存在相同名称考核组"); @@ -163,7 +175,9 @@ public class EvaluationGroupController { Long l = mIds.get(i); if(staffRoleMap.containsKey(l)){ mIds.remove(l); + continue; } + i++; } } if(mIds.size() > 0){ From 1890ea03ac0740b495c91c1d6116b60bd1057344 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 10 Nov 2020 09:25:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 70d6ba95..1fe3d0c6 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -71,7 +71,7 @@ public class ShiroConfig { filterMap.put("/dtlg/jump", "anon"); filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/updateLuck", "anon"); - filterMap.put("/**", "anon"); + filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); return shiroFilter;