Merge branch 'dev' into 'master'

管理端活动服务需求优化

See merge request !4

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) {
         try {
             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<>();
             model.setObj(tpPlanVo);
             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.setEnablePosition(vo.getEnablePosition());
             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));
         } catch (Exception e) {
@@ -387,6 +404,24 @@ public class TrainingProjectController {
             trainingProject.setTpClassificationId(vo.getTpClassificationId());
             trainingProject.setWeight(vo.getWeight());
             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));
         } catch (Exception e) {
             LOGGER.error("", e);

cloud-web-manage/src/main/java/com/yizhi/application/research/controller/manage/ResearchController.java

@@ -225,6 +225,7 @@ public class ResearchController {
     public Response<PageInfo> listPage(
             @ApiParam(name = "name", value = "调研关键字") @RequestParam(name = "name", required = false) String name,
             @ApiParam(name = "state", value = "状态，0草稿 1上架 2下架", required = false) @RequestParam(name = "state", required = false) Integer state,
+            @ApiParam(name = "bizType", value = "业务类型:1调研；2投票，不传查询所有", required = false) @RequestParam(name = "bizType", required = false) Integer bizType,
             @ApiParam(name = "currentTime", value = "当前时间") @RequestParam(value = "currentTime", required = false) String currentTime,
             @ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize
@@ -238,6 +239,7 @@ public class ResearchController {
             map.put("name", name);
             map.put("state", state);
             map.put("currentTime", currentTime);
+            map.put("bizType", bizType);
 
             Page<com.yizhi.research.application.vo.domain.ResearchVo> page = new Page<>();
             page.setCondition(map);