暂时先屏蔽需要你关注内容

app/service/ledger_audit.js

@@ -378,14 +378,13 @@ module.exports = app => {
         async getNoticeTender(projectId, auditorId, noticeTime) {
             const sql = 'SELECT la.`audit_id`, la.`times`, la.`audit_order`, la.`end_time`, la.`status`, t.`id`, t.`name`, t.`project_id`, t.`type`, t.`user_id`, ' +
                         '    pa.name As `lu_name`, pa.role As `lu_role`, pa.company As `lu_company`' +
-                        '  FROM ?? As t ' +
+                        '  FROM (SELECT * FROM ?? WHERE `user_id` = ? OR `id` in (SELECT `tender_id` FROM ?? WHERE `audit_id` = ? GROUP BY `tender_id`)) As t ' +
                         '  LEFT JOIN ?? As la ON la.`tender_id` = t.`id`' +
                         '  LEFT JOIN ?? As pa ON la.`audit_id` = pa.`id`' +
-                        '  WHERE la.`audit_id` <> ? and la.`end_time` > ? and t.`project_id` = ?' +
-                        '  GROUP By t.`id`' +
-                        '  ORDER By la.`end_time`';
-            const sqlParam = [this.ctx.service.tender.tableName, this.tableName, this.ctx.service.projectAccount.tableName,
-                auditorId, noticeTime, projectId];
+                        '  WHERE la.`end_time` > ? and t.`project_id` = ?' +
+                        '  ORDER By la.`end_time` DESC';
+            const sqlParam = [this.ctx.service.tender.tableName, auditorId, this.tableName, auditorId, this.tableName, this.ctx.service.projectAccount.tableName,
+                noticeTime, projectId];
             return await this.db.query(sql, sqlParam);
         }
     }

app/view/dashboard/index.ejs

@@ -157,96 +157,96 @@
                     <div class="card">
                         <div class="card-header">需要你关注</div>
                         <div class="card-body">
