liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '多语言支持' (#240) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/240
This commit is contained in:
dxfeng 2024-05-31 09:07:49 +08:00
parent b232148b09 703de629f9
commit 9705c64f96
20 changed files with 142 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
View File

@ -29,8 +29,8 @@ import lombok.NoArgsConstructor;
sortway = "asc",
primarykey = "id",
operates = {
@OrganizationTableOperate(index = "0", text = "编辑"),
@OrganizationTableOperate(index = "1", text = "删除")
@OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
@OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
},
tableType = WeaTableType.CHECKBOX,
operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"),
@ -51,26 +51,26 @@ public class SchemeTableVO {
/**
* 方案编号
*/
@OrganizationTableColumn(text = "编号", width = "25%", column = "scheme_no", orderkey = "scheme_no")
@OrganizationTableColumn(text = "编号", labelId = 547118, width = "25%", column = "scheme_no", orderkey = "scheme_no")
private String schemeNo;
/**
* 方案名称
*/
@OrganizationTableColumn(text = "方案名称", width = "25%", column = "scheme_name")
@OrganizationTableColumn(text = "方案名称", labelId = 547127, width = "25%", column = "scheme_name")
private String schemeName;
@OrganizationTableColumn(text = "所属分部", width = "25%", column = "subcompanyid",transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById")
@OrganizationTableColumn(text = "所属分部", labelId = 547128, width = "25%", column = "subcompanyid", transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById")
private String subCompanyName;
/**
* 方案描述
*/
@OrganizationTableColumn(text = "方案说明", width = "40%", column = "scheme_description")
@OrganizationTableColumn(text = "方案说明", labelId = 547129, width = "40%", column = "scheme_description")
private String schemeDescription;
/**
* 禁用标识
*/
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", labelId = 547130, width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}

2
src/com/engine/organization/service/impl/CompServiceImpl.java
View File

@ -197,7 +197,7 @@ public class CompServiceImpl extends Service implements CompService {
@Override
public Map<String, List<MenuBtn>> getHasRight() {
return MenuBtn.getDatasNoBtnColum();
return MenuBtn.getDatasNoBtnColum(user.getLanguage());
}
@Override

6
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -252,7 +252,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
@Override
public Map<String, List<MenuBtn>> getHasRight() {
MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build();
Map<String, List<MenuBtn>> datasNoBtnColum = MenuBtn.getDatasNoBtnColum();
Map<String, List<MenuBtn>> datasNoBtnColum = MenuBtn.getDatasNoBtnColum(user.getLanguage());
datasNoBtnColum.get("topMenu").add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("export").menuIcon("icon-coms-export").menuName("全部导出").type("BTN_Export").build());
datasNoBtnColum.get("rightMenu").add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("export").menuIcon("icon-coms-export").menuName("全部导出").type("BTN_Export").build());
return datasNoBtnColum;
@ -864,12 +864,12 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
*
* @return
*/
public static String repeatDetermine(String deptNo) {
public String repeatDetermine(String deptNo) {
CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.DEPARTMENT.getValue());
if (StringUtils.isNotBlank(deptNo)) {
deptNo = CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, deptNo);
List<DepartmentPO> list = getDepartmentMapper().listByNo(Util.null2String(deptNo));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
} else {
OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
deptNo = autoCreateCompanyNo();

5
src/com/engine/organization/service/impl/GradeServiceImpl.java
View File

@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.systeminfo.SystemEnv;
import java.util.*;
@ -145,7 +146,7 @@ public class GradeServiceImpl extends Service implements GradeService {
// 编辑状态下赋值操作
if (!StringUtil.isEmpty(id)) {
GradePO gradePO = getGradeMapper().getGradeByID(Integer.parseInt(id));
OrganizationAssert.notNull(gradePO, "选择的数据不存在，或数据已删除");
OrganizationAssert.notNull(gradePO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
gradeNameCondition.setValue(gradePO.getGradeName());
gradeNoCondition.setValue(gradePO.getGradeNo());
@ -198,7 +199,7 @@ public class GradeServiceImpl extends Service implements GradeService {
@Override
public Map<String, List<MenuBtn>> getHasRight() {
return MenuBtn.getCommonBtnDatas();
return MenuBtn.getCommonBtnDatas(user.getLanguage());
}
@Override

3
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -69,7 +69,6 @@ import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static weaver.general.Util.getIntValue;
@ -575,7 +574,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
}
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName("列定制").type("BTN_COLUMN").build());
rightMenuList.add(MenuBtn.rightMenu_btnLog());
rightMenuList.add(MenuBtn.rightMenu_btnLog(user.getLanguage()));
btnDatas.put("topMenu", topMenuList);
btnDatas.put("rightMenu", rightMenuList);
btnDatas.put("hasRight", true);

15
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -55,6 +55,7 @@ import org.apache.commons.lang.StringUtils;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.systeminfo.SystemEnv;
import java.util.*;
import java.util.stream.Collectors;
@ -201,15 +202,16 @@ public class JobServiceImpl extends Service implements JobService {
Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
ArrayList<MenuBtn> topMenuList = new ArrayList<>();
ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
int userLanguage = user.getLanguage();
// 批量删除
topMenuList.add(MenuBtn.topMenu_batchDelete());
topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
topMenuList.add(MenuBtn.topMenu_addNew());
topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
btnDatas.put("topMenu", topMenuList);
// 日志
rightMenuList.add(MenuBtn.rightMenu_btnLog());
rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
rightMenuList.add(MenuBtn.rightMenu_addNew());
rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
btnDatas.put("rightMenu", rightMenuList);
return btnDatas;
}
@ -769,12 +771,13 @@ public class JobServiceImpl extends Service implements JobService {
*
* @return
*/
public static String repeatDetermine(String jobNo) {
public String repeatDetermine(String jobNo) {
CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.JOBTITLES.getValue());
if (StringUtils.isNotBlank(jobNo)) {
jobNo = CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, jobNo);
List<JobPO> list = getJobMapper().listByNo(Util.null2String(jobNo));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
} else {
OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
jobNo = autoCreateCompanyNo();

5
src/com/engine/organization/service/impl/LevelServiceImpl.java
View File

@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.systeminfo.SystemEnv;
import java.util.*;
@ -139,7 +140,7 @@ public class LevelServiceImpl extends Service implements LevelService {
// 编辑状态下赋值操作
if (!StringUtil.isEmpty(id)) {
LevelPO levelPO = getLevelMapper().getLevelByID(Integer.parseInt(id));
OrganizationAssert.notNull(levelPO, "选择的数据不存在，或数据已删除");
OrganizationAssert.notNull(levelPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
levelNameCondition.setValue(levelPO.getLevelName());
levelNoCondition.setValue(levelPO.getLevelNo());
@ -165,7 +166,7 @@ public class LevelServiceImpl extends Service implements LevelService {
@Override
public Map<String, List<MenuBtn>> getTableBtn() {
return MenuBtn.getCommonBtnDatas();
return MenuBtn.getCommonBtnDatas(user.getLanguage());
}
@Override

18
src/com/engine/organization/service/impl/PostInfoServiceImpl.java
View File

@ -24,6 +24,7 @@ import weaver.conn.RecordSet;
import weaver.general.BaseBean;
import weaver.general.GCONST;
import weaver.general.Util;
import weaver.systeminfo.SystemEnv;
import java.io.File;
import java.io.FileOutputStream;
@ -107,7 +108,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
public int savePostInfo(PostInfoSearchParam param) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
List<PostInfoPO> list = getPostInfoMapper().listByNo(Util.null2String(param.getPostInfoNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
PostInfoPO postInfoPO = PostInfoDTO.convertParamToPO(param, (long) user.getUID());
return getPostInfoMapper().insertIgnoreNull(postInfoPO);
}
@ -119,7 +120,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
String oldPostInfoNo = getPostInfoMapper().getPostInfoByID(postInfoPO.getId()).getPostInfoNo();
if (!oldPostInfoNo.equals(postInfoPO.getPostInfoNo())) {
List<PostInfoPO> list = getPostInfoMapper().listByNo(Util.null2String(postInfoPO.getPostInfoNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
}
return getPostInfoMapper().updatePostInfo(postInfoPO);
}
@ -184,7 +185,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
String planId = Util.null2String(params.get("planId"));
if (StringUtils.isNotBlank(id)) {
PostInfoPO postInfoPO = getPostInfoMapper().getPostInfoByID(Integer.parseInt(id));
OrganizationAssert.notNull(postInfoPO, "选择的数据不存在，或数据已删除");
OrganizationAssert.notNull(postInfoPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
noItem.setValue(postInfoPO.getPostInfoNo());
nameItem.setValue(postInfoPO.getPostInfoName());
@ -224,23 +225,24 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
Map<String, Object> btnDatas = new HashMap<>();
ArrayList<MenuBtn> topMenuList = new ArrayList<>();
ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
int userLanguage = user.getLanguage();
// 新增
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("addPlan").menuIcon("icon-coms-New-Flow").menuName("新增职务分类").type("BTN_AddPlan").build());
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("editPlan").menuIcon("icon-coms-edit").menuName("修改职务分类").type("BTN_EditPlan").build());
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("delPlan").menuIcon("icon-coms-Delete").menuName("删除职务分类").type("BTN_DelPlan").build());
topMenuList.add(MenuBtn.topMenu_addNew());
topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
// 批量删除
topMenuList.add(MenuBtn.topMenu_batchDelete());
topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
btnDatas.put("topMenu", topMenuList);
// 新增
rightMenuList.add(MenuBtn.rightMenu_addNew());
rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
// 日志
rightMenuList.add(MenuBtn.rightMenu_btnLog());
rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
// 显示列定制
rightMenuList.add(MenuBtn.rightMenu_btnColumn());
rightMenuList.add(MenuBtn.rightMenu_btnColumn(userLanguage));
btnDatas.put("rightMenu", rightMenuList);
return btnDatas;

3
src/com/engine/organization/service/impl/PostServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.engine.organization.util.OrganizationFormItemUtil;
import com.engine.organization.util.db.MapperProxyFactory;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.systeminfo.SystemEnv;
import java.util.*;
@ -66,7 +67,7 @@ public class PostServiceImpl extends Service implements PostService {
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
PostPO postPO = getPostMapper().getPostByID(Integer.parseInt(id));
OrganizationAssert.notNull(postPO, "选择的数据不存在，或数据已删除");
OrganizationAssert.notNull(postPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
postNameItem.setValue(postPO.getPostName());
descriptionItem.setValue(postPO.getDescription());

5
src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java
View File

@ -23,6 +23,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.Util;
import weaver.systeminfo.SystemEnv;
import java.util.*;
import java.util.stream.Collectors;
@ -138,7 +139,7 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
@Override
public int save(ResourceItemPO resourceItemPO) {
List<ResourceItemPO> list = getResourceBasicInfoMapper().selectItemByFNo(resourceItemPO.getFno(), resourceItemPO.getFclassid());
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, this.user.getLanguage()));
return getResourceBasicInfoMapper().insertIgnoreNull(resourceItemPO);
}
@ -181,7 +182,7 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
@Override
public int saveResourceItemClass(ResourceItemClassPO itemClassPO) {
List<ResourceItemClassPO> list = getResourceBasicInfoMapper().selectItemClassByFNo(itemClassPO.getFno(), null);
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
itemClassPO.setCreator((long) user.getUID());
itemClassPO.setCreateTime(new Date());
return getResourceBasicInfoMapper().saveResourceItemClass(itemClassPO);

33
src/com/engine/organization/service/impl/SchemeServiceImpl.java
View File

@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.systeminfo.SystemEnv;
import java.util.*;
import java.util.stream.Collectors;
@ -65,9 +66,9 @@ public class SchemeServiceImpl extends Service implements SchemeService {
public int save(SchemeSearchParam param) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
List<SchemePO> list = getSchemeMapper().listByNo(Util.null2String(param.getSchemeNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
List<SchemePO> schemePOS = getSchemeMapper().selectByParams(param.getSubcompanyid(), param.getSchemeName());
OrganizationAssert.isEmpty(schemePOS, "同一分部下方案名称不允许重复");
OrganizationAssert.isEmpty(schemePOS, SystemEnv.getHtmlLabelName(547153,user.getLanguage()));
SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID());
return getSchemeMapper().insertIgnoreNull(schemePO);
}
@ -80,10 +81,10 @@ public class SchemeServiceImpl extends Service implements SchemeService {
String oldSchemeNo = getSchemeMapper().getSchemeByID(schemePO.getId()).getSchemeNo();
if (!oldSchemeNo.equals(schemePO.getSchemeNo())) {
List<SchemePO> list = getSchemeMapper().listByNo(Util.null2String(schemePO.getSchemeNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
List<SchemePO> schemePOS = getSchemeMapper().selectByParams(param.getSubcompanyid(), param.getSchemeName());
OrganizationAssert.isEmpty(schemePOS, SystemEnv.getHtmlLabelName(547153,user.getLanguage()));
}
List<SchemePO> schemePOS = getSchemeMapper().selectByParams(param.getSubcompanyid(), param.getSchemeName());
OrganizationAssert.isEmpty(schemePOS, "同一分部下方案名称不允许重复");
return getSchemeMapper().updateScheme(schemePO);
}
@ -98,7 +99,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
@Override
public int deleteByIds(Collection<Long> ids) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
return getSchemeMapper().deleteByIds(ids);
}
@ -108,8 +109,8 @@ public class SchemeServiceImpl extends Service implements SchemeService {
Map<String, Object> apiDatas = new HashMap<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();
List<SearchConditionItem> conditionItems = new ArrayList<>();
SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "方案名称", "schemeName");
SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "方案编号", "schemeNo");
SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547127, "schemeName");
SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547131, "schemeNo");
conditionItems.add(schemeNameCondition);
conditionItems.add(schemeNoCondition);
addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
@ -124,18 +125,18 @@ public class SchemeServiceImpl extends Service implements SchemeService {
Map<String, Object> apiDatas = new HashMap<>();
List<SearchConditionItem> selectItems = new ArrayList<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();
SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案名称", "schemeName");
SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547127, "schemeName");
schemeNameCondition.setRules("required|string");
SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案编号", "schemeNo");
SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547131, "schemeNo");
schemeNoCondition.setRules("required|string");
SearchConditionItem subCompanyIdItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "所属分部", "164", "subCompanyId", "");
SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "方案说明", "schemeDescription");
SearchConditionItem subCompanyIdItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547128, "164", "subCompanyId", "");
SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547129, "schemeDescription");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
SchemePO schemePO = getSchemeMapper().getSchemeByID(Integer.parseInt(id));
OrganizationAssert.notNull(schemePO, "选择的数据不存在，或数据已删除");
OrganizationAssert.notNull(schemePO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
schemeNameCondition.setValue(schemePO.getSchemeName());
schemeNoCondition.setValue(schemePO.getSchemeNo());
textareaItem.setValue(schemePO.getSchemeDescription());
@ -156,7 +157,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
@Override
public Map<String, List<MenuBtn>> getTableBtn() {
return MenuBtn.getCommonBtnDatas();
return MenuBtn.getCommonBtnDatas(user.getLanguage());
}
@Override
@ -168,8 +169,8 @@ public class SchemeServiceImpl extends Service implements SchemeService {
List<String> asList = Arrays.asList(jclRoleLevels.split(","));
treeDataList = treeDataList.stream().filter(item->asList.contains(item.getSubCompanyId())).collect(Collectors.toList());
}
List<TypeTreeVO> childList = treeDataList.stream().map(e -> TypeTreeVO.builder().domid(e.getKey()).key(Long.parseLong(e.getKey())).name(e.getStatus() == 0 ? e.getTitle() : e.getTitle() + "(已禁用)").build()).collect(Collectors.toList());
TypeTreeVO build = TypeTreeVO.builder().childs(childList).haschild(true).domid("-1").key(-1L).name("全部方案").build();
List<TypeTreeVO> childList = treeDataList.stream().map(e -> TypeTreeVO.builder().domid(e.getKey()).key(Long.parseLong(e.getKey())).name(e.getStatus() == 0 ? e.getTitle() : e.getTitle() + "("+SystemEnv.getHtmlLabelName(547155,user.getLanguage())+")").build()).collect(Collectors.toList());
TypeTreeVO build = TypeTreeVO.builder().childs(childList).haschild(true).domid("-1").key(-1L).name(SystemEnv.getHtmlLabelName(547140,user.getLanguage())).build();
List<TypeTreeVO> typeTreeVOS = new ArrayList<>();
typeTreeVOS.add(build);
return typeTreeVOS;

9
src/com/engine/organization/service/impl/SequenceServiceImpl.java
View File

@ -27,6 +27,7 @@ import weaver.general.BaseBean;
import weaver.general.GCONST;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.systeminfo.SystemEnv;
import java.io.File;
import java.io.FileOutputStream;
@ -111,7 +112,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
public int saveSequence(SequenceSearchParam param) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
List<SequencePO> list = getSequenceMapper().listByNo(Util.null2String(param.getSequenceNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID());
return getSequenceMapper().insertIgnoreNull(sequencePO);
}
@ -123,7 +124,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
String oldSequenceNo = getSequenceMapper().getSequenceByID(sequencePO.getId()).getSequenceNo();
if (!oldSequenceNo.equals(sequencePO.getSequenceNo())) {
List<SequencePO> list = getSequenceMapper().listByNo(Util.null2String(sequencePO.getSequenceNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
}
return getSequenceMapper().updateSequence(sequencePO);
}
@ -176,7 +177,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
SequencePO sequencePO = getSequenceMapper().getSequenceByID(Integer.parseInt(id));
OrganizationAssert.notNull(sequencePO, "选择的数据不存在，或数据已删除");
OrganizationAssert.notNull(sequencePO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
sequenceNameCondition.setValue(sequencePO.getSequenceName());
sequenceNoCondition.setValue(sequencePO.getSequenceNo());
@ -203,7 +204,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
@Override
public Map<String, List<MenuBtn>> getHasRight() {
Map<String, List<MenuBtn>> commonBtnDatas = MenuBtn.getCommonBtnDatas();
Map<String, List<MenuBtn>> commonBtnDatas = MenuBtn.getCommonBtnDatas(user.getLanguage());
commonBtnDatas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("importFile").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
commonBtnDatas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("importFile").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
return commonBtnDatas;

9
src/com/engine/organization/service/impl/StaffPlanServiceImpl.java
View File

@ -22,6 +22,7 @@ import weaver.common.DateUtil;
import weaver.conn.RecordSet;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.systeminfo.SystemEnv;
import java.util.*;
@ -64,7 +65,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
public int saveStaffPlan(StaffPlanSearchParam param) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
List<StaffPlanPO> list = getStaffPlanMapper().listByNo(Util.null2String(param.getPlanNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
// 结束时间大于开始时间
StaffPlanPO staffPlanPO = StaffPlanBO.convertParamToPO(param, (long) user.getUID());
// 多选赋值
@ -87,7 +88,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
String oldPlanNo = getStaffPlanMapper().getStaffPlanByID(staffPlanPO.getId()).getPlanNo();
if (!oldPlanNo.equals(staffPlanPO.getPlanNo())) {
List<StaffPlanPO> list = getStaffPlanMapper().listByNo(Util.null2String(staffPlanPO.getPlanNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
}
// 结束时间大于开始时间
String timeStart = param.getTimeStart();
@ -203,7 +204,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
StaffPlanPO staffPlanPO = getStaffPlanMapper().getStaffPlanByID(Integer.parseInt(id));
OrganizationAssert.notNull(staffPlanPO, "选择的数据不存在，或数据已删除");
OrganizationAssert.notNull(staffPlanPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
planNoItem.setValue(staffPlanPO.getPlanNo());
planNameItem.setValue(staffPlanPO.getPlanName());
planYearItem.setValue(Util.null2String(staffPlanPO.getPlanYear()));
@ -237,7 +238,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
@Override
public Map<String, List<MenuBtn>> getHasRight() {
return MenuBtn.getCommonBtnDatas();
return MenuBtn.getCommonBtnDatas(user.getLanguage());
}

6
src/com/engine/organization/service/impl/StaffServiceImpl.java
View File

@ -31,7 +31,6 @@ import com.engine.organization.util.browser.OrganizationBrowserUtil;
import com.engine.organization.util.db.DBType;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.excel.ExcelUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import weaver.conn.RecordSet;
@ -41,6 +40,7 @@ import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo;
import weaver.systeminfo.SystemEnv;
import java.io.File;
import java.io.FileOutputStream;
@ -293,7 +293,7 @@ public class StaffServiceImpl extends Service implements StaffService {
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
StaffPO staffPO = getStaffMapper().getStaffByID(Integer.parseInt(id));
OrganizationAssert.notNull(staffPO, "选择的数据不存在，或数据已删除");
OrganizationAssert.notNull(staffPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
staffPlanPO = getStaffPlanMapper().getStaffPlanByID(staffPO.getPlanId());
BrowserBean planIdItemBean = planIdItem.getBrowserConditionParam();
@ -356,7 +356,7 @@ public class StaffServiceImpl extends Service implements StaffService {
@Override
public Map<String, Object> getHasRight() {
Map<String, List<MenuBtn>> datas = MenuBtn.getCommonBtnDatas();
Map<String, List<MenuBtn>> datas = MenuBtn.getCommonBtnDatas(user.getLanguage());
datas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
datas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
Map<String, Object> map = new HashMap<>(datas);

59
src/com/engine/organization/util/MenuBtn.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import weaver.systeminfo.SystemEnv;
import java.util.ArrayList;
import java.util.HashMap;
@ -33,8 +34,8 @@ public class MenuBtn {
*
* @return
*/
public static MenuBtn topMenu_addNew() {
return MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build();
public static MenuBtn topMenu_addNew(int userLanguage) {
return MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName(SystemEnv.getHtmlLabelName(547123,userLanguage)).type("BTN_Addnew").build();
}
/**
@ -42,8 +43,8 @@ public class MenuBtn {
*
* @return
*/
public static MenuBtn topMenu_batchDelete() {
return MenuBtn.builder().isBatch("1").isTop("1").menuFun("batchDelete").menuIcon("icon-coms-Batch-delete").menuName("批量删除").type( "BTN_BatchDelete").build();
public static MenuBtn topMenu_batchDelete(int userLanguage) {
return MenuBtn.builder().isBatch("1").isTop("1").menuFun("batchDelete").menuIcon("icon-coms-Batch-delete").menuName(SystemEnv.getHtmlLabelName(547125,userLanguage)).type( "BTN_BatchDelete").build();
}
/**
@ -51,7 +52,7 @@ public class MenuBtn {
*
* @return
*/
public static MenuBtn topMenu_copy() {
public static MenuBtn topMenu_copy(int userLanguage) {
return MenuBtn.builder().isBatch("1").isTop("1").menuFun("copy").menuIcon("icon-coms-form-copy").menuName("批量复制").type( "BTN_Copy").build();
}
@ -60,8 +61,8 @@ public class MenuBtn {
*
* @return
*/
public static MenuBtn rightMenu_addNew() {
return MenuBtn.builder().isBatch("0").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build();
public static MenuBtn rightMenu_addNew(int userLanguage) {
return MenuBtn.builder().isBatch("0").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName(SystemEnv.getHtmlLabelName(547123,userLanguage)).type("BTN_Addnew").build();
}
/**
@ -69,8 +70,8 @@ public class MenuBtn {
*
* @return
*/
public static MenuBtn rightMenu_btnLog() {
return MenuBtn.builder().isBatch("0").isTop("0").menuFun("log").menuIcon("icon-coms-Print-log").menuName("日志").type("BTN_log").build();
public static MenuBtn rightMenu_btnLog(int userLanguage) {
return MenuBtn.builder().isBatch("0").isTop("0").menuFun("log").menuIcon("icon-coms-Print-log").menuName(SystemEnv.getHtmlLabelName(547126,userLanguage)).type("BTN_log").build();
}
/**
@ -78,7 +79,7 @@ public class MenuBtn {
*
* @return
*/
public static MenuBtn rightMenu_copy() {
public static MenuBtn rightMenu_copy(int userLanguage) {
return MenuBtn.builder().isBatch("0").isTop("0").menuFun("copy").menuIcon("icon-coms-form-copy").menuName("复制").type( "BTN_Copy").build();
}
@ -87,29 +88,29 @@ public class MenuBtn {
*
* @return
*/
public static MenuBtn rightMenu_btnColumn() {
return MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build();
public static MenuBtn rightMenu_btnColumn(int userLanguage) {
return MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName(SystemEnv.getHtmlLabelName(547136,userLanguage)).type("BTN_COLUMN").build();
}
/**
* 获取常用按钮列表
* @return
*/
public static Map<String, List<MenuBtn>> getCommonBtnDatas() {
public static Map<String, List<MenuBtn>> getCommonBtnDatas(int userLanguage) {
Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
ArrayList<MenuBtn> topMenuList = new ArrayList<>();
ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
// 新增
topMenuList.add(MenuBtn.topMenu_addNew());
topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
// 批量删除
topMenuList.add(MenuBtn.topMenu_batchDelete());
topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
btnDatas.put("topMenu", topMenuList);
// 新增
rightMenuList.add(MenuBtn.rightMenu_addNew());
rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
// 日志
rightMenuList.add(MenuBtn.rightMenu_btnLog());
rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
// 显示列定制
rightMenuList.add(MenuBtn.rightMenu_btnColumn());
rightMenuList.add(MenuBtn.rightMenu_btnColumn(userLanguage));
btnDatas.put("rightMenu", rightMenuList);
return btnDatas;
}
@ -118,19 +119,19 @@ public class MenuBtn {
* 获取常用按钮列表
* @return
*/
public static Map<String, List<MenuBtn>> getDatasNoBtnColum() {
public static Map<String, List<MenuBtn>> getDatasNoBtnColum(int userLanguage) {
Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
ArrayList<MenuBtn> topMenuList = new ArrayList<>();
ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
// 新增
topMenuList.add(MenuBtn.topMenu_addNew());
topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
// 批量删除
topMenuList.add(MenuBtn.topMenu_batchDelete());
topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
btnDatas.put("topMenu", topMenuList);
// 新增
rightMenuList.add(MenuBtn.rightMenu_addNew());
rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
// 日志
rightMenuList.add(MenuBtn.rightMenu_btnLog());
rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
// 显示列定制
// rightMenuList.add(MenuBtn.rightMenu_btnColumn());
btnDatas.put("rightMenu", rightMenuList);
@ -141,23 +142,23 @@ public class MenuBtn {
* 获取常用按钮列表
* @return
*/
public static Map<String, List<MenuBtn>> getDatasHasCopy() {
public static Map<String, List<MenuBtn>> getDatasHasCopy(int userLanguage) {
Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
ArrayList<MenuBtn> topMenuList = new ArrayList<>();
ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
// 新增
topMenuList.add(MenuBtn.topMenu_addNew());
topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
// 批量删除
topMenuList.add(MenuBtn.topMenu_batchDelete());
topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
// 复制
topMenuList.add(MenuBtn.topMenu_copy());
topMenuList.add(MenuBtn.topMenu_copy(userLanguage));
btnDatas.put("topMenu", topMenuList);
// 新增
rightMenuList.add(MenuBtn.rightMenu_addNew());
rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
// 复制
// rightMenuList.add(MenuBtn.rightMenu_copy());
// 日志
rightMenuList.add(MenuBtn.rightMenu_btnLog());
rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
btnDatas.put("rightMenu", rightMenuList);
return btnDatas;
}

46
src/com/engine/organization/util/OrganizationFormItemUtil.java
View File

@ -8,6 +8,7 @@ import com.api.browser.util.ConditionFactory;
import com.api.browser.util.ConditionType;
import com.engine.organization.entity.browser.po.CustomBrowserBean;
import weaver.hrm.User;
import weaver.systeminfo.SystemEnv;
import java.util.ArrayList;
import java.util.HashMap;
@ -119,6 +120,11 @@ public class OrganizationFormItemUtil {
return input;
}
public static SearchConditionItem inputItem(User user, int colSpan, int fieldcol,
int viewAttr, int length, int label, String name) {
return inputItem(user, colSpan, fieldcol, viewAttr, length, SystemEnv.getHtmlLabelName(label, user.getLanguage()), name);
}
/**
* 浏览按钮
@ -191,14 +197,19 @@ public class OrganizationFormItemUtil {
customBrowserBean.setHasLeftTree(true);
customBrowserBean.setLeftToSearchKey("treeKey");
Map<String,Object> map = new HashMap<>(2);
map.put("width",988);
Map<String, Object> map = new HashMap<>(2);
map.put("width", 988);
customBrowserBean.setModalStyle(map);
browser.setBrowserConditionParam(customBrowserBean);
}
return browser;
}
public static SearchConditionItem browserItem(User user, int colSpan, int fieldcol,
int viewAttr, boolean isQuickSearch, int label, String type, String name, String fieldDbType) {
return browserItem(user, colSpan, fieldcol, viewAttr, isQuickSearch, SystemEnv.getHtmlLabelName(label, user.getLanguage()), type, name, fieldDbType);
}
/**
* 日期区间
@ -249,9 +260,15 @@ public class OrganizationFormItemUtil {
return textarea;
}
public static SearchConditionItem textareaItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
int viewAttr, int length, int label, String name) {
return textareaItem(user,colSpan,fieldcol,isQuickSearch,viewAttr,length,SystemEnv.getHtmlLabelName(label, user.getLanguage()),name);
}
/**
* 日期组合
*
* @param user
* @param colSpan
* @param fieldcol
@ -262,7 +279,7 @@ public class OrganizationFormItemUtil {
* @return
*/
public static SearchConditionItem dateItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
int viewAttr, String label, String name) {
int viewAttr, String label, String name) {
ConditionFactory conditionFactory = new ConditionFactory(user);
SearchConditionItem date = conditionFactory.createCondition(ConditionType.DATE, 502227, name);
date.setColSpan(colSpan);
@ -274,7 +291,6 @@ public class OrganizationFormItemUtil {
}
/**
*
* @param user
* @param colSpan
* @param fieldcol
@ -298,7 +314,7 @@ public class OrganizationFormItemUtil {
public static SearchConditionItem dateGroupItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
int viewAttr, String label, String name) {
int viewAttr, String label, String name) {
ConditionFactory conditionFactory = new ConditionFactory(user);
SearchConditionItem dateGroup = conditionFactory.createCondition(ConditionType.DATEGROUP, 502227, name);
dateGroup.setColSpan(colSpan);
@ -307,22 +323,22 @@ public class OrganizationFormItemUtil {
dateGroup.setViewAttr(viewAttr);
dateGroup.setLabel(label);
List<Object> datas = new ArrayList<>();
datas.add(new DateGroupData("全部","0"));
datas.add(new DateGroupData("今天","1"));
datas.add(new DateGroupData("本周","2"));
datas.add(new DateGroupData("本月","3"));
datas.add(new DateGroupData("本季","4"));
datas.add(new DateGroupData("本年","5"));
datas.add(new DateGroupData("上个月","7"));
datas.add(new DateGroupData("上一年","8"));
datas.add(new DateGroupData("指定日期范围","6"));
datas.add(new DateGroupData("全部", "0"));
datas.add(new DateGroupData("今天", "1"));
datas.add(new DateGroupData("本周", "2"));
datas.add(new DateGroupData("本月", "3"));
datas.add(new DateGroupData("本季", "4"));
datas.add(new DateGroupData("本年", "5"));
datas.add(new DateGroupData("上个月", "7"));
datas.add(new DateGroupData("上一年", "8"));
datas.add(new DateGroupData("指定日期范围", "6"));
dateGroup.setDatas(datas);
dateGroup.setValue(new ArrayList<>());
dateGroup.setDateGroup(true);
return dateGroup;
}
static class DateGroupData{
static class DateGroupData {
private String name;
private String value;

2
src/com/engine/organization/util/saveimport/PostInfoImportUtil.java
View File

@ -116,7 +116,7 @@ public class PostInfoImportUtil {
List<PostInfoPO> postInfoPOS = MapperProxyFactory.getProxy(PostInfoMapper.class).listByNo(Util.null2String(reallyValue));
if(postInfoPOS.size()>0){
historyDetailPO.setRelatedName("");
historyDetailPO.setOperateDetail("编号:" + reallyValue + ",编号不允许重复");
historyDetailPO.setOperateDetail("编号:" + reallyValue + ","+SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
historyDetailPO.setStatus("0");
OrgImportUtil.saveImportDetailLog(historyDetailPO);
continue nextRow;

2
src/com/engine/organization/util/saveimport/SequenceImportUtil.java
View File

@ -128,7 +128,7 @@ public class SequenceImportUtil {
List<SequencePO> sequencePOS = MapperProxyFactory.getProxy(SequenceMapper.class).listByNo(Util.null2String(reallyValue));
if(sequencePOS.size()>0){
historyDetailPO.setRelatedName("");
historyDetailPO.setOperateDetail("编号:" + reallyValue + ",编号不允许重复");
historyDetailPO.setOperateDetail("编号:" + reallyValue + ","+SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
historyDetailPO.setStatus("0");
OrgImportUtil.saveImportDetailLog(historyDetailPO);
continue nextRow;

2
src/com/engine/organization/wrapper/ManagerDetachWrapper.java
View File

@ -37,7 +37,7 @@ public class ManagerDetachWrapper extends OrganizationWrapper {
}
public Map<String, List<MenuBtn>> getTableBtn() {
return MenuBtn.getCommonBtnDatas();
return MenuBtn.getCommonBtnDatas(user.getLanguage());
}
public Map<String, Object> getSearchCondition() {

11
src/com/engine/organization/wrapper/ResourceBasicInfoWrapper.java
View File

@ -53,20 +53,21 @@ public class ResourceBasicInfoWrapper extends OrganizationWrapper {
Map<String, Object> btnDatas = new HashMap<>();
ArrayList<MenuBtn> topMenuList = new ArrayList<>();
ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
int userLanguage = user.getLanguage();
// 新增
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("addItemClass").menuIcon("icon-coms-New-Flow").menuName("新增类型").type("BTN_AddItemClass").build());
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("editItemClass").menuIcon("icon-coms-edit").menuName("修改类型").type("BTN_EditItemClass").build());
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("delItemClass").menuIcon("icon-coms-Delete").menuName("删除类型").type("BTN_DelItemClass").build());
topMenuList.add(MenuBtn.topMenu_addNew());
topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
// 批量删除
topMenuList.add(MenuBtn.topMenu_batchDelete());
topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
btnDatas.put("topMenu", topMenuList);
// 新增
rightMenuList.add(MenuBtn.rightMenu_addNew());
rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
// 日志
rightMenuList.add(MenuBtn.rightMenu_btnLog());
rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
// 显示列定制
rightMenuList.add(MenuBtn.rightMenu_btnColumn());
rightMenuList.add(MenuBtn.rightMenu_btnColumn(userLanguage));
btnDatas.put("rightMenu", rightMenuList);
return btnDatas;
}