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

Merge pull request 'develop' (#280) from develop into master

Browse Source 
Reviewed-on: #280
liang.cheng 7 months ago
parent 9e411360c1 2d240460f1
commit 29176caf27
66 changed files with 1941 additions and 251 deletions
Show Stats Download Patch File Download Diff File

121
docs/sql20240530/DM.sql
Unescape Escape View File

@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 5
delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
/
delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
/
delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
/
delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'强控策略下不容许超编' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'強控策略下不容許超編' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
/
delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'调整数量不可大于在编数' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'調整數量不可大於在編數' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
/
delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
/
delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'当前冻结数为0,无需释放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'當前凍結數為0,無需釋放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
/

121
docs/sql20240530/GS.sql
Unescape Escape View File

@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 5
delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
/
delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
/
delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
/
delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'强控策略下不容许超编' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'強控策略下不容許超編' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
/
delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'调整数量不可大于在编数' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'調整數量不可大於在編數' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
/
delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
/
delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'当前冻结数为0,无需释放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'當前凍結數為0,無需釋放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
/

121
docs/sql20240530/JC.sql
Unescape Escape View File

@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 5
delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
/
delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
/
delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
/
delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'强控策略下不容许超编' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'強控策略下不容許超編' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
/
delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'调整数量不可大于在编数' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'調整數量不可大於在編數' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
/
delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
/
delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'当前冻结数为0,无需释放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'當前凍結數為0,無需釋放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
/

121
docs/sql20240530/MySql.sql
Unescape Escape View File

@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 5
delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label'
;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733)
;
delete from HtmlLabelIndex where id = 547469 and ( indexdesc is null or indexdesc = '' )
;
insert into HtmlLabelIndex(id,indexdesc) select 547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label'
;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469)
;
delete from HtmlLabelIndex where id = 547470 and ( indexdesc is null or indexdesc = '' )
;
insert into HtmlLabelIndex(id,indexdesc) select 547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label'
;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470)
;
delete from HtmlLabelIndex where id = 547471 and ( indexdesc is null or indexdesc = '' )
;
insert into HtmlLabelIndex(id,indexdesc) select 547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'强控策略下不容许超编' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'強控策略下不容許超編' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label'
;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471)
;
delete from HtmlLabelIndex where id = 547472 and ( indexdesc is null or indexdesc = '' )
;
insert into HtmlLabelIndex(id,indexdesc) select 547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'调整数量不可大于在编数' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'調整數量不可大於在編數' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label'
;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472)
;
delete from HtmlLabelIndex where id = 547474 and ( indexdesc is null or indexdesc = '' )
;
insert into HtmlLabelIndex(id,indexdesc) select 547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label'
;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474)
;
delete from HtmlLabelIndex where id = 547949 and ( indexdesc is null or indexdesc = '' )
;
insert into HtmlLabelIndex(id,indexdesc) select 547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( indexdesc is not null and indexdesc <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'当前冻结数为0,无需释放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=char_length(labelname) )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=char_length(labelname) )) limit 1
;
delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is null or labelname = '' )
;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'當前凍結數為0,無需釋放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1
;
delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label'
;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949)
;

121
docs/sql20240530/Oracle.sql
Unescape Escape View File

@ -9703,3 +9703,124 @@ delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and ty
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733)
/
delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null )
/
insert into HtmlLabelIndex(id,indexdesc) select 547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label'
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469)
/
delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null )
/
insert into HtmlLabelIndex(id,indexdesc) select 547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label'
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470)
/
delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null )
/
insert into HtmlLabelIndex(id,indexdesc) select 547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'强控策略下不容许超编' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'強控策略下不容許超編' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label'
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471)
/
delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null )
/
insert into HtmlLabelIndex(id,indexdesc) select 547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'调整数量不可大于在编数' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'調整數量不可大於在編數' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label'
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472)
/
delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null )
/
insert into HtmlLabelIndex(id,indexdesc) select 547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label'
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474)
/
delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null )
/
insert into HtmlLabelIndex(id,indexdesc) select 547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'当前冻结数为0,无需释放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null )
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'當前凍結數為0,無需釋放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1
/
delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label'
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949)
/

193
docs/sql20240530/PG.sql
Unescape Escape View File

@ -8262,81 +8262,81 @@ delete from HtmlModuleLabel where indexId = 547595 and moduleCode = 'HRM' and ty
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547595) ;
/
delete from HtmlLabelIndex where id = 547599 and ( trim(indexdesc) is null ) ;
delete from HtmlLabelIndex where id = 547598 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547599,'部门简称' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547599 and ( trim(indexdesc) is not null )) and rownum = 1 ;
insert into HtmlLabelIndex(id,indexdesc) select 547598,'部门名称' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547598 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547599 and languageid=7 and ( trim(labelname) is null ) ;
delete from HtmlLabelInfo where indexid = 547598 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547599 as indexid ,'部门简称' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547598 as indexid ,'部门名称' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547599 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
delete from HtmlLabelInfo where indexid = 547598 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547599 as indexid ,'Department Abbreviation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547598 as indexid ,'Department Name' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547599 and languageid=9 and ( trim(labelname) is null ) ;
delete from HtmlLabelInfo where indexid = 547598 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547599 as indexid ,'部門簡稱' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547598 as indexid ,'部門名稱' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547599 and moduleCode = 'HRM' and type = 'label' ;
delete from HtmlModuleLabel where indexId = 547598 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547599) ;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547598) ;
/
delete from HtmlLabelIndex where id = 547598 and ( trim(indexdesc) is null ) ;
delete from HtmlLabelIndex where id = 547599 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547598,'部门名称' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547598 and ( trim(indexdesc) is not null )) and rownum = 1 ;
insert into HtmlLabelIndex(id,indexdesc) select 547599,'部门简称' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547599 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547598 and languageid=7 and ( trim(labelname) is null ) ;
delete from HtmlLabelInfo where indexid = 547599 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547598 as indexid ,'部门名称' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547599 as indexid ,'部门简称' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547598 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
delete from HtmlLabelInfo where indexid = 547599 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547598 as indexid ,'Department Name' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547599 as indexid ,'Department Abbreviation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547598 and languageid=9 and ( trim(labelname) is null ) ;
delete from HtmlLabelInfo where indexid = 547599 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547598 as indexid ,'部門名稱' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547599 as indexid ,'部門簡稱' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547598 and moduleCode = 'HRM' and type = 'label' ;
delete from HtmlModuleLabel where indexId = 547599 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547598) ;
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547599) ;
/
delete from HtmlLabelIndex where id = 547597 and ( trim(indexdesc) is null ) ;
delete from HtmlLabelIndex where id = 547597 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547597,'标识' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547597 and ( trim(indexdesc) is not null )) and rownum = 1 ;
insert into HtmlLabelIndex(id,indexdesc) select 547597,'标识' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547597 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547597 and languageid=7 and ( trim(labelname) is null ) ;
delete from HtmlLabelInfo where indexid = 547597 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547597 as indexid ,'标识' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547597 as indexid ,'标识' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547597 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
delete from HtmlLabelInfo where indexid = 547597 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547597 as indexid ,'Identifier' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547597 as indexid ,'Identifier' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547597 and languageid=9 and ( trim(labelname) is null ) ;
delete from HtmlLabelInfo where indexid = 547597 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547597 as indexid ,'標識' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547597 as indexid ,'標識' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547597 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547597) ;
/
delete from HtmlLabelIndex where id = 547596 and ( trim(indexdesc) is null ) ;
delete from HtmlLabelIndex where id = 547596 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547596,'责任编辑' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547596 and ( trim(indexdesc) is not null )) and rownum = 1 ;
insert into HtmlLabelIndex(id,indexdesc) select 547596,'责任编辑' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547596 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547596 and languageid=7 and ( trim(labelname) is null ) ;
delete from HtmlLabelInfo where indexid = 547596 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547596 as indexid ,'责任编辑' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547596 as indexid ,'责任编辑' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547596 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
delete from HtmlLabelInfo where indexid = 547596 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547596 as indexid ,'Responsible Editor' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547596 as indexid ,'Responsible Editor' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547596 and languageid=9 and ( trim(labelname) is null ) ;
delete from HtmlLabelInfo where indexid = 547596 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547596 as indexid ,'責任編輯' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547596 as indexid ,'責任編輯' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547596 and moduleCode = 'HRM' and type = 'label' ;
/
@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 5
delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
/
delete from HtmlLabelIndex where id = 547469 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
/
delete from HtmlLabelIndex where id = 547470 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
/
delete from HtmlLabelIndex where id = 547471 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'强控策略下不容许超编' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'強控策略下不容許超編' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
/
delete from HtmlLabelIndex where id = 547472 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'调整数量不可大于在编数' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'調整數量不可大於在編數' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
/
delete from HtmlLabelIndex where id = 547474 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
/
delete from HtmlLabelIndex where id = 547949 and ( indexdesc is null or indexdesc = '' ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( indexdesc is not null and indexdesc <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'当前冻结数为0,无需释放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is null or labelname = '' or length(labelname)!=octet_length(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is not null and labelname <> '' and length(labelname)=octet_length(labelname) )) limit 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is null or labelname = '' ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'當前凍結數為0,無需釋放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is not null and labelname <> '' )) limit 1 ;
/
delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
/

120
docs/sql20240530/SQLServer.sql
Unescape Escape View File

@ -9704,3 +9704,123 @@ GO
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733)
GO
delete from HtmlLabelIndex where id = 547469 and ( indexdesc is null or indexdesc = '' )
GO
insert into HtmlLabelIndex(id,indexdesc) select top 1 547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( indexdesc is not null and indexdesc <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is null or labelname = '' or labelname like '%[吖-座]%' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is not null and labelname <> '' and labelname not like '%[吖-座]%' ))
GO
delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label'
GO
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469)
GO
delete from HtmlLabelIndex where id = 547470 and ( indexdesc is null or indexdesc = '' )
GO
insert into HtmlLabelIndex(id,indexdesc) select top 1 547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( indexdesc is not null and indexdesc <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is null or labelname = '' or labelname like '%[吖-座]%' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is not null and labelname <> '' and labelname not like '%[吖-座]%' ))
GO
delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label'
GO
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470)
GO
delete from HtmlLabelIndex where id = 547471 and ( indexdesc is null or indexdesc = '' )
GO
insert into HtmlLabelIndex(id,indexdesc) select top 1 547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( indexdesc is not null and indexdesc <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547471 as indexid ,'强控策略下不容许超编' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is null or labelname = '' or labelname like '%[吖-座]%' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is not null and labelname <> '' and labelname not like '%[吖-座]%' ))
GO
delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547471 as indexid ,'強控策略下不容許超編' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label'
GO
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471)
GO
delete from HtmlLabelIndex where id = 547472 and ( indexdesc is null or indexdesc = '' )
GO
insert into HtmlLabelIndex(id,indexdesc) select top 1 547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( indexdesc is not null and indexdesc <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547472 as indexid ,'调整数量不可大于在编数' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is null or labelname = '' or labelname like '%[吖-座]%' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is not null and labelname <> '' and labelname not like '%[吖-座]%' ))
GO
delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547472 as indexid ,'調整數量不可大於在編數' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label'
GO
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472)
GO
delete from HtmlLabelIndex where id = 547474 and ( indexdesc is null or indexdesc = '' )
GO
insert into HtmlLabelIndex(id,indexdesc) select top 1 547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( indexdesc is not null and indexdesc <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is null or labelname = '' or labelname like '%[吖-座]%' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is not null and labelname <> '' and labelname not like '%[吖-座]%' ))
GO
delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label'
GO
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474)
GO
delete from HtmlLabelIndex where id = 547949 and ( indexdesc is null or indexdesc = '' )
GO
insert into HtmlLabelIndex(id,indexdesc) select top 1 547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( indexdesc is not null and indexdesc <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547949 as indexid ,'当前冻结数为0,无需释放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is null or labelname = '' or labelname like '%[吖-座]%' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is not null and labelname <> '' and labelname not like '%[吖-座]%' ))
GO
delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is null or labelname = '' )
GO
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select top 1 547949 as indexid ,'當前凍結數為0,無需釋放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is not null and labelname <> '' ))
GO
delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label'
GO
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949)
GO

121
docs/sql20240530/ST.sql
Unescape Escape View File

@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 5
delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
/
delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
/
delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
/
delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'强控策略下不容许超编' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547471 as indexid ,'強控策略下不容許超編' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
/
delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'调整数量不可大于在编数' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547472 as indexid ,'調整數量不可大於在編數' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
/
delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
/
delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null ) ;
/
insert into HtmlLabelIndex(id,indexdesc) select 547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'当前冻结数为0,无需释放' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ;
/
delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null ) ;
/
insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 547949 as indexid ,'當前凍結數為0,無需釋放' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ;
/
delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
/
insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
/

