Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/all_models/user.js

@@ -26,10 +26,11 @@ const versionSchema = new Schema({
 });
 
 let upgrade = mongoose.Schema({
-    compilationID:String,//编办ID
+    compilationID:String,// 编办ID
     upgrade_time:Number,
     isUpgrade:Boolean,
-    remark:String//描述：广东办刘飞 2018-06-17 启用/关闭
+    remark:String,// 描述：广东办刘飞 2018-06-17 启用/关闭
+    deadline: String,
 }, { _id: false })
 
 const userdList = mongoose.Schema({

modules/users/controllers/cld_controller.js

@@ -12,6 +12,7 @@ import CLDModel from "../models/cld_model";
 import UserModel from "../models/user_model"
 import CompilationModel from "../models/compilation_model";
 let online_facade = require('../facade/online_facade')
+const SMS = require('../models/sms');
 
 class CLDController {
 
@@ -106,6 +107,9 @@ class CLDController {
     async setUsersUpgrade(request, response) {
         let ssoID = request.body.ssoId;
         let compilationID = request.body.cid;
+        let deadline = request.body.deadline || '';
+        let status = parseInt(request.body.status);
+        let smssend = parseInt(request.body.smssend);
         try {
 
             let userModel = new UserModel();
@@ -114,7 +118,7 @@ class CLDController {
 
             let compilationModel = new CompilationModel();
 
-            let compilationData = compilationModel.getCompilationById(compilationID);
+            let compilationData = await compilationModel.getCompilationById(compilationID);
 
             if (compilationData === null || compilationData === undefined) {
                 throw '不存在该编办或者编办未发布';
@@ -125,12 +129,12 @@ class CLDController {
             let upgradeIndex = upgrade_list.findIndex(function (item) {
                 return item.compilationID === compilationID
             });
-
             let upgradeInfo = {
                 compilationID:compilationID,//编办ID
                 upgrade_time:new Date().getTime(),
-                isUpgrade:true,
-                remark: ''
+                isUpgrade: status !== 2,
+                remark: '',
+                deadline: deadline,
             };
 
             if (upgradeIndex === -1) {
@@ -143,6 +147,12 @@ class CLDController {
             let result = await userModel.updateUser(condition, {upgrade_list: upgrade_list});
 
             if (result) {
+                // 短信发送
+                if (smssend) {
+                    // 发送短信
+                    const Sms = new SMS();
+                    await Sms.sendProductMsg(userData.mobile, status, userData.real_name, compilationData.name, deadline);
+                }
                 response.json({error: 0, msg: 'success'});
             } else {
                 throw '更新失败';

modules/users/models/sms.js

@@ -111,6 +111,51 @@ class SMS {
         }
     }
 
+    async sendProductMsg(mobile, status, name, product, deadline) {
+        try {
+            let templateId = 0;
+            switch (status) {
+                case 1: templateId = 746377;break;// 产品升级通知
+                case 2: templateId = 746376;break;// 产品降级通知
+                case 3: templateId = 746378;break;// 产品延期通知
+            }
+            const formData = {
+                smsUser: this.smsUser,
+                templateId: templateId,
+                msgType: 0,
+                phone: mobile,
+            };
+            formData.vars = '{"%name%": "' + name + '", "%product%": "' + product + '"' + (status !== 2 ? ', "%deadline%": "' + deadline + '"' : '') +'}';
+            const signature = await this.getSignature(this.sortDict(formData), this.smskey);
+            formData.signature = signature;
+
+            let postData = {
+                url: this.url,
+                form: formData,
+                encoding: 'utf8'
+            };
+
+            return new Promise(function (resolve, reject) {
+                try {
+                    // 请求接口
+                    Request.post(postData, function (err, postResponse, body) {
+                        if (err) {
+                            throw '请求错误';
+                        }
+                        if (postResponse.statusCode !== 200) {
+                            throw '短信发送失败！';
+                        }
+                        resolve(body);
+                    });
+                } catch (error) {
+                    reject([]);
+                }
+            });
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
     md5(data) {
         var str = data;
         return crypto.createHash("md5").update(str).digest("hex");

web/building_saas/main/js/models/calc_program.js

@@ -198,7 +198,7 @@ let calcTools = {
         if (!feeObj) return;
         if (feeObj.fieldName == '') return;
 
-        // 初始化前，先拦截属性末定义、又要给该属性赋0的情况
+        // 初始化前，先拦截属性未定义、又要给该属性赋0的情况
         if (!treeNode.data.feesIndex || !treeNode.data.feesIndex[feeObj.fieldName]){
             if (feeObj.unitFee == 0 && feeObj.totalFee == 0 && feeObj.tenderUnitFee == 0 && feeObj.tenderTotalFee == 0) return;
         }
@@ -1779,8 +1779,10 @@ class CalcProgram {
             calcTools.getGLJList(treeNode, true);
             nodes = me.project.Ration.getRationNodes(treeNode);
         }
-        else if (commonCalcType == 2)
-            nodes = treeNode.children
+        else if (commonCalcType == 2){  // 固定清单 "材料(工程设备)暂估价" 比较特殊，不进行父项汇总（需求是这么要求的）
+            // nodes = treeNode.children
+            nodes = me.project.Bills.getGatherNodes(treeNode);
+        }
         else if (commonCalcType == 3)
             nodes = treeNode.children;
 
@@ -1788,6 +1790,11 @@ class CalcProgram {
             return ['labour', 'material', 'machine', 'mainMaterial', 'equipment'].indexOf(type) > -1;
         };
 
+        let nQ = calcTools.uiNodeQty(treeNode);
+        let nTQ = calcTools.uiNodeTenderQty(treeNode);
+        let bq = nQ ? nQ : 1;
+        let btq = nTQ ? nTQ : 1;
+
         let rst = [];
         for (let ft of cpFeeTypes) {
             let ftObj = {};
@@ -1795,11 +1802,6 @@ class CalcProgram {
             ftObj.name = ft.name;
             let buf = 0, btf = 0, btuf = 0, bttf = 0;
 
-            let nQ = calcTools.uiNodeQty(treeNode);
-            let nTQ = calcTools.uiNodeTenderQty(treeNode);
-            let bq = nQ ? nQ : 1;
-            let btq = nTQ ? nTQ : 1;
-
             if (commonCalcType == 2){
                 for (let node of nodes) {
                     if (node.data.feesIndex && node.data.feesIndex[ft.type]) {