Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

docs/sql20240530/DM.sql

@@ -9301,4 +9301,24 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547660 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547660) ;
+/
+delete from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547669,'入职日期' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入职日期' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'Date of Employment' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入職日期' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547669 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547669) ;
 /

docs/sql20240530/GS.sql

@@ -9301,4 +9301,24 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547660 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547660) ;
+/
+delete from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547669,'入职日期' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入职日期' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'Date of Employment' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入職日期' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547669 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547669) ;
 /

docs/sql20240530/JC.sql

@@ -9301,4 +9301,24 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547660 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547660) ;
+/
+delete from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547669,'入职日期' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入职日期' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'Date of Employment' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入職日期' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547669 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547669) ;
 /

docs/sql20240530/MySql.sql

@@ -9301,4 +9301,24 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547660 and moduleCode = 'HRM' and type = 'label'
 ;
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547660)
+;
+delete from HtmlLabelIndex where id = 547669 and ( indexdesc is null or indexdesc = '' )
+;
+insert into HtmlLabelIndex(id,indexdesc) select  547669,'入职日期' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547669 and ( indexdesc is not null and indexdesc <> '' ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入职日期' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=char_length(labelname)  )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'Date of Employment' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=char_length(labelname)  ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入職日期' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlModuleLabel where indexId = 547669 and moduleCode = 'HRM' and type = 'label'
+;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547669)
 ;

docs/sql20240530/Oracle.sql

@@ -9302,4 +9302,24 @@ delete from HtmlModuleLabel where indexId = 547660 and moduleCode = 'HRM' and ty
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547660)
 /
+delete from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is null )
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547669,'入职日期' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is not null ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入职日期' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'Date of Employment' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入職日期' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlModuleLabel where indexId = 547669 and moduleCode = 'HRM' and type = 'label'
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547669)
+/
 

docs/sql20240530/PG.sql

@@ -9301,4 +9301,24 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547660 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547660) ;
+/
+delete from HtmlLabelIndex where id = 547669 and ( indexdesc is null or indexdesc = '' ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547669,'入职日期' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547669 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入职日期' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'Date of Employment' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入職日期' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547669 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547669) ;
 /

docs/sql20240530/SQLServer.sql

@@ -9302,7 +9302,26 @@ delete from HtmlModuleLabel where indexId = 547660 and moduleCode = 'HRM' and ty
 GO
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547660)
 GO
-
+delete from HtmlLabelIndex where id = 547669 and ( indexdesc is null or indexdesc = '' )
+GO
+insert into HtmlLabelIndex(id,indexdesc) select  top 1  547669,'入职日期' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547669 and ( indexdesc is not null and indexdesc <> '' ))
+GO
+delete from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547669 as indexid ,'入职日期' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( labelname is null or labelname = ''   or labelname like '%[吖-座]%'  )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547669 as indexid ,'Date of Employment' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( labelname is not null and labelname <> ''   and labelname not like '%[吖-座]%'  ))
+GO
+delete from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547669 as indexid ,'入職日期' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlModuleLabel where indexId = 547669 and moduleCode = 'HRM' and type = 'label'
+GO
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547669)
+GO
 
 
 

docs/sql20240530/ST.sql

@@ -9301,4 +9301,24 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547660 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547660) ;
+/
+delete from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547669,'入职日期' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547669 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入职日期' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'Date of Employment' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547669 as indexid ,'入職日期' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547669 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547669 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547669) ;
 /

src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java

@@ -276,6 +276,11 @@ public class ExtendInfoBO {
                     fieldItem.setFormat("YYYY-MM");
                 }
                 break;
+            case INPUT:
+                Map<String, Object> otherParams = new HashMap<>(2);
+                otherParams.put("inputType","multilang");
+                fieldItem.setOtherParams(otherParams);
+                break;
             default:
                 break;
         }

src/com/engine/organization/service/impl/SchemeServiceImpl.java

@@ -131,7 +131,6 @@ public class SchemeServiceImpl extends Service implements SchemeService {
         schemeNoCondition.setRules("required|string");
         SearchConditionItem subCompanyIdItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547128, "164", "subCompanyId", "");
         SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547129, "schemeDescription");
-
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));
         if (!StringUtil.isEmpty(id)) {

src/com/engine/organization/util/OrganizationFormItemUtil.java

@@ -121,12 +121,15 @@ public class OrganizationFormItemUtil {
     public static SearchConditionItem inputItem(User user, int colSpan, int fieldcol,
                                                 int viewAttr, int length, String label, String name) {
         ConditionFactory conditionFactory = new ConditionFactory(user);
+        Map<String, Object> otherParams = new HashMap<>(2);
+        otherParams.put("inputType","multilang");
         SearchConditionItem input = conditionFactory.createCondition(ConditionType.INPUT, 25034, name);
         input.setColSpan(colSpan);
         input.setFieldcol(fieldcol);
         input.setViewAttr(viewAttr);
         input.setLength(length);
         input.setLabel(label);
+        input.setOtherParams(otherParams);
         return input;
     }
 
@@ -266,7 +269,7 @@ public class OrganizationFormItemUtil {
         textarea.setViewAttr(viewAttr);
         textarea.setLength(length);
         textarea.setLabel(label);
-
+        textarea.setInputType("multilang");
         return textarea;
     }