From cd2d6856c17e9b9bfe29d55690fab0fe5e069002 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 17 Aug 2021 11:11:04 +0800
Subject: [PATCH] 20210817

---
 .../com/ccsens/defaultwbs/service/ImportService.java     | 9 ++++++---
 src/main/resources/application.yml                       | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ccsens/defaultwbs/service/ImportService.java b/src/main/java/com/ccsens/defaultwbs/service/ImportService.java
index a4aad08..bddb8a1 100644
--- a/src/main/java/com/ccsens/defaultwbs/service/ImportService.java
+++ b/src/main/java/com/ccsens/defaultwbs/service/ImportService.java
@@ -764,9 +764,9 @@ public class ImportService implements IImportService {
                 //查找定期任务标签并关联任务
                 Long taskLabel = subLabelDao.getLabelByTypeAndLevel(1, 3);
                 saveLabelTask(taskDetailId,taskLabel);
-                //添加时间颗粒度标签并关联
-                Long timeLabel = subLabelDao.getLabelByTypeAndLevel(0, 4);
-                saveLabelTask(taskDetailId,timeLabel);
+//                //添加时间颗粒度标签并关联
+//                Long timeLabel = subLabelDao.getLabelByTypeAndLevel(0, 4);
+//                saveLabelTask(taskDetailId,timeLabel);
             }catch (Exception e){
                 Date startDate = new Date(project.getBeginTime());
                 Date endDate = new Date(project.getEndTime());
@@ -790,6 +790,9 @@ public class ImportService implements IImportService {
                     if(CollectionUtil.isNotEmpty(proTaskSubList)){
                         sTaskDao.insertSelectiveList(proTaskSubList);
                     }
+                    //查找定期任务标签并关联任务
+                    Long taskLabel = subLabelDao.getLabelByTypeAndLevel(1, 3);
+                    saveLabelTask(taskDetailId,taskLabel);
                 }catch (Exception e1){
                     throw new BaseException(String.valueOf(e1));
 //                            throw new BaseException(DefaultCodeError.WBS_PROJECT_TIME_ERROR);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2fb38e5..5abf242 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: prod
+    include: common, util-prod