diff --git a/src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java b/src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java
index 49d5bb2e0ef49bad081c9cd64a1f2e453fdb6eda..01a030c5f5ae98101b1118ccd3cbd42ddd5f9016 100644
--- a/src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java
+++ b/src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java
@@ -17,11 +17,11 @@ public abstract class AbstractAuditingEntity implements Serializable {
private String createdBy;
- private String createdAt;
+ private LocalDateTime createdAt;
private String lastModifiedBy;
- private String lastModifiedAt;
+ private LocalDateTime lastModifiedAt;
/**
* 鍒犻櫎鏍囪锛坒alse:鏈垹闄� true:宸插垹闄わ級
diff --git a/src/main/java/com/luca/pilot/entity/PlanModule.java b/src/main/java/com/luca/pilot/entity/PlanModule.java
index da06de5e836bd72e9d31f22e4266a3715ef65900..90dd8c75fc0554ec22b8ee28c28f826f2f84b0e2 100644
--- a/src/main/java/com/luca/pilot/entity/PlanModule.java
+++ b/src/main/java/com/luca/pilot/entity/PlanModule.java
@@ -3,6 +3,8 @@ package com.luca.pilot.entity;
import lombok.Data;
import org.springframework.data.mongodb.core.mapping.Document;
+import java.time.LocalDateTime;
+
@Data
@Document(collection="plan_module")
public class PlanModule {
@@ -50,10 +52,10 @@ public class PlanModule {
/**
* plan task detail
*/
- private String taskStartDate;
- private String taskEndDate;
+ private LocalDateTime taskStartDate;
+ private LocalDateTime taskEndDate;
private Integer taskCompleteStatus;
- private String taskCompleteTime;
+ private LocalDateTime taskCompleteTime;
private Integer taskEnabled;
private Integer taskCompleteOrder;
@@ -71,7 +73,7 @@ public class PlanModule {
*/
private Integer moduleComplete;
private String moduleIgnoreRemark;
- private String moduleFinishTime;
+ private LocalDateTime moduleFinishTime;
/**
* 缁勮
diff --git a/src/main/java/com/luca/pilot/entity/PlanTaskDetails.java b/src/main/java/com/luca/pilot/entity/PlanTaskDetails.java
index a33616cbe4366ee244c11643430581b169c8e358..bd16bd4607ca6b1b7d26497ca3de4220a485737f 100644
--- a/src/main/java/com/luca/pilot/entity/PlanTaskDetails.java
+++ b/src/main/java/com/luca/pilot/entity/PlanTaskDetails.java
@@ -55,12 +55,12 @@ public class PlanTaskDetails extends AbstractAuditingEntity {
/**
* 璁″垝寮€濮嬫棩鏈�
*/
- private String startDate;
+ private LocalDateTime startDate;
/**
* 璁″垝缁撴潫鏃ユ湡
*/
- private String endDate;
+ private LocalDateTime endDate;
/**
* 璁″垝瀹屾垚鐘舵€�(0:鏈畬鎴� 1:宸插畬鎴�)
@@ -70,7 +70,7 @@ public class PlanTaskDetails extends AbstractAuditingEntity {
/**
* 璁″垝瀹屾垚鏃堕棿
*/
- private String completeTime;
+ private LocalDateTime completeTime;
/**
* 鍛戒腑鏉′欢(鑻ユ槸寰幆鍛ㄥ唴鍑犳1111100:鏍囪瘑 鍛ㄤ竴鍒板懆浜斿仛,鍛ㄥ叚鍛ㄥぉ涓嶅仛; 鍏跺畠绫诲瀷浠诲姟:1)
diff --git a/src/main/java/com/luca/pilot/entity/Project.java b/src/main/java/com/luca/pilot/entity/Project.java
index 88c9548cc55b51bc25f5f8a402badd51b537e54f..70ded6005cd1d88152c26a0eeda12582f66d9de8 100644
--- a/src/main/java/com/luca/pilot/entity/Project.java
+++ b/src/main/java/com/luca/pilot/entity/Project.java
@@ -7,6 +7,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
import java.time.LocalDate;
+import java.time.LocalDateTime;
/**
* @author jiangbangfa
@@ -75,7 +76,7 @@ public class Project extends AbstractAuditingEntity {
/**
* 鐮旂┒闅忚鏃堕暱
*/
- private Integer studyFollowUpTime;
+ private LocalDateTime studyFollowUpTime;
/**
* 璁″垝浜烘暟
diff --git a/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java b/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java
index 664aca3cb0874000534f2797457beaaae700da67..93dc2269b853ac7e054e2ec354f39e23e35e4056 100644
--- a/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java
+++ b/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java
@@ -118,7 +118,7 @@ public class PlanServiceImpl implements PlanService {
UserArchive userArchive = userArchives.stream().filter(x -> Objects.nonNull(userArchiveMapping) && x.getId().equals(userArchiveMapping.getUserArchiveId())).findFirst().orElse(null);
- Project project = projects.stream().filter(x -> x.getId().equals(planTaskDetail.getProjectId())).findFirst().orElse(null);
+ Project project = projects.stream().filter(x -> x.getCode().equals(planTaskDetail.getProjectCode())).findFirst().orElse(null);
Site site = sites.stream().filter(x -> Objects.nonNull(userArchiveMapping) && x.getId().equals(userArchiveMapping.getSiteId())).findFirst().orElse(null);
@@ -173,7 +173,7 @@ public class PlanServiceImpl implements PlanService {
}
if (Objects.nonNull(planTaskDetail)) {
- planMoudle.setProjectCode(String.valueOf(planTaskDetail.getProjectId()));
+ planMoudle.setProjectCode(String.valueOf(planTaskDetail.getProjectCode()));
planMoudle.setTaskStartDate(planTaskDetail.getStartDate());
planMoudle.setTaskEndDate(planTaskDetail.getEndDate());
planMoudle.setTaskCompleteStatus(planTaskDetail.getCompleteStatus());
@@ -663,8 +663,8 @@ public class PlanServiceImpl implements PlanService {
}
private List<Project> queryProjct(List<PlanTaskDetails> planTaskDetails) {
- List<Long> projectIds = planTaskDetails.stream().map(PlanTaskDetails::getProjectId).collect(Collectors.toList());
- return mongoTemplate.find(new Query().addCriteria(where("id").in(projectIds)), Project.class);
+ List<String> projectCodes = planTaskDetails.stream().map(PlanTaskDetails::getProjectCode).collect(Collectors.toList());
+ return mongoTemplate.find(new Query().addCriteria(where("code").in(projectCodes)), Project.class);
}
private List<Plan> queryPlans(List<PlanTask> planTasks) {
diff --git a/src/main/resources/application-hj.yml b/src/main/resources/application-hj.yml
index 24c2218b8f0fe48c8f091afb9d0ec08fbe839a9f..afb4d3e9b6986a6c4dc1ea7613277e96a178bca2 100644
--- a/src/main/resources/application-hj.yml
+++ b/src/main/resources/application-hj.yml
@@ -5,11 +5,11 @@ SERVER-PORT: 8181
MGDB-ADDRESS: 47.92.245.13:30606
MGDB-NAME: root
MGDB-PASSWORD: 123456
-MGDB-DATABASE: luca-copy-dev
+MGDB-DATABASE: luca-mysql-copy-en-US
#MGDB-DATABASE: luca-copy-uat
MGDB-AUTHSOURCE: admin
-ARCHIVE-MGDB-DATABASE: luca_dev
-#ARCHIVE-MGDB-DATABASE: luca_uat
+#ARCHIVE-MGDB-DATABASE: luca_dev
+ARCHIVE-MGDB-DATABASE: luca_uat
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
index 6f4f32dd014378a8528b38faf8758d9128f5aa74..c984d1b80f2cd5c93ca5fbe653fd6c6f236c421e 100644
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@@ -5,7 +5,7 @@ SERVER-PORT: 8181
MGDB-ADDRESS: mongo.luca-common:27017
MGDB-NAME: root
MGDB-PASSWORD: 123456
-MGDB-DATABASE: luca-copy-uat
+MGDB-DATABASE: luca-mysql-copy-en-US
MGDB-AUTHSOURCE: admin
ARCHIVE-MGDB-DATABASE: luca_uat