From a5286c3686ab75d600f546f79725ad3a8013c1d3 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 25 Jul 2021 16:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9C=A8=E5=9B=BD=E5=A4=96=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=87=8C=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandAttrDetailsController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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);