From 5bcd3e22fcf554e19866257c35fa676f1899ba78 Mon Sep 17 00:00:00 2001 From: Mlin Date: Mon, 19 Dec 2022 08:44:37 +0800 Subject: [PATCH] =?UTF-8?q?oracle=E7=8E=AF=E5=A2=83=E5=AD=98=E5=85=A5?= =?UTF-8?q?=E7=89=88=E6=9C=ACbug=E4=BF=AE=E5=A4=8D1219?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/jclorgmap/JclOrgMapper.xml | 141 +++++++++++++++++- .../mapper/version/CompanyVersionMapper.xml | 69 ++++++++- .../service/impl/OrgChartServiceImpl.java | 15 +- .../impl/VersionManageServiceImpl.java | 4 +- 4 files changed, 218 insertions(+), 11 deletions(-) diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml index c68bbd7b..69707dc8 100644 --- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml +++ b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml @@ -102,8 +102,34 @@ left join HrmJobTitles c on b.ec_jobTitle = c.id where a.status < 4 + + insert into jcl_org_map + (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, + fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, + fisvitual,fdatebegin,fdateend) + select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl, + c.id,c.jobtitlename,null,null, ifnull( b.id, '' ) +200000000,b.id, + 0,NOW(),'2099-12-31' + from hrmresource a + left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle + left join HrmJobTitles c on b.ec_jobTitle = c.id + where a.status < 4 + + + insert into jcl_org_map + (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleaderimg, + fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, + fisvitual,fdatebegin,fdateend) + select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl, + c.id,c.jobtitlename,null,null, nvl( b.id, '' ) +200000000,b.id, + 0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') + from hrmresource a + left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle + left join HrmJobTitles c on b.ec_jobTitle = c.id + where a.status < 4 + - + insert into jcl_org_map (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname, fparentid,fobjparentid, @@ -122,8 +148,47 @@ left join HrmJobTitles g on a.ec_jobTitle = g.id where isnull(a.delete_type,0) <> 1 and isnull(a.forbidden_tag,0) <> 1 + + insert into jcl_org_map + (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname, + fparentid,fobjparentid, + fplan,fonjob,fisvitual,fdatebegin,fdateend) + select a.id+200000000,3,a.id,g.uuid,0,'行政维度',a.job_no,g.jobtitlename, + ec_department+100000000, + ec_department, + ifnull(e.fcnt,0),ifnull(f.fcnt,0),0,NOW(),'2099-12-31' + from JCL_ORG_job as a + left join (select job_id,sum(ifnull(staff_num,0)) fcnt from JCL_ORG_STAFF + where plan_id in (select id from JCL_ORG_STAFFPLAN + where time_start<=NOW() and time_end > NOW() and delete_type=0) + group by job_id) e on a.id=e.job_id + left join (select JOBTITLE,count(1) fcnt from hrmresource group by JOBTITLE + ) f + on f.JOBTITLE=a.ec_jobTitle + left join HrmJobTitles g on a.ec_jobTitle = g.id + where ifnull(a.delete_type,0) <> 1 and ifnull(a.forbidden_tag,0) <> 1 + + + insert into jcl_org_map + (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname, + fparentid,fobjparentid, + fplan,fonjob,fisvitual,fdatebegin,fdateend) + select a.id+200000000,3,a.id,g.uuid,0,'行政维度',a.job_no,g.jobtitlename, + ec_department+100000000, + ec_department, + nvl(e.fcnt,0),nvl(f.fcnt,0),0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') + from JCL_ORG_job a + left join (select job_id,sum(nvl(staff_num,0)) fcnt from JCL_ORG_STAFF + where plan_id in (select id from JCL_ORG_STAFFPLAN + where time_start<=TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd') and time_end>TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd')) and delete_type=0 + group by job_id) e on a.id=e.job_id + left join (select jobtitle,count(1) fcnt from hrmresource group by jobtitle) f + on f.JOBTITLE=a.ec_jobTitle + left join HrmJobTitles g on a.ec_jobTitle = g.id + where nvl(a.delete_type,0) <> 1 and nvl(a.forbidden_tag,0) <> 1 + - + insert into jcl_org_map (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -139,8 +204,40 @@ left join hrmjobtitles as c on b.JOBTITLE=c.id where isnull(a.canceled,0) <> 1 + + insert into jcl_org_map + (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, + fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, + fplan,fonjob,fisvitual,fdatebegin,fdateend) + select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl, + b.lastname,b.jobtitle,c.jobtitlemark,null,null, + (case ifnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end), + (case ifnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end), + 0,0,0,NOW(),'2099-12-31' + from + HrmDepartment as a + left join hrmresource as b on a.BMFZR=b.ID + left join hrmjobtitles as c on b.JOBTITLE=c.id + where ifnull(a.canceled,0) <> 1 + + + insert into jcl_org_map + (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, + fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, + fplan,fonjob,fisvitual,fdatebegin,fdateend) + select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl, + b.lastname,b.jobtitle,c.jobtitlemark,null,null, + (case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end), + (case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end), + 0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') + from + HrmDepartment a + left join hrmresource b on a.BMFZR=b.ID + left join hrmjobtitles c on b.JOBTITLE=c.id + where nvl(a.canceled,0) <> 1 + - + insert into jcl_org_map (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, @@ -150,8 +247,28 @@ 0,0,0,convert(varchar(100),getDate(),23),'2099-12-31' from hrmsubcompany as a where isnull(a.canceled,0) <> 1 + + insert into jcl_org_map + (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, + fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, + fplan,fonjob,fisvitual,fdatebegin,fdateend) + select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'', + '',NULL,'','','',ifnull(a.supsubcomid,0),ifnull(a.supsubcomid,0), + 0,0,0,NOW(),'2099-12-31' from hrmsubcompany as a + where IFNULL(a.canceled,0) <> 1 + + + insert into jcl_org_map + (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg, + fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid, + fplan,fonjob,fisvitual,fdatebegin,fdateend) + select a.id,1,a.id,a.uuid,0,'行政维度', '',a.subcompanyname,null,'', + '',NULL,'','','',nvl(a.supsubcomid,0),nvl(a.supsubcomid,0), + 0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') from hrmsubcompany a + where nvl(a.canceled,0) <> 1 + - + INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname, fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid, fplan, fonjob, fisvitual, fdatebegin, fdateend) @@ -159,5 +276,21 @@ 0, NULL, NULL, 0, NULL, -1, 0, 0, 0, 0, convert(varchar(100),getDate(),23), '2099-12-31' FROM hrmcompany + + INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname, + fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid, + fplan, fonjob, fisvitual, fdatebegin, fdateend) + SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname, + 0, NULL, NULL, 0, NULL, -1, 0, + 0, 0, 0, TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd') FROM hrmcompany + + + INSERT INTO jcl_org_map ( id, ftype, fobjid, uuid,fclass, fclassname, fnumber, fname, + fleader, fleaderimg, fleadername, fleaderjobid, fleaderjob, fparentid,fobjparentid, + fplan, fonjob, fisvitual, fdatebegin, fdateend) + SELECT 0, 0, 0, uuid, 0, '行政维度', '00', companyname, + 0, NULL, NULL, 0, NULL, -1, 0, + 0, 0, 0, NOW(), '2099-12-31' FROM hrmcompany + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml index 04d66b13..5b2460f0 100644 --- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml +++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml @@ -62,7 +62,19 @@ VALUES (#{id},#{departmentId}, #{departmentMark}, #{departmentCode}, #{departmentName}, #{subCompanyId1}, #{supDepId}, #{bmfzr}, #{showOrder}, #{canceled}, #{description}, #{operator}, #{version}, #{operateTime}) - + + insert into HRMDEPARTMENT_VERSION + ( ID,DEPARTMENTID,DEPARTMENTMARK + ,DEPARTMENTCODE,DEPARTMENTNAME,SUBCOMPANYID1 + ,SUPDEPID,BMFZR,SHOWORDER + ,CANCELED,DESCRIPTION,OPERATOR + ,VERSION,OPERATE_TIME) + values (#{id,jdbcType=DECIMAL},#{departmentId,jdbcType=DECIMAL},#{departmentMark,jdbcType=VARCHAR} + ,#{departmentCode,jdbcType=VARCHAR},#{departmentName,jdbcType=VARCHAR},#{subCompanyId1,jdbcType=DECIMAL} + ,#{supDepId,jdbcType=DECIMAL},#{bmfzr,jdbcType=VARCHAR},#{showOrder,jdbcType=DECIMAL} + ,#{canceled,jdbcType=DECIMAL},#{description,jdbcType=VARCHAR},#{operator,jdbcType=VARCHAR} + ,#{version,jdbcType=DECIMAL},#{operateTime,jdbcType=TIMESTAMP}) + @@ -232,6 +244,61 @@ #{operateTime,jdbcType=TIMESTAMP}, + + insert into HRMRESOURCE_VERSION + ( 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) + values (#{id,jdbcType=DECIMAL},#{resourceid,jdbcType=DECIMAL},#{companystartdate,jdbcType=TIMESTAMP} + ,#{companyworkyear,jdbcType=DECIMAL},#{workstartdate,jdbcType=TIMESTAMP},#{workyear,jdbcType=DECIMAL} + ,#{usekind,jdbcType=DECIMAL},#{jobcall,jdbcType=DECIMAL},#{accumfundaccount,jdbcType=VARCHAR} + ,#{birthplace,jdbcType=VARCHAR},#{folk,jdbcType=VARCHAR},#{residentphone,jdbcType=VARCHAR} + ,#{residentpostcode,jdbcType=VARCHAR},#{extphone,jdbcType=VARCHAR},#{managerstr,jdbcType=VARCHAR} + ,#{status,jdbcType=DECIMAL},#{fax,jdbcType=VARCHAR},#{islabouunion,jdbcType=CHAR} + ,#{weight,jdbcType=DECIMAL},#{tempresidentnumber,jdbcType=VARCHAR},#{probationenddate,jdbcType=TIMESTAMP} + ,#{countryid,jdbcType=DECIMAL},#{passwdchgdate,jdbcType=TIMESTAMP},#{lloginid,jdbcType=VARCHAR} + ,#{dsporder,jdbcType=FLOAT},#{passwordstate,jdbcType=DECIMAL},#{accounttype,jdbcType=DECIMAL} + ,#{belongto,jdbcType=DECIMAL},#{messagerurl,jdbcType=VARCHAR},#{accountname,jdbcType=VARCHAR} + ,#{loginid,jdbcType=VARCHAR},#{password,jdbcType=VARCHAR},#{lastname,jdbcType=VARCHAR} + ,#{sex,jdbcType=CHAR},#{birthday,jdbcType=CHAR},#{nationality,jdbcType=DECIMAL} + ,#{maritalstatus,jdbcType=CHAR},#{telephone,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR} + ,#{mobilecall,jdbcType=VARCHAR},#{email,jdbcType=VARCHAR},#{locationid,jdbcType=DECIMAL} + ,#{workroom,jdbcType=VARCHAR},#{homeaddress,jdbcType=VARCHAR},#{resourcetype,jdbcType=CHAR} + ,#{startdate,jdbcType=TIMESTAMP},#{enddate,jdbcType=TIMESTAMP},#{jobtitle,jdbcType=DECIMAL} + ,#{jobactivitydesc,jdbcType=VARCHAR},#{joblevel,jdbcType=DECIMAL},#{seclevel,jdbcType=DECIMAL} + ,#{departmentid,jdbcType=DECIMAL},#{subcompanyid1,jdbcType=DECIMAL},#{costcenterid,jdbcType=DECIMAL} + ,#{managerid,jdbcType=DECIMAL},#{assistantid,jdbcType=DECIMAL},#{bankid1,jdbcType=DECIMAL} + ,#{accountid1,jdbcType=VARCHAR},#{resourceimageid,jdbcType=DECIMAL},#{certificatenum,jdbcType=VARCHAR} + ,#{nativeplace,jdbcType=VARCHAR},#{educationlevel,jdbcType=DECIMAL},#{bememberdate,jdbcType=TIMESTAMP} + ,#{bepartydate,jdbcType=TIMESTAMP},#{workcode,jdbcType=VARCHAR},#{regresidentplace,jdbcType=VARCHAR} + ,#{healthinfo,jdbcType=CHAR},#{residentplace,jdbcType=VARCHAR},#{policy,jdbcType=VARCHAR} + ,#{degree,jdbcType=VARCHAR},#{height,jdbcType=VARCHAR},#{classification,jdbcType=CHAR} + ,#{description,jdbcType=VARCHAR},#{operator,jdbcType=VARCHAR},#{version,jdbcType=DECIMAL} + ,#{operateTime,jdbcType=TIMESTAMP}) +