1212v1.0

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -19,6 +19,7 @@ import com.ccsens.util.cron.NatureToDate;
 import com.ccsens.util.exception.BaseException;
 import com.sun.org.apache.bcel.internal.classfile.Code;
 import io.swagger.annotations.ApiModelProperty;
+import jdk.nashorn.internal.runtime.regexp.joni.CodeRangeBuffer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -974,28 +975,27 @@ public class ProTaskDetailService implements IProTaskDetailService {
         }
         return normalTask;
     }
-//    private void changeTime(ProTaskDetail taskDetail,Long beginTime,Long endTime,SysProject project){
+    private void changeTime(ProTaskDetail taskDetail,Long beginTime,Long endTime,SysProject project){
-//        if(beginTime >= project.getBeginTime() || endTime <= project.getEndTime()){
+        if(beginTime >= project.getBeginTime() || endTime <= project.getEndTime()){
-//            throw new BaseException(CodeEnum.TIME_ERROR_PROJECT);
+            throw new BaseException(CodeEnum.TIME_ERROR_PROJECT);
-//        }
+        }
-//        if(taskDetail.getLevel() == 2){
+
-//            ProTaskDetailExample detailExample = new ProTaskDetailExample();
+        if(taskDetail.getLevel() == 2){
-//            detailExample.createCriteria().andParentIdEqualTo(taskDetail.getId());
+            //组任务不能修改时间（组任务的时间是其子任务的最早和最晚的时间）
-//            List<ProTaskDetail> detailList = taskDetailDao.selectByExample(detailExample);
+            if(taskDetail.getHasGroup() == 1){
-//            if(CollectionUtil.isNotEmpty(detailList)){
+                throw new BaseException(CodeEnum.HAS_GROUP_TIME_CHANGE);
-//
+            }else {
-//            }else {
+                if (ObjectUtil.isNotNull(beginTime)) {
-//                if (ObjectUtil.isNotNull(beginTime)) {
+                    taskDetail.setBeginTime(beginTime);
-//                    taskDetail.setBeginTime(beginTime);
+                }
-//                }
+                if (ObjectUtil.isNotNull(endTime)) {
-//                if (ObjectUtil.isNotNull(endTime)) {
+                    taskDetail.setEndTime(endTime);
-//                    taskDetail.setEndTime(endTime);
+                }
-//                }
+            }
-//            }
+        }else if(taskDetail.getLevel() == 3){
-//        }else if(taskDetail.getLevel() == 3){
+
-//
+        }
-//        }
+    }
-//    }
     private void partTaskSubTime(ProTaskDetail taskDetail){
         //cycle为空或者组任务，只加一条数据
         if (StrUtil.isEmpty(taskDetail.getCycle()) || taskDetail.getHasGroup() == 1) {

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -65,7 +65,8 @@ public enum CodeEnum {
 
     REPEAT_PROJECT_NAME(51,"项目名不能重复，请修改后重试",true),
     TIME_ERROR_BEGIN(52,"时间异常，开始时间不能大于结束时间",true),
-    TIME_ERROR_PROJECT(53,"时间异常，时间不在项目范围内",true)
+    TIME_ERROR_PROJECT(53,"时间异常，时间不在项目范围内",true),
+    HAS_GROUP_TIME_CHANGE(54,"分组任务不能修改时间，请修改其子任务时间",true)
     ;
 
     public CodeEnum addMsg(String msg){