From 38b44e0c9996f06524903417f1d0a3f746b4550b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 04 十二月 2023 17:47:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 962e0e9..b2c5762 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -427,25 +427,25 @@
Integer stateInt = baseCase.getState();
if (stateInt == 0) {
baseCase.setStateName("寰呭鐞�");
- }else if(stateInt == 1){
+ } else if (stateInt == 1) {
baseCase.setStateName("鎶ヨ");
- }else if(stateInt == 2){
+ } else if (stateInt == 2) {
baseCase.setStateName("涓婃姤");
- }else if(stateInt == 3){
+ } else if (stateInt == 3) {
baseCase.setStateName("鍦ㄥ涔�");
- }else if(stateInt == 4){
+ } else if (stateInt == 4) {
baseCase.setStateName("鏆備笉澶勭悊");
- }else if(stateInt == 5){
+ } else if (stateInt == 5) {
baseCase.setStateName("绔嬫");
- }else if(stateInt == 6 ){
+ } else if (stateInt == 6) {
baseCase.setStateName("璋冨害");
- }else if(stateInt == 7 ){
+ } else if (stateInt == 7) {
baseCase.setStateName("澶勭疆");
- }else if(stateInt == 8 ){
+ } else if (stateInt == 8) {
baseCase.setStateName("鏍告煡");
- }else if(stateInt == 9 ){
+ } else if (stateInt == 9) {
baseCase.setStateName("缁撴");
- }else if(stateInt == 10 ){
+ } else if (stateInt == 10) {
baseCase.setStateName("寰呬笂鎶�");
}
});
@@ -473,8 +473,8 @@
}
@Override
- public Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime) {
- return baseCaseMapper.selectVideoInspection(new Page<>(current, pageSize), gradeId, videoId, beginTime, endTime);
+ public Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime, Integer type) {
+ return baseCaseMapper.selectVideoInspection(new Page<>(current, pageSize), gradeId, videoId, beginTime, endTime, type);
}
@Override
--
Gitblit v1.8.0