增加more众测人员详情，more评测机构和品牌机构详情接口。

site/src/main/java/com/mooctest/crowd/site/controller/AgencyController.java

@@ -151,7 +151,7 @@ public class AgencyController extends BaseSearchController {
 
 
     @RequestMapping(value = "/agency/list/more", method = RequestMethod.GET)
-    public ResponseVO getMoreAgencyList(@RequestBody SearchConditionVO searchConditionVO){
+    public ResponseVO getMoreAgencyList(@RequestBody SearchConditionVO searchConditionVO) {
         Pageable pageable = this.getPageable(searchConditionVO);
         List<EvolutionAgencyVO> list = agencyService.findMoreAgencyVO();
         Page<EvolutionAgencyVO> page = DataUtils.listToPage(list, pageable);
@@ -159,19 +159,21 @@ public class AgencyController extends BaseSearchController {
     }
 
 
-    @RequestMapping(value = "resident/agency/more",method = RequestMethod.GET)
-    public  ResponseVO  getMoreResidentList(@RequestBody SearchConditionVO searchConditionVO){
-        Pageable pageable=this.getPageable(searchConditionVO);
-        return  new ResponseVO(ServerCode.SUCCESS,residentAgencyService.findAll(pageable));
+    @RequestMapping(value = "resident/agency/more", method = RequestMethod.GET)
+    public ResponseVO getMoreResidentList(@RequestBody SearchConditionVO searchConditionVO) {
+        Pageable pageable = this.getPageable(searchConditionVO);
+        return new ResponseVO(ServerCode.SUCCESS, residentAgencyService.findAll(pageable));
     }
 
+    @RequestMapping(value = "agency/{agencyId}", method = RequestMethod.GET)
+    public ResponseVO getAgencyDetails(@PathVariable("agencyId") long agencyId) {
 
-
-
-
+        EvolutionAgencyVO agencyVO = agencyService.getDetailById(agencyId);
+        return new ResponseVO(ServerCode.SUCCESS, agencyVO);
+    }
 
     @Override
-    public Page<?> search(String searchCondition){
+    public Page<?> search(String searchCondition) {
         return null;
     }
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
  * @Author: xuexb
@@ -18,18 +19,26 @@ public class EvolutionAgencyVO implements Serializable {
 
     private Long id;
     private Long userId;
-    private String logo;
-    private String name;
+    private String agencyPhoto;
+    private String evaluationAgencyName;
     private Double allTaskPrice;
     private Long taskCount;
     private String address;
+    private Timestamp updateTime;
+    private Timestamp expireTime;
+    private Timestamp checkTime;
+    private Timestamp applyTime;
 
 
 
-    public EvolutionAgencyVO(EvaluationAgency evaluationAgency) {
+    public EvolutionAgencyVO(EvaluationAgency evaluationAgency){
         id = evaluationAgency.getId();
-        logo = evaluationAgency.getAgencyPhoto();
-        name = evaluationAgency.getEvaluationAgencyName();
+        agencyPhoto = evaluationAgency.getAgencyPhoto();
+        evaluationAgencyName = evaluationAgency.getEvaluationAgencyName();
         userId = evaluationAgency.getUserId();
+        updateTime=evaluationAgency.getUpdateTime();
+        expireTime=evaluationAgency.getExpireTime();
+        checkTime=evaluationAgency.getCheckTime();
+        applyTime=evaluationAgency.getApplyTime();
     }
 }

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

@@ -41,6 +41,9 @@ public class UserVO implements Serializable {
     private String unit;
     private String county;
     private String address;
+
+
+
     public UserVO(User user) {
         BeanUtils.copyProperties(user, this);
         this.address=this.province+this.city;

site/src/main/java/com/mooctest/crowd/site/service/AgencyService.java

@@ -16,6 +16,8 @@ import java.util.List;
  */
 public interface AgencyService {
 
+    EvolutionAgencyVO   getDetailById(long agencyId);
+
     List<EvolutionAgencyVO> findMoreAgencyVO();
 
     UserDTO applyAgency(Long userId, ApplyAgencyAuthCommand command);

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

@@ -10,6 +10,7 @@ import com.mooctest.crowd.domain.exception.UserNotExistException;
 
 import com.mooctest.crowd.domain.model.EvaluationAgencyPO;
 import com.mooctest.crowd.domain.model.RankCountInfo;
+import com.mooctest.crowd.domain.model.RankInfo;
 import com.mooctest.crowd.domain.model.UserPO;
 import com.mooctest.crowd.domain.repository.EvaluationAgencyRepo;
 import com.mooctest.crowd.domain.repository.UserRepo;
@@ -23,7 +24,10 @@ import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.AgencyService;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -41,6 +45,7 @@ import java.util.stream.Collectors;
 @Service
 public class AgencyServiceImpl implements AgencyService {
 
+
     @Autowired
     private UserAntiCorruption userAnti;
     @Autowired
@@ -59,15 +64,37 @@ public class AgencyServiceImpl implements AgencyService {
     private EvaluationAgencyDao agencyDao;
 
     @Override
+    public EvolutionAgencyVO getDetailById(long agencyId) {
+        /*
+        先根据机构id查询出机构信息，再从task-to-user表里面找到这个机构的接的任务的数量。
+         */
+        EvaluationAgencyPO agencyPO = agencyDao.findByUserId(agencyId);
+        log.info("机构popopopo===========" + agencyPO);
+        EvolutionAgencyVO agencyVO = new EvolutionAgencyVO();
+        List<RankCountInfo> rankCountInfoList = taskToUserDao.findTotalCountOfUser();
+        long ids[] = new long[rankCountInfoList.size()];
+        for (int i = 0; i < ids.length; i++) {
+            ids[i] = rankCountInfoList.get(i).getEntityId();
+            if (ids[i] == agencyId) {
+                agencyVO.setTaskCount(rankCountInfoList.get(i).getCount());
+            }
+        }
+        BeanUtils.copyProperties(agencyPO, agencyVO);
+
+        return agencyVO;
+    }
+
+    @Override
     public List<EvolutionAgencyVO> findMoreAgencyVO() {
-        List<EvolutionAgencyVO> list = new ArrayList<EvolutionAgencyVO>();
-        List<RankCountInfo> rankInfos = taskToUserDao.findTotalCountOfUser();
-        long[] ids = new long[rankInfos.size()];
+        List<EvolutionAgencyVO> list = new ArrayList<EvolutionAgencyVO>();//机构列表
+        List<RankCountInfo> rankInfos = taskToUserDao.findTotalCountOfUser();//用户接包信息
+        long[] ids = new long[rankInfos.size()];//用户id数组ru
         for (int i = 0; i < rankInfos.size(); i++) {
             ids[i] = rankInfos.get(i).getEntityId();
             Optional<UserPO> user = userDao.findById(ids[i]);
             EvaluationAgencyPO evaluationAgencyPO = agencyDao.findByUserId(ids[i]);
             ids[i] = rankInfos.get(i).getEntityId();
+            //
             if (evaluationAgencyPO != null) {
                 EvaluationAgency evaluationAgency = new EvaluationAgency(evaluationAgencyPO);
                 EvolutionAgencyVO evolutionAgencyVO = new EvolutionAgencyVO(evaluationAgency);