From 7d95667a878f54329d3a838cb762dd27436d233a Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 14 Feb 2025 15:29:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=BF=9C=E7=BB=84=E7=BB=87=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=E5=9B=BE=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChartServiceImpl.java | 31 ++++++++++++------- .../impl/ModeHrmResourceServiceImpl.java | 4 +-- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 49f61d83..288c7f30 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -1098,20 +1098,28 @@ public class ChartServiceImpl extends Service implements ChartService { //当前人员版本存储（todo 人员数据存在建模表） + DepartmentComInfo deptInfo = new DepartmentComInfo(); + SubCompanyComInfo subInfo = new SubCompanyComInfo(); insertParamList = new ArrayList<>(); //正式员工 - rs.executeQuery("select a.id,a.gh,a.xm,a.xb,a.bm,a.gw,a.sjhm,a.ygxz,a.zt,b.departmentname,c.subcompanyname,d.gwmc from uf_zsygrzbdd a \n" + - "left join hrmdepartment b on a.bm = b.id\n" + - "left join hrmsubcompany c on b.subcompanyid1 = c.id\n" + - "left join uf_zsyggwbd d on a.gw = d.id"); + rs.executeQuery("select a.id,a.gh,a.xm,a.xb,a.bm,a.ks,a.gw,a.sjhm,a.ygxz,a.zt,d.gwmc from uf_zsygrzbdd a \n" + + "left join uf_zsyggwbd d on a.gw = d.id " + + " where a.zt = 1 and a.zgzt = 1"); while(rs.next()) { insertList = new ArrayList<>(); + + int bm = Util.getIntValue(rs.getString("bm")); + int ks = Util.getIntValue(rs.getString("ks")); + int deptId = ks != -1 ? ks : bm; + String subcompanyid1 = deptInfo.getSubcompanyid1(String.valueOf(deptId)); + String subCompanyname = subInfo.getSubCompanyname(subcompanyid1); + insertList.add(Util.null2String(rs.getString("gh"))); insertList.add(Util.null2String(rs.getString("xm"))); insertList.add(Util.null2String(rs.getString("xb"))); - insertList.add(Util.null2String(rs.getString("subcompanyname"))); - insertList.add(Util.getIntValue(rs.getString("bm"))); - insertList.add(Util.null2String(rs.getString("departmentname"))); + insertList.add(subCompanyname); + insertList.add(deptId); + insertList.add(deptInfo.getDepartmentname(String.valueOf(deptId))); insertList.add(Util.null2String(rs.getString("gwmc"))); insertList.add(Util.null2String(rs.getString("sjhm"))); insertList.add(Util.null2String(rs.getString("ygxz"))); @@ -1121,17 +1129,18 @@ public class ChartServiceImpl extends Service implements ChartService { } //外部员工 - rs.executeQuery("select a.id,a.gh,a.xm,a.xb,a.bmbz,a.gw,a.lxfs,a.zt,b.departmentname,c.subcompanyname,d.gwmc from uf_qlwbrydngljmb a\n" + - "left join hrmdepartment b on a.bmbz = b.id\n" + + rs.executeQuery("select a.id,a.gh,a.xm,a.xb,a.ks,a.gw,a.lxfs,a.zt,a.ygxz,b.departmentname,c.subcompanyname,d.gwmc from uf_qlwbrydngljmb a\n" + + "left join hrmdepartment b on a.ks = b.id\n" + "left join hrmsubcompany c on b.subcompanyid1 = c.id\n" + - "left join uf_gwmc d on a.gw = d.gwbm"); + "left join uf_gwmc d on a.gw = d.gwbm" + + " where a.zt < 4"); while(rs.next()) { insertList = new ArrayList<>(); insertList.add(Util.null2String(rs.getString("gh"))); insertList.add(Util.null2String(rs.getString("xm"))); insertList.add(Util.null2String(rs.getString("xb"))); insertList.add(Util.null2String(rs.getString("subcompanyname"))); - insertList.add(Util.getIntValue(rs.getString("bmbz"))); + insertList.add(Util.getIntValue(rs.getString("ks"))); insertList.add(Util.null2String(rs.getString("departmentname"))); insertList.add(Util.null2String(rs.getString("gwmc"))); insertList.add(Util.null2String(rs.getString("lxfs"))); diff --git a/src/com/engine/organization/service/impl/ModeHrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/ModeHrmResourceServiceImpl.java index 38ac2f09..eaed675a 100644 --- a/src/com/engine/organization/service/impl/ModeHrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/ModeHrmResourceServiceImpl.java @@ -249,7 +249,7 @@ public class ModeHrmResourceServiceImpl extends Service implements ModeHrmResour .deptType(ks != -1 ? 1 : 0) .jobBrowser(Util.null2String(rs.getString("gw"))) .mobile(Util.null2String(rs.getString("sjhm"))) - .pcUrl(String.format("/spa/cube/index.html#/main/cube/card?type=0&modeId={}&formId={}&billid={}&opentype=0&customid={}&viewfrom=fromsearchlist",modeId,formId,id,customid)) + .pcUrl(String.format("/spa/cube/index.html#/main/cube/card?type=0&modeId=%s&formId=%s&billid=%s&opentype=0&customid=%s&viewfrom=fromsearchlist",modeId,formId,id,customid)) .personType(Util.null2String(rs.getString("ygxz"))) .build(); resourceChartPOS.add(build); @@ -292,7 +292,7 @@ public class ModeHrmResourceServiceImpl extends Service implements ModeHrmResour .deptType(1) .jobBrowser(Util.null2String(rs.getString("gw"))) .mobile(Util.null2String(rs.getString("lxfs"))) - .pcUrl(String.format("/spa/cube/index.html#/main/cube/card?type=0&modeId={}&formId={}&billid={}&opentype=0&customid={}&viewfrom=fromsearchlist",modeId,formId,id,customid)) + .pcUrl(String.format("/spa/cube/index.html#/main/cube/card?type=0&modeId=%s&formId=%s&billid=%s&opentype=0&customid=%s&viewfrom=fromsearchlist",modeId,formId,id,customid)) .personType(Util.null2String(rs.getString("ygxz"))) .build(); resourceChartPOS.add(build);