From fa663a1eaa1402ae8a2f6a27206234c38111ba47 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 18 Jul 2022 13:27:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/初始数据SQL/浏览按钮.sql | 17 ++++++++++++ docs/初始数据SQL/职务类型默认.sql | 14 +++++++++- .../service/impl/JobBrowserService.java | 2 -- .../entity/extend/bo/ExtendInfoBO.java | 2 +- .../entity/job/vo/JobBrowserVO.java | 19 +++++++++----- .../transmethod/JobTransMethod.java | 26 +++++++++++++++++++ 6 files changed, 70 insertions(+), 10 deletions(-) diff --git a/docs/初始数据SQL/浏览按钮.sql b/docs/初始数据SQL/浏览按钮.sql index a2800c05..a44c6d77 100644 --- a/docs/初始数据SQL/浏览按钮.sql +++ b/docs/初始数据SQL/浏览按钮.sql @@ -44,3 +44,20 @@ INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (332, 26, '描述方案', 'description', '', 0, 3, 'b000b80201a911edbe41ea108fa1766c', NULL); INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (333, 26, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 4, 'b0019d8001a911edbe41ea108fa1766c', NULL); INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (334, 26, '职等', 'level_id', 'select group_concat(level_name) from jcl_org_level where id in ( {?currentvalue})', 0, 5, 'b002478001a911edbe41ea108fa1766c', NULL); + + +insert into WF_BROWSER_CONFIG(type,clazz,description,titelebel) +values('666','com.api.browser.service.impl.JobBrowserService','聚才林岗位管理',-81474); + +INSERT INTO WORKFLOW_BROWSERURL +( ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME, + KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID ) +VALUES + ( '666', '-81474', 'varchar(4000)', + '/systeminfo/BrowserMain.jsp?url=', + 'jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/:id', '8', '1', '0' ); + +insert into workflow_browserurl_module(browserid,modulecode)values('666','workflow'); + +--多语言标签需要申请 +select * from htmllabelinfo; \ No newline at end of file diff --git a/docs/初始数据SQL/职务类型默认.sql b/docs/初始数据SQL/职务类型默认.sql index 359bdda9..7ea84fad 100644 --- a/docs/初始数据SQL/职务类型默认.sql +++ b/docs/初始数据SQL/职务类型默认.sql @@ -6,4 +6,16 @@ VALUES INSERT INTO `hrmjobactivities` ( `JOBACTIVITYMARK`, `JOBACTIVITYNAME`, `JOBGROUPID`, `JOBLEVELFROM`, `JOBLEVELTO`, `created`, `creater`, `modified`, `modifier`, `uuid` ) VALUES - ( '默认职务', '默认职务', 14, NULL, NULL, DATE( NOW()), 1, NULL, NULL, '3a2efce3-95de-4ec2-afe1-347783817bdb' ); \ No newline at end of file + ( '默认职务', '默认职务', 14, NULL, NULL, DATE( NOW()), 1, NULL, NULL, '3a2efce3-95de-4ec2-afe1-347783817bdb' ); + + +-- SqlServer插入语句 +INSERT INTO hrmjobgroups +( JOBGROUPNAME, JOBGROUPREMARK, created, creater, modified, modifier, uuid ) +VALUES + ( '聚才林', '聚才林', getDate(), 1, NULL, NULL, 'd9f435c3-8d4d-4e01-9a97-d72f9c5d5fae' ); + +INSERT INTO hrmjobactivities +( JOBACTIVITYMARK, JOBACTIVITYNAME, JOBGROUPID, JOBLEVELFROM, JOBLEVELTO, created, creater, modified, modifier, uuid ) +VALUES + ( '默认职务', '默认职务', 14, NULL, NULL,getDate(), 1, NULL, NULL, '3a2efce3-95de-4ec2-afe1-347783817bdb' ); \ No newline at end of file diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index 713e54c2..decfed00 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -1,6 +1,5 @@ package com.api.browser.service.impl; -import com.alibaba.fastjson.JSON; import com.api.browser.bean.SearchConditionItem; import com.api.browser.service.BrowserService; import com.api.browser.util.BrowserConstant; @@ -69,7 +68,6 @@ public class JobBrowserService extends BrowserService { } List cusBrowserTrees = CusBowserTreeBO.convertSearchTreeToBorwserTree(nodeData); resultMap.put("datas", cusBrowserTrees); - System.err.println(JSON.toJSONString(cusBrowserTrees)); } else { OrganizationWeaTable table = new OrganizationWeaTable<>(user, JobBrowserVO.class); String sqlWhere = buildSqlWhere(params); diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 1e389522..d5869058 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -336,7 +336,7 @@ public class ExtendInfoBO { } else { searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype); } - // 岗位浏览按钮 + //TODO 岗位浏览按钮 if ("666".equals(detailtype)) { BrowserBean browserBean = searchConditionItem.getBrowserConditionParam(); String s = JSONObject.toJSONString(browserBean); diff --git a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java index 68db9c0b..c33dd16d 100644 --- a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java +++ b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java @@ -19,11 +19,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @OrganizationTable(pageId = "98e9c62f-cd12-11ec-a15f-00ffcbed7123", - fields = "t.id," + - "t.job_no," + - "t.job_name as name ", + fields = "t.id, t.job_no, t.job_name as name, t.sequence_id, t.scheme_id , t.grade_id , t.level_id", fromSql = "FROM jcl_org_job t ", - orderby = "job_no", + orderby = "id", sortway = "asc", primarykey = "id", operates = { @@ -34,12 +32,21 @@ import lombok.NoArgsConstructor; ) public class JobBrowserVO { - @OrganizationTableColumn(column = "id", display = false) + @OrganizationTableColumn(text = "标识", width = "25%", column = "id", display = false) private Long id; @OrganizationTableColumn(text = "编号", width = "25%", column = "job_no") private String jobNo; - @OrganizationTableColumn(text = "方案名称", width = "25%", column = "name") + @OrganizationTableColumn(text = "岗位名称", width = "25%", column = "name") private String jobName; + + @OrganizationTableColumn(text = "等级方案", width = "25%", column = "scheme_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSchemeName") + private String schemeName; + @OrganizationTableColumn(text = "职等", width = "25%", column = "level_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getLevelName") + private String levelName; + @OrganizationTableColumn(text = "职级", width = "25%", column = "grade_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getGradeName") + private String gradeName; + @OrganizationTableColumn(text = "岗位序列", width = "25%", column = "sequence_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSequenceName") + private String sequenceName; } diff --git a/src/com/engine/organization/transmethod/JobTransMethod.java b/src/com/engine/organization/transmethod/JobTransMethod.java index 76d3ae1e..645d4e3d 100644 --- a/src/com/engine/organization/transmethod/JobTransMethod.java +++ b/src/com/engine/organization/transmethod/JobTransMethod.java @@ -2,6 +2,10 @@ package com.engine.organization.transmethod; import com.engine.organization.entity.DeleteParam; import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.mapper.scheme.GradeMapper; +import com.engine.organization.mapper.scheme.LevelMapper; +import com.engine.organization.mapper.scheme.SchemeMapper; +import com.engine.organization.mapper.sequence.SequenceMapper; import com.engine.organization.util.db.MapperProxyFactory; import java.util.List; @@ -23,6 +27,28 @@ public class JobTransMethod { return names; } + public static String getLevelName(String levelId) { + LevelMapper levelMapper = MapperProxyFactory.getProxy(LevelMapper.class); + List> maps = levelMapper.listLevelsByIds(DeleteParam.builder().ids(levelId).build().getIds()); + String levelName = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); + return levelName; + } + + public static String getGradeName(String gradeId) { + GradeMapper gradeMapper = MapperProxyFactory.getProxy(GradeMapper.class); + return gradeMapper.getGradeByID(Long.parseLong(gradeId)).getGradeName(); + } + + public static String getSequenceName(String sequenceId) { + SequenceMapper sequenceMapper = MapperProxyFactory.getProxy(SequenceMapper.class); + return sequenceMapper.getSequenceByID(Long.parseLong(sequenceId)).getSequenceName(); + } + + public static String getSchemeName(String schemeId) { + SchemeMapper schemeMapper = MapperProxyFactory.getProxy(SchemeMapper.class); + return schemeMapper.getSchemeByID(Long.parseLong(schemeId)).getSchemeName(); + } + public static String getIsKeySpan(String isKey) { if ("1".equals(isKey)) { return "是"; From 3ed9ec2f992364fd9e7563274688b3874ea13aff Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 18 Jul 2022 13:33:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/entity/searchtree/SearchTreeParams.java | 2 -- src/com/engine/organization/service/impl/LevelServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/searchtree/SearchTreeParams.java b/src/com/engine/organization/entity/searchtree/SearchTreeParams.java index 1c5f480f..bc1b08f2 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTreeParams.java +++ b/src/com/engine/organization/entity/searchtree/SearchTreeParams.java @@ -1,6 +1,5 @@ package com.engine.organization.entity.searchtree; -import lombok.Builder; import lombok.Data; /** @@ -10,7 +9,6 @@ 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 5a41f878..a230d2ef 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -129,7 +129,7 @@ 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, "等级方案", "666", "schemeId", "schemeBrowser"); + SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser"); browserItem.setRules("required|string"); // 编辑状态下赋值操作 String id = Util.null2String(params.get("id"));