Browse Source

修改回报反馈,仅创建人可见,并修改小红点计数

xubin.jiang 7 months ago
parent
commit
9e49fd8d58
2 changed files with 20 additions and 5 deletions
  1. 11 2
      src/controller/matter.js
  2. 9 3
      src/controller/msg/prompt.js

+ 11 - 2
src/controller/matter.js

@@ -72,7 +72,11 @@ module.exports = class extends Base {
         it['url'] = it['url'] ? it['url'].join(',') : "";
         it['contentClassify'] = it['contentClassify'].toString();
         it['contentClassifyID'] = it['contentClassifyID'].toString(); // 问题分类可能多选,多选的话是数组,所以转字符串,单选依旧是字符串
-        it['ccmID'] = it.contentClassifyID.substr(0,3) === "003" ? it.contentClassifyMainID : it.contentClassifyID; // 用于统计的问题分类字段,纪检监察类取主要分类,其他取contentClassifyID
+        it['ccmID'] = it.contentClassifyID.substr(0,3) === "003" ?
+          (it.contentClassifyMainID === null ? it.contentClassifyID.split(",")[0] : it.contentClassifyMainID) : it.contentClassifyID; // 用于统计的问题分类字段,纪检监察类取主要分类,其他取contentClassifyID
+
+        // it['isMeeting'] = userInfo.meetingID === null ? 1 : 0;//是否大会 0大会 1不是大会
+        // it['meetingID'] = userInfo.meetingID;//大会届次
         // 办理方式记录
         handleLog.push({
           "matterID":it.id,
@@ -190,6 +194,9 @@ module.exports = class extends Base {
         it['createAccount'] = userInfo.user_name;
         it['createOrgID'] = userInfo.orgID;//创建机构ID
         it['createOrg'] = userInfo.orgName;//创建机构
+
+        // it['isMeeting'] = userInfo.meetingID === null ? 1 : 0;//是否大会 0大会 1不是大会
+        // it['meetingID'] = userInfo.meetingID;//大会届次
         // 办理方式记录
         handleLog.push({
           "matterID":it.id,
@@ -598,6 +605,7 @@ module.exports = class extends Base {
       case 12:// 已存信
       case 14:// 已自办待关闭
         where["fw.deptID_now"] = userInfo.orgID;
+        where["fw.c_creater"] = data.userId;//24-03-29修改为,仅创建人可见
         break;
       case 24://登记
       case 3://拟函审批
@@ -620,7 +628,8 @@ module.exports = class extends Base {
           //仅仅查询代理
           where['fw.agent'] = data.agent
         } else {
-          where["fw.deptID_now"] =  userInfo.orgID
+          where["fw.deptID_now"] = userInfo.orgID;
+          where["fw.c_creater"] = data.userId;//24-03-29修改为,仅创建人可见
         }
         // where["_complex"] = {
         //   "fw.deptID_now": userInfo.orgID,

+ 9 - 3
src/controller/msg/prompt.js

@@ -449,7 +449,7 @@ module.exports = class extends Base {
       back['ldsp_all'] = back.ld_qsZ +  back.ld_xsZ;
       return this.success(back);// 职能单位,直接返回
     }
-    let sql_deptID = 'SELECT fw_task.businessID,COUNT(*) AS count FROM matter LEFT JOIN fw_task ON fw_task.id = matter.taskid ' +
+    let sql_deptID = 'SELECT c_creater,fw_task.businessID,COUNT(*) AS count FROM matter LEFT JOIN fw_task ON fw_task.id = matter.taskid ' +
       'WHERE fw_task.businessID IN (22,21,17,13,2,32,4,8,26,29,37,23,20,18,10,11,12,14) AND fw_task.deptID_now = "'+ userInfo.orgID +'" GROUP BY fw_task.businessID';
     let sqlDeptID = await this.model('matter').query(sql_deptID);
     sqlDeptID.forEach(function(item) {
@@ -461,10 +461,16 @@ module.exports = class extends Base {
           back.qb_bl = back.qb_bl + item.count;
           break;
         case 17:
-          back.hb_hb = back.hb_hb + item.count;
+          if (item.c_creater === data.userId){
+            back.hb_hb = back.hb_hb + item.count;
+          }// 24-03-29修改
+          // back.hb_hb = back.hb_hb + item.count;
           break;
         case 13:
-          back.hb_zb = back.hb_zb + item.count;
+          if (item.c_creater === data.userId){
+            back.hb_zb = back.hb_zb + item.count;
+          }// 24-03-29修改
+          // back.hb_zb = back.hb_zb + item.count;
           break;
         case 2:
         case 32: