From 5ed00c6a24dd4d9dc8e3a2ccbbdf3c8bd9002398 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 21 Oct 2024 13:54:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20?= =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/mapper/job/JobMapper.java | 2 +- src/com/engine/organization/mapper/job/JobMapper.xml | 6 ++++-- .../util/saveimport/StaffInfoImportUtil.java | 10 ++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 275db287..553a2ad5 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -141,7 +141,7 @@ public interface JobMapper { * @param parentJob * @return */ - Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob, + List 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 ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany); diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 2580bdb5..617112fa 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -482,8 +482,10 @@ and delete_type = 0 - + select + + from jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id left join hrmjobactivities j on h.jobactivityid = j.id left join hrmjobgroups f on j.jobgroupid = f.id diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java index 2abe93b2..d69ce8b1 100644 --- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java @@ -222,9 +222,15 @@ 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 + List jobPList = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId ,jobactivitymark,jobgroupremark); - if (null == parentJobId) { + if (jobPList.size() > 1) { + historyDetailPO.setOperateDetail(s + "岗位在岗位管理中存在重复数据，请先处理"); + historyDetailPO.setStatus("0"); + OrgImportUtil.saveImportDetailLog(historyDetailPO); + continue nextRow; + } + if (jobPList.size() == 0) { historyDetailPO.setOperateDetail(s + "岗位未找到对应数据"); historyDetailPO.setStatus("0"); OrgImportUtil.saveImportDetailLog(historyDetailPO); From 76d91381913d284453314a05e0405ea8bf7a7def Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 21 Nov 2024 17:52:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=9B=BE=E5=8E=86=E5=8F=B2=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E5=AD=98=E5=82=A8=E9=97=AE=E9=A2=98=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/service/impl/ChartServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 957a0852..4bc2e1d4 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -1007,7 +1007,7 @@ public class ChartServiceImpl extends Service implements ChartService { " left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=1 "; deptQuerySql = "select a.id as departmentid, a.departmentmark, a.departmentname, a.subcompanyid1 as subcompanyid, " + "b.SUBCOMPANYNAME as subcompany,a.supdepid as supdepartmentid,c.departmentname as supdepartment," + - "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader,e.on_job_num,e.staff_num " + + "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,d.bmfzr as fleader,e.on_job_num,e.staff_num " + "from hrmdepartment a left join hrmsubcompany b on a.subcompanyid1 = b.id " + "left join hrmdepartment c on a.supdepid = c.id " + "left join hrmdepartmentdefined d on a.id=d.deptid " + @@ -1040,7 +1040,7 @@ public class ChartServiceImpl extends Service implements ChartService { " a.departmentcode,\n" + " a.coadjutant,\n" + " a.tlevel,\n" + - " a.bmfzr as fleader,\n" + + " d.bmfzr as fleader,\n" + " d.on_job_num,\n" + " d.staff_num" + " from hrmdepartment a\n" + @@ -1671,9 +1671,6 @@ public class ChartServiceImpl extends Service implements ChartService { * @return 人员名称 */ private String getDepartmentLeader(String ids) { - if (!isRealTime) { - return ids; - } if (StringUtils.isBlank(ids)) { return ""; }