feat，长者报告

server-service/src/main/java/com/makeit/dto/saas/analysis/SaasElderReportConfigDTO.java

 package com.makeit.dto.saas.analysis;
 package com.makeit.dto.saas.analysis;
 
 
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseBusEntity;
+import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 长者报告配置
  * 长者报告配置
@@ -21,7 +24,7 @@ public class SaasElderReportConfigDTO  {
     private String id;
     private String id;
 
 
     @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",scoreRange：\"\",evaluate:\"\"\"}")
     @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",scoreRange：\"\",evaluate:\"\"\"}")
-    private String resultContent;
+    private List<EvaluateReportVO> resultContent;
 
 
 
 
 }
 }

server-service/src/main/java/com/makeit/service/saas/impl/SaasElderReportConfigServiceImpl.java

@@ -34,14 +34,16 @@ public class SaasElderReportConfigServiceImpl extends ServiceImpl<SaasElderRepor
     @Override
     @Override
     public void add(SaasElderReportConfigDTO dto) {
     public void add(SaasElderReportConfigDTO dto) {
         SaasElderReportConfig entity = new SaasElderReportConfig();
         SaasElderReportConfig entity = new SaasElderReportConfig();
-        BeanUtils.copyProperties(dto,entity);
+        String result = JSON.toJSONString(dto.getResultContent());
+        entity.setResultContent(result);
         save(entity);
         save(entity);
     }
     }
 
 
     @Override
     @Override
     public void edit(SaasElderReportConfigDTO dto) {
     public void edit(SaasElderReportConfigDTO dto) {
         SaasElderReportConfig entity = getById(dto.getId());
         SaasElderReportConfig entity = getById(dto.getId());
-        BeanUtils.copyProperties(dto,entity);
+        String result = JSON.toJSONString(dto.getResultContent());
+        entity.setResultContent(result);
         saveOrUpdate(entity);
         saveOrUpdate(entity);
     }
     }