fix can't add glj bug

modules/common/std/schemas/std_ration_lib_glj_list.js

@@ -7,7 +7,7 @@
  */
 import mongoose from "mongoose";
 
-let collectionName = 'std_ration_lib_glj_list';
+let collectionName = 'std_glj_lib_gljList';
 // 因为别处已初始化过，所以直接使用
 let model = mongoose.model(collectionName);
 export {model as default, collectionName as collectionName};

modules/main/controllers/project_controller.js

@@ -2,7 +2,7 @@
  * Created by jimiz on 2017/4/16.
  */
 var Project = require('../models/project');
-
+let logger = require('../../../logs/log_helper').logger;
 //统一回调函数
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});
@@ -13,6 +13,7 @@ module.exports = {
         var data = JSON.parse(req.body.data);
         Project.save(data, function (err, message, result) {
             if (err) {
+                logger.err(err);
                 callback(req, res, err, message, null);
             } else {
                 callback(req, res, err, message, result);

modules/ration_glj/facade/ration_glj_facade.js

@@ -9,8 +9,7 @@ let commonConsts = consts.commonConst;
 let _=require("lodash");
 let ration_glj = mongoose.model('ration_glj');
 import GLJListModel from '../../glj/models/glj_list_model';
-//let std_ration_lib_glj_list_model = require('../../ration_repository/models/glj_repository');
-let std_ration_lib_glj_list_model = mongoose.model('std_ration_lib_glj_list');
+let std_glj_lib_gljList_model = mongoose.model('std_glj_lib_gljList');
 let async_n = require("async");
 let ration = mongoose.model('ration');
 let ration_coe_facade = require('./ration_coe_facade');
@@ -18,7 +17,7 @@ let ration_coe = mongoose.model('ration_coe');
 let std_ration_lib_ration_items = mongoose.model('std_ration_lib_ration_items');
 let glj_calculate_facade = require('./glj_calculate_facade');
 let quantity_detail_facade = require('./quantity_detail_facade');
-
+let logger = require("../../../logs/log_helper").logger;
 
 
 module.exports={
@@ -85,8 +84,8 @@ function combineQuantity(results) {
 
 function get_lib_glj_info(ration_glj) {
     return function (cb) {
-        std_ration_lib_glj_list_model.findOne({'ID':ration_glj.GLJID,'repositoryId':ration_glj.glj_repository_id},(err,glj)=>{
-            if(err){
+        std_glj_lib_gljList_model.findOne({'ID':ration_glj.GLJID},(err,glj)=>{
+                if(err){
                 cb(err,'')
             }else if(glj){
                 ration_glj.name = glj.name;
@@ -133,7 +132,7 @@ async function getInfoFromProjectGLJ(ration_glj) {
          ration_glj.isEstimate=result.is_evaluate;
          return ration_glj;
      } catch (err) {
-         console.log(err);
+         logger.err(err);
          return null;
      }
 
@@ -151,18 +150,30 @@ function create_ration_glj(user_id,datas) {
             if(err){
                 callback(err,results)
             }else {
-                ration_glj.insertMany(results,(err,doc)=>{
-                    if(err){
-                        callback(err,null);
-                    }else {
-                        let returndata ={
-                            updateTpye:commonConsts.UT_CREATE,
-                            moduleName:'ration_glj',
-                            data:results
-                        }
-                        callback(null,returndata)
+                let newRecords =[];
+                for (let r of results){
+                    if(r){
+                        newRecords.push(r)
                     }
-                });
+                }
+                if(newRecords.length>0){
+                    ration_glj.insertMany(newRecords,(err,doc)=>{
+                        if(err){
+                            callback(err,null);
+                        }else {
+                            let returndata ={
+                                updateTpye:commonConsts.UT_CREATE,
+                                moduleName:'ration_glj',
+                                data:newRecords
+                            }
+                            callback(null,returndata)
+                        }
+                    });
+                }else {
+                    logger.info("can't find gljs")
+                    callback(null,null)
+                }
+
             }
         })
     }

modules/ration_glj/models/ration_glj_temp.js

@@ -22,21 +22,22 @@ var rationAssItemSchema = mongoose.Schema({
 }, { _id: false });
 
 
-var gljSchema =new Schema({
-    repositoryId: Number,
-    ID:Number,
-    //以下是基于已有access库
-    code: String,
-    name: String,
-    specs: String,
-    unit: String,
-    basePrice: Number,
-    gljType: Number, //这个是UI显示上的详细分类，对应gljTypeSchema
-    shortName: String,  //人工，材料，机械
-    gljClass:Number
-},{versionKey:false});
+/*var gljSchema =new Schema({
+ repositoryId: Number,
+ ID:Number,
+ //以下是基于已有access库
+ code: String,
+ name: String,
+ specs: String,
+ unit: String,
+ basePrice: Number,
+ gljType: Number, //这个是UI显示上的详细分类，对应gljTypeSchema
+ shortName: String,  //人工，材料，机械
+ gljClass:Number
+ },{versionKey:false});
+
+ mongoose.model("std_ration_lib_glj_list",gljSchema,"std_ration_lib_glj_list");*/
 
-mongoose.model("std_ration_lib_glj_list",gljSchema,"std_ration_lib_glj_list");
 
 let rationSchema = new Schema({
     ID: Number,

modules/ration_repository/models/glj_repository.js

@@ -32,7 +32,7 @@ var gljSchema = mongoose.Schema({
     gljClass:Number
 });
 var gljTypeModel = db.model("std_ration_lib_glj_type",gljTypeSchema, "std_ration_lib_glj_type");
-var gljItemModel = mongoose.model("std_ration_lib_glj_list");
+var gljItemModel = mongoose.model("std_glj_lib_gljList");
 var repositoryMap = require('./repository_map');
 var counter = require('../../../public/counter/counter');