8
src/com/engine/organization/entity/chart/CompanyTreePO.java
Unescape Escape View File

@ -22,6 +22,7 @@ public class CompanyTreePO {
private boolean isLeaf;
private String key;
private boolean disabled;
private String type;
public boolean getIsLeaf() {
return isLeaf;
@ -38,4 +39,11 @@ public class CompanyTreePO {
public String getValue() {
return id;
}
public String getType() {
if(id.startsWith("d")){
return "2";
}
return "1";
}
}

4
src/com/engine/organization/entity/company/bo/CompBO.java
Unescape Escape View File

@ -33,7 +33,7 @@ public class CompBO {
tree.setIsParent(false);
tree.setIsVirtual("0");
tree.setName(item.getSubCompanyName());
tree.setPid(item.getSupSubComId().toString());
tree.setPid(item.getSupSubComId() == null ? "0" :item.getSupSubComId().toString());
tree.setSelected(false);
tree.setType("1");
tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
@ -101,7 +101,7 @@ public class CompBO {
.subCompanyCode(e.getSubCompanyCode())
.subCompanyDesc(e.getSubCompanyDesc())
.subCompanyName(e.getSubCompanyName())
.supSubComId(e.getSupSubComId())
.supSubComId(e.getSupSubComId() == null ? 0 : e.getSupSubComId())
.supSubComName(null == poMaps.get(e.getSupSubComId()) ? "" : poMaps.get(e.getSupSubComId()).getSubCompanyName())
.showOrder(e.getShowOrder())
.canceled(null == e.getCanceled() ? 0 : e.getCanceled())

26
src/com/engine/organization/entity/department/bo/DepartmentBO.java
Unescape Escape View File

@ -32,16 +32,20 @@ public class DepartmentBO {
* @param list
* @return
*/
public static List<DepartmentListDTO> buildDeptDTOShowNames(Collection<DepartmentListDTO> list) {
return list.stream().peek(e -> {
List<DepartmentListDTO> children = e.getChildren();
if (CollectionUtils.isNotEmpty(children)){
List<DepartmentListDTO> collect = children.stream().peek(item -> item.setBmfzr(getEmployeeNameById(item.getId()))).collect(Collectors.toList());
e.setChildren(collect);
}
e.setBmfzr(getEmployeeNameById(e.getId()));
}
).collect(Collectors.toList());
public static List<DepartmentListDTO> buildDeptDTOShowNames(List<DepartmentListDTO> list) {
setDeptLeader(list);
return list;
}
public static void setDeptLeader(List<DepartmentListDTO> departments) {
for (DepartmentListDTO dept : departments) {
dept.setBmfzr(getEmployeeNameById(dept.getId()));
List<DepartmentListDTO> children = dept.getChildren();
if (CollectionUtils.isNotEmpty(children)){
setDeptLeader(children);
}
}
}
public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, String orderType) {
@ -167,7 +171,7 @@ public class DepartmentBO {
tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString());
tree.setSelected(false);
tree.setType("2");
tree.setParentComp(item.getSubCompanyId1().toString());
tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString());
tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue());
return tree;
}).collect(Collectors.toList());

2
src/com/engine/organization/entity/detach/param/ManagerDetachParam.java
Unescape Escape View File

@ -24,6 +24,8 @@ public class ManagerDetachParam {
private Integer ecManager;
private Integer roleId;
private Integer jclManager;
private String ecRolelevel;

8
src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java
Unescape Escape View File

@ -22,6 +22,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@OrganizationTable(pageId = "0bf9b7bc-c8b0-4225-bf28-4cd015d96e98",
fields = "t.id," +
"t.manager_type," +
"t.ec_manager," +
"t.ec_rolelevel," +
"t.manage_module," +
@ -42,11 +43,14 @@ import lombok.NoArgsConstructor;
public class ManagerDetachVO {
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
@OrganizationTableColumn(labelId = 513540, text = "管理员类型", width = "20%", column = "manager_type")
private Integer managerType;
@OrganizationTableColumn(labelId = 547405, text = "管理员", width = "20%", column = "ec_manager", transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getManagerName")
@OrganizationTableColumn(labelId = 547405, text = "管理员", width = "20%", column = "ec_manager", transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getManagerName",otherPara = "column:manager_type")
private Integer ecManager;
@OrganizationTableColumn(labelId = 547407, text = "可管理组织机构", width = "40%", column = "ec_rolelevel", transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getRoleLevel")

2
src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java
Unescape Escape View File

@ -32,7 +32,7 @@ import lombok.NoArgsConstructor;
)
public class EmployeeTableVO {
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
@OrganizationTableColumn(labelId = 547329, text = "姓名", width = "25%", column = "lastname")

4
src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
Unescape Escape View File

@ -411,6 +411,10 @@ public class ExtendInfoBO {
searchConditionItem = new SearchConditionItem(ConditionType.BROWSER, fieldlabel, new String[]{fieldname}, browserbean);
} else {
searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype);
//隐藏虚拟组织
if(searchConditionItem != null ) {
searchConditionItem.getBrowserConditionParam().setHideVirtualOrg(true);
}
}
// 岗位浏览按钮
if ("666".equals(detailtype)) {

19
src/com/engine/organization/entity/hrmresource/param/SearchTemplateParam.java
Unescape Escape View File

@ -5,6 +5,8 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Objects;
/**
* @author:dxfeng
* @createTime: 2023/01/05
@ -19,4 +21,21 @@ public class SearchTemplateParam {
//private boolean selected;
private String showname;
private String fields;
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
SearchTemplateParam that = (SearchTemplateParam) o;
return key.equals(that.key);
}
@Override
public int hashCode() {
return Objects.hash(key);
}
}

2
src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java
Unescape Escape View File

@ -64,4 +64,6 @@ public class JclOrgCustomTemplatePO implements Serializable {
private static final long serialVersionUID = 1L;
private Integer overall;
}

1
src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java
Unescape Escape View File

@ -26,4 +26,5 @@ public class SearchTemplatePO {
private Integer creator;
private Date createTime;
private Date updateTime;
private Integer overall;
}

3
src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.engine.organization.entity.hrmresource.vo;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.organization.annotation.OrganizationTable;
import com.engine.organization.annotation.OrganizationTableColumn;
import com.engine.organization.annotation.OrganizationTableOperate;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -40,6 +41,6 @@ public class HrmResourceJclVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
}

2
src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java
Unescape Escape View File

@ -45,7 +45,7 @@ public class HrmResourceVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**

2
src/com/engine/organization/entity/hrmresource/vo/ScHrmResourceVO.java
Unescape Escape View File

@ -44,7 +44,7 @@ public class ScHrmResourceVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**

2
src/com/engine/organization/entity/jclimport/vo/JclImportHistoryDetailVO.java
Unescape Escape View File

@ -25,7 +25,7 @@ import lombok.NoArgsConstructor;
primarykey = "id"
)
public class JclImportHistoryDetailVO {
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
@OrganizationTableColumn(text = "行", width = "15%", column = "row_nums")
private String rowNums;

4
src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java
Unescape Escape View File

@ -37,7 +37,7 @@ import lombok.NoArgsConstructor;
)
public class CardAccessVO {
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
@OrganizationTableColumn(labelId = 547389, text = "栏目", width = "15%", column = "type_name",transmethod = "com.engine.organization.transmethod.CardAccessTrans.getMultiLanguage",multiLanguage = true)
@ -49,7 +49,7 @@ public class CardAccessVO {
@OrganizationTableColumn(labelId = 547390, text = "所有人可见", width = "15%", column = "all_people")
private Integer allPeople;
@OrganizationTableColumn(labelId = 547392, text = "上级可见", width = "15%", column = "superior")
@OrganizationTableColumn(labelId = 547391, text = "上级可见", width = "15%", column = "superior")
private Integer superior;
@OrganizationTableColumn(labelId = 547392, text = "所有上级可见", width = "15%", column = "all_superior")

2
src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class PostInfoTableVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 编号

4
src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
Unescape Escape View File

@ -43,12 +43,12 @@ public class GradeTableVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
//@OrganizationTableColumn(column = "isUsed", display = false)
@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**
* 编号

4
src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
Unescape Escape View File

@ -40,12 +40,12 @@ public class LevelTableVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
//@OrganizationTableColumn(column = "isUsed", display = false)
@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**

4
src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
Unescape Escape View File

@ -40,12 +40,12 @@ public class SchemeTableVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
//@OrganizationTableColumn(column = "isUsed", display = false)
@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**

4
src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java
Unescape Escape View File

@ -47,12 +47,12 @@ public class SequenceTableVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
//@OrganizationTableColumn(column = "isUsed", display = false)
@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**
* 编号

2
src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
Unescape Escape View File

@ -41,7 +41,7 @@ public class StaffPlanTableVO {
/**
* 是否被引用
*/
//@OrganizationTableColumn(column = "isUsed", display = false)
@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**
* 编号

13
src/com/engine/organization/entity/staff/vo/StaffTableVO.java
Unescape Escape View File

@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@OrganizationTable(pageId = "0cdfd5bb-dc09-11ec-b69e-00ffcbed7508",
fields = "t.id,t.is_used,s.control_dimension,t.plan_id,t.comp_id,t.dept_id,t.job_id,t.staff_num,t.permanent_num,t.freeze_num,t.lack_status,t.staff_desc",
fields = "t.id,t.is_used,s.control_dimension,t.plan_id,t.comp_id,t.dept_id,t.job_id,t.staff_num,t.permanent_num,t.freeze_num,t.lack_status,t.staff_desc,t.description",
fromSql = "FROM jcl_org_staff t inner join jcl_org_staffplan s on t.plan_id = s.id",
orderby = "id desc",
primarykey = "id",
@ -33,12 +33,12 @@ public class StaffTableVO {
/**
* 主键
*/
//@OrganizationTableColumn(column = "id", display = false)
@OrganizationTableColumn(column = "id", display = false)
private Long id;
/**
* 是否被引用
*/
//@OrganizationTableColumn(column = "isUsed", display = false)
@OrganizationTableColumn(column = "isUsed", display = false)
private Integer isUsed;
/**
* 方案id
@ -91,4 +91,11 @@ public class StaffTableVO {
@OrganizationTableColumn(labelId = 547349, text = "编制描述", width = "10%", column = "staff_desc")
private String staffDesc;
/**
* 描述说明
*/
@OrganizationTableColumn(labelId = 547142, text = "描述说明", width = "10%", column = "description")
private String description;
}

8
src/com/engine/organization/mapper/department/DepartmentMapper.java
Unescape Escape View File

@ -38,6 +38,14 @@ public interface DepartmentMapper {
*/
List<DepartmentPO> listByFilter(@Param("departmentPO") DepartmentPO departmentPO, @Param("orderSql") String orderSql);
/**
* 根据搜索条件查询数据 保留封存（禁用）数据
* @param departmentPO
* @param orderSql
* @return
*/
List<DepartmentPO> listByFilterAll(@Param("departmentPO") DepartmentPO departmentPO, @Param("orderSql") String orderSql);
/**
* 浏览按钮展示数据用
*

22
src/com/engine/organization/mapper/department/DepartmentMapper.xml
Unescape Escape View File

@ -66,6 +66,26 @@
order by ${orderSql}
</select>
<select id="listByFilterAll" parameterType="com.engine.organization.entity.department.po.DepartmentPO"
resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from hrmdepartment t
where 1=1
<include refid="likeSQL"/>
<if test=" departmentPO.subCompanyId1 != null ">
and t.subCompanyId1 = #{departmentPO.subCompanyId1}
</if>
<if test=" departmentPO.supDepId != null ">
and t.supDepId = #{departmentPO.supDepId}
</if>
<if test=" departmentPO.departmentId != null ">
and t.id = #{departmentPO.departmentId}
</if>
<include refid="isCanceled"/>
order by ${orderSql}
</select>
<select id="getDeptById" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
@ -122,7 +142,7 @@
<select id="getIdByNameAndPid" resultType="java.lang.Integer">
select id
from hrmdepartment
where departmentName = #{departmentName}
where departmentmark = #{departmentName}
and subCompanyId1 = #{subCompanyId1}
and supDepId = #{supDepId}
</select>

4
src/com/engine/organization/mapper/detach/ManagerDetachMapper.java
Unescape Escape View File

@ -24,7 +24,9 @@ public interface ManagerDetachMapper {
ManagerDetachPO getDetachById(@Param("id") Integer id);
List<ManagerDetachPO> getDetachListById(@Param("ecManager") Integer ecManager);
List<ManagerDetachPO> getDetachListById(@Param("ecManager") Integer ecManager,@Param("managerType") Integer managerType);
List<ManagerDetachPO> selectDetachListByManager(@Param("ids") Collection<Integer> ids);
ManagerDetachPO selectManagerDetachByUid(@Param("uid") Integer uId);
}

13
src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml
Unescape Escape View File

@ -216,6 +216,19 @@
from jcl_org_detach t
WHERE delete_type = 0
and ec_manager = #{ecManager}
and manager_type = #{managerType}
</select>
<select id="selectDetachListByManager" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_detach t
WHERE delete_type = 0
and manager_type = 1
and ec_manager in
<foreach collection="ids" open="(" item="id" separator="," close=")">
#{id}
</foreach>
</select>
<select id="selectManagerDetachByUid" resultMap="BaseResultMap">

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

@ -133,6 +133,7 @@
FROM cus_formfield t1,
cus_formdict t2
WHERE t1.fieldid = t2.id
AND t1.isuse = 1
AND t1.scope = 'HrmCustomFieldByInfoType'
AND t1.scopeid = #{scopeId}
UNION ALL

3
src/com/engine/organization/mapper/job/JobMapper.java
Unescape Escape View File

@ -141,7 +141,8 @@ public interface JobMapper {
* @param parentJob
* @return
*/
Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob);
Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob,
@Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark);
int updateJobCompany(@Param("ids") Collection<Long> ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany);

12
src/com/engine/organization/mapper/job/JobMapper.xml
Unescape Escape View File

@ -483,13 +483,13 @@
</select>
<select id="getIdByNameAndPid" resultType="java.lang.Long">
select
t.id
from
jcl_org_job t
select t.id from jcl_org_job t
left join hrmjobtitles h on t.ec_jobTitle = h.id
where
delete_type = 0
left join hrmjobactivities j on h.jobactivityid = j.id
left join hrmjobgroups f on j.jobgroupid = f.id
where delete_type = 0
and j.jobactivitymark = #{jobactivitymark}
and f.jobgroupremark = #{jobgroupremark}
and h.JOBTITLENAME = #{jobName}
and ec_company = #{parentCompany}
<include refid="nullparentDept"/>

8
src/com/engine/organization/mapper/resource/HrmResourceMapper.java
Unescape Escape View File

@ -55,6 +55,8 @@ public interface HrmResourceMapper {
*/
List<SearchTemplateParam> getCustomTemplatesByUser(@Param("userId") Integer userId);
List<SearchTemplateParam> getCustomOverAll();
SearchTemplatePO getSearchTemplateById(@Param("id") String id);
SearchTemplatePO getSearchTemplateByName(@Param("userId") Integer userId, @Param("name") String name);
@ -65,6 +67,10 @@ public interface HrmResourceMapper {
SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId);
SearchTemplatePO getUsedSerarchTemplateByUser(@Param("userId") Integer userId);
SearchTemplatePO getOverallCustomTemplate();
Integer insertSearchTemplate(SearchTemplatePO templatePO);
Integer deleteSearchTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
@ -73,6 +79,8 @@ public interface HrmResourceMapper {
Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
Integer updateCustomTemplateUsed(@Param("userId") Integer userId);
String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId, @Param("language") Integer language);

35
src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
Unescape Escape View File

@ -14,6 +14,9 @@
<result column="name" property="showname"/>
<!-- <result column="selected" property="selected"/>-->
</resultMap>
<update id="updateCustomTemplateUsed">
update JCL_ORG_SEARCH_TEMPLATE set isused = null where creator = #{userId}
</update>
<select id="selectFilterDatas" resultType="com.engine.organization.entity.hrmresource.po.ResourcePO">
@ -147,7 +150,14 @@
select id,
name
from jcl_org_custom_template
where creator = #{userId}
where creator = #{userId} and overall is null
</select>
<select id="getCustomOverAll" resultMap="SearchTemplateMap">
select id,
name
from jcl_org_custom_template
where overall = 1
</select>
<insert id="insertSearchTemplate" parameterType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO"
@ -176,6 +186,9 @@
<if test="workFields != null">
work_fields,
</if>
<if test="isused != null">
isused,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="creator != null">
@ -199,6 +212,9 @@
<if test="workFields != null">
#{workFields},
</if>
<if test="isused != null">
#{isused},
</if>
</trim>
</insert>
@ -445,9 +461,19 @@
select *
from jcl_org_custom_template
where ISUSED = 1
and overall is null
and creator = #{userId}
</select>
<select id="getOverallCustomTemplate"
resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
select *
from jcl_org_custom_template
where overall = 1
</select>
<select id="selectByDepartmentId" resultType="com.engine.organization.entity.hrmresource.po.ResourceChartPO">
select id,workcode,lastname,sex,departmentid,subcompanyid1,jobtitle,status,mobile
from hrmresource where departmentid = #{departmentId} and status &lt; 4 order by id
@ -462,5 +488,12 @@
</foreach>
order by id
</select>
<select id="getUsedSerarchTemplateByUser"
resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
select *
from jcl_org_search_template
where ISUSED = 1
and creator = #{userId}
</select>
</mapper>

4
src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
Unescape Escape View File

@ -34,8 +34,10 @@ public interface JclOrgCustomTemplateMapper {
int deleteByIds(@Param("ids") Collection<Long> ids);
int updateUsed(@Param("isused")String isused,@Param("id") String id,@Param("creator") String creator);
int updateUsed(@Param("overall")Integer overall,@Param("isused")String isused,@Param("id") String id,@Param("creator") String creator);
JclOrgCustomTemplatePO queryIsusedTemp(@Param("isused")String isused,@Param("creator") String creator);
JclOrgCustomTemplatePO queryOverAll();
}

18
src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
Unescape Escape View File

@ -14,12 +14,13 @@
<result property="creator" column="creator" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="DATE"/>
<result property="updateTime" column="update_time" jdbcType="DATE"/>
<result property="overall" column="overall"/>
</resultMap>
<sql id="Base_Column_List">
id,name,basic_fields,
personal_fields,work_fields,isused,
creator,create_time,update_time
creator,create_time,update_time,overall
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@ -31,7 +32,7 @@
<select id="listAllByCreator" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jcl_org_custom_template where creator = #{creator} order by id
from jcl_org_custom_template where creator = #{creator} order by id
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@ -132,8 +133,9 @@
<update id="updateUsed" parameterType="java.lang.String">
update JCL_ORG_CUSTOM_TEMPLATE set isused = #{isused}
<where>
overall is null
<if test="id !=null">
id = #{id}
and id = #{id}
</if>
<if test="creator !=null">
and creator = #{creator}
@ -144,9 +146,17 @@
<select id="queryIsusedTemp" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from JCL_ORG_CUSTOM_TEMPLATE t where t.isused = #{isused} and t.creator = #{creator}
from JCL_ORG_CUSTOM_TEMPLATE t where t.isused = #{isused} and t.creator = #{creator} and overall is null
</select>
<select id="queryOverAll" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from JCL_ORG_CUSTOM_TEMPLATE t where overall = 1
</select>
<select id="listAllIdByCreator" resultType="java.lang.Long">
select
id

9
src/com/engine/organization/service/ChartService.java
Unescape Escape View File

@ -101,4 +101,13 @@ public interface ChartService {
* @return: java.util.Map<java.lang.Integer,com.engine.organization.entity.chart.HrmLabelVO>
*/
Map<Integer, HrmLabelVO> selectLabel();
/**
* @Description: 历史版本删除
* @Author: liang.cheng
* @Date: 2024/8/1 4:30 PM
* @param: []
* @return: java.util.Map<java.lang.String,java.lang.Object>
*/
Map<String, Object> versionDelete(Integer versionId);
}

10
src/com/engine/organization/service/HrmResourceService.java
Unescape Escape View File

@ -133,7 +133,7 @@ public interface HrmResourceService {
* @param params
* @return
*/
Integer saveCustomTemplate(SearchTemplateParam params);
Map<String, Object> saveCustomTemplate(SearchTemplateParam params);
/**
* 批量修改保存定制列模板
@ -179,4 +179,12 @@ public interface HrmResourceService {
Map<String, Object> chartResourceList(Integer departmentId,String versionId,String dimension,String statusValue);
/**
* @Description: 将当前模板应用到所有人
* @Author: liang.cheng
* @Date: 2024/7/23 3:02 PM
* @param: [params]
* @return: java.util.Map<java.lang.String,java.lang.Object>
*/
Map<String, Object> customOverall(Map<String, Object> params);
}

133
src/com/engine/organization/service/impl/ChartServiceImpl.java
Unescape Escape View File

@ -89,6 +89,7 @@ public class ChartServiceImpl extends Service implements ChartService {
// 根结点
String root = Util.null2String(params.get("root"));
root = StringUtils.isBlank(root) ? "0" : root;
boolean isDepartment = root.startsWith("d");
// 维度
String dimension = Util.null2String(params.get("fclass"));
@ -140,6 +141,10 @@ public class ChartServiceImpl extends Service implements ChartService {
// 向下查询数据
if (null != topChartPO) {
// 如果根结点是部门，顶层层级设置为1
if(topChartPO.getFtype().equals("2")){
topChartPO.setDepartmentDepth(1);
}
findChildData(topChartPO, dataList, Integer.parseInt(depth), id, hideDepartment);
}
@ -461,14 +466,31 @@ public class ChartServiceImpl extends Service implements ChartService {
" versionid = " + versionId + " and companyvirtualid = " + dimension;
}
} else {
if (hasVirtualFields) {
if (showVirtual) {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,isvirtual as isvitual,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and subcompanyid = " + root;
String numSql = ",a.job_num,a.staff_num";
if (!isRealDimension) {
numSql = "";
}
if (root.startsWith("d")) {
root = root.replace("d", "");
if (hasVirtualFields) {
if (showVirtual) {
return "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual" + numSql + " from " + DEPARTMENT_TABLE + " a where (a.canceled is null or a.canceled != '1') and " + DEPARTMENT_ID + " = '" + root + "' and versionid = " + versionId;
} else {
return "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type ,isvirtual as isvitual" + numSql + " from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and (isvirtual is null or isvirtual != '1') and " + DEPARTMENT_ID + " = '" + root + "' and versionid = " + versionId;
}
} else {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,isvirtual as isvitual,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and subcompanyid = " + root + " and (isvirtual is null or isvirtual != '1')";
return "select " + DEPARTMENT_ID + " as id,a.departmentname as name,'2' as type" + numSql + " from " + DEPARTMENT_TABLE + " a where (canceled is null or canceled != '1') and " + DEPARTMENT_ID + " = '" + root + "' and versionid = " + versionId;
}
} else {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,a.job_num,a.staff_num from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and subcompanyid = " + root;
if (hasVirtualFields) {
if (showVirtual) {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,isvirtual as isvitual" + numSql + " from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and " + SUB_COMPANY_ID + " = " + root;
} else {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type,isvirtual as isvitual" + numSql + " from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and " + SUB_COMPANY_ID + " = " + root + " and (isvirtual is null or isvirtual != '1')";
}
} else {
return "select " + SUB_COMPANY_ID + " as id,subcompanyname as name,'1' as type" + numSql + " from " + SUB_COMPANY_TABLE + " a where versionid = " + versionId + " and " + SUB_COMPANY_ID + " = " + root;
}
}
}
}
@ -524,6 +546,19 @@ public class ChartServiceImpl extends Service implements ChartService {
public Map<String, Object> getDepartmentTree(Map<String, Object> params) {
Map<String, Object> result = new HashMap<>(2);
List<CompanyTreePO> departmentTree = getDepartmentTreeList(params);
result.put("departmentTree", departmentTree);
result.put("api_status", true);
return result;
}
/**
* 获取部门树集合
*
* @param params
* @return
*/
public static List<CompanyTreePO> getDepartmentTreeList(Map<String, Object> params) {
RecordSet rs = new RecordSet();
List<CompanyTreePO> departmentTree = new ArrayList<>();
String subCompany = Util.null2String(params.get("subcompany"));
@ -535,11 +570,9 @@ public class ChartServiceImpl extends Service implements ChartService {
String sql = getDepartmentTreeSql(versionId, dimension, subCompany);
rs.executeQuery(sql);
while (rs.next()) {
departmentTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).disabled(!rs.getString("id").startsWith("d")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf(versionId, dimension, rs.getString("id"))).build());
departmentTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).disabled(false).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf(versionId, dimension, rs.getString("id"))).build());
}
result.put("departmentTree", departmentTree);
result.put("api_status", true);
return result;
return departmentTree;
}
@Override
@ -701,6 +734,32 @@ public class ChartServiceImpl extends Service implements ChartService {
return labelData;
}
@Override
public Map<String, Object> versionDelete(Integer versionId) {
Map<String, Object> data = new HashMap<>();
RecordSet rs = new RecordSet();
//1.删除版本表
rs.executeUpdate("delete from jcl_org_chartversion where id = ?",versionId);
//2.删除历史分部表
rs.executeUpdate("delete from jcl_chart_subcompany where versionid = ?",versionId);
//3.删除历史部门表
rs.executeUpdate("delete from jcl_chart_department where versionid = ?",versionId);
//4.删除历史聚才林岗位表
rs.executeUpdate("delete from jcl_chart_job where versionid = ?",versionId);
//5.删除历史人员表
rs.executeUpdate("delete from jcl_chart_resource where versionid = ?",versionId);
data.put("versionId",versionId);
return data;
}
/**
* 生成人数
* @param stp
@ -1339,15 +1398,28 @@ public class ChartServiceImpl extends Service implements ChartService {
return "select id,companyname as name,'0' as type from " + COMPANY_TABLE + " where id = '" + dimension + "'";
}
} else {
if (hasVirtualFields) {
if (showVirtual) {
return "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where a.id = '" + root + "' order by showorder,id";
if(root.startsWith("d")) {
root = root.replace("d", "");
if (hasVirtualFields) {
if (showVirtual) {
return "select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,c.on_job_num,c.staff_num from " + DEPARTMENT_TABLE + " a left join " + DEPARTMENT_DEFINED_TABLE + " b on a.id = b.deptid left join jcl_org_onjob c on a.id=c.data_id and c.type=2 where (a.canceled is null or a.canceled != '1') and a.id = '" + root + "'";
} else {
return "select a.id,a.departmentname as name,'2' as type ,b.bmlx as isvitual,c.on_job_num,c.staff_num from " + DEPARTMENT_TABLE + " a left join hrmdepartmentdefined b on a.id = b.deptid left join jcl_org_onjob c on a.id=c.data_id and c.type=2 where (canceled is null or canceled != '1') and (b.bmlx is null or b.bmlx != '1') and a.id = '" + root + "'";
}
} else {
return "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where a.id = '" + root + "' and (b.fblx is null or b.fblx!='1') order by showorder,id";
return "select a.id,a.departmentname as name,'2' as type,b.on_job_num,b.staff_num from " + DEPARTMENT_TABLE + " a left join jcl_org_onjob b on a.id=b.data_id and b.type=2 where (canceled is null or canceled != '1') and a.id = '" + root + "'";
}
}else {
if (hasVirtualFields) {
if (showVirtual) {
return "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where a.id = '" + root + "' order by showorder,id";
} else {
return "select a.id,a.subcompanyname as name,'1' as type ,b.fblx as isvitual,c.on_job_num,c.staff_num from " + SUB_COMPANY_TABLE + " a left join " + SUB_COMPANY_DEFINED_TABLE + " b on a.id = b.subcomid left join jcl_org_onjob c on a.id=c.data_id and c.type=1 where a.id = '" + root + "' and (b.fblx is null or b.fblx!='1') order by showorder,id";
}
} else {
return "select a.id,a.subcompanyname as name,'1' as type,b.on_job_num,b.staff_num from " + SUB_COMPANY_TABLE + " a left join jcl_org_onjob b on a.id=b.data_id and b.type=1 where a.id = '" + root + "' order by a.showorder,a.id";
}
} else {
return "select a.id,a.subcompanyname as name,'1' as type,b.on_job_num,b.staff_num from " + SUB_COMPANY_TABLE + " a left join jcl_org_onjob b on a.id=b.data_id and b.type=1 where a.id = '" + root + "' order by a.showorder,a.id";
}
}
}
@ -1654,10 +1726,10 @@ public class ChartServiceImpl extends Service implements ChartService {
* @param subCompany 上级Id
* @return SQL
*/
private String getDepartmentTreeSql(String versionId, String dimension, String subCompany) {
private static String getDepartmentTreeSql(String versionId, String dimension, String subCompany) {
// 是否展示当前数据
boolean isSearchCurrent = StringUtils.isBlank(versionId) || "0".equals(versionId);
boolean isCurrentDimension = StringUtils.isNotBlank(dimension) && !"0".equals(dimension);
boolean isNotCurrentDimension = StringUtils.isNotBlank(dimension) && !"0".equals(dimension);
boolean isDepartment = subCompany.startsWith("d");
String sql;
DBType dbType = DBType.get(new RecordSet().getDBType());
@ -1665,36 +1737,37 @@ public class ChartServiceImpl extends Service implements ChartService {
subCompany = subCompany.replace("d", "");
if (isSearchCurrent) {
sql = "select " + dbType.concat("d", "id") + "as id, id as value, departmentname as title, " + dbType.concat("d", "supdepid") + " as pId from hrmdepartment where (canceled is null or canceled != '1') and " + dbType.ifNull("supdepid", "0") + " = " + subCompany;
if (isCurrentDimension) {
sql += " order by showorder,id ";
if (isNotCurrentDimension) {
sql = "select " + dbType.concat("d", "id") + "as id, id as value, departmentname as title, " + dbType.concat("d", "supdepid") + " as pId from hrmdepartmentvirtual where (canceled is null or canceled != '1') and " + dbType.ifNull("supdepid", "0") + " = " + subCompany;
}
sql += " order by showorder,id ";
} else {
sql = "select " + dbType.concat("d", "departmentid") + "as id, departmentid as value, departmentname as title, " + dbType.concat("d", "supdepartmentid") + " as pId from jcl_chart_department where (canceled is null or canceled != '1') and " + dbType.ifNull("supdepartmentid", "0") + " = " + subCompany;
if (isCurrentDimension) {
if (isNotCurrentDimension) {
sql = "select " + dbType.concat("d", "departmentvirtualid") + "as id, departmentvirtualid as value, departmentname as title, " + dbType.concat("d", "supdepid") + " as pId from jcl_chart_departmentvirtual where (canceled is null or canceled != '1') and " + dbType.ifNull("supdepid", "0") + " = " + subCompany;
}
// 添加时间轴条件
sql += " and versionid = " + versionId;
}
} else {
// TODO 分权
if (isSearchCurrent) {
sql = "select " + dbType.concat("", "id") + " as id, id as value, subcompanyname as title, supsubcomid as pId, showorder from hrmsubcompany where (canceled is null or canceled != '1') and " + dbType.ifNull("supsubcomid", "0") + " = " + subCompany +
" union select " + dbType.concat("d", "id") + "as id, id as value, departmentname as title, subcompanyid1 as pId, showorder from hrmdepartment where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and " + dbType.ifNull("subcompanyid1", "0") + " = " + subCompany;
if (isCurrentDimension) {
sql += " order by showorder,id ";
if (isNotCurrentDimension) {
sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompanyvirtual where (canceled is null or canceled != '1') and " + dbType.ifNull("supsubcomid", "0") + " = " + subCompany + " and companyid = '" + dimension + "' " +
" union select " + dbType.concat("d", "id") + "as id, id as value, departmentname as title, subcompanyid1 as pId from hrmdepartmentvirtual where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and" + dbType.ifNull("subcompanyid1", "0") + " = " + subCompany;
}
sql += " order by showorder,id ";
} else {
sql = "select " + dbType.concat("", "subcompanyid") + " as id, subcompanyid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompany where (canceled is null or canceled != '1') and " + dbType.ifNull("supsubcompanyid", "0") + " = " + subCompany +
" union select " + dbType.concat("d", "subcompanyid") + "as id, subcompanyid as value, departmentname as title, subcompanyid as pId from jcl_chart_department where (canceled is null or canceled != '1') and (supdepartmentid is null or supdepartmentid =0) and " + dbType.ifNull("subcompanyid", "0") + " = " + subCompany;
if (isCurrentDimension) {
sql = "select " + dbType.concat("", "subcompanyvirtualid") + " as id, subcompanyvirtualid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompanyvirtual where (canceled is null or canceled != '1') and " + dbType.ifNull("supsubcompanyid", "0") + " = " + subCompany + " and companyid = '" + dimension + "' " +
" union select " + dbType.concat("d", "departmentvirtualid") + "as id, departmentvirtualid as value, departmentname as title, subcompanyid as pId from jcl_chart_departmentvirtual where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and" + dbType.ifNull("subcompanyid", "0") + " = " + subCompany;
sql = "select " + dbType.concat("", "subcompanyid") + " as id, subcompanyid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompany where (canceled is null or canceled != '1') and " + dbType.ifNull("supsubcompanyid", "0") + " = " + subCompany + " and versionid = " + versionId +
" union select " + dbType.concat("d", "departmentid") + "as id, departmentid as value, departmentname as title, subcompanyid as pId from jcl_chart_department where (canceled is null or canceled != '1') and (supdepartmentid is null or supdepartmentid =0) and " + dbType.ifNull("subcompanyid", "0") + " = " + subCompany + " and versionid = " + versionId ;
if (isNotCurrentDimension) {
sql = "select " + dbType.concat("", "subcompanyvirtualid") + " as id, subcompanyvirtualid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompanyvirtual where (canceled is null or canceled != '1') and " + dbType.ifNull("supsubcompanyid", "0") + " = " + subCompany + " and companyid = '" + dimension + "' " + " and versionid = " + versionId +
" union select " + dbType.concat("d", "departmentvirtualid") + "as id, departmentvirtualid as value, departmentname as title, subcompanyid as pId from jcl_chart_departmentvirtual where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and" + dbType.ifNull("subcompanyid", "0") + " = " + subCompany + " and versionid = " + versionId ;
}
// 添加时间轴条件
sql += " and versionid = " + versionId;
//// 添加时间轴条件
//sql += " and versionid = " + versionId;
}
}
return sql;
@ -1716,7 +1789,7 @@ public class ChartServiceImpl extends Service implements ChartService {
* @param subCompany 上级元素ID
* @return
*/
private boolean judgeTreeLeaf(String versionId, String dimension, String subCompany) {
private static boolean judgeTreeLeaf(String versionId, String dimension, String subCompany) {
RecordSet recordSet = new RecordSet();
String sql = getDepartmentTreeSql(versionId, dimension, subCompany);
recordSet.executeQuery(sql);

2
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
Unescape Escape View File

@ -129,7 +129,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
// 通过子级遍历父级元素
if (filter) {
// 根据条件获取元素
List<DepartmentPO> filterDeptPOs = getDepartmentMapper().listByFilter(departmentPO, orderSql);
List<DepartmentPO> filterDeptPOs = getDepartmentMapper().listByFilterAll(departmentPO, orderSql);
new DetachUtil(user).filterDepartmentList(filterDeptPOs);
// 添加父级元素
List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs, orderType.toString());

54
src/com/engine/organization/service/impl/ExportCommonServiceImpl.java
Unescape Escape View File

@ -14,12 +14,14 @@ import com.engine.organization.component.OrganizationWeaTable;
import com.engine.organization.entity.department.bo.DepartmentBO;
import com.engine.organization.entity.department.dto.DepartmentListDTO;
import com.engine.organization.entity.department.po.DepartmentPO;
import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO;
import com.engine.organization.entity.hrmresource.po.SearchTemplatePO;
import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
import com.engine.organization.entity.staff.po.StaffPO;
import com.engine.organization.entity.staff.vo.StaffTableVO;
import com.engine.organization.mapper.department.DepartmentMapper;
import com.engine.organization.mapper.resource.HrmResourceMapper;
import com.engine.organization.mapper.resource.JclOrgCustomTemplateMapper;
import com.engine.organization.mapper.resource.ResourceMapper;
import com.engine.organization.mapper.staff.StaffMapper;
import com.engine.organization.mapper.staff.StaffPlanMapper;
@ -34,6 +36,7 @@ import com.engine.organization.util.detach.DetachUtil;
import com.engine.organization.util.excel.ExcelUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo;
@ -141,18 +144,31 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
HrmResourceServiceImpl hrmResourceService = ServiceUtil.getService(HrmResourceServiceImpl.class,user);
List<SearchConditionGroup> allConditions = hrmResourceService.getAllConditions();
List<String> columnList;
JclOrgCustomTemplatePO jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryIsusedTemp("1", String.valueOf(user.getUID()));
// 查询当前台账定制列
SearchTemplatePO usedCustomTemplate = MapperProxyFactory.getProxy(HrmResourceMapper.class).getUsedCustomTemplateByUser(user.getUID());
if (null == usedCustomTemplate) {
// 默认列定制
String selectKeys = "-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid";
columnList = Arrays.asList(selectKeys.split(","));
//2.是否存在通用模板
if (null == jclOrgCustomTemplatePO) {
jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryOverAll();
}
String columns = "";
if (jclOrgCustomTemplatePO != null) {
if (org.apache.commons.lang3.StringUtils.isNotBlank(jclOrgCustomTemplatePO.getBasicFields())) {
columns = jclOrgCustomTemplatePO.getBasicFields();
}
if (org.apache.commons.lang3.StringUtils.isNotBlank(jclOrgCustomTemplatePO.getPersonalFields())) {
columns = columns + "," + jclOrgCustomTemplatePO.getPersonalFields();
}
if (org.apache.commons.lang3.StringUtils.isNotBlank(jclOrgCustomTemplatePO.getWorkFields())) {
columns = columns + "," + jclOrgCustomTemplatePO.getWorkFields();
}
} else {
columnList = hrmResourceService.getSelectKeys(usedCustomTemplate);
//初次使用，无模板初始值
columns = "-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_subcompanyid1,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid,-1_hrm_sporder";
}
List<String> columnList = Arrays.asList(columns.split(","));
String propValue = new BaseBean().getPropValue("hrmOrganization", "orgId");
BigDecimal decimal = new BigDecimal(100 / columnList.size());
@ -160,17 +176,26 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
List<SearchConditionItem> items = allCondition.getItems();
for (SearchConditionItem item : items) {
String columnName = item.getDomkey()[0];
fields.add(hrmResourceService.buildTableSql(columnName) + " as " + hrmResourceService.buildTableSql(columnName).replace(".", "_"));
WeaTableColumn weaTableColumn = new WeaTableColumn();
if (columnName.equals("-1_cus_"+propValue)){
fields.add("t.id as " + hrmResourceService.buildTableSql(columnName).replace(".", "_"));
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getOrgValueExp");
}else{
fields.add(hrmResourceService.buildTableSql(columnName) + " as " + hrmResourceService.buildTableSql(columnName).replace(".", "_"));
// 导出专用转换，去除html标签
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValueExp");
}
String scopeId = columnName.split("_")[0];
String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
WeaTableColumn weaTableColumn = new WeaTableColumn();
weaTableColumn.setText(MapperProxyFactory.getProxy(HrmResourceMapper.class).queryLabelName(fieldName, scopeId, user.getLanguage()));
weaTableColumn.setColumn(hrmResourceService.buildTableSql(columnName).replace(".", "_"));
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
weaTableColumn.setOtherpara(columnName);
weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
//weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
if (weaTableColumn.getDisplay().getBoolVal()) {
weaTableColumnList.add(weaTableColumn);
headerList.add(weaTableColumn.getColumn());
@ -178,6 +203,11 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
}
}
}
//todo 修复导出excel与列定制顺序
// 增加id字段,跳转人员卡片
WeaTableColumn weaTableColumn = new WeaTableColumn();
weaTableColumn.setColumn("id");

43
src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.engine.organization.service.impl;
import com.alibaba.fastjson.JSON;
import com.engine.organization.entity.staff.param.StaffOutParam;
import com.engine.organization.entity.staff.po.StaffPO;
import com.engine.organization.enums.ModuleTypeEnum;
@ -9,6 +10,7 @@ import com.engine.organization.util.OrganizationAssert;
import com.engine.organization.util.db.MapperProxyFactory;
import lombok.SneakyThrows;
import org.apache.commons.collections.CollectionUtils;
import weaver.general.BaseBean;
import weaver.hrm.User;
import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo;
@ -75,7 +77,11 @@ public class FunctionOutStaffServiceImpl {
private Integer frozenStaffNums(StaffOutParam param) {
StaffPO staffPO = select(param);
List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
if (param.getNum() < 0) {
OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
}
List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
//1.增加冻结数 （num为负数时为减少冻结数）
Integer sum = numberF.stream()
.mapToInt(Integer::intValue)
@ -107,14 +113,14 @@ public class FunctionOutStaffServiceImpl {
}
//向上部门 分部在编数调整
upwardReviewSums(param);
//2.调整方式为流程时释放冻结数
if (param.getChangeMode() == 1) {
List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
int difference = numbersF.stream()
.reduce((a, b) -> a - b)
.orElse(0);
staffPO.setFreezeNum(difference);
}
//2.调整方式为流程时释放冻结数（废弃 单独走冻结接口释放）
// if (param.getChangeMode() == 1) {
// List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
// int difference = numbersF.stream()
// .reduce((a, b) -> a - b)
// .orElse(0);
// staffPO.setFreezeNum(difference);
// }
buildStaffPO(staffPO);
return staffMapper().updateStaff(staffPO);
}
@ -130,13 +136,13 @@ public class FunctionOutStaffServiceImpl {
//向上部门 分部在编数调整
upwardReviewSums(param);
//2.调整方式为流程时释放冻结数
if (param.getChangeMode() == 1) {
List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
int differenceF = numbersF.stream()
.reduce((a, b) -> a - b)
.orElse(0);
staffPO.setFreezeNum(differenceF);
}
// if (param.getChangeMode() == 1) {
// List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
// int differenceF = numbersF.stream()
// .reduce((a, b) -> a - b)
// .orElse(0);
// staffPO.setFreezeNum(differenceF);
// }
buildStaffPO(staffPO);
return staffMapper().updateStaff(staffPO);
}
@ -223,6 +229,11 @@ public class FunctionOutStaffServiceImpl {
private StaffPO select(StaffOutParam param) {
List<StaffPO> staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob());
BaseBean bb = new BaseBean();
bb.writeLog("编制参数"+ JSON.toJSONString(param));
bb.writeLog("查询结果"+ JSON.toJSONString(staffPO));
bb.writeLog("user对象"+JSON.toJSONString(user));
bb.writeLog("msg"+SystemEnv.getHtmlLabelName(547474,user.getLanguage()));
OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage()));
return staffPO.get(0);
}

164
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
Unescape Escape View File

@ -6,6 +6,7 @@ import com.api.browser.bean.SearchConditionOption;
import com.api.browser.util.ConditionType;
import com.api.hrm.bean.HrmFieldBean;
import com.api.hrm.util.HrmFieldSearchConditionComInfo;
import com.api.hrm.util.HrmTransMethod;
import com.cloudstore.eccom.constant.WeaBoolAttr;
import com.cloudstore.eccom.pc.table.WeaTableColumn;
import com.cloudstore.eccom.result.WeaResultMsg;
@ -34,6 +35,7 @@ import com.engine.organization.entity.search.QuickSearchDetail;
import com.engine.organization.entity.searchtree.SearchTree;
import com.engine.organization.entity.searchtree.SearchTreeParams;
import com.engine.organization.enums.HrmGroupEnum;
import com.engine.organization.exception.OrganizationRunTimeException;
import com.engine.organization.mapper.comp.CompMapper;
import com.engine.organization.mapper.condition.QuickSearchMapper;
import com.engine.organization.mapper.department.DepartmentMapper;
@ -58,6 +60,7 @@ import org.json.JSONException;
import org.json.JSONObject;
import weaver.common.DateUtil;
import weaver.conn.RecordSet;
import weaver.general.BaseBean;
import weaver.general.StringUtil;
import weaver.general.TimeUtil;
import weaver.general.Util;
@ -149,10 +152,18 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
table.setSqlwhere(sqlWhere);
List<WeaTableColumn> weaTableColumnList = new ArrayList<>();
JclOrgCustomTemplatePO jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryIsusedTemp("1", String.valueOf(user.getUID()));
//2.是否存在通用模板
if (null == jclOrgCustomTemplatePO) {
jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryOverAll();
}
String columns = "";
List<String> fields = new ArrayList<>();
List<SearchConditionGroup> allConditions = getAllConditions();
String propValue = new BaseBean().getPropValue("hrmOrganization", "orgId");
if (jclOrgCustomTemplatePO != null) {
if (StringUtils.isNotBlank(jclOrgCustomTemplatePO.getBasicFields())) {
columns = jclOrgCustomTemplatePO.getBasicFields();
@ -178,17 +189,24 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
List<SearchConditionItem> items = filterByDomkey(all, columnList);
for (SearchConditionItem item : items) {
String columnName = item.getDomkey()[0];
fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
WeaTableColumn weaTableColumn = new WeaTableColumn();
if (columnName.equals("-1_cus_"+propValue)){
fields.add("t.id as " + buildTableSql(columnName).replace(".", "_"));
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getOrgValue");
}else{
fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
}
String scopeId = columnName.split("_")[0];
String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
WeaTableColumn weaTableColumn = new WeaTableColumn();
weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId, user.getLanguage()));
weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
weaTableColumn.setOtherpara(columnName);
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
weaTableColumnList.add(weaTableColumn);
}
@ -266,6 +284,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
templatePO.setCreator(user.getUID());
templatePO.setCreateTime(new Date());
templatePO.setUpdateTime(new Date());
templatePO.setIsused("1");
// 将之前的模板，isused置为null
getHrmResourceMapper().updateCustomTemplateUsed(user.getUID());
getHrmResourceMapper().insertSearchTemplate(templatePO);
return templatePO.getId();
}
@ -314,39 +335,53 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
int userUID = user.getUID();
// 根据ID查询所存储的模板
List<SearchTemplateParam> templates;
boolean addDefault = true;
if ("custom".equals(type)) {
templates = getHrmResourceMapper().getCustomTemplatesByUser(userUID);
SearchTemplatePO overallCustomTemplate = getHrmResourceMapper().getOverallCustomTemplate();
if (null != overallCustomTemplate) {
if("-1".equals(id)) {
id = overallCustomTemplate.getId().toString();
}
templates.add(SearchTemplateParam.builder().key(overallCustomTemplate.getId().toString()).showname(overallCustomTemplate.getName()).build());
//}
addDefault = false;
}
returnMap.put("id", id);
// SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
// if (null != usedCustomTemplate) {
// returnMap.put("templateId", usedCustomTemplate.getId().toString());
// } else {
// returnMap.put("templateId", "-1");
// }
} else {
templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID);
}
templates.add(0, SearchTemplateParam.builder().key("-1").showname("默认模板").build());
returnMap.put("templates", templates);
if (addDefault) {
templates.add(0, SearchTemplateParam.builder().key("-1").showname("默认模板").build());
}
LinkedHashSet<Object> objects = new LinkedHashSet<>(templates);
returnMap.put("templates", objects);
return returnMap;
}
@Override
public Integer saveCustomTemplate(SearchTemplateParam params) {
public Map<String, Object> saveCustomTemplate(SearchTemplateParam params) {
// 重复名称校验
Map<String, Object> data = new HashMap<>();
SearchTemplatePO searchTemplateByName = getHrmResourceMapper().getCustomTemplateByName(user.getUID(), params.getShowname());
OrganizationAssert.isFalse("默认模板".equals(params.getShowname()) || null != searchTemplateByName, SystemEnv.getHtmlLabelName(547439, user.getLanguage()));
SearchTemplatePO templatePO = buildSearchTemplateByFields(params.getFields());
if (null == templatePO) {
return -1;
}
OrganizationAssert.notNull(templatePO,"模板存储失败");
templatePO.setName(params.getShowname());
templatePO.setCreator(user.getUID());
templatePO.setIsused("0");
templatePO.setCreateTime(new Date());
templatePO.setUpdateTime(new Date());
templatePO.setOverall(0);
getHrmResourceMapper().insertCustomTemplate(templatePO);
return templatePO.getId();
Map<String, Object> param = new HashMap<>();
param.put("type","custom");
param.put("id",templatePO.getId());
data.put("result",getSearchTemplate(param));
return data;
}
@Override
@ -417,20 +452,21 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
}
transferOptions.add(SearchTemplateParam.builder().key(Integer.toString(idx.getAndIncrement())).showname(allCondition.getTitle()).build());
}
// 查询当前使用的模板，没有使用的，则展示默认模板
if ("-1".equals(templateId)) {
// 查询当前使用的模板，没有使用的，则展示默认模板
SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
if (null == usedCustomTemplate) {
String selectKeys = "-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid";
transferKeys = Arrays.asList(selectKeys.split(","));
} else {
transferKeys = getSelectKeys(usedCustomTemplate);
templateId = usedCustomTemplate.getId().toString();
String selectKeys = "-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid";
transferKeys = Arrays.asList(selectKeys.split(","));
SearchTemplatePO overallCustomTemplate = getHrmResourceMapper().getOverallCustomTemplate();
if (null != overallCustomTemplate) {
transferKeys = getSelectKeys(overallCustomTemplate);
}
} else {
SearchTemplatePO searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId);
transferKeys = getSelectKeys(searchTemplateById);
}
transferOptions.add(0, SearchTemplateParam.builder().key("").showname("").build());
resultMap.put("transferDatas", transferDatas);
resultMap.put("transferKeys", transferKeys);
@ -447,18 +483,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
SearchTemplatePO templatePO = buildSearchTemplateByFields(columns);
JclOrgCustomTemplatePO jclOrgCustomTemplatePO = new JclOrgCustomTemplatePO();
if (StringUtils.isNotBlank(templateId)) {
if (templateId.equals("-1")) {
getJclOrgCustomTemplateMapper().updateUsed("0", null, String.valueOf(user.getUID()));
if ("-1".equals(templateId)) {
getJclOrgCustomTemplateMapper().updateUsed(0,"0", null, String.valueOf(user.getUID()));
} else {
jclOrgCustomTemplatePO = getJclOrgCustomTemplateMapper().selectByPrimaryKey(Long.parseLong(templateId));
if (jclOrgCustomTemplatePO != null) {
//取消已启用模板
getJclOrgCustomTemplateMapper().updateUsed(0, "0", null, String.valueOf(user.getUID()));
if (!user.isAdmin() && jclOrgCustomTemplatePO.getOverall() != null && "1".equals(jclOrgCustomTemplatePO.getOverall().toString())) {
throw new OrganizationRunTimeException(SystemEnv.getHtmlLabelName(547857, user.getLanguage()));
}
jclOrgCustomTemplatePO.setId(Integer.valueOf(templateId));
jclOrgCustomTemplatePO.setBasicFields(templatePO.getBasicFields());
jclOrgCustomTemplatePO.setPersonalFields(templatePO.getPersonalFields());
jclOrgCustomTemplatePO.setWorkFields(templatePO.getWorkFields());
jclOrgCustomTemplatePO.setIsused(1);
//取消已启用模板
getJclOrgCustomTemplateMapper().updateUsed("0", null, String.valueOf(user.getUID()));
//启用当前模板
getJclOrgCustomTemplateMapper().updateByPrimaryKeySelective(jclOrgCustomTemplatePO);
}
@ -524,6 +564,19 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
return dataMap;
}
@Override
public Map<String, Object> customOverall(Map<String, Object> params) {
RecordSet rs = new RecordSet();
Map<String, Object> data = new HashMap<>(2);
//1.将已有所有人的模板状态改变
rs.executeUpdate("update jcl_org_custom_template set overall = null where overall = 1");
//2.应用当前模板到所有人
String templateId = Util.null2String(params.get("templateId"));
boolean b = rs.executeUpdate("update jcl_org_custom_template set overall = 1,isused=1 where id = ?", templateId);
data.put("result", b);
return data;
}
private List<ResourceListColumns> getTableColumns() {
List<ResourceListColumns> list = new ArrayList<>();
int language = user.getLanguage();
@ -589,9 +642,52 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
btnDatas.put("topMenu", topMenuList);
btnDatas.put("rightMenu", rightMenuList);
btnDatas.put("hasRight", true);
btnDatas.put("loginId", user.getUID());
//获取当前用户使用的列定制模板Id
btnDatas.put("customTemplateId", getCustomTemplateId());
btnDatas.put("searchTemplateId", getSearchTemplateId());
return btnDatas;
}
/**
* 获取当前用户使用的列定制模板Id
*
* @return
*/
private String getCustomTemplateId() {
String customTemplateId = "-1";
SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
if (null != usedCustomTemplate) {
customTemplateId = usedCustomTemplate.getId().toString();
} else {
//查询全局模板
SearchTemplatePO overallCustomTemplate = getHrmResourceMapper().getOverallCustomTemplate();
if (null != overallCustomTemplate) {
customTemplateId = overallCustomTemplate.getId().toString();
}
}
return customTemplateId;
}
/**
* 获取当前用户使用的查询模板Id
*
* @return
*/
private String getSearchTemplateId() {
String searchTemplateId = "-1";
SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedSerarchTemplateByUser(user.getUID());
if (null != usedCustomTemplate) {
searchTemplateId = usedCustomTemplate.getId().toString();
}
return searchTemplateId;
}
@Override
public Map<String, Object> getTabForm(Map<String, Object> params) {
Map<String, Object> apiDatas = new HashMap<>();
@ -636,11 +732,19 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
Map<String, Object> tabInfoMap = new HashMap<>();
tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, false, true));
List<JclOrgCustomTemplatePO> jclOrgCustomTemplatePOS = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).listAllByCreator(user.getUID());
//获取当前使用的模板过滤掉
String customTemplateId = getCustomTemplateId();
jclOrgCustomTemplatePOS = jclOrgCustomTemplatePOS.stream()
.filter(item -> !customTemplateId.equals(String.valueOf(item.getId())))
.collect(Collectors.toList());
List<Integer> isUsed = new ArrayList<>();
AtomicInteger index = new AtomicInteger(0);
List<Map<String, Object>> collect = jclOrgCustomTemplatePOS.stream().map(item -> {
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("id", item.getId());
resultMap.put("viewAttr", 1);
resultMap.put("editTable", false);
resultMap.put("name", item.getName());
resultMap.put("createTime", DateUtil.getDate(item.getCreateTime(), "yyyy-MM-dd"));

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

@ -55,6 +55,7 @@ import org.apache.commons.lang.StringUtils;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.job.JobTitlesComInfo;
import weaver.systeminfo.SystemEnv;
import java.util.*;
@ -565,6 +566,7 @@ public class JobServiceImpl extends Service implements JobService {
@Override
public void refresh() {
JobTitlesComInfo jb = new JobTitlesComInfo();
// 解决并发情况下，岗位数据重复问题
synchronized (JobServiceImpl.class) {
//1.人员表查询
@ -582,6 +584,10 @@ public class JobServiceImpl extends Service implements JobService {
.createTime(new Date())
.updateTime(new Date())
.build();
String jobTitlescode = jb.getJobTitlescode(String.valueOf(resourcePO.getJobtitle()));
if (!"".equals(jobTitlescode)) {
jobPO.setJobNo(jobTitlescode+"-"+resourcePO.getDepartmentid());
}
getJobMapper().insertIgnoreNull(jobPO);
}
});
@ -741,7 +747,7 @@ public class JobServiceImpl extends Service implements JobService {
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
} else {
OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), SystemEnv.getHtmlLabelName(547430,user.getLanguage()));
//OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), SystemEnv.getHtmlLabelName(547430,user.getLanguage()));
jobNo = autoCreateCompanyNo();
}
return jobNo;

72
src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
Unescape Escape View File

@ -5,6 +5,8 @@ import com.api.browser.bean.SearchConditionGroup;
import com.api.browser.bean.SearchConditionItem;
import com.api.browser.bean.SearchConditionOption;
import com.cloudstore.eccom.result.WeaResultMsg;
import com.engine.common.service.HrmCommonService;
import com.engine.common.service.impl.HrmCommonServiceImpl;
import com.engine.core.impl.Service;
import com.engine.organization.component.OrganizationWeaTable;
import com.engine.organization.entity.DeleteParam;
@ -25,6 +27,9 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.Util;
import weaver.hrm.cachecenter.bean.RolemembersComInfo;
import weaver.hrm.resource.ResourceComInfo;
import weaver.hrm.roles.RolesComInfo;
import weaver.systeminfo.SystemEnv;
import java.util.*;
@ -78,32 +83,63 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
@Override
public Map<String, Object> getForm(Integer id) {
Map<String, Object> apiDatas = new HashMap<>();
RolesComInfo rolesComInfo = new RolesComInfo();
List<SearchConditionItem> selectItems = new ArrayList<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();
List<SearchConditionOption> selectOption = new ArrayList<>();
SearchConditionOption pOption = new SearchConditionOption("0", SystemEnv.getHtmlLabelName(547205,user.getLanguage()));
SearchConditionOption rOption = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547388,user.getLanguage()));
selectOption.add(pOption);
selectOption.add(rOption);
List<SearchConditionOption> selectOptions = new ArrayList<>();
SearchConditionOption moduleOption = new SearchConditionOption("0", SystemEnv.getHtmlLabelName(547409,user.getLanguage()), true);
selectOptions.add(moduleOption);
SearchConditionItem ecManager = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547405, "1", "ecManager", "");
SearchConditionItem roleId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547388, "267", "roleId", "");
SearchConditionItem ecManager = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, true, 547405, "1", "ecManager", "");
ecManager.setRules("required|string");
SearchConditionItem ecRolelevel = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547407, "194", "ecRolelevel", "");
ecRolelevel.setRules("required|string");
SearchConditionItem module = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547408, "module");
module.setViewAttr(1);
module.setDetailtype(2);
module.setHasBorder(true);
SearchConditionItem managerType = OrganizationFormItemUtil.selectItem(user, selectOption, 2, 16, 6, false, 513540, "managerType");
managerType.setViewAttr(3);
managerType.setRules("required|string");
selectItems.add(managerType);
if (id != null) {
ManagerDetachPO detachById = getMangeDetachMapper().getDetachById(id);
BrowserBean manager = ecManager.getBrowserConditionParam();
manager.setReplaceDatas(getEmployeeMapper().getBrowserDatas(DeleteParam.builder().ids(String.valueOf(detachById.getEcManager())).build().getIds()));
ecManager.setBrowserConditionParam(manager);
managerType.setValue(String.valueOf(detachById.getManagerType()));
managerType.setViewAttr(1);
if (detachById.getManagerType() == 0){
BrowserBean manager = ecManager.getBrowserConditionParam();
manager.setReplaceDatas(getEmployeeMapper().getBrowserDatas(DeleteParam.builder().ids(String.valueOf(detachById.getEcManager())).build().getIds()));
ecManager.setBrowserConditionParam(manager);
selectItems.add(ecManager);
}else {
BrowserBean role = roleId.getBrowserConditionParam();
List<Map<String, Object>> rep = new ArrayList<>();
Integer rolesId = detachById.getEcManager();
String rolesname = rolesComInfo.getRolesRemark(String.valueOf(rolesId));
rep.add(new HashMap<String,Object>(2){{put("name",rolesname);}});
rep.add(new HashMap<String,Object>(2){{put("id",rolesId);}});
role.setReplaceDatas(rep);
roleId.setBrowserConditionParam(role);
selectItems.add(roleId);
}
BrowserBean roleLevel = ecRolelevel.getBrowserConditionParam();
roleLevel.setReplaceDatas(getSystemDataMapper().getBrowserDatas(DeleteParam.builder().ids(String.valueOf(detachById.getEcRolelevel())).build().getIds()));
ecRolelevel.setBrowserConditionParam(roleLevel);
}else {
selectItems.add(ecManager);
selectItems.add(roleId);
}
selectItems.add(ecManager);
selectItems.add(ecRolelevel);
selectItems.add(module);
addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
apiDatas.put("condition", addGroups);
return apiDatas;
@ -116,10 +152,10 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
@Override
public int save(ManagerDetachParam param) {
Integer ecManager = param.getEcManager();
Integer ecManager = "0".equals(String.valueOf(param.getManagerType())) ? param.getEcManager() : param.getRoleId();
String noRepeatRoleLevel = param.getEcRolelevel();
// 判断有无重复数据
List<ManagerDetachPO> detachListById = getMangeDetachMapper().getDetachListById(ecManager);
List<ManagerDetachPO> detachListById = getMangeDetachMapper().getDetachListById(ecManager,param.getManagerType());
if (CollectionUtils.isNotEmpty(detachListById)) {
Set<String> noRepeatRoleLevels = getNoRepeatRoleLevels(detachListById, param.getId());
noRepeatRoleLevels.addAll(Arrays.asList(noRepeatRoleLevel.split(",")));
@ -128,7 +164,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
getMangeDetachMapper().deleteByIds(collect);
}
ManagerDetachPO managerDetachPO = ManagerDetachPO.builder()
.managerType(0)
.managerType(param.getManagerType())
.ecManager(ecManager)
.jclManager(ecManager)
.ecRolelevel(noRepeatRoleLevel)
@ -145,10 +181,10 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
@Override
public int updateDetach(ManagerDetachParam param) {
Integer ecManager = param.getEcManager();
Integer ecManager = "0".equals(String.valueOf(param.getManagerType())) ? param.getEcManager() : param.getRoleId();
String noRepeatRoleLevel = param.getEcRolelevel();
// 判断有无重复数据
List<ManagerDetachPO> detachListById = getMangeDetachMapper().getDetachListById(ecManager);
List<ManagerDetachPO> detachListById = getMangeDetachMapper().getDetachListById(ecManager,param.getManagerType());
if (CollectionUtils.isNotEmpty(detachListById)) {
Set<String> noRepeatRoleLevels = getNoRepeatRoleLevels(detachListById,param.getId());
noRepeatRoleLevels.addAll(Arrays.asList(noRepeatRoleLevel.split(",")));
@ -212,14 +248,24 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
public static List<Integer> getJclRoleLevels(Integer uId) {
List<Integer> ecRoleLevels = new ArrayList<>();
ManagerDetachMapper mangeDetachMapper = MapperProxyFactory.getProxy(ManagerDetachMapper.class);
List<ManagerDetachPO> detachListById = mangeDetachMapper.getDetachListById(uId);
//人员
List<ManagerDetachPO> detachListById = new ArrayList<>(mangeDetachMapper.getDetachListById(uId,0));
//角色
HrmCommonService hrmCommonService = new HrmCommonServiceImpl();
List<String> roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(uId).split(",")));
List<Integer> integerList = roleIds.stream()
.map(Integer::parseInt)
.collect(Collectors.toList());
detachListById.addAll(MapperProxyFactory.getProxy(ManagerDetachMapper.class).selectDetachListByManager(integerList));
for (ManagerDetachPO managerDetachPO : detachListById) {
List<Integer> ids = Stream.of(managerDetachPO.getJclRolelevel().split(",")).map(Integer::parseInt).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(ids)) {
ecRoleLevels.addAll(ids);
}
}
return ecRoleLevels;
return ecRoleLevels.stream()
.distinct() // 去除重复元素
.collect(Collectors.toList());
}

58
src/com/engine/organization/service/impl/OrgChartServiceImpl.java
Unescape Escape View File

@ -58,54 +58,29 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item.put("companyname", rs.getString("companyname"));
fclasslist.add(item);
}
List<CompanyTreePO> companyTree = new ArrayList<>();
String sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompany where (canceled is null or canceled != '1') and " + DBType.get(new RecordSet().getDBType()).ifNull("supsubcomid", "0") + " = '0'";
// 一级分部数据分权处理
String dimension = Util.null2String(request2Map.get("fclass"));
//版本id
String id = Util.null2String(request2Map.get("id"));
boolean isRealDimension = StringUtils.isBlank(dimension) || "0".equals(dimension);
boolean isRealTime = StringUtils.isBlank(id) || "0".equals(id);
if (isRealTime && user.getUID() != 1 && isRealDimension) {
DetachUtil detachUtil = new DetachUtil(user);
if(detachUtil.isDETACH()) {
String ids = detachUtil.getJclRoleLevels();
sql = sql + " and id in (" + ids + ")";
}
}
rs.executeQuery(sql);
while (rs.next()) {
companyTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf("select id from hrmsubcompany where (canceled is null or canceled != '1') and supsubcomid = ?", rs.getString("id"))).build());
}
result.put("api_status", true);
result.put("fclasslist", fclasslist);
result.put("companyTree", companyTree);
Map<String, Object> subCompanyTree = getSubCompanyTree(request2Map);
result.putAll(subCompanyTree);
return result;
}
@Override
public Map<String, Object> getSubCompanyTree(Map<String, Object> params) {
Map<String, Object> result = new HashMap<>(2);
List<CompanyTreePO> departmentTree = ChartServiceImpl.getDepartmentTreeList(params);
result.put("companyTree", departmentTree);
return result;
}
RecordSet rs = new RecordSet();
List<CompanyTreePO> companyTree = new ArrayList<>();
String subcompany = Util.null2String(params.get("subcompany"));
if (StringUtils.isBlank(subcompany)) {
subcompany = "0";
}
String fclass = Util.null2String(params.get("fclass"));
String id = Util.null2String(params.get("id"));
private String getSubCompanyTreeSql(String id, String fclass, String subcompany) {
// 是否展示当前数据
boolean isSearchCurrent = StringUtils.isBlank(id) || "0".equals(id);
String sql;
String judgeTreeLeafSql;
if (isSearchCurrent) {
sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompany where (canceled is null or canceled != '1') and " + DBType.get(new RecordSet().getDBType()).ifNull("supsubcomid", "0") + " = ? ";
boolean isRealDimension = StringUtils.isBlank(fclass) || "0".equals(fclass);
boolean isRealTime = StringUtils.isBlank(id) || "0".equals(id);
judgeTreeLeafSql = sql;
if (isRealTime && user.getUID() != 1 && isRealDimension) {
DetachUtil detachUtil = new DetachUtil(user);
if (detachUtil.isDETACH()) {
@ -125,14 +100,8 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
}
// 添加时间轴条件
sql += " and versionid = " + id;
judgeTreeLeafSql = sql;
}
rs.executeQuery(sql, subcompany);
while (rs.next()) {
companyTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf(judgeTreeLeafSql, rs.getString("id"))).build());
}
result.put("companyTree", companyTree);
return result;
return sql;
}
private String companyDateWhereSql(Map<String, Object> request2Map) {
@ -705,16 +674,19 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
return fieldname;
}
/**
* 判断树是否为叶子节点
*
* @param sql 查询下级元素SQL
* @param treeId 当前元素ID
* @param versionId
* @param dimension
* @param subCompany
* @return
*/
private boolean judgeTreeLeaf(String sql, String treeId) {
private boolean judgeTreeLeaf(String versionId, String dimension, String subCompany) {
RecordSet recordSet = new RecordSet();
recordSet.executeQuery(sql, treeId);
String sql = getSubCompanyTreeSql(versionId, dimension, subCompany);
recordSet.executeQuery(sql, subCompany);
return !recordSet.next();
}

7
src/com/engine/organization/service/impl/StaffPlanServiceImpl.java
Unescape Escape View File

@ -17,6 +17,7 @@ import com.engine.organization.util.*;
import com.engine.organization.util.browser.OrganizationBrowserUtil;
import com.engine.organization.util.db.DBType;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.detach.DetachUtil;
import org.apache.commons.lang3.StringUtils;
import weaver.common.DateUtil;
import weaver.conn.RecordSet;
@ -284,6 +285,12 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
if (null != forbiddenTag) {
sqlWhere += " AND t.forbidden_tag = '" + forbiddenTag + "'";
}
// 分权
DetachUtil detachUtil = new DetachUtil(user);
if (detachUtil.isDETACH()) {
String ids = detachUtil.getJclRoleLevels();
sqlWhere += " AND t.ec_company in (" + ids + ")";
}
return sqlWhere;
}
}

9
src/com/engine/organization/service/impl/StaffServiceImpl.java
Unescape Escape View File

@ -30,6 +30,7 @@ import com.engine.organization.util.*;
import com.engine.organization.util.browser.OrganizationBrowserUtil;
import com.engine.organization.util.db.DBType;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.detach.DetachUtil;
import com.engine.organization.util.excel.ExcelUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@ -81,7 +82,7 @@ public class StaffServiceImpl extends Service implements StaffService {
String outPutPath = GCONST.getRootPath() + File.separator + "hrm" + File.separator + "import" + File.separator + "template" + File.separator + "staff.xls";
File excelPathFile = new File(outPutPath);
if (!excelPathFile.exists()) {
String columns = "方案编号,方案名称,分部,部门,岗位,编制数";
String columns = "方案编号,方案名称,分部,部门,职务类型,职务,岗位,编制数";
String[] split = columns.split(",");
List<Object> columnList = new ArrayList<>(Arrays.asList(split));
// 创建导入模板
@ -437,6 +438,12 @@ public class StaffServiceImpl extends Service implements StaffService {
sqlWhere += " AND t.plan_id in ( select id from jcl_org_staffplan where plan_name " + dbType.like(staffName) + ") ";
}
// 分权
DetachUtil detachUtil = new DetachUtil(user);
if (detachUtil.isDETACH()) {
String ids = detachUtil.getJclRoleLevels();
sqlWhere += " AND t.ec_company in (" + ids + ")";
}
return sqlWhere;
}

63
src/com/engine/organization/transmethod/HrmResourceTransMethod.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.engine.organization.transmethod;
import com.api.hrm.util.HrmTransMethod;
import com.engine.organization.entity.job.bo.JobBO;
import com.engine.organization.mapper.comp.CompMapper;
import com.engine.organization.mapper.department.DepartmentMapper;
@ -8,6 +9,7 @@ import com.engine.organization.util.db.MapperProxyFactory;
import org.json.JSONObject;
import weaver.hrm.User;
import weaver.hrm.definedfield.HrmFieldManager;
import weaver.hrm.resource.ResourceComInfo;
/**
* @author:dxfeng
@ -16,6 +18,13 @@ import weaver.hrm.definedfield.HrmFieldManager;
*/
public class HrmResourceTransMethod {
/**
* 字段展示内容转换，列表用
*
* @param id
* @param para
* @return
*/
public static String getFieldTrueValue(String id, String para) {
HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0]));
String fieldName = para.substring(para.lastIndexOf("_") + 1);
@ -32,6 +41,60 @@ public class HrmResourceTransMethod {
}
}
public static String getOrgValue(String id, String para) {
HrmTransMethod hrmTransMethod = new HrmTransMethod();
try {
ResourceComInfo hrm = new ResourceComInfo();
String departmentId = hrm.getDepartmentID(id);
String subCompanyId = hrm.getSubCompanyID(id);
return hrmTransMethod.getAllParentDepartmentNames("",departmentId,subCompanyId);
} catch (Exception e) {
return "";
}
}
public static String getOrgValueExp(String id, String para) {
HrmTransMethod hrmTransMethod = new HrmTransMethod();
try {
ResourceComInfo hrm = new ResourceComInfo();
String departmentId = hrm.getDepartmentID(id);
String subCompanyId = hrm.getSubCompanyID(id);
String allParentDepartmentNames = hrmTransMethod.getAllParentDepartmentNames("", departmentId, subCompanyId);
allParentDepartmentNames = allParentDepartmentNames.replaceAll("<[^>]*>", "").replaceAll("&nbsp", "");
return allParentDepartmentNames;
} catch (Exception e) {
return "";
}
}
/**
* 字段展示内容转换，导出用
*
* @param id
* @param para
* @return
*/
public static String getFieldTrueValueExp(String id, String para) {
HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0]));
String fieldName = para.substring(para.lastIndexOf("_") + 1);
JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
User user = new User();
user.setUid(1);
try {
if (hfm.isBaseField(fieldName) && "jobactivity".equals(fieldName)) {
hrmFieldConf.put("type", 282);
}
String fieldvalue = hfm.getFieldvalue(null, user, null, hrmFieldConf.getString("dmlurl"), hrmFieldConf.getInt("id"), hrmFieldConf.getInt("fieldhtmltype"), hrmFieldConf.getInt("type"), id, 0, fieldName);
// fieldvalue去除Html内容
fieldvalue = fieldvalue.replaceAll("<[^>]*>", "").replaceAll("&nbsp", "");
return fieldvalue;
} catch (Exception e) {
return "";
}
}
public static String getDepartmentName(String departmentId) {
return MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptNameById(Integer.parseInt(departmentId));
}

