hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改档案字段

This commit is contained in:
lvleigang 2024-05-10 09:31:47 +08:00
parent 30a589544c
commit 4c18ebcd71
6 changed files with 83 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
View File

@ -327,14 +327,15 @@ where id = #{id}
</when> </when>
</choose> </choose>
</foreach> </foreach>
`sorts` bigint(20) DEFAULT NULL COMMENT '排序', `sorts` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '排序',
`create_user_id` varchar(50) DEFAULT NULL COMMENT '创建人id', `create_user_id` varchar(50) DEFAULT NULL COMMENT '创建人id',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`modify_user_id` varchar(50) DEFAULT NULL COMMENT '修改人id', `modify_user_id` varchar(50) DEFAULT NULL COMMENT '修改人id',
`modify_time` datetime DEFAULT NULL COMMENT '修改时间', `modify_time` datetime DEFAULT NULL COMMENT '修改时间',
`sts` char(1) DEFAULT NULL COMMENT '状态(Y正常N删除)', `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)',
`org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID', `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
PRIMARY KEY (`id`) `company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
PRIMARY KEY (`sorts`,`id`) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = #{tableRemark} ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = #{tableRemark}
</select> </select>
@ -346,14 +347,15 @@ where id = #{id}
`app_id` varchar(50) DEFAULT NULL COMMENT '应用id', `app_id` varchar(50) DEFAULT NULL COMMENT '应用id',
`status` varchar(50) DEFAULT NULL COMMENT '状态', `status` varchar(50) DEFAULT NULL COMMENT '状态',
`msg` varchar(50) DEFAULT NULL COMMENT '描述', `msg` varchar(50) DEFAULT NULL COMMENT '描述',
`sorts` bigint(20) DEFAULT NULL COMMENT '排序', `sorts` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '排序',
`create_user_id` varchar(50) DEFAULT NULL COMMENT '创建人id', `create_user_id` varchar(50) DEFAULT NULL COMMENT '创建人id',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`modify_user_id` varchar(50) DEFAULT NULL COMMENT '修改人id', `modify_user_id` varchar(50) DEFAULT NULL COMMENT '修改人id',
`modify_time` datetime DEFAULT NULL COMMENT '修改时间', `modify_time` datetime DEFAULT NULL COMMENT '修改时间',
`sts` char(1) DEFAULT NULL COMMENT '状态(Y正常N删除)', `sts` varchar(1) DEFAULT NULL COMMENT '状态(Y正常N删除)',
`org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID', `org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
PRIMARY KEY (`id`) `company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
PRIMARY KEY (`sorts`,`id`) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = #{tableRemark} ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = #{tableRemark}
</select> </select>

70
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
View File

@ -57,6 +57,7 @@ import com.hzya.frame.sys.roleModule.dao.IRoleModuleMapper;
import com.hzya.frame.sys.roleModule.entity.RoleModule; import com.hzya.frame.sys.roleModule.entity.RoleModule;
import com.hzya.frame.sys.userRole.dao.IUserRoleMapper; import com.hzya.frame.sys.userRole.dao.IUserRoleMapper;
import com.hzya.frame.sys.userRole.entity.UserRole; import com.hzya.frame.sys.userRole.entity.UserRole;
import com.hzya.frame.sysnew.menuConfig.entity.SysMenuConfigEntity;
import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.uuid.UUIDUtils;
import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.BaseResult;
import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.web.entity.JsonResultEntity;
@ -965,38 +966,45 @@ public class MdmServiceImpl implements IMdmService {
moduleEntity = mdmModuleDao.queryOne(moduleEntity); moduleEntity = mdmModuleDao.queryOne(moduleEntity);
if (flag) { if (flag) {
//新增菜单 //新增菜单
Module module = new Module(); SysMenuConfigEntity module = new SysMenuConfigEntity();
module.setCreate(); module.setCreate();
module.setServiceName("mdmService");//Spring bean名称 module.setParentMenuId("ea22757e99c144fb9ef381dd322e233c");
module.setLvl("2");//等级 module.setMenuName(moduleEntity.getMdmName());
module.setName("integrationOptionAdmin"+moduleEntity.getMdmCode());//名称 module.setMenuEnglishName("integrationOptionAdmin"+moduleEntity.getMdmCode());
module.setCode(moduleEntity.getMdmCode().toString());//编码 module.setMenuIcon(null);//模块图标
module.setFormType("0");//类型 0、menu 1、tree 2、list 3、view module.setRoute("integrationOptionAdmin/"+moduleEntity.getMdmCode());//路由地址
module.setLevel("2");//模块操作级别Superadministrator module.setMenuPage("integrationOptionV2/index");//一级Layout 二级 ParntView 三级component
module.setIcon(null);//模块图标
module.setUpIds("c3dda399207843eeac91770ac18e91e3");//上级id
module.setTableName(null);//bean表名称映射key
module.setKeyModular(null);//是否关键模块(Y是N否) //module.setServiceName("mdmService");//Spring bean名称
module.setTarget(null);//跳转目标 //module.setLvl("2");//等级
module.setRemark("主数据" + moduleEntity.getMdmName());//备注 //module.setName("integrationOptionAdmin"+moduleEntity.getMdmCode());//名称
module.setOpenType("1");//菜单打开方式 //module.setCode(moduleEntity.getMdmCode().toString());//编码
module.setFormId(entity.getId());//表单ID //module.setFormType("0");//类型 0、menu 1、tree 2、list 3、view
module.setAppId(null);//应用id //module.setLevel("2");//模块操作级别Superadministrator
module.setPath("integrationOptionAdmin/"+moduleEntity.getMdmCode());//路由地址 //module.setIcon(null);//模块图标
//module.setPath("integrationOptionAdmin");//路由地址 //module.setUpIds("c3dda399207843eeac91770ac18e91e3");//上级id
module.setComponent("integrationOptionV2/index");//一级Layout 二级 ParntView 三级component //module.setTableName(null);//bean表名称映射key
module.setHidden("false");//隐藏 //module.setKeyModular(null);//是否关键模块(Y是N否)
module.setRedirect(null);//redirevt //module.setTarget(null);//跳转目标
module.setAlwaysShow(null);//alwaysShow //module.setRemark("主数据" + moduleEntity.getMdmName());//备注
module.setTitle(moduleEntity.getMdmName());//标题 //module.setOpenType("1");//菜单打开方式
module.setNoCache(null);//nocache缓存 //module.setFormId(entity.getId());//表单ID
module.setLabel(moduleEntity.getMdmName());//label //module.setAppId(null);//应用id
JSONObject object1 = new JSONObject(); ////module.setPath("integrationOptionAdmin");//路由地址
object1.put("mdmId", moduleEntity.getId());//主数据id //module.setHidden("false");//隐藏
object1.put("mdmCode", moduleEntity.getMdmCode());//主数据编码 //module.setRedirect(null);//redirevt
object1.put("viewType", mdmModuleViewEntity.getViewName());//1、树 2、列表 //module.setAlwaysShow(null);//alwaysShow
module.setOptions(object1.toString());//菜单mate参数 //module.setTitle(moduleEntity.getMdmName());//标题
moduleMapper.entity_insert(module); //module.setNoCache(null);//nocache缓存
//module.setLabel(moduleEntity.getMdmName());//label
//JSONObject object1 = new JSONObject();
//object1.put("mdmId", moduleEntity.getId());//主数据id
//object1.put("mdmCode", moduleEntity.getMdmCode());//主数据编码
//object1.put("viewType", mdmModuleViewEntity.getViewName());//1、树 2、列表
//module.setOptions(object1.toString());//菜单mate参数
//moduleMapper.entity_insert(module);
} else { } else {
//修改菜单 注意因为可能修改显示类型，所以需要修改菜单的属性 //修改菜单 注意因为可能修改显示类型，所以需要修改菜单的属性
Module module = new Module(); Module module = new Module();

18
service/src/main/java/com/hzya/frame/u8c/ax/entity/ArchivesEntity.java
View File

@ -30,6 +30,8 @@ public class ArchivesEntity extends BaseEntity {
private String rightApiId;//右接口ID private String rightApiId;//右接口ID
private String rightId;//右id private String rightId;//右id
private String rightName;//右名称 private String rightName;//右名称
private String leftOrg;//左公司
private String rightOrg;//右公司
public String getArchivesType() { public String getArchivesType() {
return archivesType; return archivesType;
@ -151,6 +153,22 @@ public class ArchivesEntity extends BaseEntity {
this.rightName = rightName; this.rightName = rightName;
} }
public String getLeftOrg() {
return leftOrg;
}
public void setLeftOrg(String leftOrg) {
this.leftOrg = leftOrg;
}
public String getRightOrg() {
return rightOrg;
}
public void setRightOrg(String rightOrg) {
this.rightOrg = rightOrg;
}
public void setCreate() { public void setCreate() {
this.setId(UUIDUtils.getUUID()); this.setId(UUIDUtils.getUUID());
this.setSts("Y"); this.setSts("Y");

1
service/src/main/java/com/hzya/frame/u8c/ax/entity/ArchivesEntity.xml
View File

@ -45,6 +45,7 @@
</choose> </choose>
<trim prefix="where" prefixOverrides="and"> <trim prefix="where" prefixOverrides="and">
<if test="leftCode != null and leftCode != ''">and left_code = #{leftCode}</if> <if test="leftCode != null and leftCode != ''">and left_code = #{leftCode}</if>
<if test="leftOrg != null and leftOrg != ''">and left_org = #{leftOrg}</if>
and sts='Y' and sts='Y'
</trim> </trim>
</select> </select>

19
service/src/main/java/com/hzya/frame/u8c/ax/service/impl/AxServiceImpl.java
View File

@ -148,10 +148,12 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
ArchivesEntity archivesEntity = new ArchivesEntity(); ArchivesEntity archivesEntity = new ArchivesEntity();
archivesEntity.setArchivesType(ass.getChecktypecode()); archivesEntity.setArchivesType(ass.getChecktypecode());
archivesEntity.setLeftCode(ass.getCheckvaluecode()); archivesEntity.setLeftCode(ass.getCheckvaluecode());
//List<ArchivesEntity> archivesEntities = axDao.queryArchivesData(archivesEntity); archivesEntity.setLeftOrg(voucher.getPk_corp());
//if(archivesEntities != null && archivesEntities.size() > 0){
// ass.setCheckvaluecode(archivesEntities.get(0).getRightCode()); List<ArchivesEntity> archivesEntities = axDao.queryArchivesData(archivesEntity);
//} if(archivesEntities != null && archivesEntities.size() > 0){
ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
}
} }
} }
} }
@ -180,10 +182,11 @@ public class AxServiceImpl extends BaseService<ArchivesEntity, String> implement
ArchivesEntity archivesEntity = new ArchivesEntity(); ArchivesEntity archivesEntity = new ArchivesEntity();
archivesEntity.setArchivesType(ass.getChecktypecode()); archivesEntity.setArchivesType(ass.getChecktypecode());
archivesEntity.setLeftCode(ass.getCheckvaluecode()); archivesEntity.setLeftCode(ass.getCheckvaluecode());
//List<ArchivesEntity> archivesEntities = axDao.queryArchivesData(archivesEntity); archivesEntity.setLeftOrg(voucher.getPk_corp());
//if(archivesEntities != null && archivesEntities.size() > 0){ List<ArchivesEntity> archivesEntities = axDao.queryArchivesData(archivesEntity);
// ass.setCheckvaluecode(archivesEntities.get(0).getRightCode()); if(archivesEntities != null && archivesEntities.size() > 0){
//} ass.setCheckvaluecode(archivesEntities.get(0).getRightCode());
}
} }
} }
} }

2
webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
View File

@ -237,7 +237,7 @@ public class EntranceServiceImpl implements IEntranceService {
//tailuo 要访问的Bean名称 //tailuo 要访问的Bean名称
String service = request.getHeader("tl"); String service = request.getHeader("tl");
//bean方法 //bean方法
String serviceMethod = request.getHeader("ya-dj"); String serviceMethod = request.getHeader("yadj");
String body = ServletUtil.getBody(servletRequest); String body = ServletUtil.getBody(servletRequest);
//获取类 //获取类
Object object = null; Object object = null;