update

site/src/main/java/com/mooctest/crowd/site/constants/CommonConstant.java

@@ -14,5 +14,7 @@ public class CommonConstant {
 
     public static final Integer TECHNOLOGY_ROWS_ON_PAGE = 5;
 
+    public static final Integer TEST = 3;
+
     public static final Integer DEFAULT_RECOURSE_ROWS_ON_PAGE = 7;
 }

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

@@ -1,6 +1,5 @@
 package com.mooctest.crowd.site.controller;
 
-import com.alibaba.druid.sql.visitor.functions.Bin;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.site.annotation.LoginRequired;
 import com.mooctest.crowd.site.annotation.SysAdminRequired;
@@ -17,7 +16,6 @@ import com.mooctest.crowd.site.data.vo.SearchConditionVO;
 import com.mooctest.crowd.site.service.AgencyService;
 import com.mooctest.crowd.site.service.ResidentAgencyService;
 import com.mooctest.crowd.site.util.DataUtils;
-import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -25,8 +23,6 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpSession;
-import javax.validation.constraints.Pattern;
 import java.util.List;
 
 /**
@@ -150,16 +146,17 @@ public class AgencyController extends BaseSearchController {
     }
 
 
-    @RequestMapping(value = "/agency/list/more", method = RequestMethod.GET)
+    @RequestMapping(value = "/agency/list/more", method = RequestMethod.POST)
     public ResponseVO getMoreAgencyList(@RequestBody SearchConditionVO searchConditionVO) {
         Pageable pageable = this.getPageable(searchConditionVO);
-        List<EvolutionAgencyVO> list = agencyService.findMoreAgencyVO();
+        String keyword = searchConditionVO.getKeyword();
+        List<EvolutionAgencyVO> list = agencyService.findMoreAgencyVO(keyword);
         Page<EvolutionAgencyVO> page = DataUtils.listToPage(list, pageable);
         return new ResponseVO(ServerCode.SUCCESS, page);
     }
 
 
-    @RequestMapping(value = "resident/agency/more", method = RequestMethod.GET)
+    @RequestMapping(value = "resident/agency/more", method = RequestMethod.POST)
     public ResponseVO getMoreResidentList(@RequestBody SearchConditionVO searchConditionVO) {
         Pageable pageable = this.getPageable(searchConditionVO);
         return new ResponseVO(ServerCode.SUCCESS, residentAgencyService.findAll(pageable));

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

@@ -1,33 +1,29 @@
 package com.mooctest.crowd.site.data.vo;
 
 import com.mooctest.crowd.domain.domainobject.ResidentAgency;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author guochao
  * @date 2019/7/6 17:54
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class ResidentAgencyVO {
     private Long id;
     private Long agencyId;
     private Long userId;
-    private long   taskCount;
+    private long taskCount;
     private String address;
+    private String agencyPhoto;
     private  String name;//机构名称
 
-
-
-
     public ResidentAgencyVO(ResidentAgency residentAgency){
         id = residentAgency.getId();
         agencyId = residentAgency.getAgencyId();
         userId = residentAgency.getUserId();
-
-    }
-
-
-    public  ResidentAgencyVO(){
-
     }
 }

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -100,7 +100,7 @@ public class WebMediatorImpl implements ViewMediator {
     private ApplicationTypeDao applicationTypeDao;
 
     @Autowired
-    private  ResourceDao resourceDao;
+    private ResourceDao resourceDao;
 
     @Autowired
     private ResourceTypeDao resourceTypeDao;
@@ -113,15 +113,15 @@ public class WebMediatorImpl implements ViewMediator {
 
     @Override
     public List<UserVO> renderMoreUser(Pageable pageable) {
-        List<UserVO> userVOS=new ArrayList<>();
-        List<RankCountInfo> rankCountInfos=taskToUserDao.findTotalCountOfUser();
-        long []ids=new long[rankCountInfos.size()];
-        for(int i=0;i<rankCountInfos.size();i++){
-            if(userDao.findById(rankCountInfos.get(i).getEntityId()).isPresent()){
-                ids[i]=rankCountInfos.get(i).getEntityId();
-                Optional<UserPO> userPO=userDao.findById(ids[i]);
-                User  user=new User(userPO.get());
-                UserVO userVO=new UserVO(user);
+        List<UserVO> userVOS = new ArrayList<>();
+        List<RankCountInfo> rankCountInfos = taskToUserDao.findTotalCountOfUser();
+        long[] ids = new long[rankCountInfos.size()];
+        for (int i = 0; i < rankCountInfos.size(); i++) {
+            if (userDao.findById(rankCountInfos.get(i).getEntityId()).isPresent()) {
+                ids[i] = rankCountInfos.get(i).getEntityId();
+                Optional<UserPO> userPO = userDao.findById(ids[i]);
+                User user = new User(userPO.get());
+                UserVO userVO = new UserVO(user);
                 userVO.setTaskCount(rankCountInfos.get(i).getCount());
                 userVOS.add(userVO);
             }
@@ -132,7 +132,7 @@ public class WebMediatorImpl implements ViewMediator {
 
     @Override
     public List<CrowdTaskVO> findMoreHotTasks() {
-        List<CrowdTestTaskPO> list=taskDao.findMoreHotTasks();//已经根据创建时间排序好了。
+        List<CrowdTestTaskPO> list = taskDao.findMoreHotTasks();//已经根据创建时间排序好了。
         List<CrowdTaskVO> hotMoreTestprojects = taskDao.findMoreHotTasks().stream().map(crowdTestTaskPO -> {
             CrowdTestTask task = new CrowdTestTask();
             BeanUtils.copyProperties(crowdTestTaskPO, task);
@@ -143,8 +143,8 @@ public class WebMediatorImpl implements ViewMediator {
 
     @Override
     public List<CrowdTestProjectVO> findMoreHotProjects() {
-       List<CrowdTestProjectPO> list=projectDao.findMoreHotProjects();//已经根据创建时间排序好了。
-       //根据 参加人数倒序排序
+        List<CrowdTestProjectPO> list = projectDao.findMoreHotProjects();//已经根据创建时间排序好了。
+        //根据 参加人数倒序排序
         List<CrowdTestProjectVO> hotMoreTestprojects = projectDao.findMoreHotProjects().stream().map(crowdTestProjectPO -> {
             CrowdTestProject project = new CrowdTestProject();
             BeanUtils.copyProperties(crowdTestProjectPO, project);
@@ -580,9 +580,9 @@ public class WebMediatorImpl implements ViewMediator {
 
         // 领域类型值的转换
         Optional<FieldPO> fieldPO = fieldDao.findByCode(projectVO.getField());
-        if(fieldPO.isPresent()){
+        if (fieldPO.isPresent()) {
             projectVO.setField(fieldPO.get().getName());
-        }else{
+        } else {
             throw new HttpBadRequestException("请选择领域类型");
         }
 
@@ -910,7 +910,7 @@ public class WebMediatorImpl implements ViewMediator {
     @Override
     public UserDTO updateInformation(long userId, UserVO userVO) {
         Optional<UserPO> userPO = userDao.findById(userId);
-        if(userVO.getUnit()==null||userVO.getUnit().length()<=0){
+        if (userVO.getUnit() == null || userVO.getUnit().length() <= 0) {
             throw new HttpBadRequestException("请输入企业简称");
         }
         userPO.get().setUnit(userVO.getUnit());
@@ -1004,7 +1004,7 @@ public class WebMediatorImpl implements ViewMediator {
         String result = restTemplate.getForObject(url, String.class);
         JSONObject json = new JSONObject(result);
         String validated = String.valueOf(json.get("validated"));
-        if("false".equals(validated)){
+        if ("false".equals(validated)) {
             throw new HttpBadRequestException("请输入正确的卡号");
         }
         String bank = String.valueOf(json.get("bank"));
@@ -1054,13 +1054,13 @@ public class WebMediatorImpl implements ViewMediator {
             resourceVO.setRemarks(resourcePO.getRemarks());
             resourceVOList.add(resourceVO);
         });
-        List<ResourceVO> results=resourceVOList.stream().sorted(Comparator.comparing(ResourceVO::getStartTime).reversed()).collect(Collectors.toList());
+        List<ResourceVO> results = resourceVOList.stream().sorted(Comparator.comparing(ResourceVO::getStartTime).reversed()).collect(Collectors.toList());
         return results;
     }
 
     @Override
     public ResourceVO getResourceDetailed(String code) {
-        Optional<ResourcePO> resourcePO=resourceDao.findByCode(code);
+        Optional<ResourcePO> resourcePO = resourceDao.findByCode(code);
         ResourceVO resourceVO = new ResourceVO();
         resourceVO.setCode(resourcePO.get().getCode());
         resourceVO.setName(resourcePO.get().getName());
@@ -1102,7 +1102,7 @@ public class WebMediatorImpl implements ViewMediator {
             resourceVO.setRemarks(resourcePO.getRemarks());
             resourceVOList.add(resourceVO);
         });
-        List<ResourceVO> results=resourceVOList.stream().sorted(Comparator.comparing(ResourceVO::getStartTime).reversed()).collect(Collectors.toList());
+        List<ResourceVO> results = resourceVOList.stream().sorted(Comparator.comparing(ResourceVO::getStartTime).reversed()).collect(Collectors.toList());
         return results;
     }
 
@@ -1110,7 +1110,7 @@ public class WebMediatorImpl implements ViewMediator {
         ProjectOperationControl operationControl = new ProjectOperationControl();
         if (user == null)
             return operationControl;
-        if(project.getStatus() == CrowdTestProjectStatus.HAS_TIME_OUT){
+        if (project.getStatus() == CrowdTestProjectStatus.HAS_TIME_OUT) {
             return operationControl;
         }
 
@@ -1168,7 +1168,7 @@ public class WebMediatorImpl implements ViewMediator {
         TaskOperationControl taskOperationControl = new TaskOperationControl();
         if (user == null)
             return taskOperationControl;
-        if(task.getStatus() == CrowdTestTaskStatus.HAS_TIME_OUT){
+        if (task.getStatus() == CrowdTestTaskStatus.HAS_TIME_OUT) {
             return taskOperationControl;
         }
 

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

@@ -18,7 +18,7 @@ public interface AgencyService {
 
     EvolutionAgencyVO   getDetailById(long agencyId);
 
-    List<EvolutionAgencyVO> findMoreAgencyVO();
+    List<EvolutionAgencyVO> findMoreAgencyVO(String keyword);
 
     UserDTO applyAgency(Long userId, ApplyAgencyAuthCommand command);
 

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

@@ -7,15 +7,16 @@ import com.mooctest.crowd.domain.domainobject.*;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.exception.EvaluationAgencyNotExistException;
 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;
 import com.mooctest.crowd.site.anticorruption.UserAntiCorruption;
-import com.mooctest.crowd.site.command.*;
+import com.mooctest.crowd.site.command.AgencyResourceAbilityUpdateCommand;
+import com.mooctest.crowd.site.command.AgencyResourceCommand;
+import com.mooctest.crowd.site.command.ApplyAgencyAuthCommand;
+import com.mooctest.crowd.site.command.GenerateAgencyCommand;
 import com.mooctest.crowd.site.data.dto.UserDTO;
 import com.mooctest.crowd.site.data.vo.AgencyVO;
 import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
@@ -23,11 +24,9 @@ import com.mooctest.crowd.site.data.vo.UserVO;
 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.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -63,13 +62,15 @@ public class AgencyServiceImpl implements AgencyService {
     @Autowired
     private EvaluationAgencyDao agencyDao;
 
+    @Value("${agency}")
+    private String agencyId;
+
     @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()];
@@ -85,21 +86,23 @@ public class AgencyServiceImpl implements AgencyService {
     }
 
     @Override
-    public List<EvolutionAgencyVO> findMoreAgencyVO() {
+    public List<EvolutionAgencyVO> findMoreAgencyVO(String keyword) {
         List<EvolutionAgencyVO> list = new ArrayList<EvolutionAgencyVO>();//机构列表
         List<RankCountInfo> rankInfos = taskToUserDao.findTotalCountOfUser();//用户接包信息
-        long[] ids = new long[rankInfos.size()];//用户id数组ru
+        String agencyName = agencyDao.findById(Long.parseLong(agencyId)).get().getEvaluationAgencyName();
         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) {
+            Optional<UserPO> user = userDao.findById(rankInfos.get(i).getEntityId());
+            EvaluationAgencyPO evaluationAgencyPO = agencyDao.findByUserId(rankInfos.get(i).getEntityId());
+            if (evaluationAgencyPO != null && !evaluationAgencyPO.getEvaluationAgencyName().equals(agencyName)) {
+                if(keyword != null && keyword != ""){
+                    if(!evaluationAgencyPO.getEvaluationAgencyName().contains(keyword)){
+                        continue;
+                    }
+                }
                 EvaluationAgency evaluationAgency = new EvaluationAgency(evaluationAgencyPO);
                 EvolutionAgencyVO evolutionAgencyVO = new EvolutionAgencyVO(evaluationAgency);
                 evolutionAgencyVO.setTaskCount(rankInfos.get(i).getCount());
-                evolutionAgencyVO.setAddress(user.get().getProvince() + user.get().getCity());
+                evolutionAgencyVO.setAddress((user.get().getProvince() + user.get().getCity()).replaceAll("null", ""));
                 list.add(evolutionAgencyVO);
             }
         }

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

@@ -53,6 +53,7 @@ public class ResidentServiceImpl implements ResidentAgencyService {
             resagency[i] = residentAgencyPOS.get(i).getUserId();
             EvaluationAgencyPO evaluationAgencyPO = agencyDao.findByUserId(resagency[i]);
             residentAgencyVO.setName(evaluationAgencyPO.getEvaluationAgencyName());
+            residentAgencyVO.setAgencyPhoto(evaluationAgencyPO.getAgencyPhoto());
             residentAgencyVO.setTaskCount(totalCountOfUser.get(i).getCount());
             residentAgencyVO.setAddress(evaluationAgencyPO.getAddress());
             residentAgencyVO.setAgencyId(residentAgencyPOS.get(i).getAgencyId());