From 01a81beea99c0298a3b6178c7796f4c27b30c6c7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 14:27:50 +0800
Subject: [PATCH] pat detail.  新增 appontment_id

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
index 125c9f9..3c84343 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
@@ -24,13 +24,16 @@
     default PageResult<DeviceDO> selectPage(DevicePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<DeviceDO>()
                 .eqIfPresent(DeviceDO::getDevId, reqVO.getDevId())
+                .eqIfPresent(DeviceDO::getDevCodeIntrinsic, reqVO.getDevCodeIntrinsic())
+                .eqIfPresent(DeviceDO::getDevCodeHosp, reqVO.getDevCodeHosp())
+                .eqIfPresent(DeviceDO::getDevCodeDept, reqVO.getDevCodeDept())
                 .inIfPresent(DeviceDO::getState, reqVO.getState())
                 .eqIfPresent(DeviceDO::getCategory, reqVO.getCategory())
                 .eqIfPresent(DeviceDO::getBrand, reqVO.getBrand())
                 .eqIfPresent(DeviceDO::getModel, reqVO.getModel())
                 .betweenIfPresent(DeviceDO::getPurchaseDate, reqVO.getPurchaseDate())
                 .betweenIfPresent(DeviceDO::getCreateTime, reqVO.getCreateTime())
-                .orderByAsc(DeviceDO::getStateDate));
+                .orderByAsc(DeviceDO::getDevId));
     }
 
     @Select("select * from lihu.device where dev_id=#{devId}")
@@ -39,8 +42,8 @@
     })
     DeviceDO getDeviceByDevId(@Param("devId") String devId);
 
-    @Update("update lihu.device set state=#{state}, state_date=#{stateDate} where dev_id=#{devId}")
-    Integer updateDevState(@Param("devId") String devId, @Param("state") Integer state, @Param("stateDate") LocalDate stateDate);
+    @Update("update lihu.device set state=#{state}, state_date=#{stateDate}, comment=#{comment} where dev_id=#{devId}")
+    Integer updateDevState(@Param("devId") String devId, @Param("state") Integer state, @Param("stateDate") LocalDate stateDate, @Param("comment") String comment);
 
     @Select("<script>" +
             "select category, state, count(1) as dev_count from lihu.device " +

--
Gitblit v1.9.3