no message

src/biz/nongzi.ts

@@ -5,7 +5,7 @@
 import moment = require("moment");
 import { TABLENAME } from "../config/dbEnum";
 import { NongZiConfig } from "../config/eccParam";
-import { NONGZITYPE, PLANTTYPE } from "../config/enum";
+import { NONGZITYPE, PLANTTYPE, PURPOSE } from "../config/enum";
 import * as nongziData from "../data/nongzi";
 import * as dikuaiData from "../data/dikuai";
 import { randomId, successResult } from "../tools/system";
@@ -14,6 +14,10 @@ import { eccFormParam } from "../util/verificationParam";
 import { BizError } from "../util/bizError";
 import { ERRORENUM } from "../config/errorEnum";
 
+
+
+
+
 /**
  * 添加农资
  * @param reqUser 
@@ -149,7 +153,8 @@ export async function nongZiInfo(nzId) {
 
     let dataInfo = {
         nzType:nongZiInfo.nzType,//农资类型
-        dIdList:nongZiInfo.dIdList,//地块id
+        // dIdList:didStr, //地块id
+        dIdList:nongZiInfo.dIdList[0],//地块id
         plantType:nongZiInfo.plantType,//种植种类【枚举】 PLANTTYPE
         count:nongZiInfo.count,//用量
         useTime:nongZiInfo.useTime//时间
@@ -160,32 +165,64 @@ export async function nongZiInfo(nzId) {
 
 
 /**
- * 农资管理
- * @param nzType 农资类型
- * @param dIdList 地块
- * @param useTime 使用时间
- * @param count 用量
- * @param page 页码
+ * 农资列表
+ * @param selectStr 
+ * @param dId 
+ * @param nzType 
+ * @param useTime 
  * @returns 
  */
-export async function nongZiListToPage(nzType, dIdList, useTime, count, page) {
+ export async function nongZiListToPage(nzType:number, dId:string, useTime:number, pageNumber:number) {
+    let funName = "农资列表";
+    let param:any = {};
+    if (nzType) {
+        eccEnumValue(funName, "nzType", NONGZITYPE, nzType);
+        param.nzType = nzType;
+    }
+    if (dId) {
+        param.dIdList = {"$in":dId};
+    }
+    if (useTime) {
+        let startMs = moment(useTime).startOf("month").valueOf();
+        let endMs = moment(useTime).endOf("month").valueOf();
+        param.useTime = {"$gt":startMs, "$lt":endMs};
+    }
 
-    let dbList = await nongziData.findDataToParamToPage({}, page);
+    let dikuaiList = await dikuaiData.selectToParam({});
+    let diKuaiMap = {};
+    dikuaiList.forEach(info => {
+        let {dId, code} = info;
+        diKuaiMap[dId] = code;
+    });
+
+    let nongziList = await nongziData.findDataToParamToPage( param, pageNumber );
     let dataCount = await nongziData.findDataToParamCouant({});
 
     let dataList = [];
-
-    dbList.forEach(info => {
-        dataList.push({
-            nzId:info.nzId,
-            nzType:info.nzType,//农资类型
-            dIdList:info.dIdList,//地块id
-            plantType:info.plantType,//种植种类【枚举】 PLANTTYPE
-            count:info.count,//用量
-            useTime:info.useTime//时间
+    nongziList.forEach(item => {
+        let {nzId, nzType, dIdList, plantType, count, useTime, ct } = item;
+        let didStr = "";
+        let area = "";
+        let purpose = "";
+        let size = "";
+        dIdList.forEach(dId => {
+            didStr += `${diKuaiMap[dId] || "-"}`;
         })
+        dataList.push({
+            nzId,
+            nzType:changeEnumValue(NONGZITYPE, nzType), //农资类型
+            dIdList:didStr, //地块id
+            plantType:changeEnumValue(PLANTTYPE, plantType), //种植种类【枚举】 PLANTTYPE
+            count, //用量
+            useTime:moment(useTime).format("YYYY-MM-DD"), //时间
+            ct:moment(ct).format("YYYY-MM-DD"), //创建时间
+            area, //所属区域
+            purpose:changeEnumValue(PURPOSE, purpose), //地块用途
+            size, //地块面积
+        });
     });
 
     return {dataList, dataCount}
 }
 
+

src/routers/admin.ts

@@ -17,6 +17,7 @@ export function setRouter(httpServer){
     httpServer.post('/zjnt/xcxadmin/dikuai/update', checkAdminUserToken,  asyncHandler(dikuai_update));//地块修改 '/zjnt/xcxadmin/dikuai/update'
     httpServer.post('/zjnt/xcxadmin/dikuai/info', checkAdminUserToken,  asyncHandler(dikuai_info));//地块回显 '/zjnt/xcxadmin/dikuai/info'
     httpServer.post('/zjnt/xcxadmin/dikuai/list', checkAdminUserToken, asyncHandler(dikuai_list));//地块列表 '/zjnt/xcxadmin/dikuai/list'
+    httpServer.post('/zjnt/xcxadmin/dikuai/xuanze/list', checkAdminUserToken, asyncHandler(xuanze_dikuai_list));//下拉选择-使用地块
 
     /**种养 */
     httpServer.post('/zjnt/xcxadmin/zhongyang/add', checkAdminUserToken,  asyncHandler(zhongyang_add));//种养添加 '/zjnt/xcxadmin/zhongyang/add'
@@ -110,6 +111,14 @@ async function dikuai_list(req, res) {
     res.success(result);
 }
 
+async function xuanze_dikuai_list(req, res) {
+    const UserInfo = req.userInfo;
+    let reqConf = { zhongYangType:'Number'};
+    let { zhongYangType } = eccReqParamater(reqConf, req.body, ["zhongYangType"]);
+    let result = await diKuaiBiz.keXuanDiKuaiList(zhongYangType);
+    res.success(result);
+}
+
 
 
 /** 种养*/
@@ -182,9 +191,9 @@ async function nongzi_info(req, res) {
 }
 
 async function nongzi_list(req, res) {
-    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 result = await nongziBiz.nongZiListToPage(nzType, dIdList, useTime, count, page);
+    let reqConf = {nzType:'Number', dIdList:'Number', useTime:'Number', pageNumber:'Number'};
+    let { nzType, dIdList, useTime, pageNumber } = eccReqParamater(reqConf, req.body, ["nzType", "dIdList", "useTime"]);
+    let result = await nongziBiz.nongZiListToPage(nzType, dIdList, useTime, pageNumber);
     res.success(result);
 }
 

src/routers/router.ts

@@ -19,7 +19,7 @@ export function setRouter(httpServer){
     httpServer.post('/zjnt/xcx/dikuai/list', checkUserToken, asyncHandler(dikuai_list));//列表
     httpServer.post('/zjnt/xcx/dikuai/all', checkUserToken, asyncHandler(dikuai_all));//全部地块列表
     httpServer.post('/zjnt/xcx/dikuai/update', checkUserToken, asyncHandler(dikuai_update));//更新
-    httpServer.post('/zjnt/xcx/dikuai/xuanze/list', checkUserToken, asyncHandler(xuanze_dikuai_list));//可用
+    httpServer.post('/zjnt/xcx/dikuai/xuanze/list', checkUserToken, asyncHandler(xuanze_dikuai_list));//下拉选择-使用地块
     httpServer.post('/zjnt/xcx/dikuai/kecaishou/list', checkUserToken, asyncHandler(xuanze_kecaishou_list));//可采收
 
     /**种养 */