|
@@ -1,8 +1,8 @@
|
|
|
package com.diagbot.facade;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.diagbot.dto.SearchEvaluatorDTO;
|
|
|
import com.diagbot.dto.PhysicalInfoDTO;
|
|
|
+import com.diagbot.dto.SearchEvaluatorDTO;
|
|
|
import com.diagbot.entity.Evaluator;
|
|
|
import com.diagbot.entity.PhysicalInfo;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
@@ -61,15 +61,15 @@ public class EvaluatorFacade extends EvaluatorServiceImpl {
|
|
|
|
|
|
public IPage<SearchEvaluatorDTO> getEvaluatorPage(SearchEvaluatorVO searchEvaluatorVO) {
|
|
|
IPage<SearchEvaluatorDTO> res = this.getEvaluators(searchEvaluatorVO);
|
|
|
- if (ListUtil.isNotEmpty(res.getRecords())){
|
|
|
+ if (ListUtil.isNotEmpty(res.getRecords())) {
|
|
|
Map<String, PhysicalInfo> pMap = physicalInfoFacade.getPhysicalMap();
|
|
|
|
|
|
- for (SearchEvaluatorDTO searchEvaluatorDTO : res.getRecords()){
|
|
|
+ for (SearchEvaluatorDTO searchEvaluatorDTO : res.getRecords()) {
|
|
|
String[] physicalTypes = searchEvaluatorDTO.getPhysicalTypes().split(",");
|
|
|
List<PhysicalInfoDTO> physicalInfoDTOList = ListUtil.newArrayList();
|
|
|
- for (String s : physicalTypes){
|
|
|
- PhysicalInfoDTO physicalInfoDTO = new PhysicalInfoDTO();
|
|
|
- if (null != pMap.get(s)){
|
|
|
+ for (String s : physicalTypes) {
|
|
|
+ PhysicalInfoDTO physicalInfoDTO = new PhysicalInfoDTO();
|
|
|
+ if (null != pMap.get(s)) {
|
|
|
BeanUtil.copyProperties(pMap.get(s), physicalInfoDTO);
|
|
|
physicalInfoDTOList.add(physicalInfoDTO);
|
|
|
}
|