Commit 8609f1d2 by lixinming

添加小数点,系统只保留两位小数

parent 6b9bef44
...@@ -311,7 +311,7 @@ export async function getAffiliationFuHuaQi() { ...@@ -311,7 +311,7 @@ export async function getAffiliationFuHuaQi() {
let distinctMap = {}; //去重用的map对象 格式为:{uscc:name} let distinctMap = {}; //去重用的map对象 格式为:{uscc:name}
notDisabledList.forEach(info => { notDisabledList.forEach(info => {
distinctMap[info.uscc] = info.name; distinctMap[info.uscc] = info.operationName;
}); });
let result = []; let result = [];
......
...@@ -32,6 +32,10 @@ export async function homeData(uscc:string) { ...@@ -32,6 +32,10 @@ export async function homeData(uscc:string) {
data.enterpriseCount = await findEnterpriseCountByFuHuaQiUscc(uscc) || 0; data.enterpriseCount = await findEnterpriseCountByFuHuaQiUscc(uscc) || 0;
data.lv = changeEnumValue(configEnum.FUHUAQILV, dataBaseInfo.lv); data.lv = changeEnumValue(configEnum.FUHUAQILV, dataBaseInfo.lv);
data.institutionalNature = changeEnumValue(configEnum.INSTITUTIONALNATURE, dataBaseInfo.institutionalNature); data.institutionalNature = changeEnumValue(configEnum.INSTITUTIONALNATURE, dataBaseInfo.institutionalNature);
/**截取小数位 */
data.incubatedAcreage = parseInt(data.incubatedAcreage);
data.acreageTotal = parseInt(data.acreageTotal);
data.acreagePersonalUse = parseInt(data.acreagePersonalUse);
return data; return data;
} }
......
...@@ -100,7 +100,7 @@ export async function findEnterpriseListByTaskId(taskId:string) { ...@@ -100,7 +100,7 @@ export async function findEnterpriseListByTaskId(taskId:string) {
* @param taskId 任务id 格式遵循tool中getTaskId * @param taskId 任务id 格式遵循tool中getTaskId
*/ */
export async function updateEnterpriseDraftLock(taskId:string) { export async function updateEnterpriseDraftLock(taskId:string) {
return await enterpriseModel.updateMany({taskId}, {$set:{draftLock:true}}, {upsert:true}); return await enterpriseModel.updateMany({taskId}, {$set:{draftLock:true}});
} }
......
...@@ -76,7 +76,7 @@ export async function findFinancingListByTaskId(taskId:string) { ...@@ -76,7 +76,7 @@ export async function findFinancingListByTaskId(taskId:string) {
* @param taskId 任务id 格式遵循tool中getTaskId * @param taskId 任务id 格式遵循tool中getTaskId
*/ */
export async function updateFinancingDraftLock(taskId:string) { export async function updateFinancingDraftLock(taskId:string) {
return await financingModel.updateMany({taskId}, {$set:{draftLock:true}}, {upsert:true}); return await financingModel.updateMany({taskId}, {$set:{draftLock:true}});
} }
......
...@@ -31,9 +31,16 @@ export function eccFormParam(name:string, keyTypeConf:object, param:object) { ...@@ -31,9 +31,16 @@ export function eccFormParam(name:string, keyTypeConf:object, param:object) {
} }
} else if (param[key]) { } else if (param[key]) {
let paramType = typeof param[key]; let paramType = typeof param[key];
switch(keyTypeConf[key]) { let confType = keyTypeConf[key].type;
switch(confType) {
case 'Number': case 'Number':
if ( paramType != 'number' ) isError = true; if ( paramType != 'number' ) {
isError = true;
} else {
if ((""+param[key]).indexOf('.') > -1) {
param[key] = parseInt(`${param[key] *100}`)/100;
}
}
break; break;
case 'String': case 'String':
if ( paramType != 'string' ) isError = true; if ( paramType != 'string' ) isError = true;
...@@ -100,7 +107,9 @@ export function eccReqParamater(conf:object, param, skipKeys?) { ...@@ -100,7 +107,9 @@ export function eccReqParamater(conf:object, param, skipKeys?) {
let paramType = typeof param[key]; let paramType = typeof param[key];
switch(conf[key]) { switch(conf[key]) {
case 'Number': case 'Number':
if ( paramType != 'number' ) isError = true; if ( paramType != 'number' ) {
isError = true;
}
break; break;
case 'String': case 'String':
if ( paramType != 'string' ) isError = true; if ( paramType != 'string' ) isError = true;
......
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