|
|
@@ -1,6 +1,5 @@
|
|
|
package com.ruoyi.project.service.impl;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
|
|
@@ -24,7 +23,6 @@ import com.ruoyi.project.mapper.ProjectTaskMapper;
|
|
|
import com.ruoyi.project.service.ProjectTaskService;
|
|
|
import com.ruoyi.system.domain.SysUserRole;
|
|
|
import com.ruoyi.system.mapper.SysDeptMapper;
|
|
|
-import com.ruoyi.system.mapper.SysRoleMapper;
|
|
|
import com.ruoyi.system.mapper.SysUserMapper;
|
|
|
import com.ruoyi.system.mapper.SysUserRoleMapper;
|
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
|
@@ -33,23 +31,18 @@ import org.apache.poi.xwpf.usermodel.XWPFParagraph;
|
|
|
import org.apache.poi.xwpf.usermodel.XWPFRun;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.validation.Validator;
|
|
|
-import java.io.ByteArrayOutputStream;
|
|
|
import java.io.File;
|
|
|
import java.io.FileOutputStream;
|
|
|
import java.io.IOException;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
|
-import java.util.zip.ZipOutputStream;
|
|
|
|
|
|
import static java.lang.Thread.sleep;
|
|
|
|
|
|
@@ -615,7 +608,7 @@ public class ProjectTaskServiceImpl implements ProjectTaskService {
|
|
|
Map<String,ProjectTask> projectMap=new HashMap();
|
|
|
Map<String,SysUser> userMap=new HashMap();
|
|
|
if (!in.getRdList().isEmpty()){
|
|
|
- List<pushRdDataListBo> rdList = in.getRdList();
|
|
|
+ List<PushRdDataListBo> rdList = in.getRdList();
|
|
|
rdList.stream().forEach(e -> {
|
|
|
ProjectStaffRecord p = new ProjectStaffRecord();
|
|
|
if (e.getProjectNumber() != null){
|