Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

# Conflicts:
#	sql/update.sql

app/controller/stage_controller.js

@@ -338,7 +338,6 @@ module.exports = app => {
                                         ctx.session.sessionUser.accountId : null);
                             responseData.data.cooperation = uid !== null ? await ctx.service.ledgerCooperation.getValidData(
                                 ctx.tender.id, uid) : [];
-                            // responseData.data.cooperationPwd = uid !== null ? await ctx.service.cooperationPwd.getValidData(ctx.tender.id, uid) : [];
                             const stageTimes = (ctx.stage.status === auditConst.status.checkNo && ctx.stage.user_id !== ctx.session.sessionUser.accountId) ? ctx.stage.times - 1 : ctx.stage.times;
                             responseData.data.cooperationConfirm = uid !== null ? await ctx.service.cooperationConfirm.getValidData(ctx.tender.id, ctx.stage.id, stageTimes, uid) : [];
                             break;
@@ -1839,10 +1838,6 @@ module.exports = app => {
                         await ctx.service.cooperationConfirm.del(data.postData);
                         responseData.data.cooperationConfirm = await ctx.service.cooperationConfirm.getValidData(ctx.tender.id, ctx.stage.id, ctx.stage.times, ctx.session.sessionUser.accountId);
                         break;
-                    // case 'save-pwd':
-                    //     const result = await ctx.service.cooperationPwd.save(data.postData);
-                    //     responseData.data.cooperationPwd = await ctx.service.cooperationPwd.getValidData(ctx.tender.id, ctx.session.sessionUser.accountId);
-                    //     break;
                     default:
                         throw '参数有误';
                 }

app/service/cooperation_pwd.js

@@ -1,55 +0,0 @@
-'use strict';
-
-/**
- *
- *
- * @author Mai
- * @date 2018/6/1
- * @version
- */
-
-module.exports = app => {
-    class CooperationPwd extends app.BaseService {
-        /**
-         * 构造函数
-         *
-         * @param {Object} ctx - egg全局变量
-         * @return {void}
-         */
-        constructor(ctx) {
-            super(ctx);
-            this.tableName = 'cooperation_pwd';
-        }
-
-        async save(data) {
-            const info = await this.getDataByCondition({ tid: this.ctx.tender.id, ledger_id: data.ledger_id, uid: this.ctx.session.sessionUser.accountId });
-            if (info) {
-                const updateData = {
-                    id: info.id,
-                    pwd: data.pwd,
-                    create_time: new Date(),
-                };
-                return await this.db.update(this.tableName, updateData);
-            }
-            const insertData = {
-                tid: this.ctx.tender.id,
-                uid: this.ctx.session.sessionUser.accountId,
-                ledger_id: data.ledger_id,
-                pwd: data.pwd,
-                create_time: new Date(),
-            };
-            return await this.db.insert(this.tableName, insertData);
-        }
-
-        async getValidData(tid, uid) {
-            const condition = { where: { tid } };
-            if (uid) {
-                condition.where.uid = uid;
-                condition.colums = ['ledger_id', 'pwd'];
-            }
-            return await this.getAllDataByCondition(condition);
-        }
-    }
-
-    return CooperationPwd;
-};

sql/update.sql

@@ -392,3 +392,15 @@ ADD COLUMN `dagl_ratio`  decimal(6,4) NOT NULL DEFAULT 0 COMMENT '允许计量
 --更新归档结构
 ALTER TABLE `calculation`.`zh_rpt_archive`
 CHANGE COLUMN `archive_id` `id` INT(11) NOT NULL AUTO_INCREMENT ;
+
+--
+-- 表的结构 `zh_tender_tourist`
+--
+
+CREATE TABLE `zh_tender_tourist` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tid` int(11) NOT NULL COMMENT '标段id',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `in_time` datetime DEFAULT NULL COMMENT '添加时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='标段游客表';