@@ -44,7 +44,8 @@ class CompleViewController extends BaseController{
}
getRationLibs(req, res){
- compleViewModel.getRationLibs(req.session.sessionCompilation._id, function (err, data) {
+ let data = JSON.parse(req.body.data);
+ compleViewModel.getRationLibs(req.session.sessionCompilation._id, data.ids, function (err, data) {
callback(req, res, err, '', data);
});
@@ -167,7 +167,7 @@ class CompleRatoinDao {
glj = await complementaryGljModel.findOne({uesrId: userId, ID: rationGlj.gljId});
if(isDef(glj)){
- let unitHint = '' + glj.code + ' ' + glj.name + '' + glj.unit + ' ' + rationGlj.consumeAmt + '</br>';
+ let unitHint = '' + glj.code + ' ' + glj.name + ' ' + glj.unit + ' ' + rationGlj.consumeAmt + '</br>';
hint += unitHint;
@@ -15,9 +15,9 @@ class CompleViewModel {
- async getRationLibs(compilationId, callback){
+ async getRationLibs(compilationId, ids, callback){
try{
- let rationLibs = await rationRepositoryModel.find({compilationId: compilationId, $or: [{deleted: null}, {deleted: false}]});
+ let rationLibs = await rationRepositoryModel.find({compilationId: compilationId, ID: {$in: ids}, $or: [{deleted: null}, {deleted: false}]});
callback(0, rationLibs);
catch(err) {
@@ -22,7 +22,12 @@ let compleRationMain = {
};
- CommonAjax.post('/complementaryRation/api/getRationLibs', {user_id: userID}, scFunc);
+ let ration_lib = projectInfoObj.projectInfo.engineeringInfo.ration_lib;
+ let ids = [];
+ for(lib of ration_lib){
+ ids.push(parseInt(lib.id));
+ }
+ CommonAjax.post('/complementaryRation/api/getRationLibs', {user_id: userID, ids: ids}, scFunc);