明树Git Lab

Commit 5219c62f authored by zfp1's avatar zfp1

update

parent 85fcf5ff
...@@ -9,6 +9,22 @@ const fs = require('fs'); ...@@ -9,6 +9,22 @@ const fs = require('fs');
async function listFroDP(req, res, next) {
try {
let search = { del: 0 };
let page = req.body.page || 1;
let pageSize = req.body.pageSize || 10;
let skip = (page - 1) * pageSize;
if (req.body.agrProName) {
search.agrProName = req.body.agrProName;
}
let count = await DB.AgrInputRecord.countDocuments(search)
let list = await DB.AgrInputRecord.find(search).skip(skip).limit(1000); //甲方要求整体循环,暂时调整
res.sendData({ count, list });
} catch (error) {
next(error)
}
}
async function list(req, res, next) { async function list(req, res, next) {
try { try {
let search = { del: 0 }; let search = { del: 0 };
...@@ -118,5 +134,6 @@ module.exports = { ...@@ -118,5 +134,6 @@ module.exports = {
create, create,
importExcel, importExcel,
deleteOne, deleteOne,
updateOne updateOne,
listFroDP
} }
\ No newline at end of file
...@@ -3,7 +3,7 @@ const Schema = mongoose.Schema; ...@@ -3,7 +3,7 @@ const Schema = mongoose.Schema;
const moment = require('moment'); const moment = require('moment');
/** /**
* 农资管理-农资库存信息表 * 农资管理-导入导出内容--记录
*/ */
const AgrMaterialInOutSchema = new Schema({ const AgrMaterialInOutSchema = new Schema({
......
...@@ -9,7 +9,7 @@ const agrInputEmployController = require('../controller/agrInputEmployController ...@@ -9,7 +9,7 @@ const agrInputEmployController = require('../controller/agrInputEmployController
// excel采集信息上传 甲方要求 // excel采集信息上传 甲方要求
//1. 青皮柚农业投入品使用情况 //1. 青皮柚农业投入品使用情况
router.post('/input/list', agrInputRecordController.list); router.post('/input/list', agrInputRecordController.listFroDP);
router.post('/inputRecord/list', agrInputRecordController.list); router.post('/inputRecord/list', agrInputRecordController.list);
router.post('/inputRecord/update', agrInputRecordController.updateOne); router.post('/inputRecord/update', agrInputRecordController.updateOne);
router.post('/inputRecord/delete', agrInputRecordController.deleteOne); router.post('/inputRecord/delete', agrInputRecordController.deleteOne);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment