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

fix

Browse Source
This commit is contained in:
杜建超 2020-10-21 18:12:15 +08:00
parent 35afe09d7a
commit ed4f1e3736
10 changed files with 95 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/flow/dao/FlowStartMapper.java
View File

@ -8,6 +8,7 @@ package com.lz.modules.flow.dao;
* @since 2020-10-13
*/
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.lz.modules.flow.entity.FlowStart;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -32,6 +33,6 @@ public interface FlowStartMapper extends BaseMapper<FlowStart> {
int deleteFlowStartById(@Param("id")Long id);
List<FlowStart> selectListByTime();
List<FlowStart> selectListByTime(@Param("page") IPage page, @Param("cycleType")Integer cycleType,@Param("name")String name);
}

48
src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
View File

@ -1,17 +1,24 @@
package com.lz.modules.performance.controller;
import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R;
import com.lz.modules.flow.dao.FlowStartMapper;
import com.lz.modules.flow.service.FlowStartService;
import com.lz.modules.performance.req.AssessDetailReq;
import com.lz.modules.flow.entity.FlowStart;
import com.lz.modules.performance.req.AssessListReq;
import com.lz.modules.performance.req.AssessDetailReq;
import com.lz.modules.performance.res.AssessManagerDetailRes;
import com.lz.modules.performance.res.AssessManagerListRes;
import com.lz.modules.performance.res.ChartStatisticalRes;
import io.swagger.annotations.ApiParam;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
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.function.Consumer;
/**
* @Author: djc
* @Desc:
@ -27,13 +34,42 @@ public class AssessManagerController {
@RequestMapping("assess/manager/list")
public R groupList(@RequestBody AssessListReq req){
ChartStatisticalRes res = new ChartStatisticalRes();
return R.ok();
List<AssessManagerListRes> data = new ArrayList<>()
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
page -> flowStartMapper.selectListByTime(page,req.getCycleType(),req.getName())
);
List<FlowStart> list = pageUtils.getList();
if(CollectionUtils.isEmpty(list)){
return R.ok().put("data",pageUtils);
}
list.forEach(flowStart -> {
AssessManagerListRes res = new AssessManagerListRes();
res.setId(flowStart.getId());
res.setName(flowStart.getName());
if(flowStart.getCycleType()==0){
}else if(flowStart.getCycleType()==1){
}
res.setJoinNum("");
data.add(res);
});
PageUtils pages = new PageUtils();
pages.setTotalPage(pageUtils.getTotalPage());
pages.setTotalCount(pageUtils.getTotalCount());
pages.setCurrPage(req.getCurrPage());
pages.setPageSize(req.getPageSize());
pages.setList(data);
return R.ok().put("data",pages);
}
@RequestMapping("assess/manager/detail")
public R groupDetail(@RequestBody AssessDetailReq req){
ChartStatisticalRes res = new ChartStatisticalRes();
AssessManagerDetailRes res = new AssessManagerDetailRes();
return R.ok();
}
}

29
src/main/java/com/lz/modules/performance/req/AssessDetailReq.java
View File

@ -1,16 +1,33 @@
package com.lz.modules.performance.req;
import com.lz.modules.equipment.entity.model.BasePage;
import lombok.Data;
import java.util.List;
/**
* @Author: djc
* @Desc:
* @Date: 2020/10/13 18:20
* @Date: 2020/10/13 18:00
*/
@Data
public class AssessDetailReq {
//考核类型 月度 季度
private int assessType;
//组名称
private String groupName;
public class AssessDetailReq extends BasePage{
//考勤组id
private Long groupId;
private String month;
private String startTime;
private String endTime;
//周期类型
private int type;
//员工名称
private String staffName;
//部门ids数组
private List<Long> departments;
//人员id数组
private List<Long> staffIds;
//状态 确认 执行 结果录入。。。
private int status;
}

29
src/main/java/com/lz/modules/performance/req/AssessListReq.java
View File

@ -1,32 +1,17 @@
package com.lz.modules.performance.req;
import com.lz.modules.equipment.entity.model.BasePage;
import lombok.Data;
import java.util.List;
/**
* @Author: djc
* @Desc:
* @Date: 2020/10/13 18:00
* @Date: 2020/10/13 18:20
*/
@Data
public class AssessListReq {
//考勤组id
private Long groupId;
private String month;
private String startTime;
private String endTime;
//周期类型
private int type;
//员工名称
private String staffName;
//部门ids数组
private List<Long> departments;
//人员id数组
private List<Long> staffIds;
//状态 确认 执行 结果录入。。。
private int status;
public class AssessListReq extends BasePage {
//考核类型 月度 季度
private int cycleType;
//组名称
private String name;
}

2
src/main/java/com/lz/modules/performance/res/AssessManagerListRes.java
View File

@ -10,6 +10,8 @@ import lombok.Data;
@Data
public class AssessManagerListRes {
private Long id;
private String name;
private String cycleTime;

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

@ -1,34 +1,25 @@
package com.lz.modules.performance.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import com.lz.common.utils.PageUtils;
import com.lz.common.utils.StringUtil;
import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.app.service.DepartmentsStaffRelateService;
import com.lz.modules.app.service.StaffService;
import com.lz.modules.flow.entity.EvaluationGroup;
import com.lz.modules.flow.service.EvaluationGroupService;
import com.lz.modules.performance.req.AssessListReq;
import com.lz.modules.performance.req.AssessDetailReq;
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 com.lz.modules.performance.service.ChartResultService;
import com.lz.modules.sys.dao.app.ResultRecordMapper;
import com.lz.modules.sys.entity.app.ResultRecord;
import com.lz.modules.sys.service.app.ResultRecordService;
import com.qcloud.cos.http.RequestBodyValue;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ArrayUtils;
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
@ -52,7 +43,7 @@ public class ChartResultServiceImpl implements ChartResultService {
@Override
public List<ChartStatisticalRes> chartReport(ChartResultReq req) {
List<ChartStatisticalRes> data = new ArrayList<>();
AssessListReq query = new AssessListReq();
AssessDetailReq query = new AssessDetailReq();
ChartStatisticalRes res;
BeanUtils.copyProperties(req,query);

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

@ -16,10 +16,9 @@ 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.req.AssessDetailReq;
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.sys.entity.app.ResultRecord;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -74,9 +73,9 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
List<ResultRecord> selectResultRecordAllByStaffId(@Param("staffId") Long staffId);
List<ChartStatistical> countNumByFlowProcess(@Param("req") AssessListReq req);
List<ChartStatistical> countNumByFlowProcess(@Param("req") AssessDetailReq req);
List<ChartStatistical> countNumByScoreLevel(@Param("req") AssessListReq req);
List<ChartStatistical> countNumByScoreLevel(@Param("req") AssessDetailReq req);
List<ResultRecord> selectResultRankList(@Param("page") IPage page, @Param("req") ChartResultReq req);

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

@ -1,12 +1,9 @@
package com.lz.modules.sys.service.app;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lz.common.emun.WorkMsgTypeEnum;
import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R;
import com.lz.modules.app.dto.GraphicsStatisticalDto;
import com.lz.modules.app.dto.ReportProgressListDto;
import com.lz.modules.app.entity.DepartmentsEntity;
import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
import com.lz.modules.app.entity.StaffEntity;
@ -15,9 +12,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.req.AssessDetailReq;
import com.lz.modules.performance.res.ChartStatistical;
import com.lz.modules.performance.res.ChartStatisticalRes;
import com.lz.modules.sys.entity.SysUserEntity;
import com.lz.modules.sys.entity.app.ResultRecord;
@ -105,8 +101,8 @@ public interface ResultRecordService extends IService<ResultRecord> {
List<ResultRecord> selectResultRecordAllByStaffId(Long staffId);
List<ChartStatistical> countNumByFlowProcess(AssessListReq req);
List<ChartStatistical> countNumByFlowProcess(AssessDetailReq req);
List<ChartStatistical> countNumByScoreLevel(AssessListReq req);
List<ChartStatistical> countNumByScoreLevel(AssessDetailReq req);
}

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

@ -27,9 +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.req.AssessDetailReq;
import com.lz.modules.performance.res.ChartStatistical;
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;
@ -734,12 +733,12 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}
@Override
public List<ChartStatistical> countNumByFlowProcess(AssessListReq req) {
public List<ChartStatistical> countNumByFlowProcess(AssessDetailReq req) {
return resultRecordMapper.countNumByFlowProcess(req);
}
@Override
public List<ChartStatistical> countNumByScoreLevel(AssessListReq req) {
public List<ChartStatistical> countNumByScoreLevel(AssessDetailReq req) {
return resultRecordMapper.countNumByScoreLevel(req);
}
}

10
src/main/resources/mapper/flow/FlowStartMapper.xml
View File

@ -88,8 +88,14 @@
update lz_flow_start set is_delete = 1 where id=#{id} limit 1
</update>
<select id="selectListByTime">
select * from lz_flow_start where is_delete = 0 and
<select id="selectListByTime" resultType="FlowStart">
select * from lz_flow_start where is_delete = 0
<if test="cycleType != null">
AND cycle_type = #{cycleType}
</if>
<if test="name !=null and name !=''">
and name LIKE CONCAT('%',#{name},'%')
</if>
</select>
</mapper>