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

oracle环境存入版本bug修复、新增职等职级1220

This commit is contained in:
Mlin 2022-12-20 09:02:51 +08:00
parent 0128de79ea
commit 30898d0eee
6 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/organization/entity/version/HrmDepartmentVersion.java
View File

@ -21,4 +21,8 @@ public class HrmDepartmentVersion {
String operator;
Double version;
Date operateTime;
String subcompanyname;
String supDepName;
String bmfzrName;
}

4
src/com/engine/organization/entity/version/HrmResourceVersion.java
View File

@ -159,4 +159,8 @@ public class HrmResourceVersion {
private Date operateTime;
String departmentname;
String subcompanyname;
String jobtitlename;
}

2
src/com/engine/organization/entity/version/HrmSubCompanyVersion.java
View File

@ -19,4 +19,6 @@ public class HrmSubCompanyVersion {
String operator;
Double version;
Date operateTime;
String supSubComName;
}

83
src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
View File

@ -234,79 +234,76 @@
<select id="getHrmSubComp" resultType="com.engine.organization.entity.version.HrmSubCompanyDto">
select id ,subcompanyname, subcompanydesc,companyid,supsubcomid,url,canceled,subcompanycode,outkey,showorder from HrmSubCompany
select id ,subcompanyname, subcompanydesc,companyid,supsubcomid,canceled,subcompanycode,showorder from HrmSubCompany
where id=#{id}
</select>
<select id="getHrmDepartment" resultType="com.engine.organization.entity.version.HrmDepartmentDto">
select id,departmentmark,departmentname,subcompanyid1,supdepid,canceled,departmentcode,outkey,showorder,coadjutant,bmfzr from HrmDepartment
where id=#{id}
select a.id,a.departmentmark,a.departmentname,a.subcompanyid1,a.supdepid,a.canceled,
a.departmentcode,a.showorder,b.bmfzr from HrmDepartment a
left join hrmdepartmentdefined b on a.id=b.deptid
where a.id=#{id}
</select>
<select id="getHrmResource" resultType="com.engine.organization.entity.version.HrmResourceDto">
select id,loginid,password,lastname,sex,birthday,nationality,systemlanguage,
maritalstatus,telephone,mobile,mobilecall,email,locationid,workroom,homeaddress,
resourcetype,startdate,enddate,jobtitle,jobactivitydesc,joblevel,seclevel,departmentid,
subcompanyid1,costcenterid,managerid,assistantid,bankid1,accountid1,resourceimageid,createrid,
createdate,lastmodid,lastmoddate,lastlogindate,datefield1,datefield2,datefield3,datefield4,
datefield5,numberfield1,numberfield2,numberfield3,numberfield4,numberfield5,textfield1,textfield2,
textfield3,textfield4,textfield5,tinyintfield1,tinyintfield2,tinyintfield3,tinyintfield4,
tinyintfield5,certificatenum,nativeplace,educationlevel,bememberdate,bepartydate,workcode,
regresidentplace,healthinfo,residentplace,policy,degree,height,usekind,jobcall,accumfundaccount,
birthplace,folk,residentphone,residentpostcode,extphone,managerstr,status,fax,islabouunion,weight,
tempresidentnumber,probationenddate,countryid,passwdchgdate,needusb,serial,account,lloginid,
needdynapass,dsporder,passwordstate,accounttype,belongto,dactylogram,assistantdactylogram,
passwordlock,sumpasswordwrong,oldpassword1,oldpassword2,msgStyle,messagerurl,pinyinlastname,
tokenkey,userUsbType,outkey,adsjgs,adgs,adbm,mobileshowtype,usbstate,totalSpace,occupySpace,
ecology_pinyin_search,isADAccount,accountname,
haschangepwd,created,creater,modified,modifier,passwordlocktime,mobilecaflag,salt,companystartdate,
workstartdate,secondaryPwd,useSecondaryPwd,classification,uuid,passwordLockReason,companyworkyear,
workyear,DISMISSDATE,encKey,crc,usbscope,tenant_key,clauthtype,hashData,signData from HrmResource
select id,departmentid,dsporder,subcompanyid1,jobtitle,mobile,telephone,managerid,lastname from HrmResource
where id=#{id}
</select>
<select id="getSubComVersionList" resultType="com.engine.organization.entity.version.HrmSubCompanyVersion">
select id,subComId,subCompanyDesc,subCompanyCode,subCompanyName,supSubComId,showOrder,canceled,
description,operator,version,operate_time as operateTime from HRMSUBCOMPANY_VERSION
select a.id,a.subComId,a.subCompanyDesc,a.subCompanyCode,a.subCompanyName,a.supSubComId,a.showOrder,a.canceled,
a.description,a.operator,a.version,a.operate_time as operateTime,b.subcompanyname as supSubComName from HRMSUBCOMPANY_VERSION a
left join hrmsubcompany b on a.supSubComId=b.id
<where>
<if test="subComId !=null">
and subComId = #{subComId}
and a.subComId = #{subComId}
</if>
<if test="version !=null">
and version like #{version}
and a.version like #{version}
</if>
</where>
ORDER BY VERSION ASC
ORDER BY a.VERSION ASC
</select>
<select id="getDeptVersionList" resultType="com.engine.organization.entity.version.HrmDepartmentVersion">
select id,departmentid,departmentmark,departmentcode,departmentname,subcompanyid1,supdepid,bmfzr,showorder,
canceled,description,operator,version,operate_time as operateTime from HRMDEPARTMENT_VERSION
select a.id,a.departmentid,a.departmentmark,a.departmentcode,a.departmentname,a.subcompanyid1,
a.supdepid,a.bmfzr,a.showorder,a.canceled,a.description,a.operator,a.version,
a.operate_time as operateTime,b.subcompanyname,c.departmentname as supDepName,d.lastname as bmfzrName from HRMDEPARTMENT_VERSION a
left join hrmsubcompany b on a.subcompanyid1=b.id
left join hrmdepartment c on a.supdepid=c.id
left join hrmresource d on a.bmfzr=d.id
<where>
<if test="departmentid !=null">
and departmentid = #{departmentid}
and a.departmentid = #{departmentid}
</if>
<if test="version !=null">
and version like #{version}
and a.version like #{version}
</if>
</where>
ORDER BY VERSION ASC
ORDER BY a.VERSION ASC
</select>
<select id="getResourceVersionList" resultType="com.engine.organization.entity.version.HrmResourceVersion">
select id,resourceid,companystartdate,companyworkyear,workstartdate,workyear,usekind,jobcall,accumfundaccount,
birthplace,folk,residentphone,residentpostcode,extphone,managerstr,status,fax,islabouunion,weight,
tempresidentnumber,probationenddate,countryid,passwdchgdate,lloginid,dsporder,passwordstate,accounttype,
belongto,messagerurl,accountname,loginid,password,lastname,sex,birthday,nationality,maritalstatus,
telephone,mobile,mobilecall,email,locationid,workroom,homeaddress,resourcetype,startdate,enddate,
jobtitle,jobactivitydesc,joblevel,seclevel,departmentid,subcompanyid1,costcenterid,managerid,assistantid,
bankid1,accountid1,resourceimageid,certificatenum,nativeplace,educationlevel,bememberdate,bepartydate,
workcode,regresidentplace,healthinfo,residentplace,policy,degree,height,classification,description,
operator,version,operate_time as operateTime from HRMRESOURCE_VERSION
select a.id,a.resourceid,a.companystartdate,a.companyworkyear,a.workstartdate,a.workyear,a.usekind,
a.jobcall,a.accumfundaccount,a.birthplace,a.folk,a.residentphone,a.residentpostcode,a.extphone,
a.managerstr,a.status,a.fax,a.islabouunion,a.weight,a.tempresidentnumber,a.probationenddate,
a.countryid,a.passwdchgdate,a.lloginid,a.dsporder,a.passwordstate,a.accounttype,a.belongto,
a.messagerurl,a.accountname,a.loginid,a.password,a.lastname,a.sex,a.birthday,a.nationality,
a.maritalstatus,a.telephone,a.mobile,a.mobilecall,a.email,a.locationid,a.workroom,a.homeaddress,
a.resourcetype,a.startdate,a.enddate,a.jobtitle,a.jobactivitydesc,a.joblevel,a.seclevel,
a.departmentid,a.subcompanyid1,a.costcenterid,a.managerid,a.assistantid,a.bankid1,a.accountid1,
a.resourceimageid,a.certificatenum,a.nativeplace,a.educationlevel,a.bememberdate,a.bepartydate,
a.workcode,a.regresidentplace,a.healthinfo,a.residentplace,a.policy,a.degree,a.height,a.classification,
a.description,a.operator,a.version,a.operate_time as operateTime,b.departmentname,c.subcompanyname,
d.jobtitlename
from HRMRESOURCE_VERSION a
left join hrmdepartment b on a.departmentid=b.id
left join hrmsubcompany c on a.subcompanyid1=c.id
left join hrmjobtitles d on a.jobtitle=d.id
<where>
<if test="resourceid !=null">
and resourceid = #{resourceid}
and a.resourceid = #{resourceid}
</if>
<if test="version !=null">
and version like #{version}
and a.version like #{version}
</if>
</where>
ORDER BY VERSION ASC
ORDER BY a.VERSION ASC
</select>
</mapper>

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

