From 82cade6318dcf08fe0d2f30a53e84742c24cd031 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 14:28:40 +0800 Subject: [PATCH] fix --- .../controller/ChartController.java | 32 +++++++++-------- .../performance/req/ChartResultReq.java | 31 ---------------- .../modules/performance/res/ChartStart.java | 12 +++++++ .../performance/res/ChartStartsRes.java | 19 ++++++++++ .../performance/service/AssessService.java | 3 +- .../service/ChartResultService.java | 9 +++-- .../service/impl/AssessServiceImpl.java | 6 ---- .../service/impl/ChartResultServiceImpl.java | 35 ++++++++++++++----- .../sys/dao/app/ResultRecordMapper.java | 8 ++--- .../sys/service/app/ResultRecordService.java | 4 +-- .../app/impl/ResultRecordServiceImpl.java | 8 ++--- .../mapper/app/ResultRecordMapper.xml | 4 +-- 12 files changed, 90 insertions(+), 81 deletions(-) delete mode 100644 src/main/java/com/lz/modules/performance/req/ChartResultReq.java create mode 100644 src/main/java/com/lz/modules/performance/res/ChartStart.java create mode 100644 src/main/java/com/lz/modules/performance/res/ChartStartsRes.java 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 5634378d..e4f70a90 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -2,25 +2,16 @@ package com.lz.modules.performance.controller; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; -import com.lz.modules.flow.entity.EvaluationGroup; -import com.lz.modules.flow.service.EvaluationGroupService; -import com.lz.modules.performance.req.ChartResultReq; +import com.lz.modules.equipment.entity.model.BasePage; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.res.ResultRankListRes; -import com.lz.modules.performance.res.TaskListRes; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.controller.AbstractController; import io.swagger.annotations.*; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.*; -import java.util.function.ToLongFunction; /** * @Author: djc @@ -36,19 +27,30 @@ public class ChartController extends AbstractController{ @PostMapping("chart/result") @ApiOperation("获取绩效报表统计") + @ApiImplicitParam(name = "startId",value = "考核周期标识id", required = true, dataType = "Long",paramType = "query") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)}) - public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ - List chartStatisticalRes = chartResultService.chartReport(req); + public R chartResult(@RequestParam Long startId){ + List chartStatisticalRes = chartResultService.chartReport(startId); return R.ok().put("data",chartStatisticalRes); } - @PostMapping("chart/rank") + + @PostMapping("chart/starts") + @ApiOperation("获取考核类型列表") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)}) + public R chartStarts(@RequestBody BasePage req){ + + return R.ok().put("data",""); + } + + + /*@PostMapping("chart/rank") @ApiOperation("获取绩排名列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRankListRes.class)}) public R rankList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ PageUtils pageUtils = chartResultService.resultRankList(req); return R.ok().put("data",pageUtils); - } + }*/ diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java deleted file mode 100644 index abe2115b..00000000 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lz.modules.performance.req; - -import com.lz.modules.equipment.entity.model.BasePage; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.YearMonth; - -/** - * @Author: djc - * @Desc: - * @Date: 2020/10/14 16:50 - */ -@Data -@ApiModel(value = "绩效报表请求实体") -public class ChartResultReq extends BasePage{ - //考核类型 月度 季度 - @ApiModelProperty(value = "考核类型 月度，自定义",name = "type") - private int type = 0; - - @ApiModelProperty(value = "如果为月度 默认当前月",name = "month") - private String month = YearMonth.now().toString(); - - @ApiModelProperty(value = "自定义起始时间",name = "startTime") - private String startTime; - - @ApiModelProperty(value = "自定义结束时间",name = "endTime") - private String endTime; - -} diff --git a/src/main/java/com/lz/modules/performance/res/ChartStart.java b/src/main/java/com/lz/modules/performance/res/ChartStart.java new file mode 100644 index 00000000..7d8f2ea6 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/res/ChartStart.java @@ -0,0 +1,12 @@ +package com.lz.modules.performance.res; + +import lombok.Data; + +@Data +public class ChartStart{ + + private String time; + + private Long startId; + +} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/res/ChartStartsRes.java b/src/main/java/com/lz/modules/performance/res/ChartStartsRes.java new file mode 100644 index 00000000..d2349f24 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/res/ChartStartsRes.java @@ -0,0 +1,19 @@ +package com.lz.modules.performance.res; + +import lombok.Data; + +import java.util.List; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/10/26 14:21 + */ +@Data +public class ChartStartsRes { + private int type; + + private List list; + +} + diff --git a/src/main/java/com/lz/modules/performance/service/AssessService.java b/src/main/java/com/lz/modules/performance/service/AssessService.java index d303ddbb..84870015 100644 --- a/src/main/java/com/lz/modules/performance/service/AssessService.java +++ b/src/main/java/com/lz/modules/performance/service/AssessService.java @@ -2,7 +2,6 @@ package com.lz.modules.performance.service; import com.lz.common.utils.PageUtils; import com.lz.modules.performance.req.AssessTaskReq; -import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.ChartStatisticalRes; import java.util.List; @@ -15,5 +14,5 @@ import java.util.List; public interface AssessService { PageUtils userTaskList(AssessTaskReq req,Long userId); - List chartResult(ChartResultReq req); + //List chartResult(ChartResultReq req); } diff --git a/src/main/java/com/lz/modules/performance/service/ChartResultService.java b/src/main/java/com/lz/modules/performance/service/ChartResultService.java index 03f204fb..e5e64f02 100644 --- a/src/main/java/com/lz/modules/performance/service/ChartResultService.java +++ b/src/main/java/com/lz/modules/performance/service/ChartResultService.java @@ -1,12 +1,9 @@ package com.lz.modules.performance.service; import com.lz.common.utils.PageUtils; -import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; -import com.lz.modules.performance.res.ResultRankListRes; -import java.math.BigDecimal; import java.util.List; /** @@ -16,10 +13,12 @@ import java.util.List; */ public interface ChartResultService { - List chartReport(ChartResultReq req); + List chartReport(Long startId); List countDepartmentAndStaffNum(ListstaffIds); - PageUtils resultRankList(ChartResultReq req); + //PageUtils resultRankList(ChartResultReq req); + + void chartStarts(); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java index e5f6e91e..ad8c013d 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java @@ -9,7 +9,6 @@ import com.lz.modules.flow.service.FlowChangeService; import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.performance.dto.TaskListDto; import com.lz.modules.performance.req.AssessTaskReq; -import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.res.TaskListRes; import com.lz.modules.performance.service.AssessService; @@ -67,9 +66,4 @@ public class AssessServiceImpl implements AssessService { return data; } - @Override - public List chartResult(ChartResultReq req) { - - return null; - } } 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 234e0f34..988d2c9d 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 @@ -6,20 +6,22 @@ import com.lz.common.utils.PageUtils; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.service.EvaluationGroupService; -import com.lz.modules.performance.req.AssessDetailReq; -import com.lz.modules.performance.req.ChartResultReq; +import com.lz.modules.flow.service.FlowStartService; +import com.lz.modules.performance.res.ChartStart; +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.service.app.ResultRecordService; import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.function.Consumer; /** * @Author: djc @@ -39,21 +41,21 @@ public class ChartResultServiceImpl implements ChartResultService { private ResultRecordMapper resultRecordMapper; @Autowired private StaffService staffService; + @Autowired + private FlowStartService flowStartService; @Override - public List chartReport(ChartResultReq req) { + public List chartReport(Long startId) { List data = new ArrayList<>(); - AssessDetailReq query = new AssessDetailReq(); ChartStatisticalRes res; - BeanUtils.copyProperties(req,query); - List process = resultRecordService.countNumByFlowProcess(query); + List process = resultRecordService.countNumByFlowProcess(startId); res = new ChartStatisticalRes(); res.setType(0); res.setStatisticals(process); data.add(res); - List scoreLevel = resultRecordService.countNumByScoreLevel(query); + List scoreLevel = resultRecordService.countNumByScoreLevel(startId); res = new ChartStatisticalRes(); res.setType(1); res.setStatisticals(scoreLevel); @@ -99,11 +101,26 @@ public class ChartResultServiceImpl implements ChartResultService { return data; } - @Override + /* @Override public PageUtils resultRankList(ChartResultReq req) { PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( page -> resultRecordMapper.selectResultRankList(page,req) ); return pageUtils; + }*/ + + @Override + public void chartStarts() { + List res = new ArrayList<>(); + List list = flowStartService.list(new QueryWrapper().eq("is_delete", 0).orderByAsc("start_time")); + list.forEach(new Consumer() { + @Override + public void accept(FlowStart flowStart) { + + if(flowStart.getCycleType()==0){ + ChartStart chartStart = new ChartStart(); + } + } + }); } } 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 dd49703e..114fb153 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 @@ -16,8 +16,6 @@ import com.lz.modules.app.req.ReportListReq; import com.lz.modules.app.req.ResultRecordReq; import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.flow.model.ResultRecordDto; -import com.lz.modules.performance.req.AssessDetailReq; -import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.res.AssessManagerDetailRes; import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.sys.entity.app.ResultRecord; @@ -74,11 +72,11 @@ public interface ResultRecordMapper extends BaseMapper { List selectResultRecordAllByStaffId(@Param("staffId") Long staffId); - List countNumByFlowProcess(@Param("req") AssessDetailReq req); + List countNumByFlowProcess(@Param("startId") Long startId); - List countNumByScoreLevel(@Param("req") AssessDetailReq req); + List countNumByScoreLevel(@Param("startId") Long startId); - List selectResultRankList(@Param("page") IPage page, @Param("req") ChartResultReq req); + //List selectResultRankList(@Param("page") IPage page, @Param("req") ChartResultReq req); void batchDeleteByStartId(@Param("startId")Long startId); 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 e10fbf6d..b6502a4d 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 @@ -101,9 +101,9 @@ public interface ResultRecordService extends IService { List selectResultRecordAllByStaffId(Long staffId); - List countNumByFlowProcess(AssessDetailReq req); + List countNumByFlowProcess(Long startId); - List countNumByScoreLevel(AssessDetailReq req); + List countNumByScoreLevel(Long startId); void batchDeleteByStaffIds(List staffIds); 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 bc215241..d4ba637a 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 @@ -733,13 +733,13 @@ public class ResultRecordServiceImpl extends ServiceImpl countNumByFlowProcess(AssessDetailReq req) { - return resultRecordMapper.countNumByFlowProcess(req); + public List countNumByFlowProcess(Long startId) { + return resultRecordMapper.countNumByFlowProcess(startId); } @Override - public List countNumByScoreLevel(AssessDetailReq req) { - return resultRecordMapper.countNumByScoreLevel(req); + public List countNumByScoreLevel(Long startId) { + return resultRecordMapper.countNumByScoreLevel(startId); } @Override diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 50d4b090..3b056758 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -353,11 +353,11 @@