diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java new file mode 100644 index 00000000..2b3fe819 --- /dev/null +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -0,0 +1,71 @@ +package com.api.browser.service.impl; + +import com.api.browser.bean.SplitTableBean; +import com.api.browser.bean.SplitTableColBean; +import com.api.browser.service.BrowserService; +import com.api.browser.util.BrowserConstant; +import com.api.browser.util.BrowserDataType; +import com.api.browser.util.SplitTableUtil; +import com.cloudstore.eccom.result.WeaResultMsg; +import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; +import com.engine.organization.entity.scheme.vo.SchemeTableVO; +import com.engine.organization.entity.searchtree.SearchTree; +import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.service.impl.JobServiceImpl; +import com.google.common.collect.Lists; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.hrm.city.CityComInfo; +import weaver.systeminfo.SystemEnv; + + +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/7/13 + * @Version V1.0 + **/ +public class JobBrowserService extends BrowserService { + + + + @Override + public Map getBrowserData(Map params) throws Exception { + + Map resultMap = new HashMap<>(); + + String datatype = Util.null2String(params.get("datatype")); + if("tree".equals(datatype)){ + + List> nodeData = new ArrayList<>(); + Map hashMap = new HashMap<>(); + hashMap.put("domid","comp_21"); + hashMap.put("hasChild",true); + hashMap.put("isLeaf",false); + hashMap.put("isopen",true); + hashMap.put("key","compsss_21"); + hashMap.put("name","成功"); + + nodeData.add(hashMap); + //resultMap.put(BrowserConstant.BROWSER_RESULT_TYPE, BrowserDataType.TREE_DATA.getTypeid()); + resultMap.put("datas", nodeData); + }else { + OrganizationWeaTable table = new OrganizationWeaTable<>(user, SchemeTableVO.class); + WeaResultMsg result = new WeaResultMsg(false); + result.putAll(table.makeDataResult()); + result.success(); + resultMap.putAll(result.getResultMap()); + } + + + + + + return resultMap; + } +} diff --git a/src/com/engine/organization/entity/searchtree/SearchTreeParams.java b/src/com/engine/organization/entity/searchtree/SearchTreeParams.java index bc1b08f2..1c5f480f 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTreeParams.java +++ b/src/com/engine/organization/entity/searchtree/SearchTreeParams.java @@ -1,5 +1,6 @@ package com.engine.organization.entity.searchtree; +import lombok.Builder; import lombok.Data; /** @@ -9,6 +10,7 @@ import lombok.Data; * @version: 1.0 */ @Data +@Builder public class SearchTreeParams { /** * 数据类型 diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index dfb576cb..5a41f878 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -129,9 +129,8 @@ public class LevelServiceImpl extends Service implements LevelService { SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "levelNo"); levelNoCondition.setRules("required|string"); SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description"); - SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser"); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "666", "schemeId", "schemeBrowser"); browserItem.setRules("required|string"); - // 编辑状态下赋值操作 String id = Util.null2String(params.get("id")); if (!StringUtil.isEmpty(id)) {