Merge remote-tracking branch 'origin/master'

This commit is contained in:
liyawei
2022-03-23 21:11:32 +08:00
6 changed files with 82 additions and 56 deletions
@@ -89,9 +89,11 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
@Override
public Integer queryExitTableData(OnlCgformTag onlCgformTag) {
//设置标签存入数据库的字段类型
if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.TEXT_NUMBER)){
if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.TEXT_NUMBER.getValue())){
onlCgformTag.setDbType("int");
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_SINGLE) && onlCgformTag.equals(FieldTypeEnum.DATE_MORE)){
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_SINGLE.getValue())){
onlCgformTag.setDbType("Date");
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_MORE.getValue())){
onlCgformTag.setDbType("Date");
}else{
onlCgformTag.setDbType("String");
@@ -123,6 +125,16 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
onlCgformTag.setUpdateTime(now);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
onlCgformTag.setUpdateBy(sysUser.getRealname());
//设置标签存入数据库的字段类型
if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.TEXT_NUMBER.getValue())){
onlCgformTag.setDbType("int");
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_SINGLE.getValue())){
onlCgformTag.setDbType("Date");
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_MORE.getValue())){
onlCgformTag.setDbType("Date");
}else{
onlCgformTag.setDbType("String");
}
saveOrUpdate(onlCgformTag);
}