调整任务详情，返回机构名称

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

@@ -29,7 +29,7 @@ public class CrowdTaskVO {
     private Double fixedPrice;
     private Long resource;
     private Map<String, String> location;
-    private Long institution;
+    private String institution;
     private String serviceType;
     private int status;
     private Timestamp datetime;
@@ -45,7 +45,6 @@ public class CrowdTaskVO {
         location = new HashMap<>();
         location.put("provinceCode", task.getDistributionProvince());
         location.put("cityCode", task.getDistributionCity());
-        institution = task.getEvaluationAgencyId();
         serviceType = task.getType();
         status = task.getStatus();
         datetime = task.getDeadTime();

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

@@ -1,12 +1,14 @@
 package com.mooctest.crowd.site.service.impl;
 
 import com.mooctest.crowd.domain.dao.CrowdTestTaskDao;
+import com.mooctest.crowd.domain.dao.EvaluationAgencyDao;
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
 import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
 import com.mooctest.crowd.domain.domainobject.CrowdTestTaskStatus;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.exception.CrowdTestTaskNotExistException;
 import com.mooctest.crowd.domain.factory.CrowdTestProjectFactory;
+import com.mooctest.crowd.domain.model.EvaluationAgencyPO;
 import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
 import com.mooctest.crowd.site.command.CrowdTestTaskCommand;
 import com.mooctest.crowd.site.data.dto.TaskDetailsDTO;
@@ -44,6 +46,9 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
     @Autowired
     private ViewMediator viewMediator;
 
+    @Autowired
+    private EvaluationAgencyDao agencyDao;
+
 //    @Autowired
 //    GenerateFlowCodeUtil codeUtil;
 
@@ -54,7 +59,10 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
         Optional<CrowdTestTask> task =  project.getCrowdTestTaskList().stream().filter(crowdTestTask -> crowdTestTask.getCode().equals(taskCode)).findFirst();
         if (!task.isPresent())
             throw new CrowdTestTaskNotExistException();
-        taskDetailsDTO.setCrowdTaskVO(new CrowdTaskVO(task.get()));
+        CrowdTaskVO taskVO = new CrowdTaskVO(task.get());
+        EvaluationAgencyPO agencyPO = agencyDao.findByUserId(task.get().getEvaluationAgencyId());
+        taskVO.setInstitution(agencyPO==null?"该机构已注销":agencyPO.getEvaluationAgencyName());
+        taskDetailsDTO.setCrowdTaskVO(taskVO);
         List<CrowdReportVO> reportVOList = task.get().getCrowdTestReportList()
                 .stream().map(crowdTestReport -> {
             return new CrowdReportVO(crowdTestReport);
@@ -67,7 +75,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
     public TaskDetailsDTO createTask(String projectCode, CrowdTestTaskCommand command) {
         CrowdTestTask task = command.toCrowdTask(projectCode);
         CrowdTestProject project = projectRepo.getByProjectCode(projectCode);
-        String taskCode = GenerateFlowCodeUtil.generateFlowCode("TASK-"+ command.getType());
+        String taskCode = GenerateFlowCodeUtil.generateFlowCode("TASK-"+ ProjectType.getCode(command.getType()));
         task.setCode(taskCode);
         task.setStatus(CrowdTestTaskStatus.HAS_CREATED);
         project.addTask(task);