明树Git Lab

Commit 89deca4a authored by zfp1's avatar zfp1

update

parent c4e53ad4
...@@ -5,6 +5,33 @@ ...@@ -5,6 +5,33 @@
async function list(req, res, next) {
try {
let search = {del: 0};
if(req.body.name) {
search.name = {$regex: req.body.name}
}
if(req.body.startTime) {
search.time = search.time || {};
search.time.$gte = req.body.startTime;
}
if(req.body.endTime) {
search.time = search.time || {};
search.time.$lte = req.body.endTime
}
let page = req.body.page || 1;
let pageSize = req.body.pageSize || 10;
let skip = (page - 1) * pageSize;
let count = await HeavyMetal.countDocuments(search);
let data = await HeavyMetal.find(search).skip(skip).limit(pageSize);;
res.sendData({list: data, count});
} catch (error) {
next(error);
}
}
...@@ -57,5 +84,6 @@ async function batchCreate(req, res, next) { ...@@ -57,5 +84,6 @@ async function batchCreate(req, res, next) {
module.exports = { module.exports = {
batchCreate batchCreate,
list,
} }
\ No newline at end of file
...@@ -6,7 +6,10 @@ const moment = require('moment'); ...@@ -6,7 +6,10 @@ const moment = require('moment');
* 农资管理-农资库存信息表 * 农资管理-农资库存信息表
*/ */
const letianHeavyMetalSchema = new Schema({ const letianHeavyMetalSchema = new Schema({
name: {
type: String,
comment: "产品名称"
},
proHaveMetal: { proHaveMetal: {
type: Boolean, type: Boolean,
comment: "产品有无金属" comment: "产品有无金属"
......
...@@ -3,6 +3,8 @@ const express = require('express'); ...@@ -3,6 +3,8 @@ const express = require('express');
const router = express.Router(); const router = express.Router();
const indRawMatController = require('../controller/indRawMatController'); const indRawMatController = require('../controller/indRawMatController');
const heavyMetalController = require('../controller/heavyMetalController.js');
// 工业-大屏-原料品投入 // 工业-大屏-原料品投入
...@@ -10,4 +12,10 @@ router.post('/rawMat/list', indRawMatController.list); ...@@ -10,4 +12,10 @@ router.post('/rawMat/list', indRawMatController.list);
// 工业 - 重金属检测
router.post('/hm/list', heavyMetalController.list);
module.exports = router; module.exports = router;
\ No newline at end of file
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