Преглед на файлове

产品信息模块合并进系统选项

vian преди 4 години
родител
ревизия
40579ff597
променени са 3 файла, в които са добавени 7 реда и са изтрити 35 реда
  1. 0 31
      modules/all_models/product.js
  2. 4 0
      modules/all_models/system_setting.js
  3. 3 4
      modules/pm/facade/pm_facade.js

+ 0 - 31
modules/all_models/product.js

@@ -1,31 +0,0 @@
-'use strict';
-
-/**
- *
- *
- * @author Zhong
- * @date 2019/3/21
- * @version
- */
-/*
- * 与产品绑定的信息都可以在此设置
- * */
-const mongoose = require('mongoose');
-const Schema = mongoose.Schema;
-const productSchema = new Schema({
-    name: {
-        type: String,
-        default: '纵横建筑计价'
-    },
-    company: {
-        type: String,
-        default: '珠海纵横创新软件有限公司'
-    },
-    icp: {
-        type: String,
-        default: '粤ICP备14032472号'
-    },
-    version: String
-}, {versionKey: false});
-
-mongoose.model('product', productSchema, 'product');

+ 4 - 0
modules/all_models/system_setting.js

@@ -21,5 +21,9 @@ let modelSchema = {
         project: Number,
         ration:Number
     },
+    company: String, // 软件供应商
+    product: String, // 产品名
+    icp: String, // icp
+    version: String // 版本号
 };
 mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));

+ 3 - 4
modules/pm/facade/pm_facade.js

@@ -91,7 +91,6 @@ let compilationModel = mongoose.model('compilation');
 let engineeringModel = mongoose.model('engineering_lib');
 let basicInfoModel = mongoose.model('std_basic_info_lib');
 let projectFeatureModel = mongoose.model('std_project_feature_lib');
-let productModel = mongoose.model('product');
 let stdRationItemModel = mongoose.model('std_ration_lib_ration_items');
 let stdGljItemModel = mongoose.model('std_glj_lib_gljList');
 import BillsTemplateModel from "../models/templates/bills_template_model";
@@ -1872,9 +1871,9 @@ async function getProjectByGranularity(tenderID, granularity, summaryField, user
     //获取汇总信息
     constructionProject.summaryInfo = await getSummaryInfo([constructionProject.ID], summaryField);
     //获取编制软件信息: 软件公司;软件名;版本号;授权信息; base64
-    let product = await productModel.findOne({});
-    let company = product.company || '珠海纵横创新软件有限公司',
-        version = product.version || '';
+    const systemSetting = await systemSettingModel.findOne({});
+    let company = systemSetting.company || '珠海纵横创新软件有限公司',
+        version = systemSetting.version || '';
     constructionProject.softInfo = `${company};${versionName};${version};${userID}`;
     return constructionProject;
 }