@ -558,7 +558,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
String ftype = null;
if (rs.next()) {
fparentid = rs.getString("fparentid");
String typeSql = "select ftype from jcl_org_map where id=" + fparentid + " ";
String typeSql = "select ftype from jcl_org_map where id=" + fparentid + whereSql;
rs.executeQuery(typeSql + whereSql);
if (rs.next()) {
ftype = rs.getString("ftype");

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

@ -94,7 +94,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
for (HrmSubCompanyVersion hrmSubCompanyVersion : list) {
datas.add(VersionData.builder().fieldId("分部简称").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyName())).build());
datas.add(VersionData.builder().fieldId("分部描述").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyDesc())).build());
datas.add(VersionData.builder().fieldId("上级分部id").fieldValue(Util.null2String(hrmSubCompanyVersion.getSupSubComId())).build());
datas.add(VersionData.builder().fieldId("上级分部").fieldValue(Util.null2String(hrmSubCompanyVersion.getSupSubComName())).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmSubCompanyVersion.getVersion()))).build());
datas.add(VersionData.builder().fieldId("分部编码").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyCode())).build());
datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmSubCompanyVersion.getShowOrder())).build());
@ -122,10 +122,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
datas.add(VersionData.builder().fieldId("部门编号").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentCode())).build());
datas.add(VersionData.builder().fieldId("部门简称").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentName())).build());
datas.add(VersionData.builder().fieldId("部门标识").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentMark())).build());
datas.add(VersionData.builder().fieldId("所属分部").fieldValue(Util.null2String(hrmDepartmentVersion.getSubCompanyId1())).build());
datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepId())).build());
datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepId())).build());
datas.add(VersionData.builder().fieldId("部门负责人").fieldValue(Util.null2String(hrmDepartmentVersion.getBmfzr())).build());
datas.add(VersionData.builder().fieldId("所属分部").fieldValue(Util.null2String(hrmDepartmentVersion.getSubcompanyname())).build());
datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepName())).build());
datas.add(VersionData.builder().fieldId("部门负责人").fieldValue(Util.null2String(hrmDepartmentVersion.getBmfzrName())).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmDepartmentVersion.getVersion()))).build());
datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmDepartmentVersion.getShowOrder())).build());
operateName = hrmDepartmentVersion.getOperator();
@ -150,9 +149,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
resVersionList = getCompanyVersionMapper().getResourceVersionList(id, version);
for (HrmResourceVersion hrmResourceVersion : resVersionList) {
datas.add(VersionData.builder().fieldId("姓名").fieldValue(Util.null2String(hrmResourceVersion.getLastname())).build());
datas.add(VersionData.builder().fieldId("部门").fieldValue(Util.null2String(hrmResourceVersion.getDepartmentid())).build());
datas.add(VersionData.builder().fieldId("岗位").fieldValue(Util.null2String(hrmResourceVersion.getJobtitle())).build());
datas.add(VersionData.builder().fieldId("分部").fieldValue(Util.null2String(hrmResourceVersion.getSubcompanyid1())).build());
datas.add(VersionData.builder().fieldId("部门").fieldValue(Util.null2String(hrmResourceVersion.getDepartmentname())).build());
datas.add(VersionData.builder().fieldId("岗位").fieldValue(Util.null2String(hrmResourceVersion.getJobtitlename())).build());
datas.add(VersionData.builder().fieldId("分部").fieldValue(Util.null2String(hrmResourceVersion.getSubcompanyname())).build());
datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmResourceVersion.getVersion()))).build());
operateName = hrmResourceVersion.getOperator();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");