Merge branch 'Dev' into 'Test'

Dev

See merge request crowd-2019/crowd-test-service-backend!105

core/src/main/java/com/mooctest/crowd/domain/repository/UserRepo.java

@@ -100,7 +100,7 @@ public class UserRepo implements IUserRepo {
     @Override
     public User getByIDJustInfo(Long userId) throws UserNotExistException, RoleNotFoundException {
         Optional<UserPO> userPOOptional = userDao.findById(userId);
-        if (!userPOOptional.isPresent()) {
+        if (!userPOOptional.isPresent()){
             throw new UserNotExistException("用户不存在");
         } else {
             return Converter.convert(User.class, userPOOptional.get());
@@ -414,17 +414,24 @@ public class UserRepo implements IUserRepo {
             userResult.setEnterpriseAuthentication(Converter.convert(EnterpriseAuthentication.class, enterpriseAuthenticationPO));
         }
         //获取用户能力
+        String abilityName="";
+        List<String> codeList=new ArrayList<>();
         List<String> abailities = new ArrayList<>();
-         if(userPO.getPersonalCompetence()!=null){
-             abailities= Arrays.asList(userPO.getPersonalCompetence().split(","));
+         if(userPO.getPersonalCompetence()!=null&&!userPO.getPersonalCompetence().trim().equals("")){
+             codeList= Arrays.asList(userPO.getPersonalCompetence().split(","));
          }
-//        {
-//            for (int i = 0; i < abailities.size(); i++) {
-//                String abilityName = testTypeDao.findByCode(abailities.get(i)).get().getName();
-//                abailities.add(abilityName);
-//            }
-//        }
+
+        if(abailities!=null&&!codeList.isEmpty()){
+
+            for (int i = 0; i < abailities.size(); i++) {
+                    abilityName = testTypeDao.findByCode(codeList.get(i)).get().getName();
+                    abailities.add(abilityName);
+                }
+
+            }
+
         userResult.setPersonAbilities(abailities);
+
         /*获取区域管理员信息*/
         List<RegionalManagerToRegionalPO> regionalManagerToRegionalPOList = regionalManagerToRegionalDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);
         if (regionalManagerToRegionalPOList.size() > 0) {

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

@@ -140,6 +140,18 @@ public class AgencyController extends BaseSearchController {
         return new ResponseVO(ServerCode.SUCCESS ,agencyService.getDetailById(userId));
     }
 
+    /**
+     * 获取机构认证简单的信息
+     *
+     * @param userId
+     * @return
+     */
+    @LoginRequired
+    @RequestMapping(value = "/user/{userId}/agency/common", method = RequestMethod.GET)
+    public ResponseVO getAgencyInfoCommon(@PathVariable("userId") Long userId) {
+        return new ResponseVO(ServerCode.SUCCESS ,agencyService.getAgencyInfoCommon(userId));
+    }
+
     @RequestMapping(value = "/agency/list", method = RequestMethod.GET)
     public List<EvaluationAgencyVO> getAgencyList() {
         return agencyService.getAgencyList();

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

@@ -0,0 +1,34 @@
+package com.mooctest.crowd.site.data.vo;
+
+import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
+
+import java.sql.Timestamp;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-08-12 02:59
+ */
+@Data
+@NoArgsConstructor
+public class AgencyDetailVO {
+    private String evaluationAgencyName;
+    private String address;
+    private String agencyPhoto;
+    private Integer isAuthentication;
+    private Long taskCount;
+    private StatusVO authStatus;
+    private String legalPersonName;
+    private Timestamp checkTime;
+    private Double allTaskPrice;
+
+
+    public AgencyDetailVO(EvaluationAgency agency) {
+        BeanUtils.copyProperties(agency, this);
+        this.authStatus = new StatusVO();
+        this.authStatus.initAuthStatus(this.isAuthentication);
+    }
+}

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

@@ -47,7 +47,7 @@ public class EvaluationAgencyVO implements Serializable {
     private String idCardPositivePhoto;//身份证正面照
     private String idCardBackPhoto;//身份证反面照
     private Date idCardDeadTime;
-
+    private Timestamp checkTime;
     private Double allTaskPrice;
 
 

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

@@ -1255,10 +1255,10 @@ public class WebMediatorImpl implements ViewMediator {
 
     @Override
     public QualificationDTO addQualification(long userId, QualificationVO qualificationVO){
-        String regex = "^[a-z0-9A-Z]+$";
-        if (!qualificationVO.getNumber().matches(regex)) {
-            throw new HttpBadRequestException("请输入正确的证书编号");
-        }
+//        String regex = "^[a-z0-9A-Z]+$";
+//        if (!qualificationVO.getNumber().matches(regex)) {
+//            throw new HttpBadRequestException("请输入正确的证书编号");
+//        }
         Date now = new Date();
         if(qualificationVO.getTime().after(now)){
             throw new HttpBadRequestException("请输入正确的发证时间");

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

@@ -4,6 +4,7 @@ import com.mooctest.crowd.site.command.AgencyResourceAbilityUpdateCommand;
 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.AgencyDetailVO;
 import com.mooctest.crowd.site.data.vo.AgencyVO;
 import com.mooctest.crowd.site.data.vo.EvaluationAgencyVO;
 
@@ -37,4 +38,6 @@ public interface AgencyService {
     AgencyVO rejectAuth(Long userId, String explain);
 
     AgencyVO getAgencyDetails(Long userId);
+
+    AgencyDetailVO getAgencyInfoCommon(Long userId);
 }

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

@@ -16,6 +16,7 @@ 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.enums.RoleType;
+import com.mooctest.crowd.site.data.vo.AgencyDetailVO;
 import com.mooctest.crowd.site.data.vo.AgencyVO;
 import com.mooctest.crowd.site.data.vo.EvaluationAgencyVO;
 import com.mooctest.crowd.site.data.vo.UserVO;
@@ -112,6 +113,22 @@ public class AgencyServiceImpl implements AgencyService {
         return agencyVO;
     }
 
+
+
+    @Override
+    public AgencyDetailVO getAgencyInfoCommon(Long userId){
+        EvaluationAgency agency = evaluationAgencyRepo.findAgencyByUserId(userId);
+        AgencyDetailVO agencyVO = new AgencyDetailVO(agency);
+        /*
+        先根据机构的userId查询出机构信息，再从user_task_count表里面找到这个机构的接的任务的数量。
+         */
+        UserTaskCount taskCountByUserId = userRepo.getUserTaskCountByUserId(userId);
+        if(taskCountByUserId != null){
+            agencyVO.setTaskCount(taskCountByUserId.getCount());
+        }
+        return agencyVO;
+    }
+
     /**
      * 获取首页机构 more模糊查询
      *
@@ -257,4 +274,5 @@ public class AgencyServiceImpl implements AgencyService {
         }
         return agencyVO;
     }
+
 }

site/src/main/resources/application.yml

@@ -95,7 +95,7 @@ website:
 spring:
   profiles: dev-localhost
   datasource:
-    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://101.37.175.111:3306/crowd-test-service-pre?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
     username: mooctest
     password: secr3t!
   redis: