add taskVO code

core/src/main/java/com/mooctest/crowd/domain/factory/CrowdTestProjectFactory.java

@@ -1,6 +1,7 @@
 package com.mooctest.crowd.domain.factory;
 
 import com.mooctest.crowd.domain.domainobject.*;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.sql.Date;
@@ -13,17 +14,23 @@ import java.sql.Timestamp;
 @Component
 public class CrowdTestProjectFactory {
 
+    @Value("${green.manager.id}")
+    private static String regionalManagerId;
+
+    @Value("${green.agency.id}")
+    private static String agencyId;
+
     public static CrowdTestProject createCrowdTestProject() {
         return new CrowdTestProject();
     }
 
-    public static CrowdTestProject defaulstCrowdTestProject() {
+    public static CrowdTestProject defaultCrowdTestProject() {
         CrowdTestProject project = new CrowdTestProject();
         project.setStatus(CrowdTestProjectStatus.HAS_FINISHED);
         project.setIsDeleted(0);
         project.setProjectDistributionTypeId(1L);
-        project.setDistributionProvince("江苏");
-        project.setDistributionCity("南京");
+        project.setDistributionProvince("江苏省");
+        project.setDistributionCity("南京市");
         project.setRegionalManagerId(99222L);
         project.setUserId(1L);
         project.setProjectFile("");
@@ -38,7 +45,7 @@ public class CrowdTestProjectFactory {
     public static CrowdTestTask defaultFinishedCrowdTask() {
         CrowdTestTask task = new CrowdTestTask();
         task.setStatus(CrowdTestTaskStatus.HAS_FINISHED);
-        task.setEvaluationAgencyId(1l);
+        task.setEvaluationAgencyId(20471L);
         task.setDistributionType(0l);
         return task;
     }

site/src/main/java/com/mooctest/crowd/site/controller/advice/ExceptionAdvice.java

@@ -77,6 +77,6 @@ public class ExceptionAdvice {
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     public String handleExcel2ProjectException(Excel2ProjectException e){
         log.error("Excel表中存在错误："+e.getErrorLogs());
-        return e.getErrorLogs();
+        return "Excel表中存在错误："+ e.getErrorLogs();
     }
 }

site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdTaskVO.java

@@ -22,7 +22,8 @@ import static com.mooctest.crowd.site.data.vo.CrowdTestProjectVO.getDistanceTime
 @NoArgsConstructor
 @AllArgsConstructor
 public class CrowdTaskVO implements Serializable{
-    private long id;
+    private String id;
+    private String code;
     private String projectId;
     private String title;
     private String description;
@@ -48,11 +49,9 @@ public class CrowdTaskVO implements Serializable{
     private List<TaskToUserVO> taskToUserVOS = new ArrayList<>();
     private String time_interval;
 
-
-
-
     public CrowdTaskVO(CrowdTestTask task){
-        id = task.getId();
+        id = task.getCode();
+        code = task.getCode();
         projectId = task.getCrowdTestProjectCode();
         title = task.getName();
         description = task.getDescription();

site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdProjectServiceImpl.java

@@ -226,10 +226,10 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
             task.setParticipantHasCommittedCount(1);
             task.setCreateTime(project.getCreateTime());
             task.setEndTime(project.getEndTime());
-            if (user.getEvaluationAgency() == null)
-                task.setEvaluationAgencyId(1L);
-            else
-                task.setEvaluationAgencyId(user.getEvaluationAgency().getId());
+//            if (user.getEvaluationAgency() == null)
+//                task.setEvaluationAgencyId(1L);
+//            else
+//                task.setEvaluationAgencyId(user.getEvaluationAgency().getId());
 
             // 构造taskToUser
             TaskToUser taskToUser = new TaskToUser();
@@ -375,7 +375,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
         log.info("CellCount: " + cellCount);
         log.info("Rows: " + sheet.getPhysicalNumberOfRows());
         for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
-            CrowdTestProject project = CrowdTestProjectFactory.defaulstCrowdTestProject();
+            CrowdTestProject project = CrowdTestProjectFactory.defaultCrowdTestProject();
             CrowdTestReport report = CrowdTestProjectFactory.defaultProjectReport();
             Row row = sheet.getRow(i);
             if (row == null) {

site/src/main/resources/application.yml

@@ -60,6 +60,11 @@ cache:
 
 agency: 7
 
+green:
+  manager:
+    id: 99222
+  agency:
+    id: 99231
 ---
 spring:
   profiles: dev
@@ -186,3 +191,7 @@ user:
     baseUrl: http://user.cofortest.com
 website:
   domain: cofortest.com
+
+green:
+  agency:
+    id: 50565