增加一个父级ID

platform-dao/src/main/java/com/platform/dao/dto/preparation/PreparationDTO.java

@@ -172,7 +172,6 @@ public class PreparationDTO extends BaseDTO implements Serializable {
     private String dispatchUserId;
 
     private String no;
-
     /**
      * 公司
      */

platform-dao/src/main/java/com/platform/dao/mapper/store/InStoreFormMapper.java

@@ -1,8 +1,7 @@
 package com.platform.dao.mapper.store;
 
-import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.config.MyMapper;
-import com.platform.dao.entity.store.InStoreDetail;
+import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.entity.store.InStoreForm;
 import com.platform.dao.vo.query.store.InStoreDetailVO;
 import com.platform.dao.vo.query.store.InStoreFormVO;

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -592,4 +592,6 @@ public class SbInfoVO extends BaseVO implements Serializable {
     private Double zdPa;
 
     private String reportNo;
+
+    private String parentPositionId;
 }

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -629,7 +629,8 @@ sb.check_type
 
     <select id="getById" parameterType="java.lang.Object" resultType="com.platform.dao.vo.sb.SbInfoVO">
         select
-        <include refid="Left_Column"/>,parentPosition.name as parentPositionName,sbType.name as sbTypeName,parentSbType.name as parentSbTypeName
+        <include refid="Left_Column"/>,parentPosition.name as parentPositionName,parentPosition.id as parentPositionId,
+        sbType.name as sbTypeName,parentSbType.name as parentSbTypeName
         from t_sb_info sb
         left join t_sb_type sbType on sb.type_id = sbType.id
         left join t_sb_position position on sb.position_id = position.id

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -1917,11 +1917,6 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                 vo.setSbTypeStr(vo.getParentSbTypeName()+"->"+vo.getSbTypeName());
             }
         }
-
-        /*if (StringUtils.isNotBlank(vo.getParentId())) {
-            SbInfoVO parentVo = mapper.getById(vo.getParentId());
-            vo.setParentSbName(parentVo.getName());
-        }*/
         List<SysFile> sysFiles = sysFileService.getListByTargetAndType(vo.getId(), null);
         List<SysFile> repairFileList = ListUtils.newArrayList();
         List<SysFile> useFileList = ListUtils.newArrayList();