任务的标签管理

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -16,10 +16,7 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.PubTool;
-import com.xm.core.entity.XmMenu;
-import com.xm.core.entity.XmProject;
-import com.xm.core.entity.XmTask;
-import com.xm.core.entity.XmTaskExecuser;
+import com.xm.core.entity.*;
 import com.xm.core.queue.XmTaskSumParentsPushService;
 import com.xm.core.service.*;
 import com.xm.core.service.cache.XmTaskCacheService;
@@ -542,6 +539,23 @@ public class XmTaskController {
 			}
 
 			if(tips.isOk()) {
+				//新增任务技能
+				if(xmTaskVo.getSkills()!=null && xmTaskVo.getSkills().size()>0){
+					for (XmTaskSkill skill : xmTaskVo.getSkills()) {
+						if(!StringUtils.hasText(skill.getSkillId())){
+							return ResponseHelper.failed("skillId-0","标签编号不能为空");
+						}
+						if(!StringUtils.hasText(skill.getSkillName())){
+							return ResponseHelper.failed("skillName-0","标签名称不能为空");
+						}
+						/**
+						 *  这个不控制
+						if(!StringUtils.hasText(skill.getCategoryId())){
+							return ResponseHelper.failed("categoryId-0","标签分类不能为空");
+						}
+						 */
+					}
+				}
 				xmTaskVo = xmTaskService.addTask(xmTaskVo);
 			}
 			m.put("data",xmTaskVo);

xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@@ -12,6 +12,7 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmMenu;
 import com.xm.core.entity.XmTask;
+import com.xm.core.entity.XmTaskSkill;
 import com.xm.core.queue.XmTaskSumParentsPushService;
 import com.xm.core.vo.BatchRelTasksWithMenu;
 import com.xm.core.vo.BatchRelTasksWithPhase;
@@ -212,7 +213,13 @@ public class XmTaskService extends BaseService {
 		//xmAttachmentService.insertOrUpdate(xmTaskVo.getId(),TYPE,xmTaskVo.getAttachment());
 		
 		//新增任务技能
-//		xmTaskSkillService.addSkill(xmTaskVo.getSkill());
+		if(xmTaskVo.getSkills()!=null && xmTaskVo.getSkills().size()>0){
+			for (XmTaskSkill skill : xmTaskVo.getSkills()) {
+				skill.setTaskId(xmTaskVo.getId());
+			}
+			xmTaskSkillService.addSkill(xmTaskVo.getSkills());
+		}
+
 		//xmTaskExecuserService.updateXmTaskExeUseridsAndUsernamesByTaskId(xmTaskVo.getId());
 		
 		//xmTaskSkillService.updateXmTaskSkillIdsAndNamesByTaskId(xmTaskVo.getId());

xm-core/src/main/java/com/xm/core/vo/XmTaskVo.java

@@ -1,23 +1,25 @@
 package com.xm.core.vo;
 
 import com.xm.core.entity.XmTask;
+import com.xm.core.entity.XmTaskSkill;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+import java.util.List;
+@Data
 @ApiModel(description="xm_task")
 public class XmTaskVo extends XmTask {
 
+	@ApiModelProperty(notes="任务的技能标签要求列表",allowEmptyValue=true,example="",allowableValues="")
+	List<XmTaskSkill> skills;
+	
 	/**
 	 * addSub,edit,delete
 	 */
+	@ApiModelProperty(notes="操作类型 addSub,edit,delete",allowEmptyValue=true,example="",allowableValues="")
 	String opType="";
 
-	public String getOpType() {
-		return opType;
-	}
-
-	public void setOpType(String opType) {
-		this.opType = opType;
-	}
 	 
 	 
 }