From 1318fc1abaaff7730ebf2880e4b34c2190a93053 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 12 Aug 2022 09:34:19 +0800 Subject: [PATCH] =?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 --- .../organization/mapper/extend/ExtMapper.java | 14 ++++++++++--- .../organization/mapper/extend/ExtMapper.xml | 21 +++++++++++++++---- .../service/impl/ExtServiceImpl.java | 6 +++--- .../service/impl/ImportCommonServiceImpl.java | 12 +++++------ .../thread/OrganizationRunable.java | 2 +- .../cusfielddata/CusFieldDataTrigger.java | 2 +- 6 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.java b/src/com/engine/organization/mapper/extend/ExtMapper.java index 247d5e15..7b91636a 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtMapper.java @@ -29,12 +29,20 @@ public interface ExtMapper { int countExtById(ExtendInfoParams params); /** - * 插入主表拓展表 + * 插入主表 * * @param params * @return */ - int insertExt(ExtendInfoParams params); + int insertTable(ExtendInfoParams params); + + /** + * 插入拓展表 + * + * @param params + * @return + */ + int insertExtTable(ExtendInfoParams params); /** * 更新主表拓展表 @@ -42,5 +50,5 @@ public interface ExtMapper { * @param params * @return */ - int updateExt(ExtendInfoParams params); + int updateTable(ExtendInfoParams params); } diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.xml b/src/com/engine/organization/mapper/extend/ExtMapper.xml index 69cde37a..cddb6748 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtMapper.xml @@ -2,7 +2,7 @@ - insert into ${tableName} ( @@ -17,8 +17,9 @@ ) - - + + select ${sequenceName}.currval from dual @@ -33,8 +34,20 @@ ) + + insert into ${tableName} ( + + ${key} + + ) + values ( + + #{value} + + ) + - + update ${tableName} set ${key} = #{value} diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 9f37bfa9..3a65782f 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -232,14 +232,14 @@ public class ExtServiceImpl extends Service implements ExtService { int count = getExtMapper().countExtById(infoParams); if (count > 0) { map.put("update_time", new Date()); - getExtMapper().updateExt(infoParams); + getExtMapper().updateTable(infoParams); } else { map.put("creator", user.getUID()); map.put("delete_type", 0); map.put("create_time", new Date()); map.put("update_time", new Date()); map.put("id", id); - getExtMapper().insertExt(infoParams); + getExtMapper().insertExtTable(infoParams); } } else { if (!tableName.equals("JCL_ORG_HRMRESOURCE")) { @@ -249,7 +249,7 @@ public class ExtServiceImpl extends Service implements ExtService { map.put("delete_type", 0); map.put("create_time", new Date()); map.put("update_time", new Date()); - getExtMapper().insertExt(infoParams); + getExtMapper().insertTable(infoParams); } return infoParams.getId(); } diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 8e078bf8..7d60a9fd 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -641,7 +641,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ map.put("forbidden_tag", 0); } ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("JCL_ORG_COMP").params(map).build(); - MapperProxyFactory.getProxy(ExtMapper.class).insertExt(infoParams); + MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams); map.put("id", infoParams.getId()); new OrganizationRunable(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.ADD, map).run(); historyDetailPO.setOperateDetail("添加成功"); @@ -657,7 +657,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ } if (checkRepeatNo(compNo, COMPANY_TYPE, companyId)) { map.put("update_time", new Date()); - MapperProxyFactory.getProxy(ExtMapper.class).updateExt(ExtendInfoParams.builder().id(companyId).tableName("JCL_ORG_COMP").params(map).build()); + MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(companyId).tableName("JCL_ORG_COMP").params(map).build()); map.put("id", companyId); new OrganizationRunable(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, map).run(); historyDetailPO.setOperateDetail("更新成功"); @@ -828,7 +828,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ map.put("forbidden_tag", 0); } ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("JCL_ORG_DEPT").params(map).build(); - MapperProxyFactory.getProxy(ExtMapper.class).insertExt(infoParams); + MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams); map.put("id", infoParams.getId()); new OrganizationRunable(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.ADD, map).run(); historyDetailPO.setOperateDetail("添加成功"); @@ -844,7 +844,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ } if (checkRepeatNo(deptNo, DEPARTMENT_TYPE, departmentId)) { map.put("update_time", new Date()); - MapperProxyFactory.getProxy(ExtMapper.class).updateExt(ExtendInfoParams.builder().id(departmentId).tableName("JCL_ORG_DEPT").params(map).build()); + MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(departmentId).tableName("JCL_ORG_DEPT").params(map).build()); map.put("id", departmentId); new OrganizationRunable(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, map).run(); historyDetailPO.setOperateDetail("更新成功"); @@ -1043,7 +1043,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ map.put("forbidden_tag", 0); } ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("JCL_ORG_JOB").params(map).build(); - MapperProxyFactory.getProxy(ExtMapper.class).insertExt(infoParams); + MapperProxyFactory.getProxy(ExtMapper.class).insertTable(infoParams); map.put("jobactivityid", JobServiceImpl.JOB_ACTIVITY_ID); map.put("id", infoParams.getId()); new OrganizationRunable(user, LogModuleNameEnum.JOB, OperateTypeEnum.ADD, map).run(); @@ -1060,7 +1060,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ } if (checkRepeatNo(jobNo, JOB_TYPE, jobId)) { map.put("update_time", new Date()); - MapperProxyFactory.getProxy(ExtMapper.class).updateExt(ExtendInfoParams.builder().id(jobId).tableName("JCL_ORG_JOB").params(map).build()); + MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(jobId).tableName("JCL_ORG_JOB").params(map).build()); map.put("jobactivityid", JobServiceImpl.JOB_ACTIVITY_ID); map.put("id", jobId); new OrganizationRunable(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, map).run(); diff --git a/src/com/engine/organization/thread/OrganizationRunable.java b/src/com/engine/organization/thread/OrganizationRunable.java index b2c84115..1b6d7be2 100644 --- a/src/com/engine/organization/thread/OrganizationRunable.java +++ b/src/com/engine/organization/thread/OrganizationRunable.java @@ -436,7 +436,7 @@ public class OrganizationRunable implements Runnable { departmentMap.put("uuid", uuid); long jclTableId = Long.parseLong(Util.null2String(params.get("id"))); ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(jclTableName).params(departmentMap).id(jclTableId).build(); - getExtMapper().updateExt(infoParams); + getExtMapper().updateTable(infoParams); } } diff --git a/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java b/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java index 6a4148ef..0f56e2fd 100644 --- a/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java +++ b/src/com/engine/organization/trigger/cusfielddata/CusFieldDataTrigger.java @@ -97,7 +97,7 @@ public class CusFieldDataTrigger { hrmResourceMap.put("departmentid", ecBmId); // 公司 hrmResourceMap.put("subcompanyid1", ecGsId); - MapperProxyFactory.getProxy(ExtMapper.class).updateExt(ExtendInfoParams.builder().id(id).tableName("hrmresource").params(hrmResourceMap).build()); + MapperProxyFactory.getProxy(ExtMapper.class).updateTable(ExtendInfoParams.builder().id(id).tableName("hrmresource").params(hrmResourceMap).build()); updateFlag = true; }