From 5fa07593f272aa27eb24b16281d7017ce9a3f2b6 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Wed, 26 Apr 2023 20:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F=E4=BB=A3?=
 =?UTF-8?q?=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SarStandAttrInfoDao.java              |  4 +++
 .../impl/SarStandardsInfoServiceImpl.java     | 33 ++-----------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java
index fddfcb8b..63678277 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/dao/SarStandAttrInfoDao.java
@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
 import com.adc.da.sys.common.SelectionResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -45,5 +46,8 @@ public interface SarStandAttrInfoDao extends BaseMapper<SarStandAttrInfo> {
     void updateByIdInfo(@Param("id")String id,@Param("fbgbjbd") String fbgbuss,@Param("fbgywbd") String fbgywbd);
 
     String selectInfoStandId(@Param("standId")String standId);
+
+    @Select("select * from SAR_STAND_ATTR_INFO where stand_id = #{id} and valid_flag=0")
+    SarStandAttrInfo getSarStandAttrInfo(String id);
 }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index badd3f9d..5b3eb8e8 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -408,39 +408,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         if (ObjectUtils.isNotEmpty(sarStandardsInfoEOs) && sarStandardsInfoEOs != null) {
             for (SarStandardsInfo sarStandardsInfoEO : sarStandardsInfoEOs) {
                 if (sarStandardsInfoEO != null && ObjectUtils.isNotEmpty(sarStandardsInfoEO)) {
+                    SarStandAttrInfo sarStandAttrInfo = sarStandAttrInfoEODao.getSarStandAttrInfo(sarStandardsInfoEO.getId());
 
-                    //createStandAttrInfo(sarStandardsInfoEO,true);
+                    sarStandardsInfoEO.setReplacedStandNum(sarStandAttrInfo.getDtbjh());
 
-                    String sarStandAttrEOStr = sarStandardsInfoEO.getSarStandAttrEOStr();
-                    // 将字符串转为map进行解析
-                    Map<String, String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
-                    for (Map.Entry<String, String> entry : sarStandAttrMap.entrySet()) {
-                        String attrKey = entry.getKey();
-                        String attrValue = String.valueOf(entry.getValue());
-                        if (InitStandAttrUtil.queryFieldList != null && !InitStandAttrUtil.queryFieldList.isEmpty()) {
-                            if (InitStandAttrUtil.queryFieldList.contains(attrKey)) {
-                                if ("YYBJ".equals(attrKey)) {
-                                    sarStandardsInfoEO.setCiteStand(attrValue);
-                                } else if ("CBBH".equals(attrKey)) {
-                                    sarStandardsInfoEO.setRelateStand(attrValue);
-                                } else if ("DTBJH".equals(attrKey)) {
-                                    sarStandardsInfoEO.setReplaceStandNum(attrValue);
-                                } else if ("BFDTBZ".equals(attrKey)) {
-                                    sarStandardsInfoEO.setReplacePartStandNum(attrValue);
-                                }
-                                // 不同类型存储数据需单独处理值
-                                if (InitStandAttrUtil.numFieldList.contains(attrKey)) {
-                                    if (StringUtils.isBlank(attrValue)) {
-                                        attrValue = "null";
-                                    }
-                                } else if (InitStandAttrUtil.timeFieldList.contains(attrKey)) {
-                                    attrValue = FieldConvertUtil.changeTimeValue(attrValue);
-                                } else {
-                                    attrValue = "'" + attrValue + "'";
-                                }
-                            }
-                        }
-                    }
                     if (StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){
                         dao.updateById(sarStandardsInfoEO);
                         String id = sarStandardsInfoEO.getId();