Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCategoryVO.java

@@ -16,6 +16,9 @@
  */
 package com.logpm.basicdata.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.logpm.basicdata.entity.BasicdataCategoryEntity;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
@@ -31,5 +34,19 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataCategoryVO extends BasicdataCategoryEntity {
 	private static final long serialVersionUID = 1L;
+	private String title;
+	@JsonSerialize(
+		using = ToStringSerializer.class
+	)
+	private Long key;
+	@JsonSerialize(
+		using = ToStringSerializer.class
+	)
+	private Long value;
+
+	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	private Boolean hasChildren;
+
+
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java

@@ -90,6 +90,18 @@ public class BasicdataCategoryController extends BladeController {
 		return R.data(pages);
 	}
 
+
+	/**
+	 * 懒加载获取品分类树形结构
+	 */
+	@GetMapping("/lazy-tree")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+	public R<List<BasicdataCategoryEntity>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
+		List<BasicdataCategoryEntity> tree = basicdataCategoryService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()),parentId);
+		return R.data(tree);
+	}
+
 	/**
 	 * 品类 新增
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java

@@ -51,4 +51,5 @@ public interface BasicdataCategoryMapper extends BaseMapper<BasicdataCategoryEnt
 	 */
 	List<BasicdataCategoryExcel> exportBasicdataCategory(@Param("ew") Wrapper<BasicdataCategoryEntity> queryWrapper);
 
+    List<BasicdataCategoryEntity> lazyTree(String tenantId,Long parentId);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml

@@ -30,11 +30,70 @@
         <result column="name" property="name"/>
         <result column="type" property="type"/>
     </resultMap>
+    <resultMap id="ownMap" type="com.logpm.basicdata.vo.BasicdataCategoryVO">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="pid" property="pid"/>
+        <result column="stair_code" property="stairCode"/>
+        <result column="second_code" property="secondCode"/>
+        <result column="stair_name" property="stairName"/>
+        <result column="second_name" property="secondName"/>
+        <result column="three_code" property="threeCode"/>
+        <result column="three_name" property="threeName"/>
+        <result column="four_code" property="fourCode"/>
+        <result column="four_name" property="fourName"/>
+        <result column="name" property="name"/>
+        <result column="type" property="type"/>
+        <result column="title" property="title"/>
+        <result column="value" property="value"/>
+        <result column="key" property="key"/>
+        <result column="has_children" property="hasChildren"/>
+    </resultMap>
 
 
     <select id="selectBasicdataCategoryPage" resultMap="basicdataCategoryResultMap">
         select * from logpm_basicdata_category where is_deleted = 0
     </select>
+    <select id="lazyTree" resultMap="ownMap">
+        select   lbc.id,lbc.tenant_id,lbc.pid,lbc.name AS title,lbc.type,
+        lbc.id AS "value",
+        lbc.id AS "key",
+        (
+        SELECT
+        CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+        FROM
+        logpm_basicdata_category
+        WHERE
+        pid = lbc.id and is_deleted = 0
+        ) AS "has_children"
+
+        from logpm_basicdata_category lbc
+        <where>
+            lbc.is_deleted = 0
+            <if test="param2 == 1 or param2 == ''">
+                and lbc.type = 1
+            </if>
+            <if test="param2 != 1 and param2 != null and param2 != ''">
+                and lbc.pid = #{param2}
+            </if>
+            <if test="param1 != null and param1 != ''">
+                and lbc.tenant_id = #{param1}
+            </if>
+        </where>
+        ORDER BY lbc.type
+    </select>
 
 
     <select id="exportBasicdataCategory" resultType="com.logpm.basicdata.excel.BasicdataCategoryExcel">

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java

@@ -49,4 +49,5 @@ public interface IBasicdataCategoryService extends BaseService<BasicdataCategory
 	 */
 	List<BasicdataCategoryExcel> exportBasicdataCategory(Wrapper<BasicdataCategoryEntity> queryWrapper);
 
+    List<BasicdataCategoryEntity> lazyTree( String tenantId,Long parentId);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java

@@ -51,4 +51,9 @@ public class BasicdataCategoryServiceImpl extends BaseServiceImpl<BasicdataCateg
 		return basicdataCategoryList;
 	}
 
+	@Override
+	public List<BasicdataCategoryEntity> lazyTree(String tenantId, Long parentId) {
+		return baseMapper.lazyTree(tenantId,parentId);
+	}
+
 }