Compare commits

..

No commits in common. '166457f0e9b9ad03fd53dce21bd08e85b52209a9' and 'a0fed6343b260ac21e34ce4ff474203b296aa63c' have entirely different histories.

  1. 6
      ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue
  2. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java
  3. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java
  4. 8
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java
  5. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java

@ -77,6 +77,7 @@
return { return {
description: '字段管理管理页面', description: '字段管理管理页面',
tableid:'', tableid:'',
tablename:'',
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
// //
@ -118,6 +119,7 @@
key: 'tableId_dictText', title: '对应实体', width: '6%', key: 'tableId_dictText', title: '对应实体', width: '6%',
type: JVXETypes.normal, type: JVXETypes.normal,
disabled: true, disabled: true,
defaultValue:this.tablename,
}, },
{ {
key: 'fieldName', title: '中文名称', width: '6%', key: 'fieldName', title: '中文名称', width: '6%',
@ -258,16 +260,13 @@
let method = ''; let method = '';
if (str.search("row") !== -1) { if (str.search("row") !== -1) {
props.row.id =''; props.row.id ='';
console.log("新增")
httpurl += this.url.add; httpurl += this.url.add;
method = 'post'; method = 'post';
} else { } else {
console.log("编辑")
httpurl += this.url.edit; httpurl += this.url.edit;
method = 'put'; method = 'put';
} }
props.row.tableId = this.tableid props.row.tableId = this.tableid
console.log(props.row)
httpAction(httpurl, props.row, method).then((res) => { httpAction(httpurl, props.row, method).then((res) => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
@ -276,7 +275,6 @@
this.$message.warning(res.message); this.$message.warning(res.message);
} }
}) })
props.row
}, },
// //
added(event) { added(event) {

@ -3,7 +3,6 @@ package org.jeecg.modules.modulex.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.modulex.entity.Modulex; import org.jeecg.modules.modulex.entity.Modulex;
/** /**
@ -16,7 +15,4 @@ public interface ModulexMapper extends BaseMapper<Modulex> {
@Select("SELECT realname FROM sys_user WHERE id = #{id}") @Select("SELECT realname FROM sys_user WHERE id = #{id}")
String getRealName(String id); String getRealName(String id);
@Update("update modulex set related_bean=#{tablex} where id = #{moduleId}")
void setmodule(String tablex, String moduleId);
} }

@ -27,7 +27,4 @@ public interface IModulexService extends IService<Modulex> {
Result<?> chehui(String id); Result<?> chehui(String id);
Result<?> shenhe(String id); Result<?> shenhe(String id);
void setmodule(String id, String moduleId);
} }

@ -29,9 +29,6 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
@Resource @Resource
private FunctionxMapper functionxMapper; private FunctionxMapper functionxMapper;
@Resource
private ModulexMapper modulexMapper;
/** /**
* 得到最大的版本号 * 得到最大的版本号
*/ */
@ -132,11 +129,6 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
return Result.OK("审核通过"); return Result.OK("审核通过");
} }
@Override
public void setmodule(String id, String moduleId) {
modulexMapper.setmodule(id,moduleId);
}
private void handleStatus(String id, Integer a){ private void handleStatus(String id, Integer a){
//先查字模块 先查询父id 等于 这个 id 的数据 //先查字模块 先查询父id 等于 这个 id 的数据

@ -111,8 +111,6 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
tablex.setVerison(1); tablex.setVerison(1);
tablex.setTableStructure("CREATE TABLE '"+tablex.getTableEnName()+"' ();"); tablex.setTableStructure("CREATE TABLE '"+tablex.getTableEnName()+"' ();");
tablexService.save(tablex); tablexService.save(tablex);
System.err.println(tablex.toString());
modulexService.setmodule(tablex.getId(),tablex.getModuleId());
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
@ -160,7 +158,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
if (!fieldxList1.isEmpty()){ if (!fieldxList1.isEmpty()){
return Result.error("该表已被关联,不能删除"); return Result.error("该表已被关联,不能删除");
} }
tablexService.removeById(id); // tablexService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }

Loading…
Cancel
Save