From 2723130f6bf9cd12254176ba0afa6f0a65e16246 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 31 Mar 2026 13:18:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/NuAppEmployeesPermissionMapper.xml    |  3 +-
 .../controller/NuBaseInfoController.java      | 33 +++++++++++++++++++
 .../modules/nubaseinfo/entity/NuBaseInfo.java |  8 +++++
 .../mapper/xml/NuBaseInfoMapper.xml           |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml
index 2cc4fe39..0c87f028 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml
@@ -3,11 +3,12 @@
 <mapper namespace="com.nu.modules.employeesPermission.mapper.NuAppEmployeesPermissionMapper">
     <select id="listByEmployeesId" resultType="com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission">
         select a.*,b.name as menu_name,b.menu_code  from nu_app_employees_permission a
-        left join nu_app_permission b on a.permission_id = b.id
+        left join nu_app_permission b on a.permission_id = b.menu_code
         <where>
             <if test="roleId != null and roleId !=''">
                 and a.role_id = #{roleId}
             </if>
         </where>
+        order by b.sort_no asc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java
index 15abb9c6..0866db34 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java
@@ -1,6 +1,7 @@
 package com.nu.modules.nubaseinfo.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nu.dto.NuBaseInfoMQDto;
@@ -263,4 +264,36 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
         return Result.OK("操作成功!");
     }
 
+
+
+    @AutoLog(value = "护理单元-区域规划")
+    @ApiOperation(value = "护理单元-区域规划", notes = "护理单元-区域规划")
+    @PostMapping(value = "/qygh")
+    public Result<String> qygh(@RequestBody NuBaseInfo nuBaseInfo) {
+
+        String hldyCheck = nuBaseInfo.getHldyCheck();
+        String kfCheck = nuBaseInfo.getKfCheck();
+        //先将原来的数据初始化
+        UpdateWrapper<NuBaseInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("iz_hldy","N");
+        updateWrapper.set("iz_kf","N");
+        nuBaseInfoService.update(updateWrapper);
+        //更新数据
+        if(StringUtils.isNotBlank(hldyCheck)){
+            UpdateWrapper<NuBaseInfo> updateWrapper1 = new UpdateWrapper<>();
+            updateWrapper1.set("iz_hldy","Y");
+            updateWrapper1.in("nu_id",hldyCheck.split(","));
+            nuBaseInfoService.update(updateWrapper1);
+        }
+        //更新数据
+        if(StringUtils.isNotBlank(kfCheck)){
+            UpdateWrapper<NuBaseInfo> updateWrapper1 = new UpdateWrapper<>();
+            updateWrapper1.set("iz_kf","Y");
+            updateWrapper1.in("nu_id",kfCheck.split(","));
+            nuBaseInfoService.update(updateWrapper1);
+        }
+
+        return Result.OK("操作成功！");
+    }
+
 }
diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
index f9cb76ad..9e2c74a0 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
@@ -149,6 +149,9 @@ public class NuBaseInfo implements Serializable {
      * 是否绑定护理单元支付中 Y支付中（有客户正在给护理单元充值） N没有人在绑定缴费（可以让用户绑定）
      */
     private String izBindPaying;
+    private String izHldy;//是否是护理单元
+    private String izKf;//是否是库房
+
 
     @TableField(exist = false)
     private String deviceId;//摄像头 ID
@@ -199,4 +202,9 @@ public class NuBaseInfo implements Serializable {
     @TableField(exist = false)
     private List<Map<String,String>> readList;
 
+    @TableField(exist = false)
+    private String hldyCheck;
+    @TableField(exist = false)
+    private String kfCheck;
+
 }
diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
index 8de5f15b..a783782b 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
@@ -81,7 +81,7 @@
     </select>
 
     <select id="queryReadList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
-        select employee_id as empId,nu_id,'gd' as type , '工单' as typeName from nu_biz_directive_order where START_TIME like concat(DATE_FORMAT(NOW(), '%Y-%m-%d'),'%') and iz_finish = 'N' and employee_id = #{employeesId} GROUP BY employee_id,nu_id
+        select employee_id as empId,nu_id,'gd' as type , '工单' as typeName from nu_biz_directive_order where employee_id = #{employeesId} GROUP BY employee_id,nu_id
         union ALL
         select create_by as empId,nu_id,'pdd' as type,'盘点单' as typeName from nu_invoicing_pdd_main where pdd_type = '1' and create_by = #{username} GROUP BY create_by,nu_id
 <!--        union all-->