修改获取人材机分页数据接口

modules/all_models/stdGlj_lib.js

@@ -0,0 +1,30 @@
+/**
+ * Created by Zhong on 2018/3/23.
+ */
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+const oprSchema = require('../all_schemas/opr_schema');
+let gjlMapRationLibsSchema = new Schema(
+    {
+        ID: Number,
+        dispName: String
+    },
+    {_id: false},
+    {versionKey: false}
+);
+let gljMapSchema = new Schema({
+        deleted: Boolean,
+        ID: Number,
+        dispName: String,
+        appType: String,
+        creator: String,
+        createDate: String,
+        recentOpr: [oprSchema],
+        rationLibs: [gjlMapRationLibsSchema],
+        compilationId: String,
+        compilationName: String
+    },
+    {versionKey: false}
+);
+
+mongoose.model('std_glj_lib_map', gljMapSchema, 'std_glj_lib_map');

modules/ration_glj/controllers/ration_glj_controller.js

@@ -63,11 +63,12 @@ async function getGLJDataPaging(req, res) {
     };
     let data = JSON.parse(req.body.data);
     try {
-        let gljLibId = await ration_glj_facade.getGLJLibByEngineerID(data.engineerID);
+        const compilationId = req.session.sessionCompilation._id;
+        const gljLib = await ration_glj_facade.getGLJLib({ compilationId });
         let info = {
-            gljLibId,
+            gljLibId: gljLib.ID,
             userID: req.session.sessionUser.id,
-            compilationId: req.session.sessionCompilation._id
+            compilationId
         };
         result.data = await ration_glj_facade.getGLJDataPaging(info, data.condition);
         if (req.session.sessionCompilation.priceProperties) {

modules/ration_glj/facade/ration_glj_facade.js

@@ -7,6 +7,7 @@ module.exports = {
     deleteByRation: deleteByRation,
     getQuantityByProjectGLJ: getQuantityByProjectGLJ,
     getLibInfo: getLibInfo,
+    getGLJLib,
     getGLJData: getGLJData,
     getGLJDataPaging: getGLJDataPaging,
     getGLJDataByCodes:getGLJDataByCodes,
@@ -53,6 +54,7 @@ import gljType from "../../common/const/glj_type_const.js";
 const complementaryGljModel = mongoose.model('complementary_glj_lib');
 const stdGljModel = mongoose.model('std_glj_lib_gljList');
 const gljClassModel = mongoose.model('std_glj_lib_gljClass');
+const stdGLJLibModel = mongoose.model('std_glj_lib_map');
 const projectDao = require('../../pm/models/project_model').project;
 const compleClassModel = mongoose.model('complementary_glj_section');
 
@@ -535,6 +537,10 @@ async function getLibInfo(req) {
     return data;
 }
 
+async function getGLJLib(query) {
+    return stdGLJLibModel.findOne(query);
+}
+
 async function getGLJLibByEngineerID  (engineerID) {
     let engineeringLibModel = new EngineeringLibModel() ;
     let engineeringInfo = await engineeringLibModel.findDataByCondition({'_id': engineerID});

public/common_constants.js

@@ -139,6 +139,7 @@
         BILLS: 'bills',
         RATION: 'ration',
     };
+    const DEFAULT_REGION = '全省';
     return {
         fixedFlag,
         billType,
@@ -148,5 +149,6 @@
         supplyType,
         supplyText,
         SourceType,
+        DEFAULT_REGION,
     };
 });

web/building_saas/main/js/models/ration_glj.js

@@ -517,9 +517,8 @@ let ration_glj = {
         ration_glj.prototype.getGLJDataPaging = function (condition, cb) {
             gljOprObj.loadingPagination = true;
             const property = projectObj.project.projectInfo.property;
-            const engineerID = property.engineering_id;
             const actionType = $('#actionType').val();
-            CommonAjax.post('/rationGlj/getGLJDataPaging', {engineerID, condition}, function (data) {
+            CommonAjax.post('/rationGlj/getGLJDataPaging', { condition }, function (data) {
                 gljOprObj.curPageTotal = data.total;
                 data.complementaryGLJs.forEach(glj => {
                     glj.isComplementary = true;
@@ -559,7 +558,8 @@ let ration_glj = {
                 // 设置人材机类型名称
                 gljOprObj.setTypeName(gljOprObj.distTypeTree.comboDatas, newData);
                 if (data.priceProperties && data.priceProperties.length > 0) {
-                    let tmp = _.find(data.priceProperties, {region: property.region, taxModel: parseInt(property.taxType)});
+                    // region: region目前跟单位工程绑定，这里暂时固定写死commonConstants.DEFAULT_REGION，以后应改成跟建设项目绑定的region，
+                    let tmp = _.find(data.priceProperties, {region: commonConstants.DEFAULT_REGION, taxModel: parseInt(property.taxType)});
                     if (tmp) {
                         let dataCode = tmp.price.dataCode;
                         let allData = data.stdGLJ.concat(data.complementaryGLJs);

web/building_saas/pm/js/pm_import.js

@@ -248,7 +248,7 @@ const importView = (() => {
         let curEngineering = tbcObj.engineeringList.find(data => query.engineeringName === data.lib.name &&
             query.feeStandard === data.lib.feeName);
         return {
-            region: '全省',   //地区
+            region: commonConstants.DEFAULT_REGION,   //地区
             valuationType: tbcObj.valuationType,    //计价方式
             valuation: tbcObj.valuation.id, //计价规则
             valuationName: tbcObj.valuation.name,

web/building_saas/pm/js/pm_newMain.js

@@ -3821,7 +3821,7 @@ function AddTender() {
             };
         let selectedItem = projTreeObj.tree.selected;
         //地区
-        let region = $('#regionDiv').find('select').val() || '全省';
+        let region = $('#regionDiv').find('select').val() || commonConstants.DEFAULT_REGION;
         let tenderInfo = {
             gljAdjustType: 'priceInfo', //默认为造价信息差额调整法
             valuation: valuation,