-                            <% if (noticeLedger.length !== 0 || noticeRevise.length !== 0 || noticeStage.length !== 0 || noticeChange.length !== 0 || noticeMaterial.length !== 0) { %>
-                                <ul class="list-unstyled m-0">
-                                    <% for (const nl of noticeLedger) { %>
-                                        <li class="media pb-3 mb-3 border-bottom-1">
-                                            <div class="media-body">
-                                                <div class="row">
-                                                    <div class="col-auto"><span class="badge badge-info">台帐审批</span></div>
-                                                    <div class="col-6">
-                                                        <a href="/tender/<%- nl.id %>"><%- nl.name %></a> 台帐<%- acLedger.statusString[nl.status]%>
-                                                    </div>
-                                                </div>
-                                                <p class="mt-1 mb-0"><%- nl.lu_name %><small class="ml-1 text-muted"><%- (nl.lu_role ? '- ' + nl.role : '') %></small>
-                                                    <span class="pull-right text-muted"><%- nl.end_time.toLocaleString() %></span>
-                                                </p>
-                                            </div>
-                                        </li>
-                                    <% } %>
-                                    <% for (const nr of noticeRevise) { %>
-                                        <li class="media pb-3 mb-3 border-bottom-1">
-                                            <div class="media-body">
-                                                <div class="row">
-                                                    <div class="col-auto"><span class="badge badge-info">台账修订</span></div>
-                                                    <div class="col-6">
-                                                        <a href="/tender/<%- nr.id %>>"><%- nr.name %></a>
-                                                        <a href="/tender/<%- nr.t_id %>/revise/info">台账修订(第<%- nr.corder %>次)</a>
-                                                        <%- acRevise.statusString[nr.status]%>
-                                                    </div>
-                                                </div>
-                                                <p class="mt-1 mb-0"><%- nr.ru_name %><small class="ml-1 text-muted"><%- (nr.ru_role ? '- ' + nr.ru_role : '') %></small>
-                                                    <span class="pull-right text-muted"><%- (nr.end_time ? nr.end_time.toLocaleString() : '') %></span>
-                                                </p>
-                                            </div>
-                                        </li>
-                                    <% } %>
-                                    <% for (const ns of noticeStage) { %>
-                                        <li class="media pb-3 mb-3 border-bottom-1">
-                                            <div class="media-body">
-                                                <div class="row">
-                                                    <div class="col-auto"><span class="badge badge-success">计量审批</span></div>
-                                                    <div class="col-6">
-                                                        <a href="/tender/<%- ns.tid %>"><%- ns.name %></a>
-                                                        <a href="/tender/<%- ns.tid %>/measure/stage/<%- ns.s_order %>">第<%- ns.s_order %>期 </a>
-                                                        <%- acStage.statusString[ns.status]%>
-                                                    </div>
-                                                </div>
-                                                <p class="mt-1 mb-0"><%- ns.su_name %><small class="ml-1 text-muted"><%- (ns.su_role ? '- ' + ns.su_role : '') %></small>
-                                                    <span class="pull-right text-muted"><%- ns.end_time.toLocaleString() %></span>
-                                                </p>
-                                            </div>
-                                        </li>
-                                    <% } %>
-                                    <% for (const nc of noticeChange) { %>
-                                        <li class="media pb-3 mb-3 border-bottom-1">
-                                            <div class="media-body">
-                                                <div class="row">
-                                                    <div class="col-auto"><span class="badge badge-danger">变更审批</span></div>
-                                                    <div class="col-6">
-                                                        <a href="/tender/<%- nc.id %>"><%- nc.name %></a>
-                                                        <a href="/tender/<%- nc.id %>/change/<%- nc.cid %>/info"><%- nc.c_code %> </a>
-                                                        <%- acChange.statusString[nc.cu_status]%>
-                                                    </div>
-                                                </div>
-                                                <p class="mt-1 mb-0"><%- nc.cu_name %><small class="ml-1 text-muted"><%- (nc.cu_role ? '- ' + nc.cu_role : '') %></small>
-                                                    <span class="pull-right text-muted"><%- nc.cu_time.toLocaleString() %></span>
-                                                </p>
-                                            </div>
-                                        </li>
-                                    <% } %>
-                                    <% for (const nm of noticeMaterial) { %>
-                                        <li class="media pb-3 mb-3 border-bottom-1">
-                                            <div class="media-body">
-                                                <div class="row">
-                                                    <div class="col-auto"><span class="badge badge-secondary">材料调差</span></div>
-                                                    <div class="col-6">
-                                                        <a href="/tender/<%- nm.tid %>"><%- nm.name %></a>
-                                                        <a href="/tender/<%- nm.tid %>/measure/stage/<%- nm.m_order %>">第<%- nm.m_order %>期 </a>
-                                                        <%- acStage.statusString[nm.status]%>
-                                                    </div>
-                                                </div>
-                                                <p class="mt-1 mb-0"><%- nm.su_name %><small class="ml-1 text-muted"><%- (nm.su_role ? '- ' + nm.su_role : '') %></small>
-                                                    <span class="pull-right text-muted"><%- nm.end_time.toLocaleString() %></span>
-                                                </p>
-                                            </div>
-                                        </li>
-                                    <% } %>
-                                </ul>
-                                <% } else { %>
+                            <!--<% if (noticeLedger.length !== 0 || noticeRevise.length !== 0 || noticeStage.length !== 0 || noticeChange.length !== 0 || noticeMaterial.length !== 0) { %>-->
+                                <!--<ul class="list-unstyled m-0">-->
+                                    <!--<% for (const nl of noticeLedger) { %>-->
+                                        <!--<li class="media pb-3 mb-3 border-bottom-1">-->
+                                            <!--<div class="media-body">-->
+                                                <!--<div class="row">-->
+                                                    <!--<div class="col-auto"><span class="badge badge-info">台帐审批</span></div>-->
+                                                    <!--<div class="col-6">-->
+                                                        <!--<a href="/tender/<%- nl.id %>"><%- nl.name %></a> 台帐<%- acLedger.statusString[nl.status]%>-->
+                                                    <!--</div>-->
+                                                <!--</div>-->
+                                                <!--<p class="mt-1 mb-0"><%- nl.lu_name %><small class="ml-1 text-muted"><%- (nl.lu_role ? '- ' + nl.lu_role : '') %></small>-->
+                                                    <!--<span class="pull-right text-muted"><%- nl.end_time.toLocaleString() %></span>-->
+                                                <!--</p>-->
+                                            <!--</div>-->
+                                        <!--</li>-->
+                                    <!--<% } %>-->
+                                    <!--<% for (const nr of noticeRevise) { %>-->
+                                        <!--<li class="media pb-3 mb-3 border-bottom-1">-->
+                                            <!--<div class="media-body">-->
+                                                <!--<div class="row">-->
+                                                    <!--<div class="col-auto"><span class="badge badge-info">台账修订</span></div>-->
+                                                    <!--<div class="col-6">-->
+                                                        <!--<a href="/tender/<%- nr.id %>>"><%- nr.name %></a>-->
+                                                        <!--<a href="/tender/<%- nr.t_id %>/revise/info">台账修订(第<%- nr.corder %>次)</a>-->
+                                                        <!--<%- acRevise.statusString[nr.status]%>-->
+                                                    <!--</div>-->
+                                                <!--</div>-->
+                                                <!--<p class="mt-1 mb-0"><%- nr.ru_name %><small class="ml-1 text-muted"><%- (nr.ru_role ? '- ' + nr.ru_role : '') %></small>-->
+                                                    <!--<span class="pull-right text-muted"><%- (nr.end_time ? nr.end_time.toLocaleString() : '') %></span>-->
+                                                <!--</p>-->
+                                            <!--</div>-->
+                                        <!--</li>-->
+                                    <!--<% } %>-->
+                                    <!--<% for (const ns of noticeStage) { %>-->
+                                        <!--<li class="media pb-3 mb-3 border-bottom-1">-->
+                                            <!--<div class="media-body">-->
+                                                <!--<div class="row">-->
+                                                    <!--<div class="col-auto"><span class="badge badge-success">计量审批</span></div>-->
+                                                    <!--<div class="col-6">-->
+                                                        <!--<a href="/tender/<%- ns.tid %>"><%- ns.name %></a>-->
+                                                        <!--<a href="/tender/<%- ns.tid %>/measure/stage/<%- ns.s_order %>">第<%- ns.s_order %>期 </a>-->
+                                                        <!--<%- acStage.statusString[ns.status]%>-->
+                                                    <!--</div>-->
+                                                <!--</div>-->
+                                                <!--<p class="mt-1 mb-0"><%- ns.su_name %><small class="ml-1 text-muted"><%- (ns.su_role ? '- ' + ns.su_role : '') %></small>-->
+                                                    <!--<span class="pull-right text-muted"><%- ns.end_time.toLocaleString() %></span>-->
+                                                <!--</p>-->
+                                            <!--</div>-->
+                                        <!--</li>-->
+                                    <!--<% } %>-->
+                                    <!--<% for (const nc of noticeChange) { %>-->
+                                        <!--<li class="media pb-3 mb-3 border-bottom-1">-->
+                                            <!--<div class="media-body">-->
+                                                <!--<div class="row">-->
+                                                    <!--<div class="col-auto"><span class="badge badge-danger">变更审批</span></div>-->
+                                                    <!--<div class="col-6">-->
+                                                        <!--<a href="/tender/<%- nc.id %>"><%- nc.name %></a>-->
+                                                        <!--<a href="/tender/<%- nc.id %>/change/<%- nc.cid %>/info"><%- nc.c_code %> </a>-->
+                                                        <!--<%- acChange.statusString[nc.cu_status]%>-->
+                                                    <!--</div>-->
+                                                <!--</div>-->
+                                                <!--<p class="mt-1 mb-0"><%- nc.cu_name %><small class="ml-1 text-muted"><%- (nc.cu_role ? '- ' + nc.cu_role : '') %></small>-->
+                                                    <!--<span class="pull-right text-muted"><%- nc.cu_time.toLocaleString() %></span>-->
+                                                <!--</p>-->
+                                            <!--</div>-->
+                                        <!--</li>-->
+                                    <!--<% } %>-->
+                                    <!--<% for (const nm of noticeMaterial) { %>-->
+                                        <!--<li class="media pb-3 mb-3 border-bottom-1">-->
+                                            <!--<div class="media-body">-->
+                                                <!--<div class="row">-->
+                                                    <!--<div class="col-auto"><span class="badge badge-secondary">材料调差</span></div>-->
+                                                    <!--<div class="col-6">-->
+                                                        <!--<a href="/tender/<%- nm.tid %>"><%- nm.name %></a>-->
+                                                        <!--<a href="/tender/<%- nm.tid %>/measure/stage/<%- nm.m_order %>">第<%- nm.m_order %>期 </a>-->
+                                                        <!--<%- acStage.statusString[nm.status]%>-->
+                                                    <!--</div>-->
+                                                <!--</div>-->
+                                                <!--<p class="mt-1 mb-0"><%- nm.su_name %><small class="ml-1 text-muted"><%- (nm.su_role ? '- ' + nm.su_role : '') %></small>-->
+                                                    <!--<span class="pull-right text-muted"><%- nm.end_time.toLocaleString() %></span>-->
+                                                <!--</p>-->
+                                            <!--</div>-->
+                                        <!--</li>-->
+                                    <!--<% } %>-->
+                                <!--</ul>-->
+                                <!--<% } else { %>-->
                                 <!--没有关注信息-->
                                 <p class="text-center text-muted">暂时没有需要你关注的事项。</p>
-                                <% } %>
+                                <!--<% } %>-->
                         </div>
                     </div>
                 </div>