From 02df239792d75f4928e6d74bcb3cbe3c84688b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 15 Oct 2020 09:25:50 +0800 Subject: [PATCH 1/3] fix --- .../com/lz/modules/performance/req/ChartResultReq.java | 4 +++- .../performance/service/impl/ChartResultServiceImpl.java | 5 +++++ .../com/lz/modules/sys/dao/app/ResultRecordMapper.java | 5 +++++ .../lz/modules/sys/service/app/ResultRecordService.java | 4 ++++ .../sys/service/app/impl/ResultRecordServiceImpl.java | 7 +++++++ src/main/resources/mapper/app/ResultRecordMapper.xml | 4 ++++ src/main/resources/mapper/flow/FlowRecordMapper.xml | 8 +++++++- 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java index 0b879684..8d0ba522 100644 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -2,6 +2,8 @@ package com.lz.modules.performance.req; import lombok.Data; +import java.io.Serializable; + /** * @Author: djc * @Desc: @@ -10,7 +12,7 @@ import lombok.Data; @Data public class ChartResultReq { //考核类型 月度 季度 - private int assessType; + private int type; private String month; 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 00f120ae..5b04a1ec 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 @@ -1,8 +1,10 @@ package com.lz.modules.performance.service.impl; +import com.lz.modules.performance.req.AssessListReq; import com.lz.modules.performance.req.ChartResultReq; import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.sys.service.app.ResultRecordService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,6 +19,9 @@ public class ChartResultServiceImpl implements ChartResultService { private ResultRecordService resultRecordService; @Override public void ChartReport(ChartResultReq req) { + AssessListReq query = new AssessListReq(); + BeanUtils.copyProperties(req,query); + resultRecordService.countNumByFlowProcess(query); } 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 2f4f6080..cca8b1f0 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,6 +16,8 @@ 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.AssessListReq; +import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.entity.app.ResultRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -69,4 +71,7 @@ public interface ResultRecordMapper extends BaseMapper { ResultRecord selectCurrentMonthResultRecordByStaffIdType(@Param("staffId") Long staffId, @Param("type") int type); List selectResultRecordAllByStaffId(@Param("staffId") Long staffId); + + List countNumByFlowProcess(@Param("req") AssessListReq req); + } \ No newline at end of file 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 ecd51abc..0033d607 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 @@ -14,6 +14,8 @@ import com.lz.modules.app.resp.OwnResultResp; import com.lz.modules.app.utils.t.TwoTuple; import com.lz.modules.flow.entity.Flow; import com.lz.modules.flow.model.StaffRoleDto; +import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultRecord; @@ -100,4 +102,6 @@ public interface ResultRecordService extends IService { ResultRecord selectCurrentMonthResultRecordByStaffIdType(Long staffId, int type); List selectResultRecordAllByStaffId(Long staffId); + + List countNumByFlowProcess(AssessListReq req); } \ 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 07d9d10d..d588ddc7 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 @@ -27,6 +27,8 @@ import com.lz.modules.flow.model.TypeFlowDto; import com.lz.modules.flow.model.TypeRoleDto; import com.lz.modules.flow.service.*; import com.lz.modules.job.business.DingtalkBusiness; +import com.lz.modules.performance.req.AssessListReq; +import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultDetail; @@ -729,4 +731,9 @@ public class ResultRecordServiceImpl extends ServiceImpl countNumByFlowProcess(AssessListReq req) { + return resultRecordMapper.countNumByFlowProcess(req); + } } diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 95755060..472708c1 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -338,6 +338,10 @@ select * from lz_result_record where staff_id = #{staffId} + + diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index 47e6523c..17152bcf 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -212,7 +212,13 @@ From 9cf848b01dfbcf90dda9f5579783a72bfcef18c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 15 Oct 2020 09:51:44 +0800 Subject: [PATCH 2/3] fix --- .../controller/ChartController.java | 30 +++++++++++++++++++ ...ontroller.java => UserTaskController.java} | 21 +++++-------- .../performance/req/AssessTaskReq.java | 4 +++ 3 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/lz/modules/performance/controller/ChartController.java rename src/main/java/com/lz/modules/performance/controller/{SmartPerformanceController.java => UserTaskController.java} (80%) diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java new file mode 100644 index 00000000..381d0409 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -0,0 +1,30 @@ +package com.lz.modules.performance.controller; + +import com.lz.common.utils.R; +import com.lz.modules.performance.req.ChartResultReq; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +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; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/10/15 9:33 + */ +@RestController +@RequestMapping("/performance") +@Api(value="报表接口", tags={"报表统计"}) +public class ChartController { + + @PostMapping("chart/result") + public R chartResult(@RequestBody ChartResultReq req){ + return R.ok(); + } + + + + +} diff --git a/src/main/java/com/lz/modules/performance/controller/SmartPerformanceController.java b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java similarity index 80% rename from src/main/java/com/lz/modules/performance/controller/SmartPerformanceController.java rename to src/main/java/com/lz/modules/performance/controller/UserTaskController.java index 49019058..83f37106 100644 --- a/src/main/java/com/lz/modules/performance/controller/SmartPerformanceController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -24,6 +24,7 @@ import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; import org.apache.commons.collections.CollectionUtils; 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; @@ -40,28 +41,20 @@ import java.util.function.Consumer; */ @RestController @RequestMapping("/performance") -@Api(value="智能绩效", tags={"智能绩效部分接口"}) -public class SmartPerformanceController extends AbstractController{ +@Api(value="事项接口", tags={"用户任务"}) +public class UserTaskController extends AbstractController{ @Autowired private AssessTaskService assessTaskService; - @RequestMapping("task/list") + @PostMapping("task/list") @ApiOperation("获取待办/处理事项") - @ApiImplicitParam(name = "status",value = "状态 (0:待办 1：已处理)", required = true, dataType = "int",paramType = "query") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) - public R list(AssessTaskReq req){ - assessTaskService.assessTaskList(req,getUserId()); - return R.ok().put("page",""); + public R list(@RequestBody @ApiParam(name = "body",value = "body请求体") AssessTaskReq req){ + PageUtils pageUtils = assessTaskService.assessTaskList(req, getUserId()); + return R.ok().put("page",pageUtils); } - @RequestMapping("chart/result") - public R chartResult(@RequestBody ChartResultReq req){ - return R.ok(); - } - - - @RequestMapping("assess/group/list") public R groupList(@RequestBody AssessListReq req){ diff --git a/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java index 41bfd27c..1a670f93 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java @@ -1,6 +1,8 @@ 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; /** @@ -9,6 +11,8 @@ import lombok.Data; * @Date: 2020/10/14 11:38 */ @Data +@ApiModel(value = "获取用户任务实体") public class AssessTaskReq extends BasePage{ + @ApiModelProperty(value = "状态 (0:待办 1：已处理)", name = "status",required = true, dataType = "int") private int status; } From ce09b75fc0621acee8a40b61039117ee3648f58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 15 Oct 2020 10:15:55 +0800 Subject: [PATCH 3/3] fix --- .../controller/ChartController.java | 14 ++++++++----- .../controller/UserTaskController.java | 20 +------------------ .../performance/req/AssessTaskReq.java | 2 +- 3 files changed, 11 insertions(+), 25 deletions(-) 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 381d0409..a6444683 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -2,8 +2,10 @@ package com.lz.modules.performance.controller; import com.lz.common.utils.R; import com.lz.modules.performance.req.ChartResultReq; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; +import com.lz.modules.performance.res.ChartStatisticalRes; +import com.lz.modules.performance.res.TaskListRes; +import com.lz.modules.sys.controller.AbstractController; +import io.swagger.annotations.*; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,11 +18,13 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/performance") -@Api(value="报表接口", tags={"报表统计"}) -public class ChartController { +//@Api(value="报表接口", tags={"报表统计"}) +public class ChartController extends AbstractController{ @PostMapping("chart/result") - public R chartResult(@RequestBody ChartResultReq req){ + @ApiOperation("获取待办/处理事项") + @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)}) + public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体") ChartResultReq req){ return R.ok(); } diff --git a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java index 83f37106..89316140 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -1,39 +1,21 @@ package com.lz.modules.performance.controller; -import com.lz.common.utils.DateUtils; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; -import com.lz.common.utils.StringUtil; -import com.lz.modules.app.entity.StaffEntity; -import com.lz.modules.app.service.StaffService; -import com.lz.modules.equipment.entity.model.BasePage; -import com.lz.modules.flow.entity.FlowChart; -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.AssessDetailReq; import com.lz.modules.performance.req.AssessListReq; 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.AssessTaskService; import com.lz.modules.sys.controller.AbstractController; -import com.lz.modules.sys.entity.app.ResultRecord; -import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; -import org.apache.commons.collections.CollectionUtils; 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 java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.function.Consumer; - /** * @Author: djc * @Desc: @@ -49,7 +31,7 @@ public class UserTaskController extends AbstractController{ @PostMapping("task/list") @ApiOperation("获取待办/处理事项") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) - public R list(@RequestBody @ApiParam(name = "body",value = "body请求体") AssessTaskReq req){ + public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ PageUtils pageUtils = assessTaskService.assessTaskList(req, getUserId()); return R.ok().put("page",pageUtils); } diff --git a/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java index 1a670f93..697cf389 100644 --- a/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java +++ b/src/main/java/com/lz/modules/performance/req/AssessTaskReq.java @@ -14,5 +14,5 @@ import lombok.Data; @ApiModel(value = "获取用户任务实体") public class AssessTaskReq extends BasePage{ @ApiModelProperty(value = "状态 (0:待办 1：已处理)", name = "status",required = true, dataType = "int") - private int status; + private int status = 0; }