From 43e16c0697b7c546a4f5fa5b93cba663c6b6d04d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 06 十一月 2024 17:02:04 +0800
Subject: [PATCH] 检查类型属性新增
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java | 3 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeService.java | 6 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java | 9 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeServiceImpl.java | 8 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java | 25 ++++++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java | 11 ++++-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java | 22 +++++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java | 15 +++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java | 18 ++++++++
9 files changed, 100 insertions(+), 17 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
index 5bc4266..30bb5a1 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
@@ -6,4 +6,7 @@
static final String ECG_SCREEN_PANE_WAITING_KEY = "ecg.screen.pane.waiting";
static final String ECG_SCREEN_PANE_PASSED_KEY = "ecg.screen.pane.passed";
static final String DEV_CODE_CHOICE = "dev.code.choice";
+
+ static final String BOOK_TIMESLOT_LENGTH = "book.timeslot.length";
+ static final String BOOK_TIMESLOT_LIST = "book.timeslot.list";
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java
index c77b2d0..f3d5507 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java
@@ -1,12 +1,16 @@
package cn.lihu.jh.module.ecg.controller.admin.checktype;
import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
@@ -24,11 +28,6 @@
import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.service.checktype.CheckTypeService;
-
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
@Tag(name = "绠＄悊鍚庡彴 - 妫�鏌ョ被鍨�")
@RestController
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java
index 30f5b87..1e009a8 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypePageReqVO.java
@@ -34,4 +34,19 @@
@Schema(description = "鍙彿鍒�")
private Integer callingColumn;
+ @Schema(description = "鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
+ private Integer displayBarcode;
+
+ @Schema(description = "鏄惁闇�瑕佺‘璐�")
+ private Integer expenseRecognition;
+
+ @Schema(description = "鏃舵棰勭害瑙勫畾浜烘暟")
+ private Integer timeslotBookNum;
+
+ @Schema(description = "姣忔椂娈甸鐣欎汉鏁�")
+ private Integer timeslotReservedNum;
+
+ @Schema(description = "浜插拰鐨勬鏌ョ被鍨�")
+ private String affinityCheckTypes;
+
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java
index dbfda2f..30fd1cf 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeRespVO.java
@@ -6,6 +6,8 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
+import cn.lihu.jh.framework.excel.core.annotations.DictFormat;
+import cn.lihu.jh.framework.excel.core.convert.DictConvert;
@Schema(description = "绠＄悊鍚庡彴 - 妫�鏌ョ被鍨� Response VO")
@Data
@@ -33,11 +35,32 @@
private LocalDateTime createTime;
@Schema(description = "闇�瑕佽澶囬鐢�")
- @ExcelProperty("闇�瑕佽澶囬鐢�")
+ @ExcelProperty(value = "闇�瑕佽澶囬鐢�", converter = DictConvert.class)
+ @DictFormat("infra_boolean_string") // TODO 浠ｇ爜浼樺寲锛氬缓璁缃埌瀵瑰簲鐨� DictTypeConstants 鏋氫妇绫讳腑
private Integer needDevReady;
@Schema(description = "鍙彿鍒�")
@ExcelProperty("鍙彿鍒�")
private Integer callingColumn;
+ @Schema(description = "鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
+ @ExcelProperty("鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
+ private Integer displayBarcode;
+
+ @Schema(description = "鏄惁闇�瑕佺‘璐�")
+ @ExcelProperty("鏄惁闇�瑕佺‘璐�")
+ private Integer expenseRecognition;
+
+ @Schema(description = "鏃舵棰勭害瑙勫畾浜烘暟")
+ @ExcelProperty("鏃舵棰勭害瑙勫畾浜烘暟")
+ private Integer timeslotBookNum;
+
+ @Schema(description = "姣忔椂娈甸鐣欎汉鏁�")
+ @ExcelProperty("姣忔椂娈甸鐣欎汉鏁�")
+ private Integer timeslotReservedNum;
+
+ @Schema(description = "浜插拰鐨勬鏌ョ被鍨�")
+ @ExcelProperty("浜插拰鐨勬鏌ョ被鍨�")
+ private String affinityCheckTypes;
+
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java
index f57d522..516417c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/vo/CheckTypeSaveReqVO.java
@@ -1,8 +1,9 @@
package cn.lihu.jh.module.ecg.controller.admin.checktype.vo;
-import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
@Schema(description = "绠＄悊鍚庡彴 - 妫�鏌ョ被鍨嬫柊澧�/淇敼 Request VO")
@Data
@@ -26,4 +27,19 @@
@Schema(description = "鍙彿鍒�")
private Integer callingColumn;
+ @Schema(description = "鏄惁鏄剧ず鎮ｈ�呮潯鐮�")
+ private Integer displayBarcode;
+
+ @Schema(description = "鏄惁闇�瑕佺‘璐�")
+ private Integer expenseRecognition;
+
+ @Schema(description = "鏃舵棰勭害瑙勫畾浜烘暟")
+ private Integer timeslotBookNum;
+
+ @Schema(description = "姣忔椂娈甸鐣欎汉鏁�")
+ private Integer timeslotReservedNum;
+
+ @Schema(description = "浜插拰鐨勬鏌ョ被鍨�")
+ private String affinityCheckTypes;
+
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java
index a94bd35..e0d4d6d 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/checktype/CheckTypeDO.java
@@ -41,11 +41,33 @@
private Integer readyNum;
/**
* 闇�瑕佽澶囬鐢�
+ *
+ * 鏋氫妇 {@link TODO infra_boolean_string 瀵瑰簲鐨勭被}
*/
private Integer needDevReady;
/**
* 鍙彿鍒�
*/
private Integer callingColumn;
+ /**
+ * 鏄惁鏄剧ず鎮ｈ�呮潯鐮�
+ */
+ private Integer displayBarcode;
+ /**
+ * 鏄惁闇�瑕佺‘璐�
+ */
+ private Integer expenseRecognition;
+ /**
+ * 鏃舵棰勭害瑙勫畾浜烘暟
+ */
+ private Integer timeslotBookNum;
+ /**
+ * 姣忔椂娈甸鐣欎汉鏁�
+ */
+ private Integer timeslotReservedNum;
+ /**
+ * 浜插拰鐨勬鏌ョ被鍨�
+ */
+ private String affinityCheckTypes;
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
index 987d12e..fe3afa2 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
@@ -6,10 +6,9 @@
import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Mapper;
import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*;
+import org.apache.ibatis.annotations.Select;
/**
* 妫�鏌ョ被鍨� Mapper
@@ -26,6 +25,12 @@
.eqIfPresent(CheckTypeDO::getReadyNum, reqVO.getReadyNum())
.betweenIfPresent(CheckTypeDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(CheckTypeDO::getNeedDevReady, reqVO.getNeedDevReady())
+ .eqIfPresent(CheckTypeDO::getCallingColumn, reqVO.getCallingColumn())
+ .eqIfPresent(CheckTypeDO::getDisplayBarcode, reqVO.getDisplayBarcode())
+ .eqIfPresent(CheckTypeDO::getExpenseRecognition, reqVO.getExpenseRecognition())
+ .eqIfPresent(CheckTypeDO::getTimeslotBookNum, reqVO.getTimeslotBookNum())
+ .eqIfPresent(CheckTypeDO::getTimeslotReservedNum, reqVO.getTimeslotReservedNum())
+ .eqIfPresent(CheckTypeDO::getAffinityCheckTypes, reqVO.getAffinityCheckTypes())
.orderByDesc(CheckTypeDO::getId));
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeService.java
index a17d156..4b3e7bf 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeService.java
@@ -1,11 +1,11 @@
package cn.lihu.jh.module.ecg.service.checktype;
+import java.util.*;
+import jakarta.validation.*;
import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
-
-import javax.validation.Valid;
-import java.util.List;
+import cn.lihu.jh.framework.common.pojo.PageParam;
/**
* 妫�鏌ョ被鍨� Service 鎺ュ彛
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeServiceImpl.java
index ec783b8..2cdecce 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/checktype/CheckTypeServiceImpl.java
@@ -1,18 +1,18 @@
package cn.lihu.jh.module.ecg.service.checktype;
import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.*;
import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
+import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
-
-import javax.annotation.Resource;
-
-import java.util.List;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
--
Gitblit v1.9.3