增加服务

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

@@ -344,6 +344,7 @@ public class ReportController {
                                   Integer[] extraField1,
                                   Integer[] extraField2,
                                   Integer[] extraField3,
+                                  Integer[] sapServiceId,//依斯贝的服务Id
                                   String summary         //针对工作总结的字段
                                     ) {
         List<Report> reportList = new ArrayList<>();
@@ -477,6 +478,12 @@ public class ReportController {
                 professionProgress[i] = null;
             }
         }
+        if (sapServiceId == null) {
+            sapServiceId = new Integer[projectId.length];
+            for (int i=0;i<sapServiceId.length; i++) {
+                sapServiceId[i] = null;
+            }
+        }
         if (company.getPackageProject() == 1) {
             //检查是否设置了预算的工时预警
             ProjectBasecostSetting alarmSetting = projectBasecostSettingMapper.selectOne(new QueryWrapper<ProjectBasecostSetting>()
@@ -854,6 +861,7 @@ public class ReportController {
                             report.setExtraField1(extraField1[i]);
                             report.setExtraField2(extraField2[i]);
                             report.setExtraField3(extraField3[i]);
+                            report.setSapServiceId(sapServiceId[i]);
                             //如果是员工自由选择审批流程的方式，需要处理一下
                             if (comTimeType.getReportAuditType() == 3) {
                                 report.setAuditorSetting(auditorSettingList.get(i));
@@ -919,6 +927,7 @@ public class ReportController {
                                 report.setExtraField1(extraField1[i]);
                                 report.setExtraField2(extraField2[i]);
                                 report.setExtraField3(extraField3[i]);
+                                report.setSapServiceId(sapServiceId[i]);
                                 //如果是员工自由选择审批流程的方式，需要处理一下
                                 if (comTimeType.getReportAuditType() == 3) {
                                     report.setAuditorSetting(auditorSettingList.get(i));
@@ -986,6 +995,7 @@ public class ReportController {
                         report.setExtraField1(extraField1[i]);
                         report.setExtraField2(extraField2[i]);
                         report.setExtraField3(extraField3[i]);
+                        report.setSapServiceId(sapServiceId[i]);
                         //如果是员工自由选择审批流程的方式，需要处理一下
                         if (comTimeType.getReportAuditType() == 3) {
                             report.setAuditorSetting(auditorSettingList.get(i));
@@ -1058,6 +1068,7 @@ public class ReportController {
                             report.setExtraField1(extraField1[i]);
                             report.setExtraField2(extraField2[i]);
                             report.setExtraField3(extraField3[i]);
+                            report.setSapServiceId(sapServiceId[i]);
                             //如果是员工自由选择审批流程的方式，需要处理一下
                             if (comTimeType.getReportAuditType() == 3) {
                                 report.setAuditorSetting(auditorSettingList.get(i));

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

@@ -65,6 +65,8 @@ public class TaskController {
     @Resource
     private SysFunctionMapper sysFunctionMapper;
     @Resource
+    private SapProjectServiceMapper sapProjectServiceMapper;
+    @Resource
     private TprogressPaticipatorsService tprogressPaticipatorsService;
     @Resource
     private TaskCommentMapper taskCommentMapper;
@@ -1024,5 +1026,31 @@ public class TaskController {
         httpRespMsg.data=meetingInfo;
         return httpRespMsg;
     }
+
+    //获取当前用户在任务上参与的服务
+    @RequestMapping("/getMyTaskService")
+    public HttpRespMsg getMyTaskService(Integer taskId) throws Exception {
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        String userId = request.getHeader("token");
+        System.out.println(userId+"======="+taskId);
+        List<TaskExecutor> taskExecutors = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("executor_id", userId).eq("task_id", taskId));
+        List<Integer> serviceIds = new ArrayList<>();
+        for (TaskExecutor executor : taskExecutors) {
+            String serviceId = executor.getServiceId();
+            if (!StringUtils.isEmpty(serviceId)) {
+                List<Integer> ints = JSONArray.parseArray(serviceId, Integer.class);
+                serviceIds.addAll(ints);
+            }
+        }
+        if (serviceIds.size() > 0) {
+            List<SapProjectService> dataList = sapProjectServiceMapper.selectList(new QueryWrapper<SapProjectService>().in("id", serviceIds));
+            httpRespMsg.data = dataList;
+        } else {
+            httpRespMsg.data = new ArrayList<>();
+        }
+        return httpRespMsg;
+    }
+
+
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/TaskMapper.java

@@ -39,7 +39,7 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List getTaskWithProjectName(@Param(Constants.WRAPPER) Wrapper wrapper, Integer pageStart, Integer pageSize,Integer companyId,List<Integer> deptIds);
 
-    List recentSimpleList(Integer projectId, String userId);
+    List recentSimpleList(Integer projectId, String userId, String stage, Integer groupId);
 
     @Update("update task set executor_id = null, executor_name = null, executor_color=null where id=#{id}")
     void removeTaskExecutor(Integer id);

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

@@ -149,6 +149,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Resource
     private ProjectMapper projectMapper;
     @Resource
+    private SapProjectServiceMapper sapProjectServiceMapper;
+    @Resource
     private CompanyDingdingService companyDingdingService;
     @Resource
     private InformationMapper informationMapper;
@@ -573,6 +575,21 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                 }
             }
+            //为依斯贝增加日报的服务名称显示
+            if (user.getCompanyId() == 3092) {
+                List<SapProjectService> alLServiceList = sapProjectServiceMapper.selectList(new QueryWrapper<SapProjectService>().eq("company_id", user.getCompanyId()));
+                for (Map map : nameList) {
+                    List<Map<String, Object>> reportList = (List<Map<String, Object>>)map.get("data");
+                    for (Map<String, Object> report : reportList) {
+                        Integer sapServiceId = (Integer)report.get("sapServiceId");
+                        Optional<SapProjectService> first = alLServiceList.stream().filter(d->d.getId().equals(sapServiceId)).findFirst();
+                        if (first.isPresent()) {
+                            SapProjectService divItem = first.get();
+                            report.put("sapServiceName", divItem.getServiceName());
+                        }
+                    }
+                }
+            }
             httpRespMsg.data = nameList;
         } catch (NullPointerException e) {
             e.printStackTrace();
@@ -626,7 +643,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //获取当前项目的子项目列表，任务分组，任务列表，项目相关维度列表
             reports.forEach(r->{
                 r.setSubProjectList(subProjectList.stream().filter(s->s.getProjectId().equals(r.getProjectId())).collect(Collectors.toList()));
-                r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId));
+                r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId, r.getStage(), r.getGroupId()));
                 //获取当前项目的工程专业进度
                 List<ReportProfessionProgress> progressList = reportProfessionProgressService.list(new QueryWrapper<ReportProfessionProgress>().eq("report_id", r.getId()));
                 //去掉当前项目上已经不存在的专业
@@ -853,7 +870,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //获取当前项目的子项目列表，任务分组，任务列表，项目相关维度列表
             Report r = report;
             r.setSubProjectList(subProjectList.stream().filter(s->s.getProjectId().equals(r.getProjectId())).collect(Collectors.toList()));
-            r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId));
+            r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId, r.getStage(), r.getGroupId()));
             //获取当前项目的工程专业进度
             List<ReportProfessionProgress> progressList = reportProfessionProgressService.list(new QueryWrapper<ReportProfessionProgress>().eq("report_id", r.getId()));
             //去掉当前项目上已经不存在的专业
@@ -6865,7 +6882,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             reports.forEach(r->{
                 r.setContent(null);
                 r.setSubProjectList(subProjectList.stream().filter(s->s.getProjectId().equals(r.getProjectId())).collect(Collectors.toList()));
-                r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId));
+                r.setTaskList(taskMapper.recentSimpleList(r.getProjectId(), userId, r.getStage(), r.getGroupId()));
                 //获取当前项目的工程专业进度
                 List<ReportProfessionProgress> progressList = reportProfessionProgressService.list(new QueryWrapper<ReportProfessionProgress>().eq("report_id", r.getId()));
                 //去掉当前项目上已经不存在的专业

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

@@ -68,7 +68,7 @@
         ,c.plate1 as plate1,c.plate2 as plate2,c.plate3 as plate3,c.plate4 as plate4,c.plate5 as plate5
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,task_group.name as groupName,a.group_id as groupId,a.custom_data as customData
         ,u.name as projectAuditorName,u.corpwx_userid as projectAuditorCorpwxUserId, a.project_auditor_id as projectAuditorId, department.department_name as departmentName,dp2.department_name as buDepartmentName,department.department_id as departmentId, a.overtime_hours as overtimeHours, a.custom_text as customText,a.project_audit_time  as projectAuditTime,project_main.name as projectMainName,
-        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN user AS c ON a.creator_id=c.id
@@ -200,7 +200,7 @@
         ,c.plate1 as plate1,c.plate2 as plate2,c.plate3 as plate3,c.plate4 as plate4,c.plate5 as plate5
         ,u.name as projectAuditorName,u.corpwx_userid as projectAuditorCorpwxUserId, a.project_auditor_id as projectAuditorId, department.department_name as
         departmentName,dp2.department_name as buDepartmentName,department.department_id as departmentId, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as
-        projectAuditTime,project_main.name as projectMainName,a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        projectAuditTime,project_main.name as projectMainName,a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN user AS c ON a.creator_id=c.id
@@ -325,7 +325,7 @@
         ,c.plate1 as plate1,c.plate2 as plate2,c.plate3 as plate3,c.plate4 as plate4,c.plate5 as plate5
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName,u.corpwx_userid as projectAuditorCorpwxUserId, a.project_auditor_id as projectAuditorId, department.department_name as departmentName,dp2.department_name as buDepartmentName,department.department_id as departmentId, a.overtime_hours as overtimeHours, a.custom_text as customText, a.project_audit_time as projectAuditTime,project_main.name as projectMainName
-        ,a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        ,a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN user AS c ON a.creator_id=c.id
@@ -385,7 +385,7 @@
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId,dp2.department_name as buDepartmentName,a.overtime_hours as overtimeHours, a.custom_text as customText,a.evaluate as evaluate,a.report_auto_approve as reportAutoApprove,
-        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         left join sub_project as d on d.id = a.sub_project_id
@@ -412,7 +412,7 @@
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText,a.evaluate as evaluate,a.report_auto_approve as reportAutoApprove,
-        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
             JOIN project AS b ON a.project_id=b.id
             left join sub_project as d on d.id = a.sub_project_id
@@ -436,7 +436,7 @@
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText, dept_manager.name as deptAuditorName,a.evaluate as evaluate,
-        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         left join sub_project as d on d.id = a.sub_project_id
@@ -467,7 +467,7 @@
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText, dept_manager.name as deptAuditorName,a.evaluate as evaluate,
-        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         left join project_ccuser on project_ccuser.project_id = a.project_id
@@ -499,7 +499,7 @@
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId, a.overtime_hours as overtimeHours, a.custom_text as customText, dept_manager.name as deptAuditorName
-        ,a.group_audit_state as groupAuditState,a.batch_id as batchId,a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        ,a.group_audit_state as groupAuditState,a.batch_id as batchId,a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
         left join user on user.id = a.creator_id
         JOIN project AS b ON a.project_id=b.id
@@ -579,7 +579,7 @@
         , reject_reason as rejectReason, reject_username as rejectUsername, reject_userid as rejectUserid, degree_id as degree_id,report_extra_degree.name as degreeName,
         department.department_name as auditDeptName, a.is_dept_audit as isDeptAudit, a.project_audit_state as projectAuditState,task_group.name as groupName,a.group_id as groupId, a.custom_data as customData
         ,u.name as projectAuditorName, a.project_auditor_id as projectAuditorId,dp2.department_name as buDepartmentName, a.overtime_hours as overtimeHours, a.custom_text as customText, dept_manager.name as deptAuditorName,a.evaluate as evaluate,a.report_auto_approve as reportAutoApprove,
-        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId
+        a.extra_field1 as extraField1,a.extra_field2 as extraField2,a.extra_field3 as extraField3, a.batch_id as batchId,a.sap_service_id as sapServiceId
         FROM report AS a
         JOIN project AS b ON a.project_id=b.id
         left join sub_project as d on d.id = a.sub_project_id

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

@@ -227,12 +227,18 @@
     </select>
 
     <select id="recentSimpleList" resultType="java.util.Map">
-        select task.id as taskId, task.name as taskName, stages.stages_name as stagesName
+        select task.id as taskId, task.name as taskName, stages.stages_name as stagesName,task.group_id as groupId
         from task left join stages on stages.id = task.stages_id
         where task.project_id = #{projectId}
         <if test="userId != null">
             and executor_id like '%${userId}%'
         </if>
+        <if test="stage != null">
+            and stages.stagesName = #{stage}
+        </if>
+        <if test="groupId != null">
+            and task.gruop_id = #{groupId}
+        </if>
         and task_status = 0 order by task.id desc limit 50
     </select>
     <select id="selectMilepost" resultType="com.management.platform.entity.Task">

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -295,6 +295,7 @@
                                                             </span>
                                                     </p>
                                                     <p v-if="item2.taskId != null">{{$t('other.task')}}：{{item2.taskName}}
+                                                        <span style="margin-left:10px;" v-if="user.companyId==3092">-- 服务：{{ item2.sapServiceName }}</span>
                                                     </p>
                                                     <div v-if="item2.multiWorktime==0">
                                                     <p style="display: inline-block;">{{$t('time.duration')}}：
@@ -647,16 +648,26 @@
                                 <span >任务</span>
                             </template>
                             <el-select v-model="domain.taskId" :placeholder="$t('defaultText.pleaseChoose')" style="width:75%;margin-right:7%" filterable="true" 
-                            :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
+                            :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" @change="onTaskSelected(domain)">
                                 <el-option v-for="item in domain.taskList" :key="item.taskId" :label="item.taskName" :value="item.taskId"></el-option>
                             </el-select>
                             <el-checkbox v-model="domain.taskFinish" v-if="domain.taskId != undefined">{{$t('state.completed')}}</el-checkbox>
                         </el-form-item>
+                        <!--针对依斯贝的SAP服务-->
+                        <el-form-item v-if="user.companyId==3092" label="服务" :prop="'domains.' + index + '.sapServiceId'" 
+                        :rules=" { required: true, message: '请选择服务', trigger: 'blur' }">
+                        <el-select v-model="domain.sapServiceId" placeholder="请选择服务" style="width:75%;margin-right:7%" filterable="true" 
+                            :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" >
+                                <el-option v-for="item in domain.serviceList" :key="item.id" :label="item.serviceName" :value="item.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <!--工作事项-->
                         <el-form-item :label="user.companyId==781? $t('other.specificContentAndResults') : $t('other.workMatters') " :prop="'domains.' + index + '.content'" 
                         :rules="user.timeType.workContentState == 1 ? { required: true, message: user.companyId==781? $t('other.tianspecificContentAndResults'):$t('other.tianworkMatters'), trigger: 'blur' } : null">
                             <el-input v-model="domain.content" type="textarea" :rows="4" :placeholder="$t('defaultText.pleaseFillOut')" clearable style="width:75%;margin-right:7%"
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"></el-input>
                         </el-form-item>
+
                         <!-- 拍照上传 -->
                         <el-form-item label="图片上传" v-if="user.timeType.choseFromAlbum == 1">
                             <div class="photos">
@@ -1907,6 +1918,7 @@
             return {
                 roleList:[{value: 1,label: 'CRC&LM'},{value: 2,label: 'PM'}],
                 jobResponseList:[],
+                yisibeiCompId: 3092,
                 yuzhongCompId: 3385,
                 mingyiName : '成都明夷电子科技有限公司',
                 // mingyiName : '明夷',
@@ -2263,7 +2275,34 @@
         },
         methods: {
             ...mapMutations(['upDataLoading']),
+            //任务被选中
+            onTaskSelected(domainItem) {
+                //取服务
+                if (domainItem.taskId) {
+                    var that = this;
+                    this.http.post('/task/getMyTaskService',{taskId:domainItem.taskId},res => {
+                            if (res.code == "ok") {
+                                // domainItem.workContentList = res.data;
+                                that.$set(domainItem, 'serviceList', null);
+                                that.$set(domainItem, 'serviceList', res.data);
+                            } else {
+                                this.$message({
+                                    message: res.msg,
+                                    type: "error"
+                                });
+                            }
+                        },error => {
+                            this.$message({
+                                message: error,
+                                type: "error"
+                            });
+                            }
+                        );  
+                } else {
+                    //清空服务
 
+                }
+            },
             onBatchTimeChange() {
                 //反向计算每日工作时长
                 if (this.workForm.createDate) {
@@ -4092,31 +4131,13 @@
                 );
                 //项目相关的近期任务
                 if (this.user.company.packageProject == 1) {
-                    this.http.post('/task/getRecentTask',{ 
-                        projectId: domain.projectId,
-                        isSubstitude:this.isSubstitude?1:0
-                    },
-                    res => {
-                        if (res.code == "ok") {
-                            this.workForm.domains[index].allTaskList = res.data;
-                            this.workForm.domains[index].taskList = res.data;
-                            this.$forceUpdate();
-                        } 
-                    },
-                    error => {
-                        this.$message({
-                            message: error,
-                            type: "error"
-                        });
-                        }
-                    );
+                    this.getRecentTaskList(domain, index);
                     //获取项目相关专业
                     if (this.user.company.packageEngineering == 1) {
                         this.getProjectProfessions(domain, index);
                     }
                     //获取项目下的任务分组
                     this.getTaskGroups(domain, index);
-                    
                 }
                 
                 
@@ -4146,6 +4167,34 @@
                 }
             },
 
+            getRecentTaskList(domain, index) {
+                var param = { 
+                    projectId: domain.projectId,
+                    isSubstitude:this.isSubstitude?1:0
+                };
+                if (domain.groupId) {
+                    param.groupId = domain.groupId;
+                }
+                if (domain.stage) {
+                    param.stage = domain.stage;
+                }
+                this.http.post('/task/getRecentTask',param,
+                res => {
+                    if (res.code == "ok") {
+                        this.workForm.domains[index].allTaskList = res.data;
+                        this.workForm.domains[index].taskList = res.data;
+                        this.$forceUpdate();
+                    } 
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                    }
+                );
+            },
+
             //获取项目审核人
             getProjectAuditorList(domainItem, index) {
                 if(domainItem.projectId == '') {
@@ -7292,6 +7341,10 @@
                                 formData.append('extraField2', this.workForm.domains[i].extraField2);
                                 formData.append('extraField3', this.workForm.domains[i].extraField3);
                             }
+                            //依斯贝的服务Id
+                            if (this.user.companyId == this.yisibeiCompId || this.user.companyId == 10) {
+                                formData.append('sapServiceId', this.workForm.domains[i].sapServiceId);
+                            }
                         }
                         this.submitingReport = true;
                         this.http.uploadFile( this.port.report.editPort, formData,