设备类型优化

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbTypeMapper.java

@@ -50,4 +50,6 @@ public interface SbTypeMapper extends MyMapper<SbType> {
      * @return
      */
     String selectNameById(Object id);
+
+    List<SbTypeVO> selectLongYanList(SbTypeDTO dto);
 }

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

@@ -43,4 +43,19 @@
         where id = #{value}
     </select>
 
+    <select id="selectLongYanList" parameterType="com.platform.dao.dto.sb.SbTypeDTO"
+            resultType="com.platform.dao.vo.sb.SbTypeVO">
+        select * from t_sb_type
+        <where>
+            <choose>
+                <when test="parentId != null and parentId != ''">
+                    and parent_id = #{parentId}
+                </when>
+                <otherwise>
+                    and (parent_id is null or parent_id = '')
+                </otherwise>
+            </choose>
+        </where>
+    </select>
+
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/sb/SbTypeController.java

@@ -5,6 +5,7 @@ import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
+import com.platform.dao.dto.sb.SbPositionDTO;
 import com.platform.dao.dto.sb.SbTypeDTO;
 import com.platform.dao.entity.sb.SbType;
 import com.platform.dao.enums.SbTreeTypeEnum;
@@ -178,4 +179,15 @@ public class SbTypeController {
         return new R<>(parentList);
     }
 
+    /**
+     * 获取列表
+     *
+     * @param sbTypeDTO 设备位置DTO
+     * @return R
+     */
+    @GetMapping("/longYan")
+    public R queryLongYan(SbTypeDTO sbTypeDTO) {
+        return new R<>(sbTypeService.selectLongYanList(sbTypeDTO));
+    }
+
 }

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -11,9 +11,7 @@ import com.platform.common.yongyou.response.OtherOutAddResponse;
 import com.platform.dao.dto.upms.SysUserDTO;
 import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
-import com.platform.dao.entity.preparation.Preparation;
 import com.platform.dao.entity.store.OutStoreForm;
-import com.platform.dao.entity.upms.SysDept;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.entity.upms.SysUserDept;
 import com.platform.dao.enums.*;
@@ -32,14 +30,10 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.task.Task;
 import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
 
-import java.io.OutputStream;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

platform-service/src/main/java/com/platform/service/sb/SbTypeService.java

@@ -2,9 +2,11 @@ package com.platform.service.sb;
 
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.sb.SbModelDTO;
+import com.platform.dao.dto.sb.SbPositionDTO;
 import com.platform.dao.dto.sb.SbTypeDTO;
 import com.platform.dao.entity.sb.SbType;
 import com.platform.dao.vo.sb.SbModelVO;
+import com.platform.dao.vo.sb.SbPositionVO;
 import com.platform.dao.vo.sb.SbTypeVO;
 import com.platform.service.base.IBaseService;
 
@@ -34,4 +36,7 @@ public interface SbTypeService extends IBaseService<SbType, SbTypeDTO> {
      * @return ：
      */
     int batchDelete(List<String> ids);
+
+    List<SbTypeVO> selectLongYanList(SbTypeDTO dto);
+
 }

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

@@ -5,10 +5,12 @@ import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.util.IdGeneratorUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.bean.MyVOPage;
+import com.platform.dao.dto.sb.SbPositionDTO;
 import com.platform.dao.dto.sb.SbTypeDTO;
 import com.platform.dao.entity.sb.SbType;
 import com.platform.dao.mapper.sb.SbTypeMapper;
 import com.platform.dao.vo.sb.SbModelVO;
+import com.platform.dao.vo.sb.SbPositionVO;
 import com.platform.dao.vo.sb.SbTypeVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.sb.SbTypeService;
@@ -38,6 +40,11 @@ public class SbTypeServiceImpl extends BaseServiceImpl<SbTypeMapper, SbType, SbT
         return 1;
     }
 
+    @Override
+    public List<SbTypeVO> selectLongYanList(SbTypeDTO dto) {
+        return mapper.selectLongYanList(dto);
+    }
+
     @Override
     public MyVOPage<SbTypeVO> selectVOPage(SbTypeDTO model, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);