Merge remote-tracking branch 'origin/dev_1.1.1' into dev_1.1.1

sop-business/src/main/java/com/qmth/sop/business/bean/result/ProjectMonitorCardResult.java

@@ -24,7 +24,7 @@ public class ProjectMonitorCardResult {
     private String mobileNumber;
 
     @ApiModelProperty(value = "项目经验")
-    private List<UserArchivesProjectExperienceResult> projectExperience;
+    private String projectExperience;
 
     public String getName() {
         return name;
@@ -58,11 +58,11 @@ public class ProjectMonitorCardResult {
         this.mobileNumber = mobileNumber;
     }
 
-    public List<UserArchivesProjectExperienceResult> getProjectExperience() {
+    public String getProjectExperience() {
         return projectExperience;
     }
 
-    public void setProjectExperience(List<UserArchivesProjectExperienceResult> projectExperience) {
+    public void setProjectExperience(String projectExperience) {
         this.projectExperience = projectExperience;
     }
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/ProjectMonitorServiceImpl.java

@@ -9,7 +9,6 @@ import com.qmth.sop.business.bean.dto.UserArchivesAllocationDto;
 import com.qmth.sop.business.bean.result.ProjectMonitorCardResult;
 import com.qmth.sop.business.bean.result.ProjectMonitorResult;
 import com.qmth.sop.business.bean.result.ProjectMonitorUserResult;
-import com.qmth.sop.business.bean.result.UserArchivesProjectExperienceResult;
 import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBSopInfo;
 import com.qmth.sop.business.entity.TBUserArchives;
@@ -88,13 +87,14 @@ public class ProjectMonitorServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSo
             userCard.setPhotoPath(null);
         }
         //项目经验
-        if (StringUtils.isNotBlank(userArchives.getProjectExperience())) {
+        /*if (StringUtils.isNotBlank(userArchives.getProjectExperience())) {
             List<UserArchivesProjectExperienceResult> resultList = JSONObject.parseArray(userArchives.getProjectExperience(),
                     UserArchivesProjectExperienceResult.class);
             List<UserArchivesProjectExperienceResult> sortedExperienceList = resultList.stream()
                     .sorted(Comparator.comparingInt(UserArchivesProjectExperienceResult::getOrder)).collect(Collectors.toList());
             userCard.setProjectExperience(sortedExperienceList);
-        }
+        }*/
+        userCard.setProjectExperience(userArchives.getProjectExperience());
         return userCard;
     }