15
src/com/engine/organization/transmethod/ManagerDetachTransMethod.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.engine.organization.mapper.hrmresource.SystemDataMapper;
import com.engine.organization.util.db.MapperProxyFactory;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import weaver.hrm.roles.RolesComInfo;
import java.util.Arrays;
import java.util.List;
@ -21,7 +22,7 @@ import java.util.stream.Collectors;
**/
public class ManagerDetachTransMethod {
public static String getManagerName(String ecManager) {
public static String getManagerName(String ecManager,String managerType) {
if (org.apache.commons.lang.StringUtils.isBlank(ecManager)) {
return "";
}
@ -29,8 +30,16 @@ public class ManagerDetachTransMethod {
if (CollectionUtils.isEmpty(collect)) {
return "";
}
List<String> employeeNameById = MapperProxyFactory.getProxy(EmployeeMapper.class).getEmployeeNameById(collect);
return StringUtils.join(employeeNameById, ",");
if ("0".equals(managerType)) {
List<String> employeeNameById = MapperProxyFactory.getProxy(EmployeeMapper.class).getEmployeeNameById(collect);
return StringUtils.join(employeeNameById, ",");
}else {
//角色
RolesComInfo rolesComInfo = new RolesComInfo();
return rolesComInfo.getRolesRemark(ecManager);
}
}

57
src/com/engine/organization/util/OrganizationDateUtil.java
Unescape Escape View File

@ -11,6 +11,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.Calendar;
import java.util.Date;
import java.util.Objects;
@ -470,6 +471,62 @@ public class OrganizationDateUtil {
return localDate;
}
/**
* 获取一个月后的日期
* @param firstDate
* @return
*/
public static String getLastMonthDate(String firstDate) {
// 定义日期格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String nextMonthDateString = "";
try {
LocalDate date = LocalDate.parse(firstDate, formatter);
LocalDate nextMonthDate = date.plusMonths(1);
nextMonthDateString = nextMonthDate.format(formatter);
} catch (DateTimeParseException e) {
e.printStackTrace();
}
return nextMonthDateString;
}
/**
* 获取一年后的日期
* @param firstDate
* @return
*/
public static String getLastYearDate(String firstDate) {
// 定义日期格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String nextYearDateString = "";
try {
LocalDate date = LocalDate.parse(firstDate, formatter);
LocalDate nextYearDate = date.plusYears(1);
nextYearDateString = nextYearDate.format(formatter);
} catch (DateTimeParseException e) {
e.printStackTrace();
}
return nextYearDateString;
}
/**
* 格式化日期
* @return
*/
public static String dateExample(LocalDate date) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
return date.format(formatter);
}
}

2
src/com/engine/organization/util/OrganizationFormItemUtil.java
Unescape Escape View File

@ -162,6 +162,8 @@ public class OrganizationFormItemUtil {
browser.setViewAttr(viewAttr);
browser.setIsQuickSearch(isQuickSearch);
browser.setLabel(label);
//隐藏虚拟组织
browser.getBrowserConditionParam().setHideVirtualOrg(true);
if ("161".equals(type) || "162".equals(type)) {
fieldDbType = "browser." + fieldDbType;
BrowserBean browserBean = new BrowserBean();

10
src/com/engine/organization/util/response/ReturnResult.java
Unescape Escape View File

@ -113,11 +113,11 @@ public class ReturnResult<T> implements Serializable {
* @param data
* @return
*/
//@Deprecated
//public static <T> ReturnResult<T> successed(T data) {
//
// return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data);
//}
@Deprecated
public static <T> ReturnResult<T> successed(T data) {
return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data);
}
/**
* 多语言响应

26
src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
Unescape Escape View File

@ -24,9 +24,11 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import weaver.conn.RecordSet;
import weaver.file.ImageFileManager;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.job.JobGroupsComInfo;
import weaver.systeminfo.SystemEnv;
import java.io.IOException;
@ -49,6 +51,8 @@ public class StaffInfoImportUtil {
importFieldsMap.put("方案名称", ExtendInfoPO.builder().tableName("jcl_org_staff").fieldName("plan_name").fieldNameDesc("方案名称").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("分部", ExtendInfoPO.builder().tableName("jcl_org_staff").fieldName("comp_id").fieldNameDesc("分部").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("部门", ExtendInfoPO.builder().tableName("jcl_org_staff").fieldName("dept_id").fieldNameDesc("部门").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职务类型", ExtendInfoPO.builder().tableName("hrmjobgroups").fieldName("jobgroupname").fieldNameDesc("职务类型").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("职务", ExtendInfoPO.builder().tableName("hrmjobactivities").fieldName("jobactivityname").fieldNameDesc("职务").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("岗位", ExtendInfoPO.builder().tableName("jcl_org_staff").fieldName("job_id").fieldNameDesc("岗位").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
importFieldsMap.put("编制数", ExtendInfoPO.builder().tableName("jcl_org_staff").fieldName("staff_num").fieldNameDesc("编制数").isrequired(1).controlType(1).browserType("2").customValue("[\"input\",\"int\"]").build());
@ -88,6 +92,9 @@ public class StaffInfoImportUtil {
Long parentJobId = null;
StaffPlanPO staffPlanPO = null;
String jobactivitymark = "";
String jobgroupremark = "";
historyDetailPO.setRowNums(String.valueOf(i + 1));
for (int cellIndex = 0; cellIndex < lastCellNum; cellIndex++) {
XSSFCell cell = row.getCell((short) cellIndex);
@ -188,6 +195,16 @@ public class StaffInfoImportUtil {
map.put("ec_department", parentDepartmentId);
}
//职务类型
if ("jobgroupname".equals(infoPO.getFieldName()) && StringUtils.isNotBlank(cellValue)) {
jobgroupremark = cellValue;
}
//职务
if ("jobactivityname".equals(infoPO.getFieldName()) && StringUtils.isNotBlank(cellValue)) {
jobactivitymark = cellValue;
}
// 岗位
if ("job_id".equals(infoPO.getFieldName()) && StringUtils.isNotBlank(cellValue)) {
if (null == parentCompanyId) {
@ -205,7 +222,8 @@ public class StaffInfoImportUtil {
continue nextRow;
}
for (String s : split) {
parentJobId = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId);
parentJobId = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId
,jobactivitymark,jobgroupremark);
if (null == parentJobId) {
historyDetailPO.setOperateDetail(s + "岗位未找到对应数据");
historyDetailPO.setStatus("0");
@ -335,8 +353,14 @@ public class StaffInfoImportUtil {
item.put("value", value);
itemList.add(item);
}
Map<String, Object> other = new HashMap<>();
other.put("index", (lsPromptLabel.size() + 1));
other.put("value", "注意:岗位维度编制信息导入时引入职务类型和职务判断,导入时请先去除多语言,否则无法找到对应岗位");
itemList.add(other);
groupItem.put("items", itemList);
lsGroup.add(groupItem);
return lsGroup;
}
}

17
src/com/engine/organization/web/HrmResourceController.java
Unescape Escape View File

@ -286,8 +286,7 @@ public class HrmResourceController {
public ReturnResult saveCustomTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SearchTemplateParam params) {
try {
User user = HrmUserVarify.getUser(request, response);
Integer templateId = getHrmResourceWrapper(user).saveCustomTemplate(params);
return ReturnResult.successed(user,Util.null2String(templateId));
return ReturnResult.successed(user,getHrmResourceWrapper(user).saveCustomTemplate(params));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}
@ -374,4 +373,18 @@ public class HrmResourceController {
}
}
@POST
@Path("/customOverall")
@Produces(MediaType.APPLICATION_JSON)
public ReturnResult customOverall(@Context HttpServletRequest request, @Context HttpServletResponse response) {
try {
User user = HrmUserVarify.getUser(request, response);
Map<String,Object> map = ParamUtil.request2Map(request);
return ReturnResult.successed(user,getHrmResourceWrapper(user).customOverall(map));
} catch (Exception e) {
return ReturnResult.exceptionHandle(e);
}
}
}

23
src/com/engine/organization/web/OrgChartController.java
Unescape Escape View File

@ -12,10 +12,7 @@ import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.util.HashMap;
@ -100,6 +97,24 @@ public class OrgChartController {
return JSONObject.toJSONString(apidatas);
}
@GET
@Path("/versionDelete")
@Produces(MediaType.APPLICATION_JSON)
public String versionDelete(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam("versionId") Integer versionId) {
Map<String, Object> apidatas = new HashMap<>(4);
try {
User user = HrmUserVarify.getUser(request, response);
apidatas = getOrgChartWrapper(user).versionDelete(versionId);
apidatas.put("api_status", true);
} catch (Exception e) {
//异常处理
e.printStackTrace();
apidatas.put("api_status", false);
apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
}
return JSONObject.toJSONString(apidatas);
}
@GET
@Path("/getSubCompanyTree")

6
src/com/engine/organization/wrapper/HrmResourceWrapper.java
Unescape Escape View File

@ -91,7 +91,7 @@ public class HrmResourceWrapper extends OrganizationWrapper {
return getHrmResourceService(user).getSearchTemplate(params);
}
public Integer saveCustomTemplate(SearchTemplateParam params) {
public Map<String, Object> saveCustomTemplate(SearchTemplateParam params) {
return getHrmResourceService(user).saveCustomTemplate(params);
}
@ -114,4 +114,8 @@ public class HrmResourceWrapper extends OrganizationWrapper {
public Integer saveColumnsCustomTemplate(Map<String,Object> params) {
return getHrmResourceService(user).saveColumnsCustomTemplate(params);
}
public Object customOverall(Map<String, Object> params) {
return getHrmResourceService(user).customOverall(params);
}
}

4
src/com/engine/organization/wrapper/OrgChartWrapper.java
Unescape Escape View File

@ -94,4 +94,8 @@ public class OrgChartWrapper extends Service {
public Map<Integer, HrmLabelVO> selectLabel() {
return getChartService(user).selectLabel();
}
public Map<String, Object> versionDelete(Integer versionId) {
return getChartService(user).versionDelete(versionId);
}
}

70
src/weaver/interfaces/organization/cronjob/OrgVersionDeleteCron.java
Unescape Escape View File

@ -0,0 +1,70 @@
package weaver.interfaces.organization.cronjob;
import com.engine.organization.service.impl.ChartServiceImpl;
import com.engine.organization.util.OrganizationAssert;
import com.engine.organization.util.OrganizationDateUtil;
import weaver.conn.RecordSet;
import weaver.general.Util;
import weaver.interfaces.schedule.BaseCronJob;
import java.util.ArrayList;
import java.util.List;
/**
* @Author liang.cheng
* @Date 2024/8/1 3:12 PM
* @Description: 组织架构版本定时删除
* @Version 1.0
*/
public class OrgVersionDeleteCron extends BaseCronJob {
private String type;
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Override
public void execute() {
RecordSet rs = new RecordSet();
List<Integer> idList = new ArrayList<>();
String createTime = "";
rs.executeQuery("select id,createtime from jcl_org_chartversion order by createtime asc");
if (rs.next()){
idList.add(Util.getIntValue(rs.getString("id")));
createTime = Util.null2String(rs.getString("createtime"));
}
OrganizationAssert.notEmpty(idList,"未查询到组织架构图历史版本");
//1.type=1 删除最早版本记录日期
//2.type=2 删除最早版本日期--往后一个月的数据
if("2".equals(type)){
String lastMonthDate = OrganizationDateUtil.getLastMonthDate(createTime);
rs.executeQuery("select id from jcl_org_chartversion where createtime >= ? and createtime <= ?",createTime,lastMonthDate);
while (rs.next()) {
idList.add(Util.getIntValue(rs.getString("id")));
}
}
//3.type=3 删除最早版本日期--往后一年的数据
if("3".equals(type)){
String lastYearDate = OrganizationDateUtil.getLastYearDate(createTime);
rs.executeQuery("select id from jcl_org_chartversion where createtime >= ? and createtime <= ?",createTime,lastYearDate);
while (rs.next()) {
idList.add(Util.getIntValue(rs.getString("id")));
}
}
//删除数据
ChartServiceImpl chartService = new ChartServiceImpl();
idList.forEach(chartService::versionDelete);
}
}

39
src/weaver/interfaces/organization/cronjob/OrgVersionRecordCron.java
Unescape Escape View File

@ -0,0 +1,39 @@
package weaver.interfaces.organization.cronjob;
import com.engine.organization.service.impl.ChartServiceImpl;
import com.engine.organization.util.OrganizationDateUtil;
import weaver.hrm.User;
import weaver.interfaces.schedule.BaseCronJob;
import java.time.LocalDate;
import java.util.HashMap;
import java.util.Map;
/**
* @Author liang.cheng
* @Date 2024/8/2 9:39 AM
* @Description: 组织架构图定时版本保存
* @Version 1.0
*/
public class OrgVersionRecordCron extends BaseCronJob {
@Override
public void execute() {
ChartServiceImpl chartService = new ChartServiceImpl();
User user = new User();
user.setUid(1);
// 获取当前日期
LocalDate today = LocalDate.now();
String example = OrganizationDateUtil.dateExample(today);
String description = "版本自动记录"+example;
Map<String, Object> params = new HashMap<String, Object>(){
{
put("description",description);
}};
chartService.versionRecord(params,user);
}
}

2
src/weaver/interfaces/organization/cronjob/StatisticsPersonCron.java
Unescape Escape View File

@ -34,7 +34,7 @@ public class StatisticsPersonCron extends BaseCronJob {
@Override
public void execute() {
Integer value = StringUtils.isNotBlank(companyId) ? Integer.parseInt(companyId) : null;
StatisticsParam build = StatisticsParam.builder().companyId(value).build();
StatisticsParam build = StatisticsParam.builder().companyId(null).build();
User user = new User();
user.setUid(1);
getChartService(user).recordStatistics(build);

Write Preview
Loading…
Cancel
Save