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

岗位浏览按钮优化

This commit is contained in:
dxfeng 2022-07-18 13:27:15 +08:00
parent 63336fa223
commit fa663a1eaa
6 changed files with 70 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/初始数据SQL/浏览按钮.sql
View File

@ -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;

14
docs/初始数据SQL/职务类型默认.sql
View File

@ -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' );
( '默认职务', '默认职务', 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' );

2
src/com/api/browser/service/impl/JobBrowserService.java
View File

@ -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<CusBrowserTree> cusBrowserTrees = CusBowserTreeBO.convertSearchTreeToBorwserTree(nodeData);
resultMap.put("datas", cusBrowserTrees);
System.err.println(JSON.toJSONString(cusBrowserTrees));
} else {
OrganizationWeaTable<JobBrowserVO> table = new OrganizationWeaTable<>(user, JobBrowserVO.class);
String sqlWhere = buildSqlWhere(params);

2
src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
View File

@ -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);

19
src/com/engine/organization/entity/job/vo/JobBrowserVO.java
View File

@ -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;
}

26
src/com/engine/organization/transmethod/JobTransMethod.java
View File

@ -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<Map<String, Object>> 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 "是";