From 1c4de3dad5e7c505f08cd6020d29b84a60668b02 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 09:43:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 95c9d88..eae91e8 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -114,6 +114,7 @@
public static final Integer THREE =3 ;
public static final Integer FOUR =4 ;
public static final Integer FIVE =5 ;
+ public static final Integer SIX =6 ;
public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
public static final String VIRTUAL_CARD_INDEX = "02098469790";
public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ;
@@ -565,6 +566,16 @@
int reason = 6;//鍏ュ洯鍘熷洜
}
+public interface noticesObjectType{
+ int visit = 0;//璁垮鐢宠
+ int visitReporting = 1;//璁垮鎶ュ
+ int useCar = 2;//鐢ㄨ溅鐢宠
+ int dangerDeal = 3;//闅愭偅澶勭悊
+ int logisticsCarUse = 4;//鐗╂祦杞﹀鎵�
+ int system = 5;//绯荤粺娑堟伅
+ int reason = 6;//鍏ュ洯鍘熷洜
+ int hknotice = 7;//娴峰悍鑰冨嫟浠ｅ姙
+}
public static Integer approveTypeToNoticeType(Integer approveType){
@@ -588,16 +599,6 @@
- public interface noticesObjectType{
- int visit = 0;//璁垮鐢宠
- int visitReporting = 1;//璁垮鎶ュ
- int useCar = 2;//鐢ㄨ溅鐢宠
- int dangerDeal = 3;//闅愭偅澶勭悊
- int logisticsCarUse = 4;//鐗╂祦杞﹀鎵�
- int system = 5;//绯荤粺娑堟伅
- int reason = 6;//鍏ュ洯鍘熷洜
- int hknotice = 7;//娴峰悍鑰冨嫟浠ｅ姙
-}
public interface approveStatus{
@@ -726,7 +727,7 @@
"meeting_user_rel ur\n" +
"LEFT JOIN `SYSTEM_USER` su ON ur.USER_ID = su.id \n" +
"LEFT JOIN meeting_book b ON ur.OBJ_ID = b.id \n" +
- "WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS = 0" +
+ "WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS in(0,2) and b.isdeleted=0" +
"<if test='userId != null'>"+
"and ur.USER_ID = #{userId}\n" +
"</if>"+
--
Gitblit v1.9.3