From 0f5ca95696b25db2814ecdf96cf974765e2ef6c5 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 02 二月 2026 11:29:02 +0800
Subject: [PATCH] 移动端消息获取界面变更为，消息、任务、会议
---
src/main/java/com/product/mobile/core/service/ContanctOrgListService.java | 1 +
src/main/java/com/product/mobile/core/service/SysMessageService.java | 38 ++++++++++++++++++++++++++++++++++++++
src/main/java/com/product/mobile/core/controller/SysMessageController.java | 4 +++-
3 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/mobile/core/controller/SysMessageController.java b/src/main/java/com/product/mobile/core/controller/SysMessageController.java
index 7405965..f925d20 100644
--- a/src/main/java/com/product/mobile/core/controller/SysMessageController.java
+++ b/src/main/java/com/product/mobile/core/controller/SysMessageController.java
@@ -83,7 +83,9 @@
SpringMVCContextHolder.getSystemLogger().error(MobileCoreCode.SYSTEM_FORM_NODATA.getValue(), MobileCoreCode.SYSTEM_FORM_NODATA.getText());
return this.error(MobileCoreCode.SYSTEM_FORM_NODATA.getValue(), MobileCoreCode.SYSTEM_FORM_NODATA.getText());
}
- return OK_List(sysMessageService.getTypeMessage(fse.getObject("type"),fse.getInteger("read")));
+// return OK_List(sysMessageService.getTypeMessage(fse.getObject("type"),fse.getInteger("read")));
+
+ return OK_List(sysMessageService.getTypeMessage());
} catch (BaseException e) {
e.printStackTrace();
return error(e);
diff --git a/src/main/java/com/product/mobile/core/service/ContanctOrgListService.java b/src/main/java/com/product/mobile/core/service/ContanctOrgListService.java
index 39c2c8f..0f4b93d 100644
--- a/src/main/java/com/product/mobile/core/service/ContanctOrgListService.java
+++ b/src/main/java/com/product/mobile/core/service/ContanctOrgListService.java
@@ -65,6 +65,7 @@
return parseData(org,staff);
}
+
/**
* 鍏堟煡鍑哄巻鍙叉墦鍗¤褰�
* @param cpage
diff --git a/src/main/java/com/product/mobile/core/service/SysMessageService.java b/src/main/java/com/product/mobile/core/service/SysMessageService.java
index 489b877..cea147d 100644
--- a/src/main/java/com/product/mobile/core/service/SysMessageService.java
+++ b/src/main/java/com/product/mobile/core/service/SysMessageService.java
@@ -7,6 +7,7 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.spring.context.SpringMVCContextHolder;
+import com.product.module.sys.entity.SystemUser;
import com.product.module.sys.service.UserService;
import java.util.ArrayList;
@@ -89,5 +90,42 @@
DataTableEntity dte = baseDao.listTable(sql.toString(),ps.toArray(),Integer.MAX_VALUE, 1);
return dte;
}
+ /**
+ * 缁熻鍒嗙被鍨嬫秷鎭�,浼氳銆佷换鍔°�佹渶鏂版秷鎭�佸巻鍙叉秷鎭�
+ * @param fse
+ * @return
+ */
+ public DataTableEntity getTypeMessage() {
+ ArrayList<Object> ps= new ArrayList<Object>();
+ SystemUser user=SpringMVCContextHolder.getCurrentUser();
+ ps.add(user.getUser_id());
+ StringBuilder sql = new StringBuilder();
+ sql.append(" select read_type message_type, count(*) num from product_sys_message m inner join product_sys_message_user u on u.message_uuid=m.uuid \r\n"
+ + "and u.user_id=? ").append(" group by read_type ");
+ ///鎴戠殑浼氳
+ sql.append( " union all select 2 as message_type,count(*) num from product_oa_conference_apply where ( CONCAT(',',meeting_master,',') like '%,")
+ .append(user.getUser_id()).append(",%' ")
+ .append(" or CONCAT(',',meeting_recorder,',') like '%,")
+ .append(user.getUser_id()).append(",%'")
+ .append(" or CONCAT(',',participator,',') like '%,")
+ .append(user.getUser_id()).append(",%'")
+ .append(" ) and (start_time>now() or (start_time<now() and now()<end_time))"
+ );
+ ///鏈粨鏉熺殑浠诲姟
+ sql.append( " union all select 3 as message_type,count(*) num from product_oa_task_distribution where task_status=1 and finish_type=0 ");
+ sql.append( " and ( CONCAT(',',task_persons,',') like '%,").append(user.getUser_id()).append(",%' ");
+ DataTableEntity dt=baseDao.listTable("product_sys_org_levels", "org_level_leader_uuid=?", new String[] {user.getUuid()});
+
+ if(!DataTableEntity.isEmpty(dt)) {
+ for(int i=0;i<dt.getRows();i++) {
+ sql.append(" or CONCAT(',',task_org,',') like '%,").append(dt.getString(i, "uuid")).append(",%' ");
+ }
+ }
+ sql.append(" )");
+
+ DataTableEntity dte = baseDao.listTable(sql.toString(),ps.toArray());
+ return dte;
+ }
+
}
--
Gitblit v1.9.2