wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-10-15 10:52:06 +08:00
commit e5a72e8351
10 changed files with 81 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/lz/modules/performance/controller/ChartController.java Normal file
View File

@ -0,0 +1,34 @@
package com.lz.modules.performance.controller;
import com.lz.common.utils.R;
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.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;
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 extends AbstractController{
@PostMapping("chart/result")
@ApiOperation("获取待办/处理事项")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatisticalRes.class)})
public R chartResult(@RequestBody @ApiParam(name = "body",value = "body请求体") ChartResultReq req){
return R.ok();
}
}

39
src/main/java/com/lz/modules/performance/controller/SmartPerformanceController.java → src/main/java/com/lz/modules/performance/controller/UserTaskController.java
View File

@ -1,38 +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:
@ -40,28 +23,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请求体",required = true) 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){

6
src/main/java/com/lz/modules/performance/req/AssessTaskReq.java
View File

@ -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{
private int status;
@ApiModelProperty(value = "状态 (0:待办 1：已处理)", name = "status",required = true, dataType = "int")
private int status = 0;
}

4
src/main/java/com/lz/modules/performance/req/ChartResultReq.java
View File

@ -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;

5
src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
View File

@ -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);
}

5
src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
View File

@ -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> {
ResultRecord selectCurrentMonthResultRecordByStaffIdType(@Param("staffId") Long staffId, @Param("type") int type);
List<ResultRecord> selectResultRecordAllByStaffId(@Param("staffId") Long staffId);
List<ChartStatisticalRes> countNumByFlowProcess(@Param("req") AssessListReq req);
}

4
src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
View File

@ -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> {
ResultRecord selectCurrentMonthResultRecordByStaffIdType(Long staffId, int type);
List<ResultRecord> selectResultRecordAllByStaffId(Long staffId);
List<ChartStatisticalRes> countNumByFlowProcess(AssessListReq req);
}

7
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -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<ResultRecordMapper, Res
return resultRecordMapper.staffDistribution(monthTime,staffIds);
}
@Override
public List<ChartStatisticalRes> countNumByFlowProcess(AssessListReq req) {
return resultRecordMapper.countNumByFlowProcess(req);
}
}

4
src/main/resources/mapper/app/ResultRecordMapper.xml
View File

@ -338,6 +338,10 @@
select * from lz_result_record where staff_id = #{staffId}
</select>
<select id="countNumByFlowProcess" resultType="com.lz.modules.performance.res.ChartStatisticalRes">
SELECT count(flow_process) num,flow_process type from lz_result_record where is_delete=0 GROUP BY flow_process
</select>
</mapper>

8
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -212,7 +212,13 @@
</select>
<select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
SELECT DISTINCT(record_id),flow_process,current_approval_staff_id,staff_id,month_time,r.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r
ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0
and approval_staff_id = #{approvalStaffId}
and f.status = 2
order by r.gmt_modified desc
</select>
</mapper>