From b1ed914ebc22c7b656599eef9bcc5107c068b85b Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 19 Aug 2022 10:28:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/脚本/Mysql/0818补丁.sql | 17 +++++++++++ .../service/impl/CompServiceImpl.java | 2 +- .../thread/OrganizationRunable.java | 30 +++++++++++++++---- 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 docs/脚本/Mysql/0818补丁.sql diff --git a/docs/脚本/Mysql/0818补丁.sql b/docs/脚本/Mysql/0818补丁.sql new file mode 100644 index 00000000..2dd4c6c3 --- /dev/null +++ b/docs/脚本/Mysql/0818补丁.sql @@ -0,0 +1,17 @@ +update jcl_field_extendinfo set isrequired = 1 where table_name ='JCL_ORG_JOB' and field_name ='job_name'; + + +delete from SystemRightDetail where rightid =2714; +delete from SystemRightsLanguage where id =2714; +delete from SystemRights where id =2714; +delete from SystemRightToGroup where rightid =2714; +delete from SystemRightType where id =37; +delete from SystemRightGroups where id =-23; +insert into SystemRights (id,rightdesc,righttype,detachable) values (2714,'组织数据导入','37',0); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,8,'Organization data import','Organization data import'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,9,'組織數據導入','組織數據導入'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,7,'组织数据导入','组织数据导入'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43998,'组织数据导入权限','DataImport:All',2714); +insert into SystemRightToGroup(rightid,groupid) values (2714,-23); +insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理'); +insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理'); \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index a2abc11f..c710c247 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -199,7 +199,7 @@ public class CompServiceImpl extends Service implements CompService { OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); Map map = new HashMap<>(); map.put("id", StringUtils.join(ids, ",")); - new Thread(new OrganizationRunable(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.CANCELED, map)).start(); + new OrganizationRunable(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.CANCELED, map).run(); return getCompMapper().deleteByIds(ids); } diff --git a/src/com/engine/organization/thread/OrganizationRunable.java b/src/com/engine/organization/thread/OrganizationRunable.java index 1b6d7be2..700d2ae6 100644 --- a/src/com/engine/organization/thread/OrganizationRunable.java +++ b/src/com/engine/organization/thread/OrganizationRunable.java @@ -4,10 +4,12 @@ import com.engine.common.util.ServiceUtil; import com.engine.hrm.service.impl.HrmJobServiceImpl; import com.engine.hrm.service.impl.OrganizationServiceImpl; import com.engine.organization.entity.commom.RecordInfo; +import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.extend.param.ExtendInfoParams; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.enums.LogModuleNameEnum; import com.engine.organization.enums.OperateTypeEnum; +import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.job.JobMapper; @@ -407,17 +409,33 @@ public class OrganizationRunable implements Runnable { String forbiddenTag = Util.null2String(params.get("forbiddenTag")); List idList = new ArrayList<>(); String[] split = companyIds.split(","); - for (String s : split) { - idList.add(EcHrmRelationUtil.getEcCompanyId(s)); + if (StringUtils.isBlank(forbiddenTag)) { + long currentTimeMillis = System.currentTimeMillis(); + for (String s : split) { + // 更新名称为：名称+时间戳 + CompPO comp = MapperProxyFactory.getProxy(CompMapper.class).listById(Long.parseLong(s)); + params.put("parent_company", comp.getParentCompany()); + params.put("comp_no", comp.getCompNo()); + params.put("comp_name", comp.getCompName() + currentTimeMillis); + params.put("comp_name_short", comp.getCompNameShort() + currentTimeMillis); + params.put("show_order", comp.getShowOrder()); + updateCompany(); + idList.add(EcHrmRelationUtil.getEcCompanyId(s)); + } + } else { + for (String s : split) { + idList.add(EcHrmRelationUtil.getEcCompanyId(s)); + } } Map map = new HashMap<>(); map.put("id", StringUtils.join(idList, ",")); - if (StringUtils.isBlank(forbiddenTag) || "1".equals(forbiddenTag)) { - // 封存 - ServiceUtil.getService(OrganizationServiceImpl.class, user).doSubCompanyCancel(map, user); - } else { + + if ("0".equals(forbiddenTag)) { // 解封 ServiceUtil.getService(OrganizationServiceImpl.class, user).doSubCompanyISCanceled(map, user); + } else { + // 删除封存、禁用封存 + ServiceUtil.getService(OrganizationServiceImpl.class, user).doSubCompanyCancel(map, user); } } From 9c64467cc8e4b5a93360af725d57a3dedf67eb97 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 19 Aug 2022 10:37:05 +0800 Subject: [PATCH 2/3] =?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 --- .../service/impl/DepartmentServiceImpl.java | 2 +- .../thread/OrganizationRunable.java | 30 +++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 82b27230..f7053a5f 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -251,7 +251,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); Map map = new HashMap<>(); map.put("id", StringUtils.join(ids, ",")); - new Thread(new OrganizationRunable(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.CANCELED, map)).start(); + new OrganizationRunable(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.CANCELED, map).run(); return getDepartmentMapper().deleteByIds(ids); } diff --git a/src/com/engine/organization/thread/OrganizationRunable.java b/src/com/engine/organization/thread/OrganizationRunable.java index 700d2ae6..90689f41 100644 --- a/src/com/engine/organization/thread/OrganizationRunable.java +++ b/src/com/engine/organization/thread/OrganizationRunable.java @@ -5,11 +5,13 @@ import com.engine.hrm.service.impl.HrmJobServiceImpl; import com.engine.hrm.service.impl.OrganizationServiceImpl; import com.engine.organization.entity.commom.RecordInfo; import com.engine.organization.entity.company.po.CompPO; +import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.extend.param.ExtendInfoParams; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.enums.LogModuleNameEnum; import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.comp.CompMapper; +import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.job.JobMapper; @@ -315,17 +317,33 @@ public class OrganizationRunable implements Runnable { String forbiddenTag = Util.null2String(params.get("forbiddenTag")); List idList = new ArrayList<>(); String[] split = departmentIds.split(","); - for (String s : split) { - idList.add(EcHrmRelationUtil.getEcDepartmentId(s)); + if (StringUtils.isBlank(forbiddenTag)) { + long currentTimeMillis = System.currentTimeMillis(); + for (String s : split) { + DepartmentPO departmentPO = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(Long.parseLong(s)); + params.put("dept_name_short", departmentPO.getDeptNameShort() + currentTimeMillis); + params.put("dept_name", departmentPO.getDeptName() + currentTimeMillis); + params.put("parent_comp", departmentPO.getParentComp()); + params.put("parent_dept", departmentPO.getParentDept()); + params.put("show_order", departmentPO.getShowOrder()); + params.put("dept_no", departmentPO.getDeptNo()); + params.put("dept_principal", departmentPO.getDeptPrincipal()); + updateDepartment(); + idList.add(EcHrmRelationUtil.getEcDepartmentId(s)); + } + } else { + for (String s : split) { + idList.add(EcHrmRelationUtil.getEcDepartmentId(s)); + } } Map map = new HashMap<>(); map.put("id", StringUtils.join(idList, ",")); - if (StringUtils.isBlank(forbiddenTag) || "1".equals(forbiddenTag)) { - // 封存 - ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentCancel(map, user); - } else { + if ("0".equals(forbiddenTag)) { // 解封 ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentISCanceled(map, user); + } else { + // 封存 + ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentCancel(map, user); } } From ff8660a586b4f44e25c0ee8087e3d82e28235449 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 22 Aug 2022 09:10:00 +0800 Subject: [PATCH 3/3] =?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/脚本/Mysql/0818补丁.sql | 10 ++++++ .../organization/mapper/extend/ExtMapper.java | 3 ++ .../organization/mapper/extend/ExtMapper.xml | 5 +++ .../mapper/extend/ExtendInfoMapper.xml | 6 ++-- .../service/impl/CompServiceImpl.java | 7 +++++ .../service/impl/DepartmentServiceImpl.java | 8 ++++- .../service/impl/ImportCommonServiceImpl.java | 31 +++++++------------ .../service/impl/JobServiceImpl.java | 7 ++++- .../service/impl/StaffPlanServiceImpl.java | 12 +++++++ 9 files changed, 66 insertions(+), 23 deletions(-) diff --git a/docs/脚本/Mysql/0818补丁.sql b/docs/脚本/Mysql/0818补丁.sql index 2dd4c6c3..7c6ef079 100644 --- a/docs/脚本/Mysql/0818补丁.sql +++ b/docs/脚本/Mysql/0818补丁.sql @@ -1,4 +1,14 @@ update jcl_field_extendinfo set isrequired = 1 where table_name ='JCL_ORG_JOB' and field_name ='job_name'; +update jcl_field_extendinfo set isrequired = 1 where table_name ='JCL_ORG_JOB' and field_name ='ec_company'; +update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"行业","replaceDatas":[{"itemorderid":"63","name":"行业","id":"63","parenttitle":"客户","title":"客户-行业"}],"value":"63"}]' where table_name ='JCL_ORG_COMP' and field_name='industry' ; +update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]' where table_name ='JCL_ORG_COMP' and field_name='comp_principal' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_COMP' and field_name='description' ; +update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]' where table_name ='JCL_ORG_DEPT' and field_name='dept_principal' ; +update jcl_field_extendinfo set custom_value='["input","int"]' where table_name ='JCL_ORG_DEPT' and field_name='show_order' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_DEPT' and field_name='description' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='description' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='work_duty' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='work_authority'; delete from SystemRightDetail where rightid =2714; diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.java b/src/com/engine/organization/mapper/extend/ExtMapper.java index 7b91636a..2506e584 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtMapper.java @@ -1,6 +1,7 @@ package com.engine.organization.mapper.extend; import com.engine.organization.entity.extend.param.ExtendInfoParams; +import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -51,4 +52,6 @@ public interface ExtMapper { * @return */ int updateTable(ExtendInfoParams params); + + int deleteByID(@Param("tableName") String tableName, @Param("id") long id); } diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.xml b/src/com/engine/organization/mapper/extend/ExtMapper.xml index cddb6748..f2029aae 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtMapper.xml @@ -54,6 +54,11 @@ where id = #{id} + + delete + from ${tableName} + where id = #{id} + select ${fieldName} from ${tableName} + where delete_type = 0