Merge branch 'Dev' into 'Test'

Dev

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

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

@@ -418,12 +418,12 @@ public class UserRepo implements IUserRepo {
          if(userPO.getPersonalCompetence()!=null){
              abailities= 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);
-            }
-        }
+//        {
+//            for (int i = 0; i < abailities.size(); i++) {
+//                String abilityName = testTypeDao.findByCode(abailities.get(i)).get().getName();
+//                abailities.add(abilityName);
+//            }
+//        }
         userResult.setPersonAbilities(abailities);
         /*获取区域管理员信息*/
         List<RegionalManagerToRegionalPO> regionalManagerToRegionalPOList = regionalManagerToRegionalDao.findByUserIdAndIsDeleted(userPO.getId(), DeletedStatus.isNotDeleted);

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

@@ -1,16 +1,18 @@
 package com.mooctest.crowd.site.data.vo;
 
+import com.alibaba.fastjson.JSONArray;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
-import com.mooctest.crowd.domain.domainobject.EvaluationAgencyResource;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
+import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author: xuexb
@@ -21,45 +23,51 @@ import java.util.List;
 @AllArgsConstructor
 public class EvaluationAgencyVO implements Serializable {
 
-    private Long id;
     private Long userId;
-    private String agencyPhoto;
     private String evaluationAgencyName;
-    private Double allTaskPrice;
-    private Long taskCount;
-    private int authStatus;
     private String address;
+    private List<String> evaluationAgencyAbilityList;
+    private List<AgencyResourceVO> evaluationAgencyResourceList;
+    private String agencyPhoto;
+    private Integer isAuthentication;
+    private String explain;
+    private Long taskCount;
+    private int isDeleted;
+    private String businessLicensePhoto;
     private Timestamp updateTime;
     private Timestamp expireTime;
-    private Timestamp checkTime;
+    private Timestamp createTime;
+    private StatusVO authStatus;
     private Timestamp applyTime;
-    private List<String> agencyAbilities;
-
-    private String businessLicensePhoto;
+    private List<String> roleList;
+    private String IdCardNum;
     private String legalPersonName;
-//    private String IdCardNum;
-//    private String gender;
-//    private String idCardPositivePhoto;//身份证正面照
-//    private String idCardBackPhoto;//身份证反面照
-//    private Date idCardDeadTime;
+    private Long id;
+    private String gender;
+    private String idCardPositivePhoto;//身份证正面照
+    private String idCardBackPhoto;//身份证反面照
+    private Date idCardDeadTime;
 
-    private List<EvaluationAgencyAbility> evaluationAgencyAbilityList;
-    private List<EvaluationAgencyResource> evaluationAgencyResourceList;
-    private int isAuthentication;
-    private String explain;
-    private int isDeleted;
-    private String type;
+    private Double allTaskPrice;
+
+
+
+    public EvaluationAgencyVO(EvaluationAgency agency) {
+        BeanUtils.copyProperties(agency, this, "evaluationAgencyResourceList", "evaluationAgencyAbilityList");
 
+        if(agency.getEvaluationAgencyAbilityList() != null && agency.getEvaluationAgencyAbilityList().size() > 0){
+            this.setEvaluationAgencyAbilityList(agency.getEvaluationAgencyAbilityList()
+                    .stream().map(EvaluationAgencyAbility::getAbilityName).collect(Collectors.toList()));
+        }
+        if(agency.getEvaluationAgencyResourceList() != null && agency.getEvaluationAgencyResourceList().size() > 0){
+            this.setEvaluationAgencyResourceList(agency.getEvaluationAgencyResourceList()
+                    .stream().map(AgencyResourceVO::new).collect(Collectors.toList()));
+        }
 
-    public EvaluationAgencyVO(EvaluationAgency evaluationAgency) {
-        BeanUtils.copyProperties(evaluationAgency, this);
-//        id = evaluationAgency.getId();
-//        agencyPhoto = evaluationAgency.getAgencyPhoto();
-//        evaluationAgencyName = evaluationAgency.getEvaluationAgencyName();
-//        userId = evaluationAgency.getUserId();
-//        updateTime = evaluationAgency.getUpdateTime();
-//        expireTime = evaluationAgency.getExpireTime();
-//        checkTime = evaluationAgency.getCheckTime();
-//        applyTime = evaluationAgency.getApplyTime();
+        if(agency.getType() != null && agency.getType() !=  ""){
+            this.roleList = (List<String>) JSONArray.parse(agency.getType());
+        }
+        this.authStatus = new StatusVO();
+        this.authStatus.initAuthStatus(this.isAuthentication);
     }
 }

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

@@ -71,7 +71,9 @@ public class AgencyServiceImpl implements AgencyService {
         先根据机构的userId查询出机构信息，再从user_task_count表里面找到这个机构的接的任务的数量。
          */
         UserTaskCount taskCountByUserId = userRepo.getUserTaskCountByUserId(userId);
-        agencyVO.setTaskCount(taskCountByUserId.getCount());
+        if(taskCountByUserId != null){
+            agencyVO.setTaskCount(taskCountByUserId.getCount());
+        }
 
 //        List<String> agencyAbilities = new ArrayList<>();//机构能力list
 //        //根据compentence[]从test——type表利查询对应的能力名称

site/src/main/resources/application.yml

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