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

modules/ration_repository/models/ration_item.js

@@ -356,7 +356,8 @@ rationItemDAO.prototype.mixUpdateRationItems = function(rationLibId, lastOpr, se
                 callback(true, "Fail to remove", false);
             } else {
                 me.updateRationItems(rationLibId, lastOpr, sectionId, updateItems, function(err, results){
-                    if (err) {
+                  if (err) {
+                        console.log(err);
                         callback(true, "Fail to save", false);
                     } else {
                         if (addItems && addItems.length > 0) {

modules/sys_tools/models/sys_model.js

@@ -11,7 +11,7 @@
 import mongoose from 'mongoose';
 import async from 'async';
 import moment from 'moment';
-const SMS = require('../../users/models/sms');
+// const SMS = require('../../users/models/sms');
 const projectModel = mongoose.model('projects');
 const projSettingModel = mongoose.model('proj_setting');
 const calcProgramModel = mongoose.model('calc_programs');
@@ -36,7 +36,7 @@ const bidListModel = mongoose.model("bid_evaluation_list");
 const contractorListModel = mongoose.model("contractor_list");
 const shareListModel = mongoose.model('share_list');
 const userModel = mongoose.model('users');
-const compilationModel = mongoose.model('compilation');
+// const compilationModel = mongoose.model('compilation');
 
 
 //删除垃圾数据
@@ -222,44 +222,44 @@ async function checkUserCompilationStatus(callback) {
 /*
 * 为每天降为免费公用版的用户发送降级短信。
 * */
-async function sendCompilationStatusSms(callback) {
-    let functions = [];
-    let today = moment(new Date()).format('YYYY-MM-DD');
-    let userList = await userModel.find({upgrade_list: {$elemMatch:{ deadline: today }}});
-    if (userList.length > 0) {
-        const Sms = new SMS();
-        for (let user of userList) {
-            let ssoId = JSON.parse(JSON.stringify(user)).ssoId;
-            for (let cul of user.upgrade_list) {
-                if (cul.deadline === today) {
-                    cul.deadline = '';
-                    // cul.isUpgrade = false;
-                    // 发送短信
-                    let compilationData = await compilationModel.findOne({_id: cul.compilationID});
-                    await Sms.sendProductMsg(user.mobile, 2, user.real_name, compilationData.name, '');
-                }
-            }
-            functions.push(function (cb) {
-                userModel.update({ssoId: ssoId}, {upgrade_list: user.upgrade_list}, { safe: true }, cb);
-            });
-        }
-    }
-    if(functions.length > 0){
-        async.parallel(functions, async function(err, result){
-            if(callback){
-                callback(err);
-            }
-        });
-    } else {
-        if(callback) callback(0);
-    }
-}
+// async function sendCompilationStatusSms(callback) {
+//     let functions = [];
+//     let today = moment(new Date()).format('YYYY-MM-DD');
+//     let userList = await userModel.find({upgrade_list: {$elemMatch:{ deadline: today }}});
+//     if (userList.length > 0) {
+//         const Sms = new SMS();
+//         for (let user of userList) {
+//             // let ssoId = JSON.parse(JSON.stringify(user)).ssoId;
+//             for (let cul of user.upgrade_list) {
+//                 if (cul.deadline === today) {
+//                     // cul.deadline = '';
+//                     // cul.isUpgrade = false;
+//                     // 发送短信
+//                     let compilationData = await compilationModel.findOne({_id: cul.compilationID});
+//                     await Sms.sendProductMsg(user.mobile, 2, user.real_name, compilationData.name, '');
+//                 }
+//             }
+//             // functions.push(function (cb) {
+//             //     userModel.update({ssoId: ssoId}, {upgrade_list: user.upgrade_list}, { safe: true }, cb);
+//             // });
+//         }
+//     }
+//     if(functions.length > 0){
+//         async.parallel(functions, async function(err, result){
+//             if(callback){
+//                 callback(err);
+//             }
+//         });
+//     } else {
+//         if(callback) callback(0);
+//     }
+// }
 
 const sysSchedule = {
     clearJunkData,
     clearFakeData,
     checkUserCompilationStatus,
-    sendCompilationStatusSms,
+    // sendCompilationStatusSms,
 };
 
 //export {sysSchedule as default}

operation.js

@@ -119,16 +119,16 @@ schedule.scheduleJob({hour: 0, minute: 1}, function(){
     })
 });
 
-schedule.scheduleJob({hour: 10, minute: 0}, function(){
-    sysSchedule.sendCompilationStatusSms(function (err) {
-        if(err){
-            console.log('短信发送失败');
-        }
-        else{
-            console.log('短信发送成功');
-        }
-    })
-});
+// schedule.scheduleJob({hour: 10, minute: 0}, function(){
+//     sysSchedule.sendCompilationStatusSms(function (err) {
+//         if(err){
+//             console.log('短信发送失败');
+//         }
+//         else{
+//             console.log('短信发送成功');
+//         }
+//     })
+// });
 
 app.listen(6080, function () {
     console.log("server started!");

web/maintain/ration_repository/js/ration.js

@@ -465,7 +465,7 @@ let rationOprObj = {
 
                         }
                     }
-                    else if(dataCode === 'feeType'){//取费专业控制为整数
+                    else if (dataCode === 'feeType') {//取费专业控制为整数    
                         if(me.isInt(rObj[dataCode])){
                             updateArr.push(rObj);
                         }