From c9d8a42aedf6462611d38a40d34e6c2c5ebfabb2 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 10 七月 2025 17:02:14 +0800
Subject: [PATCH] mdm内增加deptlazylist接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 6 ++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 8 ++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmSystemController.java | 49 ++++++++++++++++++++++++
3 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmSystemController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmSystemController.java
new file mode 100644
index 0000000..2cdb2f6
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmSystemController.java
@@ -0,0 +1,49 @@
+
+package org.springblade.mdm.program.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.system.pojo.entity.Dept;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 娴佺▼绠＄悊鎺ュ彛
+ *
+ * @author Chill
+ */
+@NonDS
+@RestController
+@RequestMapping("/system/")
+@AllArgsConstructor
+@Tag(name = "MDM绯荤粺鎺ュ彛", description = "寮曞叆blade-system鐨勬帴鍙�")
+@Slf4j
+public class MdmSystemController {
+ private final ISysClient sysClient;
+
+ @GetMapping("/dept/lazy-list")
+ @ApiOperationSupport(order = 2)
+ @Operation(summary = "鑾峰彇鍙傛暟鍊�")
+ public R<List<Dept>> deptLazyList(@Parameter(description = "鏈烘瀯鐖惰妭鐐筰d") @RequestParam Long deptId) {
+ try {
+ if(deptId == null){
+ deptId = 0L;
+ }
+ return sysClient.getDeptChild(deptId);
+ }catch (Exception e){
+ return R.fail(e.getMessage());
+ }
+
+ }
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
index 928ad8f..981d24b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
@@ -37,14 +37,16 @@
<sql id="all_columns">id,tenant_id,name,parent_id,node_type,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
<sql id="all_columns_n">n.id,n.tenant_id,n.name,n.parent_id,n.node_type,n.description,n.remark,n.status,n.create_dept,n.is_deleted,n.create_time,n.create_user,n.update_time,n.update_user</sql>
<select id="lazyList" resultType="org.springblade.mdm.program.vo.NcNodeVO">
- select <include refid="all_columns_n"/>,u.name create_user_name,(
+ select <include refid="all_columns_n"/>,dt.dict_value as node_type_name,u.name create_user_name,(
SELECT
CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
FROM
mdm_nc_node
WHERE
parent_id = n.id and is_deleted = 0
- ) AS "has_children" from mdm_nc_node n left join blade_user u on n.create_user=u.id where n.is_deleted=0 and n.parent_id=#{parentId}
+ ) AS "has_children" from mdm_nc_node n left join blade_user u on n.create_user=u.id
+ left join blade_dict_biz dt on n.node_type=dt.dict_key and dt.code='nc_node_type'
+ where n.is_deleted=0 and n.parent_id=#{parentId}
</select>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index 66fbc5b..0a0653c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -244,15 +244,15 @@
/**
* 鍗囩増(鍗囩骇宸ュ簭鐗堟),鍗囩骇宸ュ簭鐗堟湰锛堝寘鎷▼搴忓拰鍏朵粬闄勪欢锛�
- * @param bindNodeid 绋嬪簭鏂囦欢缁戝畾鐨勮妭鐐筰d
+ * @param bindNcNodeId 绋嬪簭鏂囦欢缁戝畾鐨勮妭鐐筰d
* @param newProcessEdition 鏂扮増娆�
*/
- public void upgradeProcessEdition(long bindNcNodeid,String newProcessEdition) {
+ public void upgradeProcessEdition(Long bindNcNodeId,String newProcessEdition) {
//NcProgram prog = this.getById(id);
- NcProgram prog = getByBindNodeId(bindNcNodeid);
+ NcProgram prog = getByBindNodeId(bindNcNodeId);
//灏嗙幇鏈夌▼搴忔洿鏂颁负闈炴渶鏂扮増鏈�
- this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getBindNcNodeId,bindNcNodeid).set(NcProgram::getIsLastEdition,0));
+ this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getBindNcNodeId,bindNcNodeId).set(NcProgram::getIsLastEdition,0));
NcProgram newVerProg = new NcProgram();
BeanUtils.copyProperties(prog, newVerProg);
--
Gitblit v1.9.3