Merge remote-tracking branch 'origin/1.0.0_online' into 1.0.0_online

modules/reports/util/rpt_construct_data_util.js

@@ -551,7 +551,8 @@ function filterData(sourceData, handleCfg, prjData) {
         let rst = false;
         if (arr.length > 0) {
             for (let arrItem of arr) {
-                if (arrItem[key]) {
+                if (arrItem[key] !== undefined) {
+                    // 可以为null值去判断
                     rst = private_chkVal(arrItem[key], compVal, compStr);
                 }
                 if (rst) {

modules/users/controllers/user_controller.js

@@ -381,6 +381,32 @@ class UserController extends BaseController {
             response.json({error: 1, msg: error, data: null});
         }
     }
+
+    // /**
+    //  * 是否时免费版用户
+    //  */
+    // async isFree(request, response) {
+    //     try{
+    //         const compilationId = request.session.sessionCompilation.compilationId;
+    //         const userModel = new UserModel();
+    //         const userId = request.session.sessionUser.ssoId;
+    //         const userData = await userModel.findDataBySsoId(userId);
+    //         const upgrade_list = userData ? userData.upgrade_list : [];
+    //         let free = false;
+    //         if (upgrade_list && upgrade_list.length > 0) {
+    //             const upgrade = upgrade_list.find(function (item) {
+    //                 return item.compilationID === compilationId && item.isUpgrade === true;
+    //             });
+    //             if (upgrade) {
+    //                free = true;
+    //             }
+    //         }
+    //         response.json({error: 0, data: free});
+    //     }
+    //     catch(error){
+    //         response.json({error: 1, msg: error, data: null});
+    //     }
+    // }
 }
 
 export default UserController;

modules/users/models/user_model.js

@@ -322,7 +322,7 @@ class UserModel extends BaseModel {
      * @return {version}
      */
     async getVersionFromUpgrade(ssoId, compilationId){
-        let version = '大司空云计价(免费版)';
+        let version = '大司空云计价(免费公用版)';
         let userData = await this.findDataBySsoId(ssoId);
         if (userData.upgrade_list !== undefined) {
             let compilationInfo = userData.upgrade_list.find(function (item) {
@@ -335,6 +335,26 @@ class UserModel extends BaseModel {
         return version;
     }
 
+    /**
+     * 判断用户是免费版还是专业版用户
+     */
+    async isFree(ssoId, compilationId) {
+        const userData = await this.findDataBySsoId(ssoId);
+        if (!userData) {
+            throw '不存在此用户';
+        }
+        const upgrade_list = userData.upgrade_list;
+        let free = true;
+        if (upgrade_list && upgrade_list.length > 0) {
+            const upgrade = upgrade_list.find(function (item) {
+                return item.compilationID === compilationId && item.isUpgrade === true;
+            });
+            if (upgrade) {
+                free = false;
+            }
+        }
+        return free
+    }
 }
 
 export default UserModel;

modules/users/routes/user_route.js

@@ -26,5 +26,7 @@ module.exports = function (app) {
     router.post('/getVersionInfo', userController.init, userController.getVersionInfo);
     router.post('/change/isSmsLogin', userController.init, userController.changeIsSmsLogin);
     router.post('/change/isLoginValid', userController.init, userController.changeIsLoginValid);
+
+    // router.get('/isFree', userController.init, userController.isFree);
     app.use('/user',router);
 };

test/unit/reports/test_rpt_test_template.js

@@ -55,7 +55,7 @@ let demoPrjId = - 1;
 // let demoRptId = 475; //计日工
 // let demoRptId = 551; //表05
 
-let demoRptId = 510;
+let demoRptId = 1035;
 
 let pagesize = "A4";
 
@@ -71,10 +71,10 @@ let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // demoPrjId = 2260; //QA:
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //项目名称过长
-demoPrjId = 7542; //
+demoPrjId = 10807; //
 // demoPrjId = 4107; //UAT:
 //*/
-let userId_Dft = userId_Leng;
+let userId_Dft = userId_me;
 // let userId_Dft = "5a025c4c15074d134c2b9689";
 /*/
  let userId_Dft = "595328da1934dc327cad08eb";
@@ -109,7 +109,7 @@ test('测试 - 测试模板啦: ', function (t) {
         rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filter, function (err, msg, rawDataObj) {
             if (!err) {
                 try {
-                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_测试模板.jsp");
+                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_测试模板.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
                     // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_测试模板.jsp");

test/unit/reports/test_tpl_project_fields.js

@@ -28,8 +28,10 @@ let fsUtil = require("../../../public/fsUtil");
 let pm_facade = require('../../../modules/pm/facade/pm_facade');
 
 let demoPrjId = - 1;
-// let demoRptId = 1006; //qa 重庆2018 A03
-let demoRptId = 1005; //qa 重庆2018 A01
+let demoRptId = 1029; //qa 重庆2018 A03
+// let demoRptId = 1005; //qa 重庆2018 A01
+// let demoRptId = 1035; //qa 重庆2018 C41
+// let demoRptId = 1036; //qa 重庆2018 B11
 let pagesize = "A4";
 
 
@@ -37,7 +39,7 @@ let pagesize = "A4";
 let userId_Leng = "5acac1e885bf55000bd055ba"; //小冷User Id2
 let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // let userId_HaiZhu = "5b5a66c4a3c23e000dccdd77"; //海珠user id
-demoPrjId = 9279; //
+demoPrjId = 10853; //
 //*/
 let userId_Dft = userId_Leng;
 // let userId_Dft = "5a025c4c15074d134c2b9689";
@@ -96,11 +98,12 @@ test('测试 - : ', function (t) {
                         let dftOption = JV.PAGING_OPTION_NORMAL;
                         printCom.initialize(rptTpl);
                         printCom.analyzeData(rptTpl, tplData, defProperties, dftOption, JV.OUTPUT_TYPE_EXCEL);
+                        // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_系统指标.jsp");
                         let maxPages = printCom.totalPages;
                         let customizeCfg = {"fillZero": true};
                         let pageRst = printCom.outputAsSimpleJSONPageArray(rptTpl, tplData, 1, maxPages, defProperties, customizeCfg);
                         if (pageRst) {
-                            // fsUtil.writeObjToFile(pageRst, "D:/GitHome/ConstructionCost/tmp/testBuiltPageResult_系统指标.jsp");
+                            fsUtil.writeObjToFile(pageRst, "D:/GitHome/ConstructionCost/tmp/testBuiltPageResult_系统指标.jsp");
                             // rpt_xl_util.exportExcel(pageRst, pagesize, "local_test_rpt_excel", true, null, null, function(uuidName){
                             //     console.log("excel uuid: " + uuidName);
                             // });