From 91c60b946e0d2e8abc2c350598aa6d47ed28e83c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 24 九月 2024 14:36:29 +0800
Subject: [PATCH] 装机&放弃 逻辑新增state
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java
index 0536dff..a366038 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java
@@ -12,7 +12,6 @@
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
/**
* 宸ヤ綔璁板綍 Mapper
@@ -24,7 +23,8 @@
default PageResult<JobRecordDO> selectPage(JobRecordPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<JobRecordDO>()
- .eqIfPresent(JobRecordDO::getJobType, reqVO.getJobType())
+ //.eqIfPresent(JobRecordDO::getJobType, reqVO.getJobType())
+ .inIfPresent(JobRecordDO::getJobType, reqVO.getJobType())
.eqIfPresent(JobRecordDO::getDocId, reqVO.getDocId())
.likeIfPresent(JobRecordDO::getDocName, reqVO.getDocName())
.eqIfPresent(JobRecordDO::getDevId, reqVO.getDevId())
@@ -38,8 +38,8 @@
.orderByDesc(JobRecordDO::getId));
}
- @Select("SELECT * FROM lihu.job_record where rent_id=#{rentId} and job_type=#{jobType} and doc_id=#{docId} limit 1")
- JobRecordDO selectByRentIdJobTypeDocId(@Param("rentId") Long rentId, @Param("jobType") Integer jobType, @Param("docId") Long docId );
+ @Select("SELECT * FROM lihu.job_record where rent_id=#{rentId} and doc_id=#{docId} limit 1")
+ JobRecordDO selectByRentIdDocId(@Param("rentId") Long rentId, @Param("docId") Long docId );
@Select("SELECT count(1) FROM lihu.job_record where pat_id=#{patId} and TO_DAYS(job_time)=TO_DAYS(#{jobTime}) and job_type=#{jobType} ")
Integer getPatientJobNum(@Param("patId") String patId, @Param("jobTime") LocalDateTime jobTime, @Param("jobType") Integer jobType );
--
Gitblit v1.9.3