20210416v1.1

tall/src/main/java/com/ccsens/tall/bean/vo/LwbsVo.java

@@ -20,6 +20,8 @@ public class LwbsVo {
         private String name;
         @ApiModelProperty("项目id")
         private Long id;
+        @ApiModelProperty("类型 0我的 1正常的项目 2其他")
+        private int type = 1;
     }
     @Data
     @ApiModel("查询某人下的项目的任务")

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

@@ -78,7 +78,11 @@ public class InputDocService implements IInputDocService {
         //手动添加一个我的
         LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_wode =new LwbsVo.SelByUserIdToComProjectVo();
         selByUserIdToComProjectVo_wode.setName("我的");
+        selByUserIdToComProjectVo_wode.setType(0);
+        selByUserIdToComProjectVo_wode.setId(userId);
         selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_wode);
+
+
         //查询中间的项目
         ProMemberExample proMemberExample=new ProMemberExample();
         proMemberExample.createCriteria().andRecStatusEqualTo((byte) 0).andUserIdEqualTo(userId);
@@ -94,12 +98,15 @@ public class InputDocService implements IInputDocService {
             LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_zhongjian =new LwbsVo.SelByUserIdToComProjectVo();
             selByUserIdToComProjectVo_zhongjian.setName(sysProject.getName());
             selByUserIdToComProjectVo_zhongjian.setId(sysProject.getId());
+            selByUserIdToComProjectVo_zhongjian.setType(1);
             selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_zhongjian);
         });
         //手动添加一个其他
         LwbsVo.SelByUserIdToComProjectVo selByUserIdToComProjectVo_qita =new LwbsVo.SelByUserIdToComProjectVo();
         selByUserIdToComProjectVo_qita.setName("其他");
+        selByUserIdToComProjectVo_qita.setType(2);
         selByUserIdToComProjectVos.add(selByUserIdToComProjectVo_qita);
+
         return selByUserIdToComProjectVos;
     }
 

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

@@ -367,7 +367,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
         if(ObjectUtil.isNotNull(addTask.getPriority())){
             detail.setPriority(addTask.getPriority());
         }
-        SysProject project;
+        SysProject project = null;
         if (ObjectUtil.isNotNull(addTask.getProjectId())) {
             project = sysProjectDao.selectByPrimaryKey(addTask.getProjectId());
             if (ObjectUtil.isNotNull(project)) {
@@ -379,8 +379,15 @@ public class TaskSubTimeService implements ITaskSubTimeService {
                 throw new BaseException("项目信息不正确");
             }
         } else {
-            throw new BaseException(CodeEnum.PARAM_ERROR);
+            //TODO 没有项目id可以添加 时间默认为当天
+//            throw new BaseException(CodeEnum.PARAM_ERROR);
+            long todayS = DateUtil.parse(DateUtil.today()).getTime();
+            long todayE = todayS += 24 * 60 * 60 *1000;
+            detail.setBeginTime(todayS);
+            detail.setEndTime(todayE);
+            detail.setLevel((byte) 2);
         }
+
         if (ObjectUtil.isNotNull(addTask.getParentTaskId())) {
             ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(addTask.getParentTaskId());
             if (ObjectUtil.isNotNull(taskDetail)) {

util/src/test/java/com/ccsens/util/OtherTest.java

@@ -1,6 +1,7 @@
 package com.ccsens.util;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ImageUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -184,6 +185,23 @@ public class OtherTest {
             System.out.println(x.get(i).getName()+" "+x.get(i).getScore());
         }
     }
+    @Test
+    public void test11(){
+        System.out.println(DateUtil.today());
+        DateUtil.today();
+        System.out.println(DateUtil.parse(DateUtil.today()).getTime());
+
+        List<String> s = new ArrayList<>();
+        s.add("11");
+        s.add("22");
+
+        List<String> x = new ArrayList<>();
+        x.add("33");
+        x.add("44");
 
+        s.addAll(x);
+
+        System.out.println(s);
+    }
 
 }