中远组织架构图新增需求开发

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" +
+        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 hrmdepartment b on a.bm = b.id\n" +
+                "left join uf_zsyggwbd d on a.gw = d.id " +
-                "left join hrmsubcompany c on b.subcompanyid1 = c.id\n" +
+                " where a.zt = 1 and a.zgzt = 1");
-                "left join uf_zsyggwbd d on a.gw = d.id");
         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(subCompanyname);
-            insertList.add(Util.getIntValue(rs.getString("bm")));
+            insertList.add(deptId);
-            insertList.add(Util.null2String(rs.getString("departmentname")));
+            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" +
+        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.bmbz = b.id\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")));

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);