Commit 49792b7c by lixinming

no message

parent a340ab0e
...@@ -322,7 +322,8 @@ export async function visitDemandList(fuHuaQiUscc, demand) { ...@@ -322,7 +322,8 @@ export async function visitDemandList(fuHuaQiUscc, demand) {
dataList.push({ dataList.push({
enterpriseName:item.enterpriseName, enterpriseName:item.enterpriseName,
id:item.id, id:item.id,
demand demand,
uscc:item.uscc
}); });
}) })
...@@ -362,22 +363,26 @@ export async function visitDemandAdd(fuHuaQiUscc, uscc, demand, demandDesc) { ...@@ -362,22 +363,26 @@ export async function visitDemandAdd(fuHuaQiUscc, uscc, demand, demandDesc) {
return {isSuccess:true}; return {isSuccess:true};
} }
export async function visitDemandEnterpriseInfo(id) { export async function visitDemandEnterpriseInfo(uscc) {
let dbList = await demandData.findByParam({id}); let dbList = await demandData.findByParam({uscc});
let enterpriseName = "";
let dataList = []; let dataList = [];
dbList.forEach(item => { dbList.forEach(item => {
let demand = changeEnumManyValue(VISITDEMAND, item.demand) let demand = changeEnumManyValue(VISITDEMAND, item.demand)
enterpriseName = item.enterpriseName;
uscc = item.uscc;
dataList.push({ dataList.push({
id:item.id, id:item.id,
uscc:item.uscc,
demand, demand,
time:moment(item.createTime).format("YYYY.MM.DD"), time:moment(item.createTime).format("YYYY.MM.DD"),
demandDesc:item.demandDesc demandDesc:item.demandDesc
}); });
}) })
return {dataList}; return {dataList,uscc, enterpriseName};
} }
export async function visitDemandDelete(id) { export async function visitDemandDelete(id) {
......
...@@ -43,6 +43,7 @@ import * as leaseModel from "../../data/lease"; ...@@ -43,6 +43,7 @@ import * as leaseModel from "../../data/lease";
import * as visitModel from "../../data/fuHuaQi/visit"; import * as visitModel from "../../data/fuHuaQi/visit";
import * as demandModel from "../../data/fuHuaQi/demand"; import * as demandModel from "../../data/fuHuaQi/demand";
import * as trackModel from "../../data/fuHuaQi/track"; import * as trackModel from "../../data/fuHuaQi/track";
import * as activityModel from "../../data/activity";
...@@ -90,4 +91,5 @@ export async function initTable() { ...@@ -90,4 +91,5 @@ export async function initTable() {
visitModel.initModel(); visitModel.initModel();
demandModel.initModel(); demandModel.initModel();
trackModel.initModel(); trackModel.initModel();
activityModel.initModel();
} }
\ No newline at end of file
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
import * as asyncHandler from 'express-async-handler'; import * as asyncHandler from 'express-async-handler';
import { eccReqParamater } from '../../util/verificationParam'; import { eccReqParamater } from '../../util/verificationParam';
import { checkFuHuaQiToken } from '../../middleware/user'; import { checkEnterpriseToken } from '../../middleware/user';
import * as visitBiz from '../../biz/mobileFuHuaQi/visit'; import * as visitBiz from '../../biz/mobileFuHuaQi/visit';
export function setRouter(httpServer) { export function setRouter(httpServer) {
httpServer.post('/enterprise/visit/demand/list', checkFuHuaQiToken, asyncHandler(visit_demand_list));//诉求列表 httpServer.post('/enterprise/visit/demand/list', checkEnterpriseToken, asyncHandler(visit_demand_list));//诉求列表
httpServer.post('/enterprise/visit/demand/add', checkFuHuaQiToken, asyncHandler(visit_demand_add));//添加诉求 httpServer.post('/enterprise/visit/demand/add', checkEnterpriseToken, asyncHandler(visit_demand_add));//添加诉求
} }
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
*/ */
import * as asyncHandler from 'express-async-handler'; import * as asyncHandler from 'express-async-handler';
import { checkEnterpriseToken } from '../../middleware/user'; import { checkFuHuaQiToken } from '../../middleware/user';
import * as activityBiz from '../../biz/mobileEnterprise/activity'; import * as activityBiz from '../../biz/mobileEnterprise/activity';
import { eccReqParamater } from '../../util/verificationParam'; import { eccReqParamater } from '../../util/verificationParam';
export function setRouter(httpServer) { export function setRouter(httpServer) {
httpServer.post('/fuhuaqi/activity/list', checkEnterpriseToken, asyncHandler(activity_list));//活动列表 httpServer.post('/fuhuaqi/activity/list', checkFuHuaQiToken, asyncHandler(activity_list));//活动列表
httpServer.post('/fuhuaqi/activity/info', checkEnterpriseToken, asyncHandler(activity_info));//活动详情 httpServer.post('/fuhuaqi/activity/info', checkFuHuaQiToken, asyncHandler(activity_info));//活动详情
} }
async function activity_list(req, res) { async function activity_list(req, res) {
......
...@@ -68,11 +68,11 @@ async function visit_demand_add(req, res) { ...@@ -68,11 +68,11 @@ async function visit_demand_add(req, res) {
} }
async function visit_demand_enterpriseinfo(req, res) { async function visit_demand_enterpriseinfo(req, res) {
let reqConf = { id:'String', }; let reqConf = { uscc:'String', };
let {id} = eccReqParamater(reqConf, req.body); let {uscc} = eccReqParamater(reqConf, req.body);
const FHQUscc = req.headers.uscc; const FHQUscc = req.headers.uscc;
let userInfo = await visitBiz.visitDemandEnterpriseInfo(id); let userInfo = await visitBiz.visitDemandEnterpriseInfo(uscc);
res.success(userInfo); res.success(userInfo);
} }
...@@ -146,11 +146,11 @@ async function visit_track_add(req, res) { ...@@ -146,11 +146,11 @@ async function visit_track_add(req, res) {
} }
async function visit_track_list(req, res) { async function visit_track_list(req, res) {
let reqConf = { id:'String', }; let reqConf = { uscc:'String', };
let {id} = eccReqParamater(reqConf, req.body); let {uscc} = eccReqParamater(reqConf, req.body);
const FHQUscc = req.headers.uscc; const FHQUscc = req.headers.uscc;
let userInfo = await visitBiz.visitDemandEnterpriseInfo(id); let userInfo = await visitBiz.visitDemandEnterpriseInfo(uscc);
res.success(userInfo); res.success(userInfo);
} }
......
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