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

!191 Oracle BUG修复

Browse Source 
Merge pull request !191 from dxfeng/feature/dxf
pull/192/MERGE
dxfeng 3 years ago committed by Gitee
parent 8b98bcf3f1 05c24b5e98
commit e29df86b58
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
12 changed files with 130 additions and 104 deletions
Show Stats Download Patch File Download Diff File

14
docs/脚本/Oracle/浏览按钮Oracle.sql
Unescape Escape View File

@ -3,7 +3,7 @@ datashowset_id NUMBER;
hrmjobgroups_id NUMBER;
begin
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('schemeBrowser', '1', '1', '', 'select id,scheme_no ,scheme_name ,scheme_description from jcl_org_scheme where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '等级方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0',SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('schemeBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '编号', 'scheme_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '方案名称', 'scheme_name', '', 1, 2, SYS_GUID(), NULL);
@ -12,7 +12,7 @@ INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIE
INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, '方案名称', 'scheme_name', '2', '', 2, SYS_GUID(), '');
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('LevelBrowser', '1', '1', '', 'select id,level_no ,level_name ,description ,scheme_id from jcl_org_level where delete_type = 0 and forbidden_tag = 0 and (scheme_id =$scheme_id$ or id in ($level_id$))', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职等浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('LevelBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'level_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'level_name', '', 1, 2, SYS_GUID(), NULL);
@ -21,7 +21,7 @@ INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFI
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '名称', 'level_name', '2', '', 2, SYS_GUID(), '');
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('postBrowser', '1', '1', '', 'select id,post_name ,description from jcl_org_post jop where delete_type =0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职务分类浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('postBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'post_name', '', 1, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '说明', 'description', '', 0, 2, SYS_GUID(), NULL);
@ -35,7 +35,7 @@ INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WS
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('deptBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('sequenceBrowser', '1', '1', '', 'select *,scheme_id as scheme_value from jcl_org_sequence where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '岗位序列', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('sequenceBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'sequence_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'sequence_name', '', 1, 2, SYS_GUID(), NULL);
@ -45,7 +45,7 @@ INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFI
INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(datashowset_id, '名称', 'sequence_name', '2', '', 2, SYS_GUID(), '');
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('staffPlanBrowser', '1', '1', '', 'select id,plan_no ,plan_name ,plan_year ,case control_dimension when ''1'' then ''分部'' when ''2'' then ''部门'' when ''3'' then ''岗位'' end as control_dimension from jcl_org_staffplan where forbidden_tag=0 and delete_type =0 ', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '编制方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('staffPlanBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'plan_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'plan_name', '', 1, 2, SYS_GUID(), NULL);
@ -58,7 +58,7 @@ INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WS
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('deptBrowserPrepare', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('gradeBrowser', '1', '1', '', 'select * from jcl_org_grade where delete_type = 0 and forbidden_tag = 0 and scheme_id = $scheme_id$', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职级浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1);
SELECT max(id)+1 INTO datashowset_id FROM DATASHOWSET;
SELECT max(id) INTO datashowset_id FROM DATASHOWSET;
INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('gradeBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '编号', 'grade_no', '', 0, 1, SYS_GUID(), NULL);
INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(datashowset_id, '名称', 'grade_name', '', 1, 2, SYS_GUID(), NULL);
@ -73,7 +73,7 @@ INSERT INTO WORKFLOW_BROWSERURL(ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME,
INSERT INTO WORKFLOW_BROWSERURL_MODULE(BROWSERID,MODULECODE)VALUES('666','workflow');
INSERT INTO HRMJOBGROUPS ( JOBGROUPNAME, JOBGROUPREMARK, created, creater, modified, modifier, uuid ) VALUES ( '聚才林', '聚才林',SYSDATE, 1, NULL, NULL, 'd9f435c3-8d4d-4e01-9a97-d72f9c5d5fae' );
select max(id)+1 INTO hrmjobgroups_id from HRMJOBGROUPS;
select max(id) INTO hrmjobgroups_id from HRMJOBGROUPS;
INSERT INTO HRMJOBACTIVITIES ( JOBACTIVITYMARK, JOBACTIVITYNAME, JOBGROUPID, JOBLEVELFROM, JOBLEVELTO, created, creater, modified, modifier, uuid ) VALUES ( '默认职务', '默认职务', hrmjobgroups_id, NULL, NULL,sysdate, 1, NULL, NULL, '3a2efce3-95de-4ec2-afe1-347783817bdb' );
end;
/

21
src/com/engine/organization/entity/commom/RecordInfo.java
Unescape Escape View File

@ -0,0 +1,21 @@
package com.engine.organization.entity.commom;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author:dxfeng
* @createTime: 2022/08/11
* @version: 1.0
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class RecordInfo {
private String uuid;
private String id;
private String canceled;
}

17
src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java
Unescape Escape View File

@ -1,10 +1,7 @@
package com.engine.organization.mapper.hrmresource;
import com.alibaba.fastjson.JSONObject;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @description:
* @author:dxfeng
@ -37,11 +34,11 @@ public interface HrmResourceMapper {
*/
Integer getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue);
/**
* 根据所选关键字段，查询关键列
*
* @param keyField
* @return
*/
List<JSONObject> getKeyMapByKetField(@Param("keyField") String keyField);
///**
// * 根据所选关键字段，查询关键列
// *
// * @param keyField
// * @return
// */
//List<JSONObject> getKeyMapByKetField(@Param("keyField") String keyField);
}

8
src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml
Unescape Escape View File

@ -38,8 +38,8 @@
where delete_type = 0
and ${keyField} = #{keyFieldValue}
</select>
<select id="getKeyMapByKetField" resultType="com.alibaba.fastjson.JSONObject">
select id, account_type, certificate_num, login_id, work_code, ${keyField}
from jcl_org_hrmresource
</select>
<!-- <select id="getKeyMapByKetField" resultType="com.alibaba.fastjson.JSONObject">-->
<!-- select id, account_type, certificate_num, login_id, work_code, ${keyField}-->
<!-- from jcl_org_hrmresource-->
<!-- </select>-->
</mapper>

20
src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.engine.organization.mapper.hrmresource;
import com.alibaba.fastjson.JSONObject;
import com.engine.organization.entity.commom.RecordInfo;
import com.engine.organization.entity.cusfielddata.po.CusFieldData;
import com.engine.organization.entity.jclimport.po.CusFormFieldPO;
import com.engine.organization.entity.jclimport.po.JclSelectItem;
@ -17,17 +17,17 @@ import java.util.List;
*/
public interface SystemDataMapper {
JSONObject getSysLanguageByLicense();
//JSONObject getSysLanguageByLicense();
List<JSONObject> getSysLanguageByActivable();
//List<JSONObject> getSysLanguageByActivable();
List<JSONObject> getHrmEducationLevelData();
//List<JSONObject> getHrmEducationLevelData();
List<JSONObject> getHrmJobCallData();
//List<JSONObject> getHrmJobCallData();
List<JSONObject> getHrmLocationsByCountryId();
//List<JSONObject> getHrmLocationsByCountryId();
List<JSONObject> getHrmUseKindData();
//List<JSONObject> getHrmUseKindData();
String getScCompanyNameById(@Param("companyId") String companyId);
@ -35,11 +35,11 @@ public interface SystemDataMapper {
String getScHrmResourceNameById(@Param("managerId") String managerId);
JSONObject getHrmObjectByID(@Param("tableName") String tableName, @Param("id") String id);
RecordInfo getHrmObjectByID(@Param("tableName") String tableName, @Param("id") String id);
JSONObject getHrmObjectByUUID(@Param("tableName") String tableName, @Param("uuid") String uuid);
RecordInfo getHrmObjectByUUID(@Param("tableName") String tableName, @Param("uuid") String uuid);
JSONObject getHrmJobTitleByName(@Param("name") String name);
RecordInfo getHrmJobTitleByName(@Param("name") String name);
List<Long> getHrmResourceIds(@Param("departmentId") Long departmentId, @Param("jobTitle") String jobTitle);

65
src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml
Unescape Escape View File

@ -18,6 +18,13 @@
<result column="selectvalue" property="selectValue"/>
<result column="selectname" property="selectName"/>
</resultMap>
<resultMap id="RecordMap" type="com.engine.organization.entity.commom.RecordInfo">
<result column="uuid" property="uuid"/>
<result column="id" property="id"/>
<result column="canceled" property="canceled"/>
</resultMap>
<insert id="insertCusFieldData">
insert into cus_fielddata(scope, scopeid, id)
values ('HrmCustomFieldByInfoType', #{scopeId}, #{id})
@ -47,37 +54,37 @@
and scopeid = #{scopeId}
</update>
<select id="getSysLanguageByLicense" resultType="com.alibaba.fastjson.JSONObject">
select multilanguage, (select id from syslanguage where language='简体中文' or language='中文') as cnLanguageId
from license
</select>
<!-- <select id="getSysLanguageByLicense" resultType="com.alibaba.fastjson.JSONObject">-->
<!-- select multilanguage, (select id from syslanguage where language='简体中文' or language='中文') as cnLanguageId-->
<!-- from license-->
<!-- </select>-->
<select id="getSysLanguageByActivable" resultType="com.alibaba.fastjson.JSONObject">
select id, language
from syslanguage
where activable = 1
</select>
<!-- <select id="getSysLanguageByActivable" resultType="com.alibaba.fastjson.JSONObject">-->
<!-- select id, language-->
<!-- from syslanguage-->
<!-- where activable = 1-->
<!-- </select>-->
<select id="getHrmEducationLevelData" resultType="com.alibaba.fastjson.JSONObject">
select id, name
from HrmEducationLevel
</select>
<!-- <select id="getHrmEducationLevelData" resultType="com.alibaba.fastjson.JSONObject">-->
<!-- select id, name-->
<!-- from HrmEducationLevel-->
<!-- </select>-->
<select id="getHrmJobCallData" resultType="com.alibaba.fastjson.JSONObject">
select id, name
from HrmJobCall
</select>
<!-- <select id="getHrmJobCallData" resultType="com.alibaba.fastjson.JSONObject">-->
<!-- select id, name-->
<!-- from HrmJobCall-->
<!-- </select>-->
<select id="getHrmLocationsByCountryId" resultType="com.alibaba.fastjson.JSONObject">
select id, locationname
from HrmLocations
where countryid = 1
</select>
<!-- <select id="getHrmLocationsByCountryId" resultType="com.alibaba.fastjson.JSONObject">-->
<!-- select id, locationname-->
<!-- from HrmLocations-->
<!-- where countryid = 1-->
<!-- </select>-->
<select id="getHrmUseKindData" resultType="com.alibaba.fastjson.JSONObject">
select id, name
from HrmUseKind
</select>
<!-- <select id="getHrmUseKindData" resultType="com.alibaba.fastjson.JSONObject">-->
<!-- select id, name-->
<!-- from HrmUseKind-->
<!-- </select>-->
<select id="getScCompanyNameById" resultType="java.lang.String">
select subcompanyname
from hrmsubcompany
@ -93,17 +100,17 @@
from hrmresource
where id = #{managerId}
</select>
<select id="getHrmObjectByID" resultType="com.alibaba.fastjson.JSONObject">
<select id="getHrmObjectByID" resultMap="RecordMap">
select *
from ${tableName}
where id = #{id}
</select>
<select id="getHrmObjectByUUID" resultType="com.alibaba.fastjson.JSONObject">
<select id="getHrmObjectByUUID" resultMap="RecordMap">
select *
from ${tableName}
where uuid = #{uuid}
</select>
<select id="getHrmJobTitleByName" resultType="com.alibaba.fastjson.JSONObject">
<select id="getHrmJobTitleByName" resultMap="RecordMap">
select *
from hrmjobtitles
where jobtitlename = #{name}

3
src/com/engine/organization/service/impl/ExtServiceImpl.java
Unescape Escape View File

@ -19,7 +19,6 @@ import com.engine.organization.util.db.DBType;
import com.engine.organization.util.db.MapperProxyFactory;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.Util;
import weaver.hrm.User;
@ -73,7 +72,7 @@ public class ExtServiceImpl extends Service implements ExtService {
List<String> readOnlyFieldList = Arrays.asList(readOnlyFields);
// 组装拓展页内容
for (ExtendInfoPO extendInfoPO : infoPOList) {
SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null == compExtMap ? null : compExtMap.get(DBType.get(new RecordSet().getDBType()).equals(DBType.ORACLE) ? extendInfoPO.getFieldName().toUpperCase() : extendInfoPO.getFieldName()));
SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null == compExtMap ? null : compExtMap.get(DBType.isOracle() ? extendInfoPO.getFieldName().toUpperCase() : extendInfoPO.getFieldName()));
item.setFieldcol(16);
if (2 == viewAttr) {
if (CollectionUtils.isNotEmpty(readOnlyFieldList) && readOnlyFieldList.contains(extendInfoPO.getFieldName())) {

5
src/com/engine/organization/service/impl/JobServiceImpl.java
Unescape Escape View File

@ -12,6 +12,7 @@ import com.engine.hrm.entity.RuleCodeType;
import com.engine.organization.component.OrganizationWeaTable;
import com.engine.organization.entity.DeleteParam;
import com.engine.organization.entity.codesetting.po.CodeRulePO;
import com.engine.organization.entity.commom.RecordInfo;
import com.engine.organization.entity.company.bo.CompBO;
import com.engine.organization.entity.company.po.CompPO;
import com.engine.organization.entity.department.bo.DepartmentBO;
@ -122,8 +123,8 @@ public class JobServiceImpl extends Service implements JobService {
static {
JSONObject hrmJobActivity = MapperProxyFactory.getProxy(SystemDataMapper.class).getHrmObjectByUUID("hrmjobactivities", "3a2efce3-95de-4ec2-afe1-347783817bdb");
JOB_ACTIVITY_ID = hrmJobActivity.getString("ID");
RecordInfo hrmJobActivity = MapperProxyFactory.getProxy(SystemDataMapper.class).getHrmObjectByUUID("hrmjobactivities", "3a2efce3-95de-4ec2-afe1-347783817bdb");
JOB_ACTIVITY_ID = hrmJobActivity.getId();
}
@Override

51
src/com/engine/organization/thread/OrganizationRunable.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.engine.organization.thread;
import com.alibaba.fastjson.JSONObject;
import com.engine.common.util.ServiceUtil;
import com.engine.hrm.service.impl.HrmJobServiceImpl;
import com.engine.hrm.service.impl.OrganizationServiceImpl;
import com.engine.organization.entity.commom.RecordInfo;
import com.engine.organization.entity.extend.param.ExtendInfoParams;
import com.engine.organization.entity.job.po.JobPO;
import com.engine.organization.enums.LogModuleNameEnum;
@ -11,12 +11,10 @@ import com.engine.organization.enums.OperateTypeEnum;
import com.engine.organization.mapper.extend.ExtMapper;
import com.engine.organization.mapper.hrmresource.SystemDataMapper;
import com.engine.organization.mapper.job.JobMapper;
import com.engine.organization.util.db.DBType;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.relation.EcHrmRelationUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.Util;
import weaver.hrm.User;
@ -154,11 +152,11 @@ public class OrganizationRunable implements Runnable {
private void addJob() {
// 判断是否存在同名岗位、存在不做处理，不存在，在“默认职务分类--默认职务”下新建岗位
String jobName = Util.null2String(params.get("job_name"));
JSONObject hrmJobActivity = getSystemDataMapper().getHrmJobTitleByName(jobName);
RecordInfo hrmJobActivity = getSystemDataMapper().getHrmJobTitleByName(jobName);
Map<String, Object> map = new HashMap<>();
//存在且已封存，对岗位解封
if (null != hrmJobActivity && "1".equals(hrmJobActivity.getString("canceled"))) {
map.put("ids", hrmJobActivity.getString("id"));
if (null != hrmJobActivity && "1".equals(hrmJobActivity.getCanceled())) {
map.put("ids", hrmJobActivity.getId());
map.put("canceled", "docanceled");
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
} else {
@ -184,7 +182,7 @@ public class OrganizationRunable implements Runnable {
String oldName = oldJobPO.getJobName();
String newName = Util.null2String(params.get("job_name"));
JSONObject oldHrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName);
RecordInfo oldHrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName);
Map<String, Object> map = new HashMap<>();
// 修改前不存在共用
@ -192,8 +190,8 @@ public class OrganizationRunable implements Runnable {
// 修改后不存在共用、直接修改EC岗位表数据
if (EcHrmRelationUtil.isNotExistJob(newName, jclJobId)) {
// 查询ec表ID
JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName);
map.put("id", Util.null2String(hrmJobTitle.get("id")));
RecordInfo hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName);
map.put("id", Util.null2String(hrmJobTitle.getId()));
map.put("operateIp", Util.null2String(user.getLoginip()));
map.put("jobtitlemark", newName);
map.put("jobtitlename", newName);
@ -206,13 +204,13 @@ public class OrganizationRunable implements Runnable {
ServiceUtil.getService(HrmJobServiceImpl.class, user).editJobTitle(map, user);
} else {
// 修改后存在共用、不修改岗位表数据，更新对应人员的岗位信息为当前岗位的ID
JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
RecordInfo hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
// 查询原分部、原岗位下的人员，并更新岗位ID
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id"));
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds);
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getId());
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.getId()), hrmResourceIds);
// 封存原名称岗位
map.clear();
map.put("ids", oldHrmJobTitle.getString("id"));
map.put("ids", oldHrmJobTitle.getId());
map.put("canceled", "canceled");
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
}
@ -232,16 +230,16 @@ public class OrganizationRunable implements Runnable {
map.put("jobtitlecode", Util.null2String(params.get("job_no")));
ServiceUtil.getService(HrmJobServiceImpl.class, user).addJobTitle(map, user);
// 新建岗位
JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
RecordInfo hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
// 查询原分部、原岗位下的人员，并更新岗位ID
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id"));
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds);
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getId());
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.getId()), hrmResourceIds);
} else {
// 修改后存在共用，更新原有岗位下人员的岗位ID
JSONObject hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
RecordInfo hrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(newName);
// 查询原分部、原岗位下的人员，并更新岗位ID
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getString("id"));
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.get("id")), hrmResourceIds);
List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIds(oldJobPO.getParentDept(), oldHrmJobTitle.getId());
getSystemDataMapper().updateResourceJobTitleByIds(Util.null2String(hrmJobTitle.getId()), hrmResourceIds);
}
}
}
@ -251,10 +249,10 @@ public class OrganizationRunable implements Runnable {
*/
private void cancelJob() {
Map<String, Object> map = new HashMap<>();
JSONObject hrmJobTitleByName = getSystemDataMapper().getHrmJobTitleByName(oldJobPO.getJobName());
RecordInfo hrmJobTitleByName = getSystemDataMapper().getHrmJobTitleByName(oldJobPO.getJobName());
if (0 == oldJobPO.getForbiddenTag()) {
// 启用
map.put("ids", hrmJobTitleByName.getString("id"));
map.put("ids", hrmJobTitleByName.getId());
map.put("canceled", "docanceled");
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
} else {
@ -262,14 +260,14 @@ public class OrganizationRunable implements Runnable {
List<JobPO> jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listByNameExceptId(oldJobPO.getJobName(), oldJobPO.getId());
// 不存在共用
if (CollectionUtils.isEmpty(jobPOS)) {
map.put("ids", hrmJobTitleByName.getString("id"));
map.put("ids", hrmJobTitleByName.getId());
map.put("canceled", "canceled");
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
} else {
List<JobPO> collect = jobPOS.stream().filter(item -> 0 == item.getForbiddenTag()).collect(Collectors.toList());
// 不存在非禁用
if (CollectionUtils.isEmpty(collect)) {
map.put("ids", hrmJobTitleByName.getString("id"));
map.put("ids", hrmJobTitleByName.getId());
map.put("canceled", "canceled");
ServiceUtil.getService(HrmJobServiceImpl.class, user).doCanceled(map, user);
}
@ -432,11 +430,8 @@ public class OrganizationRunable implements Runnable {
* @param jclTableName
*/
private void updateJclUUID(String id, String ecTableName, String jclTableName) {
JSONObject hrmDepartment = getSystemDataMapper().getHrmObjectByID(ecTableName, id);
String uuid = hrmDepartment.getString("uuid");
if (DBType.get(new RecordSet().getDBType()).equals(DBType.ORACLE)) {
uuid = hrmDepartment.getString("UUID");
}
RecordInfo hrmDepartment = getSystemDataMapper().getHrmObjectByID(ecTableName, id);
String uuid = hrmDepartment.getUuid();
Map<String, Object> departmentMap = new HashMap<>();
departmentMap.put("uuid", uuid);
long jclTableId = Long.parseLong(Util.null2String(params.get("id")));

7
src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.engine.organization.trigger.cusfielddata;
import com.alibaba.fastjson.JSONObject;
import com.engine.organization.entity.commom.RecordInfo;
import com.engine.organization.entity.cusfielddata.po.CusFieldData;
import com.engine.organization.entity.extend.param.ExtendInfoParams;
import com.engine.organization.entity.job.po.JobPO;
@ -20,6 +20,7 @@ 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 org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Map;
@ -85,8 +86,8 @@ public class CusFieldDataTrigger {
directionData.setField100002(sourceField100002);
Long gwId = Long.parseLong(sourceField100002);
JobPO jobById = MapperProxyFactory.getProxy(JobMapper.class).getJobById(gwId);
JSONObject hrmJobTitleByName = MapperProxyFactory.getProxy(SystemDataMapper.class).getHrmJobTitleByName(jobById.getJobName());
Long ecGwId = hrmJobTitleByName.getLong("id");
RecordInfo hrmJobTitleByName = MapperProxyFactory.getProxy(SystemDataMapper.class).getHrmJobTitleByName(jobById.getJobName());
Long ecGwId = StringUtils.isNotBlank(hrmJobTitleByName.getId()) ? Long.parseLong(hrmJobTitleByName.getId()) : null;
Long ecBmId = jobById.getEcDepartment();
Long ecGsId = jobById.getEcCompany();
Map<String, Object> hrmResourceMap = new HashMap<>();

5
src/com/engine/organization/util/db/DBType.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.engine.organization.util.db;
import com.engine.organization.exception.OrganizationRunTimeException;
import weaver.conn.RecordSet;
public enum DBType implements DBOperateAdapter {
MYSQL("mysql") {
@ -38,5 +39,9 @@ public enum DBType implements DBOperateAdapter {
throw new OrganizationRunTimeException("不支持的数据库类型");
}
public static boolean isOracle() {
return DBType.get(new RecordSet().getDBType()).equals(DBType.ORACLE);
}
}

18
src/com/engine/organization/util/relation/EcHrmRelationUtil.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.engine.organization.util.relation;
import com.alibaba.fastjson.JSONObject;
import com.engine.organization.entity.commom.RecordInfo;
import com.engine.organization.entity.company.po.CompPO;
import com.engine.organization.entity.department.po.DepartmentPO;
import com.engine.organization.entity.job.po.JobPO;
@ -49,8 +49,8 @@ public class EcHrmRelationUtil {
*/
public static String getEcCompanyId(String companyId) {
CompPO compPO = getCompMapper().listById(Long.parseLong(companyId));
JSONObject supSubCompany = getSystemDataMapper().getHrmObjectByUUID(HRM_COMPANY, compPO.getUuid());
return supSubCompany.getString("id");
RecordInfo supSubCompany = getSystemDataMapper().getHrmObjectByUUID(HRM_COMPANY, compPO.getUuid());
return supSubCompany.getId();
}
/**
@ -61,19 +61,19 @@ public class EcHrmRelationUtil {
*/
public static String getEcDepartmentId(String departmentId) {
DepartmentPO departmentPO = getDepartmentMapper().getDeptById(Long.parseLong(departmentId));
JSONObject supDepartment = getSystemDataMapper().getHrmObjectByUUID(HRM_DEPARTMENT, departmentPO.getUuid());
return supDepartment.getString("id");
RecordInfo supDepartment = getSystemDataMapper().getHrmObjectByUUID(HRM_DEPARTMENT, departmentPO.getUuid());
return supDepartment.getId();
}
public static CompPO getJclCompanyId(String ecCompanyId) {
if (StringUtils.isBlank(ecCompanyId)) {
return null;
}
JSONObject ecCompany = getSystemDataMapper().getHrmObjectByID(HRM_COMPANY, ecCompanyId);
RecordInfo ecCompany = getSystemDataMapper().getHrmObjectByID(HRM_COMPANY, ecCompanyId);
if (null == ecCompany) {
return null;
}
String uuid = ecCompany.getString("uuid");
String uuid = ecCompany.getUuid();
return getCompMapper().getCompanyByUUID(uuid);
}
@ -82,11 +82,11 @@ public class EcHrmRelationUtil {
if (StringUtils.isBlank(ecDepartmentId)) {
return null;
}
JSONObject ecDepartment = getSystemDataMapper().getHrmObjectByID(HRM_DEPARTMENT, ecDepartmentId);
RecordInfo ecDepartment = getSystemDataMapper().getHrmObjectByID(HRM_DEPARTMENT, ecDepartmentId);
if (null == ecDepartment) {
return null;
}
String uuid = ecDepartment.getString("uuid");
String uuid = ecDepartment.getUuid();
return getDepartmentMapper().getDepartmentByUUID(uuid);
}

Write Preview
Loading…
Cancel
Save