no message

serverConfig.xml

 <config>
     <port>13281</port>
     <mongodb>
-        <path>127.0.0.1</path>
+        <path>192.168.0.105</path>
         <port>27017</port>
         <w>1</w>
         <!-- <dataBase>baseDB</dataBase> -->

src/biz/diKuai.ts

@@ -2,6 +2,7 @@
  * 地块
  */
 
+import moment = require("moment");
 import { TABLENAME } from "../config/dbEnum";
 import { DiKuaiConfig, YangZhiChiConfig } from "../config/eccParam";
 import { AREARANGE, PLANTTYPE, PLOTTYPE, PURPOSE, ZHONGYANGTYPE } from "../config/enum";
@@ -111,22 +112,42 @@ export async function diKuaiList(plotType:number, selectStr:string, code:string,
     return {dataList}
 }
 
+
 /**
  * 地块列表分页
- * @param plotType 
- * @param selectStr 
- * @param code 
- * @param purpose 
- * @param area 
+ * @param code 地块编号 string
+ * @param area 地块区域 string
+ * @param purpose 地块用途 number
+ * @param pageNumber 页码
  * @returns 
  */
-export async function diKuaiListToPage(pageNumber) {
+export async function diKuaiListToPage(code, area, purpose, pageNumber) {
+    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 diKuaiList = await dikuaiData.findDataToParamToPage({}, pageNumber);
+    let diKuaiList = await dikuaiData.findDataToParamToPage(param, pageNumber);
     let dataList = [];
     diKuaiList.forEach(item => {
-        let { size, dId, purpose, code, area, ct } = item;
-        dataList.push({size,dId,type:changeEnumValue(PURPOSE, purpose),code,area,ct});
+        let { size, dId, plotType, purpose, code, area, ct } = item;
+        dataList.push({
+            size,
+            dId,
+            plotType:changeEnumValue(PLOTTYPE, plotType),
+            type:changeEnumValue(PURPOSE, purpose),
+            code,
+            area,
+            ct:moment(ct).format("YYYY-MM-DD")
+        });
     });
 
     return {dataList}

src/biz/nongzi.ts

@@ -147,7 +147,30 @@ export async function zhongYangInfo(nzId) {
     return {dataInfo}
 }
 
-export async function zhongYangListToPage(page) {
+
+/**
+ * 农资管理
+ * @param nzType 农资类型
+ * @param dIdList 地块
+ * @param useTime 使用时间
+ * @param count 用量
+ * @param page 页码
+ * @returns 
+ */
+export async function zhongYangListToPage(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 dataCount = await nongziData.findDataToParamCouant({});
 
@@ -165,4 +188,5 @@ export async function zhongYangListToPage(page) {
     });
 
     return {dataList, dataCount}
-}
\ No newline at end of file
+}
+

src/config/enum.ts

@@ -9,7 +9,6 @@ export enum PLOTTYPE {
 }
 
 
-
 /**
  * 用途
  */
@@ -20,6 +19,23 @@ export enum PURPOSE {
 }
 
 
+/**
+ * 地块用途
+ */
+export enum DIKUAIPURPOSE {
+    菜田 = 1,
+    粮田 = 2,
+}
+
+
+/**
+ * 养殖用途
+ */
+export enum YANGZHIPURPOSE {
+    养殖 = 1000
+}
+
+
 
 /**
  * 种养类型

src/routers/admin.ts

@@ -104,9 +104,9 @@ async function dikuai_info(req, res) {
 }
 
 async function dikuai_list(req, res) {
-    let reqConf = {pageNumber:'Number'};
-    let { pageNumber } = eccReqParamater(reqConf, req.body);
-    let result = await diKuaiBiz.diKuaiListToPage(pageNumber);
+    let reqConf = {code:'String', area:'String', purpose:'Number', pageNumber:'Number'};
+    let { code, area, purpose, pageNumber } = eccReqParamater(reqConf, req.body, ["code", "area", "purpose"]);
+    let result = await diKuaiBiz.diKuaiListToPage(code, area, purpose, pageNumber);
     res.success(result);
 }
 
@@ -182,9 +182,9 @@ async function nongzi_info(req, res) {
 }
 
 async function nongzi_list(req, res) {
-    let reqConf = {page:'Number'};
-    let { page } = eccReqParamater(reqConf, req.body);
-    let result = await nongziBiz.zhongYangListToPage(page);
+    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.zhongYangListToPage(nzType, dIdList, useTime, count, page);
     res.success(result);
 }
 

src/routers/public.ts

@@ -7,6 +7,8 @@ import * as enumConfig from '../config/enum';
 const config = {
     "/zjnt/xcx/public/plottype":enumConfig.PLOTTYPE,//地块类型
     "/zjnt/xcx/public/purpose":enumConfig.PURPOSE,//用途
+    "/zjnt/xcx/public/dikuaipurpose":enumConfig.DIKUAIPURPOSE,//地块用途
+    "/zjnt/xcx/public/yangzhipurpose":enumConfig.YANGZHIPURPOSE,//养殖用途
     "/zjnt/xcx/public/planttype":enumConfig.PLANTTYPE,//种植种类
     "/zjnt/xcx/public/arearange":enumConfig.AREARANGE,//面积范围
     "/zjnt/xcx/public/nongzitype":enumConfig.NONGZITYPE,//农资类型