1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/GroupBudgetReviewController.java

@@ -6,9 +6,13 @@ import com.management.platform.entity.*;
 import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.TaskGroupMapper;
 import com.management.platform.mapper.UserMapper;
+import com.management.platform.mapper.WxCorpInfoMapper;
+import com.management.platform.service.ExcelExportService;
 import com.management.platform.service.GroupBudgetReviewService;
 import com.management.platform.service.TaskService;
 import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -16,7 +20,10 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -43,6 +50,12 @@ public class GroupBudgetReviewController {
     private ProjectMapper projectMapper;
     @Resource
     private TaskService taskService;
+    @Value(value = "${upload.path}")
+    private String path;
+    @Resource
+    private WxCorpInfoMapper wxCorpInfoMapper;
+    @Resource
+    private ExcelExportService excelExportService;
 
     @RequestMapping("/add")
     public HttpRespMsg add(Integer groupId,Integer oldManDay,Integer changeManDay,Integer nowManDay,String remark){
@@ -100,14 +113,89 @@ public class GroupBudgetReviewController {
     }
 
     @RequestMapping("/list")
-    public HttpRespMsg list(){
+    public HttpRespMsg list(String startDate,String endDate,Integer projectId,Integer status,String submitUserId){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
-        List<GroupBudgetReview> list = groupBudgetReviewService.list(new LambdaQueryWrapper<GroupBudgetReview>().eq(GroupBudgetReview::getCompanyId, companyId).orderByDesc(GroupBudgetReview::getCreateTime));
+        LambdaQueryWrapper<GroupBudgetReview> queryWrapper = new LambdaQueryWrapper<GroupBudgetReview>().eq(GroupBudgetReview::getCompanyId, companyId).orderByDesc(GroupBudgetReview::getCreateTime);
+        if(startDate!=null && endDate!=null){
+            queryWrapper.between(GroupBudgetReview::getCreateTime,startDate,endDate);
+        }
+        if(projectId!=null){
+            queryWrapper.eq(GroupBudgetReview::getProjectId,projectId);
+        }
+        if(status!=null){
+            queryWrapper.eq(GroupBudgetReview::getStatus,status);
+        }
+        if(!StringUtils.isEmpty(submitUserId)){
+            queryWrapper.eq(GroupBudgetReview::getCreatorId,submitUserId);
+        }
+        List<GroupBudgetReview> list = groupBudgetReviewService.list(queryWrapper);
         httpRespMsg.setData(list);
         return httpRespMsg;
     }
 
+    @RequestMapping("/export")
+    public HttpRespMsg export(String startDate,String endDate,Integer projectId,Integer status,String submitUserId){
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, companyId));
+        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
+        LambdaQueryWrapper<GroupBudgetReview> queryWrapper = new LambdaQueryWrapper<GroupBudgetReview>().eq(GroupBudgetReview::getCompanyId, companyId).orderByDesc(GroupBudgetReview::getCreateTime);
+        if(startDate!=null && endDate!=null){
+            queryWrapper.between(GroupBudgetReview::getCreateTime,startDate,endDate);
+        }
+        if(projectId!=null){
+            queryWrapper.eq(GroupBudgetReview::getProjectId,projectId);
+        }
+        if(status!=null){
+            queryWrapper.eq(GroupBudgetReview::getStatus,status);
+        }
+        if(!StringUtils.isEmpty(submitUserId)){
+            queryWrapper.eq(GroupBudgetReview::getCreatorId,submitUserId);
+        }
+        List<GroupBudgetReview> list = groupBudgetReviewService.list(queryWrapper);
+        List<List<String>> dataList=new ArrayList<>();
+        List<String> titleList=new ArrayList<>();
+        titleList.add("项目名称");
+        titleList.add("分组名称");
+        titleList.add("提交人");
+        titleList.add("提交时间");
+        titleList.add("变更前预估工时");
+        titleList.add("预估工时变更");
+        titleList.add("变更后预估工时");
+        titleList.add("变更理由");
+        titleList.add("状态");
+        dataList.add(titleList);
+        for (GroupBudgetReview groupBudgetReview : list) {
+            List<String> item=new ArrayList<>();
+            item.add(groupBudgetReview.getProjectName());
+            item.add(groupBudgetReview.getGroupName());
+            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                Optional<User> first = userList.stream().filter(u -> u.getId().equals(groupBudgetReview.getCreatorId())).findFirst();
+                if(first.isPresent()){
+                    item.add("$userName="+first.get().getName()+"$");
+                }else {
+                    item.add("");
+                }
+            }
+            item.add(df.format(groupBudgetReview.getCreateTime()));
+            item.add(String.valueOf(groupBudgetReview.getOldManDay()));
+            item.add(String.valueOf(groupBudgetReview.getChangeManDay()));
+            item.add(String.valueOf(groupBudgetReview.getNowManDay()));
+            item.add(String.valueOf(groupBudgetReview.getRemark()));
+            item.add(groupBudgetReview.getStatus()==0?"待审核":groupBudgetReview.getStatus()==1?"审核通过":"已驳回");
+            dataList.add(item);
+        }
+        String fileUrlSuffix = "预估工时审核表_" + System.currentTimeMillis();
+        try {
+            return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileUrlSuffix,dataList,path);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return httpRespMsg;
+    }
+
 
 
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -511,8 +511,8 @@ public class ProjectController {
 
     @RequestMapping("/importData")
     @Transactional(rollbackFor = Exception.class)
-    public HttpRespMsg importData(String userId, MultipartFile file,@RequestParam(defaultValue = "0") Integer key,HttpServletRequest request) {
-        return projectService.importData(userId, file,key, request);
+    public HttpRespMsg importData(String userId, MultipartFile file,@RequestParam(defaultValue = "0") Integer key,@RequestParam(defaultValue = "0") Integer changeParticipation,HttpServletRequest request) {
+        return projectService.importData(userId, file,key,changeParticipation, request);
     }
 
     @RequestMapping("/getGanttData")
@@ -1487,13 +1487,13 @@ public class ProjectController {
         return projectService.exportProjectExpendProcessList(projectId,categoryId,userId);
     }
 
-    //依斯倍定制 员工任务完成表
+    //依斯倍定制 员工任务进度表
     @RequestMapping("/userTaskProcessList")
     public HttpRespMsg userTaskProcessList(Integer deptId,String userId,Integer projectId,String startDate,String endDate,Integer pageIndex,Integer pageSize){
         return projectService.userTaskProcessList(deptId,userId,projectId,startDate,endDate,pageIndex,pageSize);
     }
 
-    //依斯倍定制 导出员工项目进度表
+    //依斯倍定制 导出员工任务进度表
     @RequestMapping("/exportUserTaskProcessList")
     public HttpRespMsg exportUserTaskProcessList(Integer deptId,String userId,Integer projectId,String startDate,String endDate){
         return projectService.exportUserTaskProcessList(deptId,userId,projectId,startDate,endDate);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskGroupController.java

@@ -68,6 +68,8 @@ public class TaskGroupController {
     private TaskExecutorService taskExecutorService;
     @Resource
     private GroupParticipatorService groupParticipatorService;
+    @Resource
+    private ParticipationService participationService;
     /**
      * 保存任务分组
      */
@@ -273,6 +275,7 @@ public class TaskGroupController {
         String[] projectIdArr = projectIds.split(",");
         List<String> list = Arrays.asList(projectIdArr);
         List<Integer> projectIdList = list.stream().map(Integer::parseInt).collect(Collectors.toList());
+        List<Participation> participationList = participationService.list(new LambdaQueryWrapper<Participation>().in(Participation::getProjectId, projectIdList));
         List<TaskGroup> taskGroups = taskGroupService.list(new QueryWrapper<TaskGroup>().in("project_id", projectIdList).eq("name",taskGroupName));
         taskGroups.forEach(t->{
             t.setInchargerId(inchargerId);
@@ -281,6 +284,7 @@ public class TaskGroupController {
         ids.add(-1);
         List<GroupParticipator> participatorList = groupParticipatorMapper.selectList(new QueryWrapper<GroupParticipator>().in("group_id", ids));
         List<GroupParticipator> add=new ArrayList<>();
+        List<Participation> addParticipationList=new ArrayList<>();
         for (TaskGroup taskGroup : taskGroups) {
             GroupParticipator groupParticipator=new GroupParticipator();
             groupParticipator.setGroupId(taskGroup.getId()).setUserId(inchargerId);
@@ -288,6 +292,13 @@ public class TaskGroupController {
             if(!first.isPresent()){
                 add.add(groupParticipator);
             }
+            boolean match = participationList.stream().anyMatch(p -> p.getProjectId().equals(taskGroup.getProjectId()) && p.getUserId().equals(inchargerId));
+            if(!match){
+                Participation participation=new Participation();
+                participation.setUserId(inchargerId);
+                participation.setProjectId(taskGroup.getProjectId());
+                addParticipationList.add(participation);
+            }
         }
         if(!groupParticipatorService.saveBatch(add)){
             msg.setError("验证失败");
@@ -295,6 +306,11 @@ public class TaskGroupController {
         if(!taskGroupService.updateBatchById(taskGroups)){
             msg.setError("验证失败");
         }
+        if(addParticipationList.size()>0){
+            if(!participationService.saveBatch(addParticipationList)){
+                msg.setError("验证失败");
+            }
+        }
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -106,7 +106,7 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg exportProjectInAndOut(HttpServletRequest request);
 
-    HttpRespMsg importData(String userId, MultipartFile file,Integer key, HttpServletRequest request);
+    HttpRespMsg importData(String userId, MultipartFile file,Integer key,@RequestParam(defaultValue = "0") Integer changeParticipation, HttpServletRequest request);
 
     HttpRespMsg getCustomerProjectInAndOut(Integer pageIndex, Integer pageSize, HttpServletRequest request,Integer customerId,Integer projectId);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -4296,7 +4296,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
 
     @Override
-    public HttpRespMsg importData(String userId, MultipartFile multipartFile,Integer key, HttpServletRequest request) {
+    public HttpRespMsg importData(String userId, MultipartFile multipartFile,Integer key,@RequestParam(defaultValue = "0") Integer changeParticipation, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectById(userId);
         TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
@@ -4610,9 +4610,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         project.setId(updateProject.getId());
                         projectMapper.updateById(project);
                     }else {
-                        if(projectMapper.insert(project)>0){
-
-                        }
+                        projectMapper.insert(project);
                     }
                     importCount++;
                     //处理子项目
@@ -4790,6 +4788,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         //批量保存
                         List<Participation> finalOldPartList = oldPartList;
                         List<Participation> addPartList = participationList.stream().filter(newP-> !finalOldPartList.stream().anyMatch(oldP->oldP.getUserId().equals(newP.getUserId()))).collect(Collectors.toList());
+                        if(changeParticipation==1){
+                            participationService.remove(new LambdaQueryWrapper<Participation>().eq(project.getId()!=null,Participation::getProjectId,project.getId()));
+                            addPartList = participationList;
+                        }
                         if (addPartList.size() > 0) {
                             participationService.saveBatch(addPartList);
                         }
@@ -6024,6 +6026,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         //批量保存
                         List<Participation> finalOldPartList = oldPartList;
                         List<Participation> addPartList = participationList.stream().filter(newP-> !finalOldPartList.stream().anyMatch(oldP->oldP.getUserId().equals(newP.getUserId()))).collect(Collectors.toList());
+                        if(changeParticipation==1){
+                            participationService.remove(new LambdaQueryWrapper<Participation>().eq(project.getId()!=null,Participation::getProjectId,project.getId()));
+                            addPartList = participationList;
+                        }
                         if (addPartList.size() > 0) {
                             participationService.saveBatch(addPartList);
                         }
@@ -12984,6 +12990,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }
             map.put("userProgress",targetLsit);
         }
+        //处理项目下的负责组长
+        List<Integer> needProjectIds = resultList.stream().map(m -> Integer.valueOf(String.valueOf(m.get("projectId")))).collect(Collectors.toList());
+        List<Participation> participationList = participationMapper.selectList(new LambdaQueryWrapper<Participation>().in(Participation::getProjectId, needProjectIds));
+        List<String> needUserIds = participationList.stream().map(m -> String.valueOf(m.getUserId())).collect(Collectors.toList());
+        List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getId, needUserIds));
+        resultList.forEach(r->{
+            List<Participation> targetParticipationList = participationList.stream().filter(p -> p.getProjectId().equals(Integer.valueOf(String.valueOf(r.get("projectId"))))).collect(Collectors.toList());
+            List<String> targetUserIds = targetParticipationList.stream().map(m -> String.valueOf(m.getUserId())).collect(Collectors.toList());
+            String targetUserString = userList.stream().filter(u -> targetUserIds.contains(u.getId()) && u.getRoleId().equals(30770)).map(User::getName).collect(Collectors.joining(","));
+            r.put("teamLeader",targetUserString);
+        });
         Map<String,Object> resultMap=new HashMap<>();
         resultMap.put("record",resultList);
         resultMap.put("total",total);
@@ -13006,10 +13023,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         titleList.add("项目名称");
         titleList.add("项目分类");
         titleList.add("项目编号");
+        titleList.add("开始时间");
+        titleList.add("截止时间");
         titleList.add("分配工时");
         titleList.add("已消耗工时");
         titleList.add("已消耗工时成本");
         titleList.add("剩余工时");
+        titleList.add("负责组长");
         titleList.add("参与员工");
         dataList.add(titleList);
         for (Map<String, Object> map : mapList) {
@@ -13017,10 +13037,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             item.add(String.valueOf(map.get("projectName")));
             item.add(String.valueOf(map.get("categoryName")));
             item.add(String.valueOf(map.get("projectCode")));
+            item.add(String.valueOf(map.get("planStartDate")));
+            item.add(String.valueOf(map.get("planEndDate")));
             item.add(String.valueOf(map.get("planHour")));
             item.add(String.valueOf(map.get("realHour")));
             item.add(String.valueOf(map.get("realCost")));
             item.add(String.valueOf(map.get("residueHour")));
+            if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                item.add("$userName="+String.valueOf(map.get("teamLeader"))+"$");
+            }else {
+                item.add(String.valueOf(map.get("teamLeader")));
+            }
             List<Map<String, Object>> userProgress = (List<Map<String, Object>>) map.get("userProgress");
             StringBuilder sb=new StringBuilder();
             for (int i = 0; i < userProgress.size(); i++) {
@@ -13056,8 +13083,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
         Integer companyId = user.getCompanyId();
-        boolean viewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "全部员工项目进度表");
-        boolean incharger = sysFunctionService.hasPriviledge(user.getRoleId(), "负责部门员工项目进度表");
+        boolean viewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "全部员工任务进度表");
+        boolean incharger = sysFunctionService.hasPriviledge(user.getRoleId(), "负责部门员工任务进度表");
         List<Department> allDeptList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, companyId));
         List<Map<String,Object>> resultList;
         Long total;
@@ -13195,12 +13222,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         row_first.add("");
         row_first.add("");
         row_first.add("");
+        row_first.add("");
+        row_first.add("");
+        row_first.add("");
         for (int i = 0; i < row_first.size(); i++) {
             SXSSFCell tempCell = row0.createCell(i);
             tempCell.setCellValue(row_first.get(i));
             tempCell.setCellStyle(headStyle);
         }
-        sheet.addMergedRegion(new CellRangeAddress(0,0,2,6));
+        sheet.addMergedRegion(new CellRangeAddress(0,0,2,9));
         sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
         sheet.addMergedRegion(new CellRangeAddress(0,1,1,1));
         //第二行
@@ -13214,6 +13244,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         row_second.add("项目任务");
         row_second.add("计划工时");
         row_second.add("消耗工时");
+        row_second.add("剩余工时");
+        row_second.add("项目开始时间");
+        row_second.add("项目截止时间");
         for (int i = 0; i < row_second.size(); i++) {
             SXSSFCell tempCell = row1.createCell(i);
             tempCell.setCellValue(row_second.get(i));
@@ -13249,13 +13282,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 list.add(String.valueOf(maps.get(i).get("taskName")));
                 list.add(String.valueOf(maps.get(i).get("planHour")));
                 list.add(String.valueOf(maps.get(i).get("consumeTime")));
+                list.add(String.valueOf(maps.get(i).get("residue")));
+                list.add(String.valueOf(maps.get(i).get("planStartDate")));
+                list.add(String.valueOf(maps.get(i).get("planEndDate")));
             }
         }
         int k=0;
         for(int i = 0;i<mapList.size();i++){
             SXSSFRow tempRow = sheet.createRow(rowNum++);
             tempRow.setHeight((short)500);
-            for(int j=0;j<7;j++){
+            for(int j=0;j<10;j++){
                 SXSSFCell tempCell = tempRow.createCell(j);
                 String cellValue = "";
                 tempCell.setCellStyle(cellStyle);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1903,7 +1903,7 @@
     </select>
 
     <select id="projectExpendProcessList" resultType="java.util.Map">
-        select p.project_name as projectName,pc.name as categoryName,p.project_code as projectCode,IFNULL(SUM(te.plan_hours),0) as planHour,
+        select p.id AS projectId,p.project_name as projectName,DATE_FORMAT(p.`plan_start_date`,'%Y-%m-%d') AS planStartDate,DATE_FORMAT(p.`plan_end_date`,'%Y-%m-%d') AS planEndDate,pc.name as categoryName,p.project_code as projectCode,IFNULL(SUM(te.plan_hours),0) as planHour,
         IFNULL((select SUM(working_time) from report where project_id=p.id and state=1),0) as realHour, IFNULL((select SUM(cost) from report where project_id=p.id and state=1),0) as realCost,
         IFNULL(IFNULL(SUM(te.plan_hours),0)-IFNULL((select SUM(working_time) from report where project_id=p.id and state=1),0),0) as residueHour,
         GROUP_CONCAT(CONCAT_WS('|',te.executor_name,IFNULL((select SUM(working_time) from report where creator_id=te.executor_id and project_id=p.id and state=1),0))) as executorString
@@ -1966,7 +1966,8 @@
 
     <select id="userTaskProcessList" resultType="java.util.Map">
         select d.department_name as departmentName,d.corpwx_deptid as corpwxDeptId,u.corpwx_userid as corpwxUserId,t.name as taskName,IFNULL(t.plan_hours,0) as planHour,u.name as userName,u.job_number as jobNumber,p.project_name as projectName,p.project_code as projectCode,
-        IFNULL((select SUM(working_time) from report where task_id=te.task_id and state=1),0)as consumeTime
+        IFNULL((select SUM(working_time) from report where task_id=te.task_id and state=1),0)as consumeTime,IF((IFNULL(t.plan_hours,0)-IFNULL((SELECT SUM(working_time) FROM report WHERE task_id=te.task_id AND state=1),0))&lt;0,0,(IFNULL(t.plan_hours,0)-IFNULL((SELECT SUM(working_time) FROM report WHERE task_id=te.task_id AND state=1),0))) AS residue
+        ,DATE_FORMAT(p.`plan_start_date`,'%Y-%m-%d') AS planStartDate,DATE_FORMAT(p.`plan_end_date`,'%Y-%m-%d') AS planEndDate
         from task_executor te
         left join  user u on u.id=te.executor_id
         left join department d on d.department_id=u.department_id

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -1442,6 +1442,7 @@
 
         <el-dialog :title="$t('importproject')" v-if="importProjectBeforeDialog" :visible.sync="importProjectBeforeDialog" width="30%">
             <el-checkbox v-model="paramData1" style="margin-left:10px">{{ $t('dui-yi-you-xiang-mu-jin-hang-xin-xi-geng-xin') }}</el-checkbox>
+            <el-checkbox v-model="changeParticipation" @change="changeParticipationValue(changeParticipation)" style="margin-left:10px" >{{ '根据文件中参与人对现有的进行删减' }}</el-checkbox>
             <div slot="footer" class="dialog-footer" style="text-algin:center;">
                 <el-upload ref="upload" action="#" :limit="1" :http-request="importProject" :show-file-list="false">
                     <el-button type="primary">{{ $t('importproject') }}</el-button>
@@ -2046,6 +2047,7 @@ a {
                 groupForm:{},
                 setTemplateDialog: false,
                 selectedGroup:{},
+                changeParticipation:false,
             };
         },
         // 过滤器
@@ -4509,8 +4511,12 @@ a {
             },
             importProjectBefore(){
                 this.paramData1 = false
+                this.changeParticipation = false
                 this.importProjectBeforeDialog = true
             },
+            changeParticipationValue(value){
+                this.paramData1=value
+            },
             importProject(item) {
                 //首先判断文件类型
                 let str = item.file.name.split(".");
@@ -4526,6 +4532,7 @@ a {
                     formData.append("file", item.file);
                     formData.append("userId", this.user.id);
                     formData.append('key',this.paramData1 ? 1 : 0)
+                    formData.append('changeParticipation',this.changeParticipation ? 1 : 0)
                     this.http.uploadFile('/project/importData', formData,
                     res => {
                         this.$refs.upload.clearFiles();