管理端活动服务需求优化

cloud-web-manage/src/main/java/com/yizhi/application/project/controller/TpPlanController.java

@@ -128,7 +128,19 @@ public class TpPlanController {
             @ApiParam(value = "培训计划vo", required = true) @RequestBody TpPlanVo tpPlanVo) {
             @ApiParam(value = "培训计划vo", required = true) @RequestBody TpPlanVo tpPlanVo) {
         try {
         try {
             SimpleDateFormat formatDate = new SimpleDateFormat("yyyy-MM-dd HH:mm");
             SimpleDateFormat formatDate = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
+            
+            if(StringUtils.isEmpty(tpPlanVo.getName()) || tpPlanVo.getStartTime() == null || tpPlanVo.getEndTime() == null){
+            	com.yizhi.training.application.vo.domain.TrainingProjectVo trainingProjectVo = trainingProjectClient.getOne(tpPlanVo.getTrainingProjectId());
+            	if (CollectionUtils.isEmpty(tpPlanVo.getActivities())) {
+            		tpPlanVo.setName(tpPlanVo.getName());
+            	} else {
+            		tpPlanVo.setName(tpPlanVo.getActivities().get(0).getName());
+            	}
+            	
+            	tpPlanVo.setStartTime(trainingProjectVo.getStartTime());
+            	tpPlanVo.setEndTime(trainingProjectVo.getEndTime());
+            }
+            
             BaseModel<TpPlanVo> model = new BaseModel<>();
             BaseModel<TpPlanVo> model = new BaseModel<>();
             model.setObj(tpPlanVo);
             model.setObj(tpPlanVo);
             model.setContext(ContextHolder.get());
             model.setContext(ContextHolder.get());

cloud-web-manage/src/main/java/com/yizhi/application/project/controller/TrainingProjectController.java

@@ -221,6 +221,23 @@ public class TrainingProjectController {
             trainingProject.setWeight(vo.getWeight());
             trainingProject.setWeight(vo.getWeight());
             trainingProject.setEnablePosition(vo.getEnablePosition());
             trainingProject.setEnablePosition(vo.getEnablePosition());
             trainingProject.setEnableQueue(vo.getEnableQueue());
             trainingProject.setEnableQueue(vo.getEnableQueue());
+            
+            //新增字段
+            trainingProject.setActivityType(vo.getActivityType());
+            trainingProject.setBizType(vo.getBizType());
+            trainingProject.setActivityCode(vo.getActivityCode());
+            trainingProject.setSubtitle(vo.getSubtitle());
+            trainingProject.setPictureSource(vo.getPictureSource());
+            trainingProject.setActivityAddress(vo.getActivityAddress());
+            trainingProject.setOrganizer(vo.getOrganizer());
+            trainingProject.setCoOrganizer(vo.getCoOrganizer());
+            trainingProject.setTips(vo.getTips());
+            trainingProject.setOther(vo.getOther());
+            trainingProject.setTopUp(vo.getTopUp());
+            trainingProject.setResearchId(vo.getResearchId());
+            trainingProject.setVideoUrl(vo.getVideoUrl());
+            trainingProject.setActivityReward(vo.getActivityReward());
+            trainingProject.setDetailsImage(vo.getDetailsImage());
 
 
             return Response.ok(trainingProjectClient.save(trainingProject));
             return Response.ok(trainingProjectClient.save(trainingProject));
         } catch (Exception e) {
         } catch (Exception e) {
@@ -387,6 +404,24 @@ public class TrainingProjectController {
             trainingProject.setTpClassificationId(vo.getTpClassificationId());
             trainingProject.setTpClassificationId(vo.getTpClassificationId());
             trainingProject.setWeight(vo.getWeight());
             trainingProject.setWeight(vo.getWeight());
             trainingProject.setEnablePosition(vo.getEnablePosition());
             trainingProject.setEnablePosition(vo.getEnablePosition());
+            
+            //新增字段
+            trainingProject.setActivityType(vo.getActivityType());
+            trainingProject.setBizType(vo.getBizType());
+            trainingProject.setActivityCode(vo.getActivityCode());
+            trainingProject.setSubtitle(vo.getSubtitle());
+            trainingProject.setPictureSource(vo.getPictureSource());
+            trainingProject.setActivityAddress(vo.getActivityAddress());
+            trainingProject.setOrganizer(vo.getOrganizer());
+            trainingProject.setCoOrganizer(vo.getCoOrganizer());
+            trainingProject.setTips(vo.getTips());
+            trainingProject.setOther(vo.getOther());
+            trainingProject.setTopUp(vo.getTopUp());
+            trainingProject.setResearchId(vo.getResearchId());
+            trainingProject.setVideoUrl(vo.getVideoUrl());
+            trainingProject.setActivityReward(vo.getActivityReward());
+            trainingProject.setDetailsImage(vo.getDetailsImage());
+            
             return Response.ok(trainingProjectClient.update(trainingProject));
             return Response.ok(trainingProjectClient.update(trainingProject));
         } catch (Exception e) {
         } catch (Exception e) {
             LOGGER.error("", e);
             LOGGER.error("", e);