|
|
@@ -3191,6 +3191,68 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
return httpRespMsg;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public HttpRespMsg getWaitingReviewList(HttpServletRequest request, Integer stateKey, String userId, Integer departmentId,Integer projectId,Integer pageIndex,Integer pageSize,String startDate,String endDate) {
|
|
|
+ HttpRespMsg msg=new HttpRespMsg();
|
|
|
+ User user = userMapper.selectById(request.getHeader("token"));
|
|
|
+ List<Map<String,Object>> list;
|
|
|
+ Integer size;
|
|
|
+ Integer start;
|
|
|
+ if(pageIndex!=null&&pageSize!=null){
|
|
|
+ size=pageSize;
|
|
|
+ start=(pageIndex-1)*size;
|
|
|
+ }else {
|
|
|
+ size=null;
|
|
|
+ start=null;
|
|
|
+ }
|
|
|
+ long total;
|
|
|
+ if(stateKey==0){
|
|
|
+ list=projectMapper.getWaitingReviewListByDepartment(user.getCompanyId(),userId,departmentId,start,size,startDate,endDate);
|
|
|
+ total=projectMapper.findCountWithDepartment(user.getCompanyId(),userId,departmentId,null,null,startDate,endDate);
|
|
|
+ }else {
|
|
|
+ list=projectMapper.getWaitingReviewListByProject(user.getCompanyId(),userId,projectId,start,size,startDate,endDate);
|
|
|
+ total=projectMapper.findCountWithProject(user.getCompanyId(),userId,projectId,null,null,startDate,endDate);
|
|
|
+ }
|
|
|
+ HashMap map=new HashMap();
|
|
|
+ map.put("total",total);
|
|
|
+ map.put("result",list);
|
|
|
+ msg.data=map;
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public HttpRespMsg exportWaitingReviewList(HttpServletRequest request, Integer stateKey, String userId, Integer departmentId, Integer projectId,String startDate,String endDate) {
|
|
|
+ HttpRespMsg msg = getWaitingReviewList(request, stateKey, userId, departmentId, projectId, null, null,startDate,endDate);
|
|
|
+ HashMap resultmap= (HashMap) msg.data;
|
|
|
+ List<Map<String,Object>> list= (List<Map<String, Object>>) resultmap.get("result");
|
|
|
+ List<List<String>> dataList=new ArrayList<>();
|
|
|
+ String[] s;
|
|
|
+ String fileName;
|
|
|
+ if(stateKey==0){
|
|
|
+ s= new String[]{"人员", "部门", "待审核数量"};
|
|
|
+ fileName = "人员部门待审核统计_"+System.currentTimeMillis();
|
|
|
+ }else {
|
|
|
+ s= new String[]{"人员", "项目", "待审核数量"};
|
|
|
+ fileName = "人员项目待审核统计_"+System.currentTimeMillis();
|
|
|
+ }
|
|
|
+ dataList.add(Arrays.asList(s));
|
|
|
+ for (Map<String, Object> map : list) {
|
|
|
+ List<String> item=new ArrayList<>();
|
|
|
+ item.add(String.valueOf(map.get("userName")));
|
|
|
+ if(stateKey==0){
|
|
|
+ item.add(String.valueOf(map.get("departmentName")));
|
|
|
+ }else {
|
|
|
+ item.add(String.valueOf(map.get("projectName")));
|
|
|
+ }
|
|
|
+ item.add(String.valueOf(map.get("num")));
|
|
|
+ dataList.add(item);
|
|
|
+ }
|
|
|
+ //生成excel文件导出
|
|
|
+ String resp = ExcelUtil.exportGeneralExcelByTitleAndList(fileName , dataList, path);
|
|
|
+ msg.data = resp;
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
private List<Department> getSubDepts(Department dp, List<Department> list) {
|
|
|
List<Department> collect = list.stream().filter(l -> dp.getDepartmentId().equals(l.getSuperiorId())).collect(Collectors.toList());
|
yurk