From f05cf6da8fbc308c78ab81b406a2e80d38eee096 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 5 Sep 2022 10:51:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/0829/Mysql.sql | 2 ++ docs/0829/Oracle.sql | 3 ++ docs/0829/SqlServer.sql | 29 ++----------------- .../service/impl/GradeServiceImpl.java | 2 +- .../service/impl/LevelServiceImpl.java | 2 +- .../impl/NonStandardOptServiceImpl.java | 3 +- 6 files changed, 11 insertions(+), 30 deletions(-) diff --git a/docs/0829/Mysql.sql b/docs/0829/Mysql.sql index a859b7b6..2d975372 100644 --- a/docs/0829/Mysql.sql +++ b/docs/0829/Mysql.sql @@ -35,3 +35,5 @@ DROP TRIGGER IF EXISTS JCL_ORG_job_ed; DROP TRIGGER IF EXISTS JCL_ORG_job_del; DROP TRIGGER IF EXISTS hrmresource_ed; DROP TRIGGER IF EXISTS cus_fielddata_jclgw; + +update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666'; \ No newline at end of file diff --git a/docs/0829/Oracle.sql b/docs/0829/Oracle.sql index 7a13b4fd..adc3ca26 100644 --- a/docs/0829/Oracle.sql +++ b/docs/0829/Oracle.sql @@ -122,4 +122,7 @@ if V_NUM > 0 then execute immediate 'DROP TRIGGER cus_fielddata_jclgw'; end if; END; +/ + +update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666' / \ No newline at end of file diff --git a/docs/0829/SqlServer.sql b/docs/0829/SqlServer.sql index 7b161090..e10e587a 100644 --- a/docs/0829/SqlServer.sql +++ b/docs/0829/SqlServer.sql @@ -1,5 +1,7 @@ alter table JCL_ORG_STAFFS add description varchar(200) GO +update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666' +GO IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_ITEMCLASS]') AND type IN ('U')) DROP TABLE [dbo].[JCL_ORG_ITEMCLASS] @@ -50,30 +52,3 @@ ALTER TABLE [dbo].[JCL_ORG_ITEM] ADD CONSTRAINT [JCL_ORG_ITEM_PK] PRIMARY KEY CL GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[HrmCompany_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[HrmCompany_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_COMP_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_COMP_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_COMP_del]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_COMP_del] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_dept_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_dept_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_dept_del]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_dept_del] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_job_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_job_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_job_del]') AND type IN ('TR')) -DROP TRIGGER [dbo].[JCL_ORG_job_del] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[hrmresource_ed]') AND type IN ('TR')) -DROP TRIGGER [dbo].[hrmresource_ed] -GO -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[cus_fielddata_jclgw]') AND type IN ('TR')) -DROP TRIGGER [dbo].[cus_fielddata_jclgw] -GO \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index 6919317c..7c851cd1 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -137,7 +137,7 @@ public class GradeServiceImpl extends Service implements GradeService { SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser"); schemeBrowserItem.setRules("required|string"); BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam(); - if (!"-1".equals(schemeId) && StringUtil.isEmpty(id)) { + if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId) && StringUtil.isEmpty(id)) { schemeBrowserBean.setValue(schemeId); List> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(schemeId).build().getIds()); schemeBrowserBean.setReplaceDatas(maps); diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 2302007e..01cfd72f 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -133,7 +133,7 @@ public class LevelServiceImpl extends Service implements LevelService { SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description"); SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser"); BrowserBean browserBean = browserItem.getBrowserConditionParam(); - if (!"-1".equals(schemeId) && StringUtil.isEmpty(id)) { + if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId) && StringUtil.isEmpty(id)) { browserItem.setValue(schemeId); List> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(schemeId).build().getIds()); browserBean.setReplaceDatas(maps); diff --git a/src/com/engine/organization/service/impl/NonStandardOptServiceImpl.java b/src/com/engine/organization/service/impl/NonStandardOptServiceImpl.java index 6b952291..4e923556 100644 --- a/src/com/engine/organization/service/impl/NonStandardOptServiceImpl.java +++ b/src/com/engine/organization/service/impl/NonStandardOptServiceImpl.java @@ -43,7 +43,8 @@ public class NonStandardOptServiceImpl extends Service implements NonStandardOpt // 更新人员表系统字段 rs.executeUpdate("update hrm_formfield set isuse=1,ismand=1,allowhide=-1 where fieldname='sex'"); rs.executeUpdate("update hrm_formfield set isuse=1,ismand=0,allowhide=-1 where fieldname='departmentid'"); - rs.executeUpdate("update hrm_formfield set isuse=1,ismand=0,allowhide=-1 where fieldname='jobtitle'"); + // 非标启用，停用EC岗位字段 + rs.executeUpdate("update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobtitle'"); rs.executeUpdate("update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobactivity'"); rs.executeUpdate("update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='joblevel'"); rs.executeUpdate("update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobcall'"); From 4fa38f704cebf9bf95aafbf3ee89b75aa329ccab Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 5 Sep 2022 15:58:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=86=E9=83=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=B8=BAEC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/company/bo/CompBO.java | 1 + .../entity/company/param/CompSearchParam.java | 1 + .../entity/company/po/CompPO.java | 2 ++ .../organization/mapper/comp/CompMapper.xml | 22 ++++++++++++++----- .../service/impl/CompServiceImpl.java | 15 +++++++++++-- .../service/impl/ExtServiceImpl.java | 2 +- .../thread/OrganizationSyncEc.java | 6 ++--- 7 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index f0c62966..e1e04f5d 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -88,6 +88,7 @@ public class CompBO { .compName(param.getCompName()) .compNameShort(param.getCompNameShort()) .parentCompany(param.getParentCompany()) + .ecCompany(param.getEcCompany()) .orgCode(param.getOrgCode()) .industry(param.getIndustry()) .compPrincipal(param.getCompPrincipal()) diff --git a/src/com/engine/organization/entity/company/param/CompSearchParam.java b/src/com/engine/organization/entity/company/param/CompSearchParam.java index 1134b99c..425bb5a5 100644 --- a/src/com/engine/organization/entity/company/param/CompSearchParam.java +++ b/src/com/engine/organization/entity/company/param/CompSearchParam.java @@ -42,6 +42,7 @@ public class CompSearchParam extends BaseQueryParam { * 上级公司 */ private Long parentCompany; + private Long ecCompany; /** * 组织机构代码 diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index 1ab9fd96..98bfc5c5 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -44,6 +44,8 @@ public class CompPO { */ private Long parentCompany; + private Long ecCompany; + /** * 组织机构代码 */ diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml index 96ca0365..2acd1494 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.xml +++ b/src/com/engine/organization/mapper/comp/CompMapper.xml @@ -7,6 +7,7 @@ + @@ -30,6 +31,7 @@ , t.comp_name , t.comp_name_short , t.parent_company + , t.ec_company , t.org_code , t.industry , t.comp_principal @@ -98,6 +100,9 @@ parent_company, + + ec_company, + org_code, @@ -140,6 +145,9 @@ #{parentCompany}, + + #{ecCompany}, + #{orgCode}, @@ -160,7 +168,7 @@ - + select JCL_ORG_COMP_ID.currval from dual INSERT INTO jcl_org_comp @@ -189,6 +197,9 @@ parent_company, + + ec_company, + org_code, @@ -228,8 +239,8 @@ #{compNameShort}, - - #{parentCompany}, + + #{ecCompany}, #{orgCode}, @@ -300,8 +311,8 @@ jcl_org_comp t WHERE t.delete_type = 0 - - and t.parent_company = #{compPO.parentCompany} + + and t.ec_company = #{compPO.ecCompany} and t.industry = #{compPO.industry} @@ -434,6 +445,7 @@ comp_name=#{compName}, comp_name_short=#{compNameShort}, parent_company=#{parentCompany}, + ec_company=#{ecCompany}, org_code=#{orgCode}, industry=#{industry}, comp_principal=#{compPrincipal}, diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 1143da41..36d3ff71 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -37,6 +37,7 @@ import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; import com.engine.organization.util.page.PageUtil; +import com.engine.organization.util.relation.EcHrmRelationUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import weaver.general.StringUtil; @@ -161,6 +162,11 @@ public class CompServiceImpl extends Service implements CompService { } params.put("show_order", maxShowOrder + 1); } + // 赋值上级分部 + String ecCompany = Util.null2String(params.get("ec_company")); + if (StringUtils.isNotBlank(ecCompany)) { + params.put("parent_company", EcHrmRelationUtil.getJclCompanyId(ecCompany).getId()); + } Map syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.ADD, params).sync(); String ecCompanyID = Util.null2String(syncMap.get("id")); OrganizationAssert.isTrue(StringUtils.isNotBlank(ecCompanyID), syncMap.get("message").toString()); @@ -196,6 +202,11 @@ public class CompServiceImpl extends Service implements CompService { compNo = repeatDetermine(compNo); params.put("comp_no", compNo); } + // 上级分部 + String ecCompany = Util.null2String(params.get("ec_company")); + if (StringUtils.isNotBlank(ecCompany)) { + params.put("parent_company", EcHrmRelationUtil.getJclCompanyId(ecCompany).getId()); + } new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, params).sync(); // 更新主表数据 getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", searchParam.getId()); @@ -234,7 +245,7 @@ public class CompServiceImpl extends Service implements CompService { // 简称 SearchConditionItem compNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "compNameShort"); // 上级公司 - SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "161", "parentCompany", "compBrowser"); + SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "164", "ecCompany", ""); // 组织机构代码 SearchConditionItem orgCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "组织机构代码", "orgCode"); // 行业 @@ -379,7 +390,7 @@ public class CompServiceImpl extends Service implements CompService { && StringUtil.isEmpty(compPO.getCompNo()) && StringUtil.isEmpty(compPO.getCompNameShort()) && StringUtil.isEmpty(compPO.getOrgCode()) - && null == compPO.getParentCompany() + && null == compPO.getEcCompany() && null == compPO.getIndustry() && null == compPO.getCompPrincipal() && null == compPO.getForbiddenTag()); diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index ab1f7ff1..429452ca 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -62,7 +62,7 @@ public class ExtServiceImpl extends Service implements ExtService { // 2编辑 1查看 OrganizationAssert.notNull(groupId, "请选择对应的拓展页"); - List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.EDIT.getValue(), "1"); + List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, 1 == viewAttr ? ExtendInfoOperateType.LIST.getValue() : ExtendInfoOperateType.EDIT.getValue(), "1"); String fields = infoPOList.stream().map(ExtendInfoPO::getFieldName).collect(Collectors.joining(",")); if (StringUtils.isEmpty(fields)) { return conditionItems; diff --git a/src/com/engine/organization/thread/OrganizationSyncEc.java b/src/com/engine/organization/thread/OrganizationSyncEc.java index c182e6ec..57afff97 100644 --- a/src/com/engine/organization/thread/OrganizationSyncEc.java +++ b/src/com/engine/organization/thread/OrganizationSyncEc.java @@ -385,9 +385,9 @@ public class OrganizationSyncEc { map.put("subcompanyname", Util.null2String(params.get("comp_name_short"))); // 上级分部通过UUID联查ec表ID - String parentCompany = Util.null2String(params.get("parent_company")); - if (StringUtils.isNotBlank(parentCompany)) { - map.put("supsubcomid", EcHrmRelationUtil.getEcCompanyId(parentCompany)); + String ecCompany = Util.null2String(params.get("ec_company")); + if (StringUtils.isNotBlank(ecCompany)) { + map.put("supsubcomid", ecCompany); } map.put("subcompanycode", params.get("comp_no").toString()); From b1b2a9a88aaf7238d9485ad705abe18006ba4d67 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 5 Sep 2022 17:25:11 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=B8=BAEC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/department/bo/DepartmentBO.java | 2 + .../department/param/DeptSearchParam.java | 2 + .../entity/department/po/DepartmentPO.java | 2 + .../mapper/department/DepartmentMapper.xml | 48 ++++++-- .../service/impl/CompServiceImpl.java | 2 + .../service/impl/DepartmentServiceImpl.java | 110 ++++++++++++++---- 6 files changed, 134 insertions(+), 32 deletions(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 4973e807..438e6305 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -84,7 +84,9 @@ public class DepartmentBO { .deptName(param.getDepartmentName()) .deptNameShort(param.getDeptNameShort()) .parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp()) + .ecCompany(param.getEcCompany()) .parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept()) + .ecDepartment(param.getEcDepartment()) .deptPrincipal(param.getDeptPrincipal()) .showOrder(param.getShowOrder()) .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) diff --git a/src/com/engine/organization/entity/department/param/DeptSearchParam.java b/src/com/engine/organization/entity/department/param/DeptSearchParam.java index 1eaff53c..ed70fcfe 100644 --- a/src/com/engine/organization/entity/department/param/DeptSearchParam.java +++ b/src/com/engine/organization/entity/department/param/DeptSearchParam.java @@ -26,8 +26,10 @@ public class DeptSearchParam extends BaseQueryParam { private String deptNameShort; private Long parentComp; + private Long ecCompany; private Long parentDept; + private Long ecDepartment; private Long deptPrincipal; diff --git a/src/com/engine/organization/entity/department/po/DepartmentPO.java b/src/com/engine/organization/entity/department/po/DepartmentPO.java index d4f5528f..ab4fcbf2 100644 --- a/src/com/engine/organization/entity/department/po/DepartmentPO.java +++ b/src/com/engine/organization/entity/department/po/DepartmentPO.java @@ -28,8 +28,10 @@ public class DepartmentPO { private String deptNameShort; private Long parentComp; + private Long ecCompany; private Long parentDept; + private Long ecDepartment; private Long deptPrincipal; //部门负责人 diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 4221b0fe..b73b2b51 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -7,7 +7,9 @@ + + @@ -30,7 +32,9 @@ t.dept_name, t.dept_name_short, t.parent_comp, + t.ec_company, t.parent_dept, + t.ec_department, t.dept_principal, t.show_order, t.description, @@ -39,17 +43,19 @@