From 3d1344ca6f0613bf3726d2c40d35f3928f82a910 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 九月 2025 18:15:27 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 fa9ddd3..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
@@ -10,11 +10,8 @@
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordStatisticDO;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
import cn.lihu.jh.module.ecg.controller.admin.devmanage.vo.*;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
/**
* 璁惧 Mapper
@@ -27,20 +24,26 @@
default PageResult<DeviceDO> selectPage(DevicePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<DeviceDO>()
.eqIfPresent(DeviceDO::getDevId, reqVO.getDevId())
- .eqIfPresent(DeviceDO::getState, reqVO.getState())
+ .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())
- .orderByDesc(DeviceDO::getId));
+ .orderByAsc(DeviceDO::getDevId));
}
@Select("select * from lihu.device where dev_id=#{devId}")
+ @Results({
+ @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ })
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