no message

serverConfig.xml

 <config>
     <port>9099</port>
     <sign>xxx90909082fsdahfjosadjfpoiwausjorip2hjklrhn1ioud0u124rx0qwejfokasjfolksaujfoas</sign>
-    <dbServer>http://192.168.0.71:9096</dbServer>
+    <dbServer>http://192.168.0.71:40012</dbServer>
 </config>
\ No newline at end of file

src/biz/finance.ts

@@ -149,8 +149,8 @@ export async function enterpriseManageInfo(eId, mId) {
 
     let dataInfo = {
         mId:resInfo.mId,
-        annual:moment(resInfo.annual).format("YYYY"),
-        quarter: changeEnumValue(enumConfig.QUARTER, resInfo.quarter),//新增季度
+        annual:moment(resInfo.annual).format("YYYY"),//年度
+        quarter: changeEnumValue(enumConfig.QUARTER, resInfo.quarter),//季度
         BI:parseFloat(resInfo.BI),
         TXP:parseFloat(resInfo.TXP),
         RD:parseFloat(resInfo.RD)
@@ -165,6 +165,7 @@ export async function enterpriseManageInfo(eId, mId) {
  */
 // 季度配置数组
 let quarterConf = ["第一季度", "第二季度", "第三季度", "第四季度"];
+
 /**
  * 辅助函数：将年度和季度字符串转换为年份和季度序号
  * @param annual "2025第一季度"
@@ -182,6 +183,14 @@ function getYearAndQuarter(annual: string) {
     return { year, quarter };
 }
 
+
+/**
+ * 营收数据添加
+ * @param eId 
+ * @param mId 
+ * @param param 
+ * @returns 
+ */
 export async function updateEnterpriseManageInfo(eId, mId, param) {
     const FuncName = "企业修改企业营收记录"
     eccFormParam(FuncName, EnterpriseManageInfoUpdateConfig, param );

src/config/enum/dbEnum.ts

@@ -48,6 +48,8 @@ export enum TABLENAME {
     租房补贴企业自评="zufang_answer",
     租房补贴答题记录="zufang_answerrecord",
     租房补贴答题记录明细="zufang_answerdetail",
+    企业消息通知表 = "message_notice",
+    企业消息已读状态表 = "message_reads",
     
 }
 
@@ -82,4 +84,6 @@ export enum TABLEID {
     租房补贴企业自评="zaId",
     租房补贴答题记录="zarId",
     租房补贴答题记录明细="zadId",
+    企业消息通知表 = "msg",
+    企业消息已读状态表 = "read",
 } 
\ No newline at end of file

src/config/enum/enum.ts

@@ -80,7 +80,8 @@ export enum EMIGRATIONTYPE {
     毕业迁出 = 1,
     毕业未迁出, //新加状态
     到期退租,
-    违约退租
+    违约退租,
+    到期未迁出
 }
 
 
@@ -257,6 +258,32 @@ export enum BUILDING {
 }
 
 
+// 企业服务状态枚举
+export enum MSGTYPE {
+    // 季度填报相关
+    季度填报提醒 = 1,
+    填报截止提醒 = 2,
+    
+    // 政策相关
+    政策发布 = 3,
+    政策更新 = 4,
+    
+    // 服务相关
+    服务反馈 = 5,
+    服务进度 = 6,
+    
+    // 系统相关
+    系统维护 = 7,
+    系统更新 = 8,
+    
+    // 园区通知
+    园区公告 = 9,
+    活动通知 = 10
+};
+
+
+
+
 /**
  * 知识产权类型其他 前端用
  */

src/config/enum/errorEnum.ts

@@ -35,6 +35,8 @@ export enum ERRORENUM {
     密码不一致,
     密码只能由6至18位字符和数字组成,
     原密码错误,
+    当前无法提交,
+    当前不在填报时间内,
 }
 
 export enum ERRORCODEENUM {

src/routers/enterpriseInfo.ts

@@ -2,7 +2,7 @@
  * 小程序端  企业入口  用户基础功能路由
  */
 
-import * as asyncHandler from 'express-async-handler';
+import asyncHandler = require('express-async-handler');
 import * as enterpriseInfoBiz from '../biz/enterpriseInfo';
 import { checkUser } from '../middleware/user';
 
@@ -325,8 +325,8 @@ async function baseInfo(req, res) {
 
 async function homePageTaskSubmit(req, res) {
     const UserInfo = req.userInfo;
-    let { mId } = req.body; 
-    let result = await enterpriseInfoBiz.submitTask(UserInfo.eId, mId);
+    let { mId, param } = req.body; 
+    let result = await enterpriseInfoBiz.submitTask(UserInfo.eId, mId, param);
 
     res.success(result);
 }
@@ -374,8 +374,8 @@ async function homePageTop(req, res) {
  */
 async function homePageTask(req, res) {
     const UserInfo = req.userInfo;
-    let {state, annual} = req.body
-    let result = await enterpriseInfoBiz.taskList(UserInfo.eId, annual, state);
+    let {annual} = req.body
+    let result = await enterpriseInfoBiz.taskList(UserInfo.eId, annual);
 
     res.success(result);
 }

src/routers/files.ts

@@ -2,7 +2,7 @@
  * 文件管理 路由
  */
 
-import * as asyncHandler from 'express-async-handler';
+import asyncHandler = require('express-async-handler');
 import * as fileBiz from '../biz/file';
 import { checkUser } from '../middleware/user';
 import { parseFormParam } from '../middleware/fromParam';

src/routers/finance.ts

@@ -2,7 +2,7 @@
  * 企业融资
  */
 
-import * as asyncHandler from 'express-async-handler';
+import asyncHandler = require('express-async-handler');
 import * as financeBiz from '../biz/finance';
 import { checkUser } from '../middleware/user';
 

src/routers/gaoxin.ts

@@ -2,7 +2,7 @@
  * 高新企业创新能力评价答题
  */
 
-import * as asyncHandler from 'express-async-handler';
+import asyncHandler = require('express-async-handler');
 import * as gaoxinBiz from '../biz/answer';
 import { checkUser } from '../middleware/user';
 

src/routers/notification.ts

+/**
+ * 企业消息通知
+ */
+
+import asyncHandler = require('express-async-handler');
+import * as massageNoticeBiz from '../biz/massageNotice';
+import { checkUser } from '../middleware/user';
+
+
+export function setRouter(httpServer) {
+    httpServer.post('/xcx/enterprise/massagnotice/list', checkUser, asyncHandler(notificationList));
+    httpServer.post('/xcx/enterprise/massagnotice/markasread', checkUser, asyncHandler(markAsRead));
+    
+}
+
+
+/**
+ * 获取登录用户的企业消息通知列表
+ * @param req 
+ * @param res 
+ */
+async function notificationList(req, res) {
+    const UserInfo = req.userInfo;
+    let result = await massageNoticeBiz.getPopupNotifications(UserInfo.eId);
+
+    res.success(result);
+}
+
+
+/**
+ * 标记通知为已读
+ * @param req 
+ * @param res 
+ */
+async function markAsRead(req, res) {
+    let { msgId, readId } = req.body;
+    const UserInfo = req.userInfo;
+    let result = await massageNoticeBiz.markNotificationAsRead(UserInfo.eId, msgId, readId);
+
+    res.success(result);
+}
+ 
+ 
+ 

src/routers/public.ts

 /**
  * 公共资源路由
  */
-import * as asyncHandler from 'express-async-handler';
+import asyncHandler = require('express-async-handler');
 import * as enumConfig from '../config/enum/enum';
 
 const config = {

src/routers/qualification.ts

@@ -2,7 +2,7 @@
  * 资质
  */
 
-import * as asyncHandler from 'express-async-handler';
+import asyncHandler = require('express-async-handler');
 import * as qualificationBiz from '../biz/qualification';
 import { checkUser } from '../middleware/user';
 

src/routers/router.ts

@@ -9,6 +9,7 @@ import * as qualificationRouters from './qualification';
 import * as financeRouters from './finance';
 import * as gaoxinRouters from './gaoxin';
 import * as filesInfoRouters from './files';
+import * as notificationRouters from './notification';
 
 export function setRouter(httpServer){
     /**下拉框等公用 路由 */
@@ -22,4 +23,6 @@ export function setRouter(httpServer){
     gaoxinRouters.setRouter(httpServer);
 
     filesInfoRouters.setRouter(httpServer);
+
+    notificationRouters.setRouter(httpServer);
 }
\ No newline at end of file

src/routers/teams.ts

@@ -2,7 +2,7 @@
  * 企业团队
  */
 
-import * as asyncHandler from 'express-async-handler';
+import asyncHandler = require('express-async-handler');
 import * as teamsBiz from '../biz/teams';
 import { checkUser } from '../middleware/user';
 

src/tools/system.ts

@@ -92,8 +92,9 @@ export function getLastDeclarationTime() {
  */
 export function getDeclarationTime() {
     let thisYear = new Date().getFullYear();
-    let thisQuarter = moment().quarter();//当月填报季度
-    return {declarationYear:getMySqlMs(`${thisYear}-01-01 00:00:00`), declarationQuarter:thisQuarter};
+    return {declarationYear:getMySqlMs(`${thisYear}-01-01 00:00:00`)};
+    // let thisQuarter = moment().quarter();//当月填报季度
+    // return {declarationYear:getMySqlMs(`${thisYear}-01-01 00:00:00`), declarationQuarter:thisQuarter};
 }
     
 /**