From 4f8b83178eabea113df2ea48b64a56cb7f721107 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 14:55:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 27 ++++++++++++++++-----------
1 files changed, 16 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 2b7b0ad..1405932 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
@@ -565,6 +565,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 +598,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 +726,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>"+
@@ -751,6 +751,10 @@
LW_FK(0,"鍔冲姟璁垮"),
PT_FK(1,"鏅�氳瀹�"),
NB_FK(2,"鍐呴儴浜哄憳"),
+
+ COMPANY_TYPE_REL(0,"鐩稿叧鏂圭粍缁�"),
+ COMPANY_TYPE_INTERNAL(1,"鍐呴儴浜哄憳"),
+ COMPANY_TYPE_FK(3,"璁垮"),
/** 杩涘満绫诲瀷 **/
OUT(0,"鍑�"),
@@ -1391,6 +1395,7 @@
HIDDEN_DANGER_SUBMIT(0, "闅愭偅闅忔墜鎷嶆彁鎶�", "闅愭偅闅忔墜鎷嶆彁鎶�"),
HIDDEN_DANGER_DEAL_BEFORE(1, "闅愭偅闅忔墜鎷嶅鐞嗗墠", "闅愭偅闅忔墜鎷嶅鐞嗗墠"),
HIDDEN_DANGER_DEAL_AFTER(2, "闅愭偅闅忔墜鎷嶅鐞嗗悗 ", "闅愭偅闅忔墜鎷嶅鐞嗗悗 "),
+ MEETING_BOOKS(4, "浼氳鏂囦欢 ", "浼氳鏂囦欢 "),
;
// 鎴愬憳鍙橀噺
private String name;
--
Gitblit v1.9.3