diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index fa5cf2f1..5a6cb02a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -59,8 +60,22 @@ public class SarStandAttrDetailsController extends BaseController getInlandStandList = InitStandAttrUtil.standInlandAttrFieldList; resultMap.put(SarTypeEnum.INLAND_STAND.getValue(),getInlandStandList); + + List getForeignStandList = InitStandAttrUtil.standForeignAttrFieldList; + //新增字段 + Iterator iterator = getInlandStandList.iterator(); + while (iterator.hasNext()){ + SarStandAttrDetails next = iterator.next(); + + if (next.getAttrName().matches("能源类型|适用产品线|适用认证|责任工程师|关联文件")){ + getForeignStandList.add(next); + } + + } resultMap.put(SarTypeEnum.FOREIGN_STAND.getValue(),getForeignStandList); + + // 政策属性字段 List getInlandLawsList = InitStandAttrUtil.lawsInlandAttrFieldList; resultMap.put(SarTypeEnum.INLAND_LAWS.getValue(),getInlandLawsList);