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 { 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 sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); - for (Map.Entry 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();