From 6d23951b3c281eff83da8e0e51e8bb2dfd6e57b9 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 20 Jul 2016 17:23:20 +0800 Subject: [PATCH] =?UTF-8?q?online=20=E5=AF=BC=E5=85=A5=E8=A1=A8=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cgform/controller/trans/CgformTransController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java b/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java index 0b343233..d79623e9 100644 --- a/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java +++ b/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java @@ -22,6 +22,7 @@ import org.jeecgframework.codegenerate.pojo.Columnt; import org.jeecgframework.core.common.model.json.AjaxJson; import org.jeecgframework.core.common.model.json.DataGrid; import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.core.util.oConvertUtils; import org.jeecgframework.tag.vo.datatable.SortDirection; import org.jeecgframework.web.cgform.entity.config.CgFormFieldEntity; import org.jeecgframework.web.cgform.entity.config.CgFormHeadEntity; @@ -197,13 +198,13 @@ public class CgformTransController { cgFormField.setLength(Integer.valueOf(columnt .getPrecision())); } - + //update-begin--Author:zhangdaihao Date:20140212 for:[001]oracle下number类型,数据库表导出表单,默认长度为0同步失败 else{ if(cgFormField.getType().equals(DataBaseConst.INT)){ cgFormField.setLength(10); } } - + //update-end--Author:zhangdaihao Date:20140212 for:[001]oracle下number类型,数据库表导出表单,默认长度为0同步失败 if (StringUtil.isNotEmpty(columnt.getScale())) cgFormField.setPointLength(Integer.valueOf(columnt .getScale())); @@ -212,6 +213,11 @@ public class CgformTransController { columnsList.add(cgFormField); } cgFormHead.setColumns(columnsList); + //update-begin--Author:scott Date:20170720 for:导入报单报错----- + if(oConvertUtils.isEmpty(cgFormHead.getJformCategory())){ + cgFormHead.setJformCategory("bdfl_ptbd"); + } + //update-end--Author:scott Date:20170720 for:导入报单报错----- cgFormFieldService.saveTable(cgFormHead, ""); if (yes != "") yes += ",";