Skip to content

C
cloud-web
Commit 2862e870 by Lichen
Options

活动添加投票关联调整

parent d034a7eb
Showing with 57 additions and 59 deletions
cloud-web-manage/src/main/java/com/yizhi/application/project/controller/TpPlanController.java
...@@ -3,23 +3,21 @@ package com.yizhi.application.project.controller; ...@@ -3,23 +3,21 @@ package com.yizhi.application.project.controller;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.yizhi.core.application.enums.InternationalEnums;
import com.yizhi.assignment.application.feign.AssignmentClient; import com.yizhi.assignment.application.feign.AssignmentClient;
import com.yizhi.assignment.application.vo.apivo.AssignmentTrainingProject;
import com.yizhi.certificate.application.feign.CertificateClient; import com.yizhi.certificate.application.feign.CertificateClient;
import com.yizhi.certificate.application.vo.RelateCertificateParam;
import com.yizhi.core.application.context.ContextHolder; import com.yizhi.core.application.context.ContextHolder;
import com.yizhi.core.application.context.RequestContext; import com.yizhi.core.application.context.RequestContext;
import com.yizhi.core.application.task.AbstractTaskHandler; import com.yizhi.core.application.enums.InternationalEnums;
import com.yizhi.core.application.task.TaskExecutor; import com.yizhi.core.application.task.TaskExecutor;
import com.yizhi.library.application.feign.CaseLibraryClient; import com.yizhi.library.application.feign.CaseLibraryClient;
import com.yizhi.library.application.param.RelateProjectParam;
import com.yizhi.training.application.feign.TpPlanClient; import com.yizhi.training.application.feign.TpPlanClient;
import com.yizhi.training.application.feign.TrainingProjectClient; import com.yizhi.training.application.feign.TrainingProjectClient;
import com.yizhi.training.application.model.BaseModel; import com.yizhi.training.application.model.BaseModel;
import com.yizhi.training.application.vo.api.IdVo; import com.yizhi.training.application.vo.api.IdVo;
import com.yizhi.training.application.vo.manage.*; import com.yizhi.training.application.vo.manage.ConditionDeleteVo;
import com.yizhi.util.application.constant.TpActivityType; import com.yizhi.training.application.vo.manage.TpPlanSortVo;
import com.yizhi.training.application.vo.manage.TpPlanUpdateVo;
import com.yizhi.training.application.vo.manage.TpPlanVo;
import com.yizhi.util.application.domain.Response; import com.yizhi.util.application.domain.Response;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -147,58 +145,58 @@ public class TpPlanController { ...@@ -147,58 +145,58 @@ public class TpPlanController {
model.setDate(new Date()); model.setDate(new Date());
com.yizhi.training.application.vo.domain.TpPlanVo tpPlan = tpPlanClient.save(model); com.yizhi.training.application.vo.domain.TpPlanVo tpPlan = tpPlanClient.save(model);
if (tpPlan != null && StringUtils.isEmpty(tpPlan.getSubMsg())) { // if (tpPlan != null && StringUtils.isEmpty(tpPlan.getSubMsg())) {
com.yizhi.training.application.vo.domain.TrainingProjectVo project = trainingProjectClient.getOne(tpPlanVo.getTrainingProjectId()); // com.yizhi.training.application.vo.domain.TrainingProjectVo project = trainingProjectClient.getOne(tpPlanVo.getTrainingProjectId());
List<TpPlanActivityVo> activities = tpPlanVo.getActivities(); // List<TpPlanActivityVo> activities = tpPlanVo.getActivities();
if (!CollectionUtils.isEmpty(activities)) { // if (!CollectionUtils.isEmpty(activities)) {
// 循环处理作业关联关系 // // 循环处理作业关联关系
//加上案例活动关联 // //加上案例活动关联
taskExecutor.asynExecute(new AbstractTaskHandler() { // taskExecutor.asynExecute(new AbstractTaskHandler() {
@Override // @Override
public void handle() { // public void handle() {
List<Long> assignmentIds = new ArrayList<>(); // List<Long> assignmentIds = new ArrayList<>();
List<Long> caseLibraryIds = new ArrayList<>(); // List<Long> caseLibraryIds = new ArrayList<>();
List<Long> certificateIds = new ArrayList<>(); // List<Long> certificateIds = new ArrayList<>();
for (TpPlanActivityVo vo : activities) { // for (TpPlanActivityVo vo : activities) {
if (vo.getType().equals(TpActivityType.TYPE_ASSIGNMENT)) { // if (vo.getType().equals(TpActivityType.TYPE_ASSIGNMENT)) {
assignmentIds.add(vo.getRelationId()); // assignmentIds.add(vo.getRelationId());
} else if (vo.getType().equals(TpActivityType.TYPE_CASE_ACTIVITY)) { // } else if (vo.getType().equals(TpActivityType.TYPE_CASE_ACTIVITY)) {
caseLibraryIds.add(vo.getRelationId()); // caseLibraryIds.add(vo.getRelationId());
} else if (vo.getType().equals(TpActivityType.TYPE_CERTIFICATE)) { // } else if (vo.getType().equals(TpActivityType.TYPE_CERTIFICATE)) {
certificateIds.add(vo.getRelationId()); // certificateIds.add(vo.getRelationId());
} // }
} // }
if (!CollectionUtils.isEmpty(assignmentIds)) { // if (!CollectionUtils.isEmpty(assignmentIds)) {
AssignmentTrainingProject assignmentTrainingProject = new AssignmentTrainingProject(); // AssignmentTrainingProject assignmentTrainingProject = new AssignmentTrainingProject();
assignmentTrainingProject.setListAssignmentIds(assignmentIds); // assignmentTrainingProject.setListAssignmentIds(assignmentIds);
assignmentTrainingProject.setProjectId(project.getId()); // assignmentTrainingProject.setProjectId(project.getId());
assignmentTrainingProject.setProjectName(project.getName()); // assignmentTrainingProject.setProjectName(project.getName());
assignmentClient.updateTrainingProjectByAssignmentId(assignmentTrainingProject); // assignmentClient.updateTrainingProjectByAssignmentId(assignmentTrainingProject);
} // }
//关联案例库 // //关联案例库
if (!CollectionUtils.isEmpty(caseLibraryIds)) { // if (!CollectionUtils.isEmpty(caseLibraryIds)) {
RelateProjectParam relateProjectParam = new RelateProjectParam(); // RelateProjectParam relateProjectParam = new RelateProjectParam();
relateProjectParam.setCaseLibraryIds(caseLibraryIds); // relateProjectParam.setCaseLibraryIds(caseLibraryIds);
relateProjectParam.setProjectId(project.getId()); // relateProjectParam.setProjectId(project.getId());
caseLibraryClient.relateProject(relateProjectParam); // caseLibraryClient.relateProject(relateProjectParam);
} // }
//关联证书 // //关联证书
if (!CollectionUtils.isEmpty(certificateIds)) { // if (!CollectionUtils.isEmpty(certificateIds)) {
RelateCertificateParam relateCertificateParam = new RelateCertificateParam(); // RelateCertificateParam relateCertificateParam = new RelateCertificateParam();
relateCertificateParam.setTpPlanId(tpPlan.getId()); // relateCertificateParam.setTpPlanId(tpPlan.getId());
relateCertificateParam.setTpPlanName(tpPlan.getName()); // relateCertificateParam.setTpPlanName(tpPlan.getName());
relateCertificateParam.setBizdId(project.getId()); // relateCertificateParam.setBizdId(project.getId());
relateCertificateParam.setBizdName(project.getName()); // relateCertificateParam.setBizdName(project.getName());
relateCertificateParam.setType(0); // relateCertificateParam.setType(0);
relateCertificateParam.setCertificateIds(certificateIds); // relateCertificateParam.setCertificateIds(certificateIds);
certificateClient.relateProject(relateCertificateParam); // certificateClient.relateProject(relateCertificateParam);
} // }
} // }
}); // });
} // }
} else { // } else {
return Response.fail(tpPlan.getSubMsg()); // return Response.fail(tpPlan.getSubMsg());
} // }
return Response.ok(tpPlan); return Response.ok(tpPlan);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("", e); LOGGER.error("", e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment