变更令，终审人信息缓存

app/controller/change_controller.js

@@ -61,14 +61,22 @@ module.exports = app => {
             const tp = await ctx.service.change.getTp(tender.id, status);
             if (changes !== null) {
                 for (const c of changes) {
-                    c.curAuditors = await ctx.service.changeAudit.getAuditorsByStatus(c.cid, c.status, c.times);
-                    if (c.status === audit.change.status.checkNoPre) {
-                        c.curAuditors2 = await ctx.service.stageAudit.getAuditorsByStatus(c.cid, audit.change.status.checking, c.times);
-                    }
-                    if (c.status === audit.change.status.checkNo || c.status === audit.change.status.revise) {
-                        const changeUsedData = await ctx.service.stageChange.getAllFinalUsedData(ctx.tender.id, c.cid);
-                        c.stageChangeNum = this.ctx.helper.sum(changeUsedData.map(x => { return Math.abs(x.qty); }));
-                        c.isSettle = await ctx.service.changeSettleList.isSettle(c.cid);
+                    if (c.status !== audit.change.status.checked || !c.final_auditor_str) {
+                        c.curAuditors = await ctx.service.changeAudit.getAuditorsByStatus(c.cid, c.status, c.times);
+                        if (c.status === audit.change.status.checkNoPre) {
+                            c.curAuditors2 = await ctx.service.stageAudit.getAuditorsByStatus(c.cid, audit.change.status.checking, c.times);
+                        }
+                        if (c.status === audit.change.status.checkNo || c.status === audit.change.status.revise) {
+                            const changeUsedData = await ctx.service.stageChange.getAllFinalUsedData(ctx.tender.id, c.cid);
+                            c.stageChangeNum = this.ctx.helper.sum(changeUsedData.map(x => { return Math.abs(x.qty); }));
+                            c.isSettle = await ctx.service.changeSettleList.isSettle(c.cid);
+                        }
+                        if (c.status === audit.change.status.checked && c.curAuditors.length > 0) {
+                            const final_auditor_str = c.curAuditors[0].audit_type === auditType.key.common
+                                ? c.curAuditors[0].name + (c.curAuditors[0].role ? '-' + c.curAuditors[0].role : '')
+                                : ctx.helper.transFormToChinese(c.curAuditors[0].audit_order) + '审';
+                            await ctx.service.change.defaultUpdate({ final_auditor_str }, { where: { cid: c.cid } });
+                        }
                     }
                     page_total = ctx.helper.add(page_total, c.total_price);
                 }

app/view/change/index.ejs

@@ -135,7 +135,9 @@
                             <% } %>
                         </td>
                         <td class="<%- auditConst.auditProgressClass[c.status] %>">
-                            <% if (c.curAuditors.length > 0) { %>
+                            <% if (c.status === auditConst.status.checked && c.final_auditor_str) { %>
+                                <a href="#sp-list" data-toggle="modal" data-target="#sp-list" c-id="<%- c.cid %>"><%- c.final_auditor_str %></a>
+                            <% } else if (c.curAuditors.length > 0) { %>
                                 <% if (c.curAuditors[0].audit_type === auditType.key.common) { %>
                                     <a href="#sp-list" data-toggle="modal" data-target="#sp-list" c-id="<%- c.cid %>"><%- c.curAuditors[0].name %><%if (c.curAuditors[0].role !== '' && c.curAuditors[0].role !== null) { %>-<%- c.curAuditors[0].role %><% } %></a>
                                 <% } else { %>

config/config.remoteprod.js

@@ -0,0 +1,77 @@
+'use strict';
+/**
+ * 开发环境相关配置
+ *
+ * @author CaiAoLin
+ * @date 2017/8/29
+ * @version
+ */
+
+module.exports = appInfo => {
+    const config = {};
+    // 数据库配置
+    config.mysql = {
+        client: {
+            // host
+            host: 'rm-wz9ae9t6qopwrday6po.mysql.rds.aliyuncs.com',
+            // 端口号
+            port: '3306',
+            // 用户名
+            user: 'zh_calc',
+            // 密码
+            password: 'Zh@)!(3850Calc',
+            // 数据库名
+            database: 'calculation',
+            multipleStatements: true,
+        },
+        // 是否加载到 app 上，默认开启
+        app: true,
+        // 是否加载到 agent 上，默认关闭
+        agent: false,
+    };
+    // 表名前缀
+    config.tablePrefix = 'zh_';
+
+    // redis设置
+    config.redis = {
+        client: {
+            host: '192.168.1.76',
+            port: '6379',
+            password: 'zongheng2019',
+            db: '0',
+        },
+        agent: true,
+    };
+
+    // session配置
+    config.session = {
+        key: 'ZHC_SESS',
+        maxAge: 7 * 24 * 3600 * 1000, // 7天
+        httpOnly: true,
+        encrypt: true,
+        //renew: true, // session临近过期更新过期时间
+        rolling: true, // 每次都更新session有效期
+    };
+
+    config.oss = {
+        clients: {
+            signPdf: {
+                bucket: 'measure-sign-pdf',
+            },
+            fujian: {
+                bucket: 'jiliang-qa',
+            },
+        },
+        default: {
+            accessKeyId: 'LTAIALMjBHOs9PLA',
+            accessKeySecret: 'HSnULQs87wAJhcziAdyRv3GZ4EYctc',
+            endpoint: 'oss-cn-shenzhen.aliyuncs.com',
+            timeout: '60s',
+        },
+    };
+
+    config.fujianOssPath = 'https://jiliang-qa-oss.smartcost.com.cn/uat/';
+    config.fujianOssFolder = 'uat/';
+
+    return config;
+};

package.json

@@ -76,6 +76,7 @@
         "dev-local": "set EGG_SERVER_ENV=local&&egg-bin dev --port 7002",
         "dev-remoteqa": "set EGG_SERVER_ENV=remoteqa&&egg-bin dev --port 7002",
         "dev-remoteuat": "set EGG_SERVER_ENV=remoteuat&&egg-bin dev --port 7002",
+        "dev-remoteprod": "set EGG_SERVER_ENV=remoteprod&&egg-bin dev --port 7002",
         "dev-localpro": "set EGG_SERVER_ENV=localpro&&egg-bin dev --port 7002",
         "dev-temp": "set EGG_SERVER_ENV=temp&&egg-bin dev --port 7002",
         "dev-qa": "set EGG_SERVER_ENV=qa&&egg-bin dev --port 7002",

sql/update.sql

@@ -41,3 +41,6 @@ ADD COLUMN `final_auditor_str` varchar(50) NOT NULL DEFAULT '' COMMENT '终审
 
 ALTER TABLE `zh_global_log`
 ADD COLUMN `memo` varchar(255) NOT NULL DEFAULT '' AFTER `run_time`;
+
+ALTER TABLE `zh_change`
+ADD COLUMN `final_auditor_str` varchar(50) NOT NULL DEFAULT '' COMMENT '终审人相关（cache）' AFTER `sp_group`;