Commit 5c3b6226 by chenjinjing

no message

parent 1011ef08
...@@ -61,8 +61,6 @@ export async function addDiKuai(reqUser, plotType, param) { ...@@ -61,8 +61,6 @@ export async function addDiKuai(reqUser, plotType, param) {
* @returns * @returns
*/ */
export async function diKuaiInfo(dId:String ) { export async function diKuaiInfo(dId:String ) {
let funName = "地块信息";
let dikuaiInfo = await dikuaiData.selectOne({dId}); let dikuaiInfo = await dikuaiData.selectOne({dId});
let dataInfo = { let dataInfo = {
size:dikuaiInfo.size, size:dikuaiInfo.size,
...@@ -136,6 +134,7 @@ export async function diKuaiListToPage(code, area, purpose, pageNumber) { ...@@ -136,6 +134,7 @@ export async function diKuaiListToPage(code, area, purpose, pageNumber) {
} }
let diKuaiList = await dikuaiData.findDataToParamToPage(param, pageNumber); let diKuaiList = await dikuaiData.findDataToParamToPage(param, pageNumber);
let dataCount = await dikuaiData.findDataToParamCouant({});
let dataList = []; let dataList = [];
diKuaiList.forEach(item => { diKuaiList.forEach(item => {
let { size, dId, plotType, purpose, code, area, ct } = item; let { size, dId, plotType, purpose, code, area, ct } = item;
...@@ -150,7 +149,7 @@ export async function diKuaiListToPage(code, area, purpose, pageNumber) { ...@@ -150,7 +149,7 @@ export async function diKuaiListToPage(code, area, purpose, pageNumber) {
}); });
}); });
return {dataList} return {dataList, dataCount}
} }
......
...@@ -102,9 +102,15 @@ export async function nongZiList(selectStr:string, dId:string, nzType:number, us ...@@ -102,9 +102,15 @@ export async function nongZiList(selectStr:string, dId:string, nzType:number, us
} }
/**
export async function updateZhongYang(reqUser, nzId, param) { * 修改农资
let funName = `修改种养`; * @param reqUser
* @param nzId
* @param param
* @returns
*/
export async function updateNongZi(reqUser, nzId, param) {
let funName = `修改农资`;
eccFormParam(funName, NongZiConfig, param); eccFormParam(funName, NongZiConfig, param);
eccEnumValue(funName, "nzType", NONGZITYPE, param.nzType); eccEnumValue(funName, "nzType", NONGZITYPE, param.nzType);
eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType); eccEnumValue(funName, "plantType", PLANTTYPE, param.plantType);
...@@ -133,7 +139,12 @@ export async function updateZhongYang(reqUser, nzId, param) { ...@@ -133,7 +139,12 @@ export async function updateZhongYang(reqUser, nzId, param) {
} }
export async function zhongYangInfo(nzId) { /**
* 农资回显
* @param nzId
* @returns
*/
export async function nongZiInfo(nzId) {
let nongZiInfo = await nongziData.findOne({nzId}); let nongZiInfo = await nongziData.findOne({nzId});
let dataInfo = { let dataInfo = {
...@@ -157,19 +168,7 @@ export async function zhongYangInfo(nzId) { ...@@ -157,19 +168,7 @@ export async function zhongYangInfo(nzId) {
* @param page 页码 * @param page 页码
* @returns * @returns
*/ */
export async function zhongYangListToPage(nzType, dIdList, useTime, count, page) { export async function nongZiListToPage(nzType, dIdList, useTime, count, page) {
// let funName = "地块列表";
// let param:any = {};
// if (code) {
// param.code = { "$regex":code };
// }
// if (area) {
// param.area = { "$regex":area };
// }
// if (purpose) {
// eccEnumValue(funName, "purpose", PURPOSE, purpose);
// param.purpose = purpose;
// }
let dbList = await nongziData.findDataToParamToPage({}, page); let dbList = await nongziData.findDataToParamToPage({}, page);
let dataCount = await nongziData.findDataToParamCouant({}); let dataCount = await nongziData.findDataToParamCouant({});
......
...@@ -63,6 +63,10 @@ export async function findDataToParamToPage(param, pageNumber) { ...@@ -63,6 +63,10 @@ export async function findDataToParamToPage(param, pageNumber) {
return await dikuaiModel.find(param).skip((pageNumber-1)*10).limit(10); return await dikuaiModel.find(param).skip((pageNumber-1)*10).limit(10);
} }
export async function findDataToParamCouant(param) {
return await dikuaiModel.find(param).countDocuments();
}
export async function diKuaiSizeCount(param) { export async function diKuaiSizeCount(param) {
let list = await dikuaiModel.aggregate([ let list = await dikuaiModel.aggregate([
......
...@@ -67,7 +67,7 @@ async function user_login(req, res) { ...@@ -67,7 +67,7 @@ async function user_login(req, res) {
} }
async function user_logout(req, res) { async function user_logout(req, res) {
let userInfo = req.headers.userInfo; let userInfo = req.headers;
let result = await userBiz.adminUserLogout(userInfo); let result = await userBiz.adminUserLogout(userInfo);
res.success(result); res.success(result);
} }
...@@ -79,7 +79,7 @@ async function dikuai_add(req, res) { ...@@ -79,7 +79,7 @@ async function dikuai_add(req, res) {
let reqConf = {plotType:'Number', param:'Object'}; let reqConf = {plotType:'Number', param:'Object'};
let { plotType, param } = eccReqParamater(reqConf, req.body); let { plotType, param } = eccReqParamater(reqConf, req.body);
let userInfo = req.headers.userInfo; let userInfo = req.headers;
let result = await diKuaiBiz.addDiKuai(userInfo, plotType, param); let result = await diKuaiBiz.addDiKuai(userInfo, plotType, param);
res.success(result); res.success(result);
...@@ -89,7 +89,7 @@ async function dikuai_add(req, res) { ...@@ -89,7 +89,7 @@ async function dikuai_add(req, res) {
async function dikuai_update(req, res) { async function dikuai_update(req, res) {
let reqConf = {dId:'String', plotType:'Number', param:'Object'}; let reqConf = {dId:'String', plotType:'Number', param:'Object'};
let { dId, param, plotType } = eccReqParamater(reqConf, req.body); let { dId, param, plotType } = eccReqParamater(reqConf, req.body);
let userInfo = req.headers.userInfo; let userInfo = req.headers;
let result = await diKuaiBiz.updateDiKuai(userInfo, plotType, dId, param); let result = await diKuaiBiz.updateDiKuai(userInfo, plotType, dId, param);
res.success(result); res.success(result);
...@@ -97,7 +97,7 @@ async function dikuai_update(req, res) { ...@@ -97,7 +97,7 @@ async function dikuai_update(req, res) {
async function dikuai_info(req, res) { async function dikuai_info(req, res) {
let reqConf = {dId:'Number'}; let reqConf = {dId:'String'};
let { dId } = eccReqParamater(reqConf, req.body); let { dId } = eccReqParamater(reqConf, req.body);
let result = await diKuaiBiz.diKuaiInfo(dId); let result = await diKuaiBiz.diKuaiInfo(dId);
res.success(result); res.success(result);
...@@ -116,7 +116,7 @@ async function dikuai_list(req, res) { ...@@ -116,7 +116,7 @@ async function dikuai_list(req, res) {
async function zhongyang_add(req, res) { async function zhongyang_add(req, res) {
let reqConf = {param:'Object'}; let reqConf = {param:'Object'};
let { param } = eccReqParamater(reqConf, req.body); let { param } = eccReqParamater(reqConf, req.body);
let userInfo = req.headers.userInfo; let userInfo = req.headers;
let result = await zhongYangBiz.addZhongYang(userInfo, param); let result = await zhongYangBiz.addZhongYang(userInfo, param);
res.success(result); res.success(result);
...@@ -125,7 +125,7 @@ async function zhongyang_add(req, res) { ...@@ -125,7 +125,7 @@ async function zhongyang_add(req, res) {
async function zhongyang_update(req, res) { async function zhongyang_update(req, res) {
let reqConf = {param:'Object', zId:"String"}; let reqConf = {param:'Object', zId:"String"};
let { param, zId } = eccReqParamater(reqConf, req.body); let { param, zId } = eccReqParamater(reqConf, req.body);
let userInfo = req.headers.userInfo; let userInfo = req.headers;
let result = await zhongYangBiz.updateZhongYang(userInfo, zId, param); let result = await zhongYangBiz.updateZhongYang(userInfo, zId, param);
res.success(result); res.success(result);
} }
...@@ -152,11 +152,11 @@ async function zhongyang_del(req, res) { ...@@ -152,11 +152,11 @@ async function zhongyang_del(req, res) {
} }
/**农资 */
async function nongzi_add(req, res) { async function nongzi_add(req, res) {
let reqConf = {param:'Object'}; let reqConf = {param:'Object'};
let { param } = eccReqParamater(reqConf, req.body); let { param } = eccReqParamater(reqConf, req.body);
let userInfo = req.headers.userInfo; let userInfo = req.headers;
let result = await nongziBiz.addNongZi(userInfo, param); let result = await nongziBiz.addNongZi(userInfo, param);
res.success(result); res.success(result);
...@@ -167,8 +167,8 @@ async function nongzi_add(req, res) { ...@@ -167,8 +167,8 @@ async function nongzi_add(req, res) {
async function nongzi_update(req, res) { async function nongzi_update(req, res) {
let reqConf = {param:'Object', nzId:"String"}; let reqConf = {param:'Object', nzId:"String"};
let { param, nzId} = eccReqParamater(reqConf, req.body); let { param, nzId} = eccReqParamater(reqConf, req.body);
let userInfo = req.headers.userInfo; let userInfo = req.headers;
let result = await nongziBiz.updateZhongYang(userInfo, nzId, param); let result = await nongziBiz.updateNongZi(userInfo, nzId, param);
res.success(result); res.success(result);
} }
...@@ -177,14 +177,14 @@ async function nongzi_update(req, res) { ...@@ -177,14 +177,14 @@ async function nongzi_update(req, res) {
async function nongzi_info(req, res) { async function nongzi_info(req, res) {
let reqConf = {nzId:'String'}; let reqConf = {nzId:'String'};
let { nzId } = eccReqParamater(reqConf, req.body); let { nzId } = eccReqParamater(reqConf, req.body);
let result = await nongziBiz.zhongYangInfo(nzId); let result = await nongziBiz.nongZiInfo(nzId);
res.success(result); res.success(result);
} }
async function nongzi_list(req, res) { async function nongzi_list(req, res) {
let reqConf = {nzType:'Number', dIdList:'Number', useTime:'Number', count:'Number', page:'Number'}; let reqConf = {nzType:'Number', dIdList:'Number', useTime:'Number', count:'Number', page:'Number'};
let { nzType, dIdList, useTime, count, page } = eccReqParamater(reqConf, req.body, ["nzType", "dIdList", "useTime", "count"]); let { nzType, dIdList, useTime, count, page } = eccReqParamater(reqConf, req.body, ["nzType", "dIdList", "useTime", "count"]);
let result = await nongziBiz.zhongYangListToPage(nzType, dIdList, useTime, count, page); let result = await nongziBiz.nongZiListToPage(nzType, dIdList, useTime, count, page);
res.success(result); res.success(result);
} }
......
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