From 0a809a29c9fb5d26e1106f8d604348cca5e2549e Mon Sep 17 00:00:00 2001 From: Mlin Date: Fri, 14 Jul 2023 14:46:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=8E=A7=E5=88=B6bug=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChartServiceImpl.java | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 21e39e87..2c2ff22e 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -425,18 +425,17 @@ public class ChartServiceImpl extends Service implements ChartService { if (rs.next()) { versionId = Util.null2String(rs.getString("id")); } - if ("0".equals(dimension)) { //实体维度 - trueDimension(versionId,currentUser,currentDate); + trueDimension(recordSetTrans,versionId,currentUser,currentDate); } else { - virtualDimension(versionId,currentUser,currentDate,dimension); + virtualDimension(recordSetTrans,versionId,currentUser,currentDate,dimension); } Map result = new HashMap<>(); result.put("api_status", true); return result; } - private void trueDimension(String versionId,String currentUser,String currentDate){ + private void trueDimension(RecordSetTrans recordSetTrans,String versionId,String currentUser,String currentDate){ RecordSet rs = new RecordSet(); rs.execute("delete from jcl_chart_subcompany where versionid = "+versionId); rs.execute("delete from jcl_chart_department where versionid = "+versionId); @@ -474,7 +473,7 @@ public class ChartServiceImpl extends Service implements ChartService { " a.subcompanyname,\n" + " a.subcompanydesc,\n" + " a.companyid as company,\n" + - " b.supsubcomid as supsubcompanyid,\n" + + " a.supsubcomid as supsubcompanyid,\n" + " b.subcompanyname as supsubcompany,\n" + " a.canceled,\n" + " a.subcompanycode,\n" + @@ -526,7 +525,7 @@ public class ChartServiceImpl extends Service implements ChartService { String insertSubSql = "insert into jcl_chart_subcompany(creater, subcompanyid, subcompanyname, subcompanydesc, company,\n" + " supsubcompanyid, supsubcompany, canceled, subcompanycode, limitusers,\n" + " tlevel, versiondate, isvirtual,versionId) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - insertData(insertSubSql,insertParamList); + insertData(recordSetTrans,insertSubSql,insertParamList); //当前部门版本存储 rs.executeQuery(deptQuerySql); @@ -554,7 +553,7 @@ public class ChartServiceImpl extends Service implements ChartService { String insertDeptSql = "insert into jcl_chart_department(creater, departmentid, departmentmark, departmentname, subcompanyid,\n" + " subcompany, supdepartmentid, supdepartment, canceled, departmentcode,\n" + " coadjutant, fleader,versiondate, isvirtual,versionid) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - insertData(insertDeptSql,insertParamList); + insertData(recordSetTrans,insertDeptSql,insertParamList); //当前岗位版本存储 rs.executeQuery("select b.id as jobid,b.JOBTITLENAME as jobname,a.ec_department as departmentid," + @@ -574,7 +573,7 @@ public class ChartServiceImpl extends Service implements ChartService { insertList.add(rs.getString("subcompanyid")); insertList.add(rs.getString("subcompany")); insertList.add(rs.getString("jobresponsibility")); - insertList.add(rs.getString("canceled")); + insertList.add(StringUtils.isBlank(rs.getString("canceled")) ? null : rs.getInt("canceled")); insertList.add(rs.getString("jobcode")); insertList.add(rs.getString("description")); insertList.add(currentDate); @@ -583,7 +582,7 @@ public class ChartServiceImpl extends Service implements ChartService { } String insertJobSql = "insert into jcl_chart_job(jobid,creater,jobname,departmentid,department,subcompanyid," + "subcompany,jobresponsibility,canceled,jobcode,description,versiondate,versionid)values(?,?,?,?,?,?,?,?,?,?,?,?,?)"; - insertData(insertJobSql,insertParamList); + insertData(recordSetTrans,insertJobSql,insertParamList); //当前人员版本存储 rs.executeQuery("select a.id as resourceid,workyear,usekind,managerstr,status,sex,accounttype,belongto," + @@ -645,10 +644,10 @@ public class ChartServiceImpl extends Service implements ChartService { "department, subcompanyid, subcompany, costcenter,manager, assistant, workcode, classification, " + "versiondate, policy, degree,versionid,lastname,companyworkyear) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - insertData(insertResourceSql,insertParamList); + insertData(recordSetTrans,insertResourceSql,insertParamList); } - private void virtualDimension(String versionId,String currentUser,String currentDate,String fclass){ + private void virtualDimension(RecordSetTrans recordSetTrans,String versionId,String currentUser,String currentDate,String fclass){ RecordSet rs = new RecordSet(); List insertList; List> insertParamList = new ArrayList<>(); @@ -677,7 +676,7 @@ public class ChartServiceImpl extends Service implements ChartService { } String insertVirtualComSql = "insert into jcl_chart_companyvirtual(companyvirtualid,creater,companyname,companycode,companydesc,showorder,\n" + "canceled,virtualtype,virtualtypedesc,versiondate,versionid) values(?,?,?,?,?,?,?,?,?,?,?)"; - insertData(insertVirtualComSql,insertParamList); + insertData(recordSetTrans,insertVirtualComSql,insertParamList); //虚拟分部版本存储 rs.executeQuery("select a.id as subcompanyvirtualid,a.subcompanyname,a.subcompanycode,a.subcompanydesc," + @@ -708,7 +707,7 @@ public class ChartServiceImpl extends Service implements ChartService { String insertVirtualSubComSql = "insert into jcl_chart_subcompanyvirtual(subcompanyvirtualid, creater, " + "subcompanyname, subcompanycode,subcompanydesc, supsubcompany, supsubcompanyid, company, companyid," + "canceled, virtualtype, tlevel, showorder, versiondate,versionid) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - insertData(insertVirtualSubComSql,insertParamList); + insertData(recordSetTrans,insertVirtualSubComSql,insertParamList); //虚拟部门版本存储 rs.executeQuery("select a.id as departmentvirtualid,a.departmentname,a.departmentcode,a.departmentmark," + @@ -740,7 +739,7 @@ public class ChartServiceImpl extends Service implements ChartService { String insertVirtualDeptSql = "insert into jcl_chart_departmentvirtual(departmentvirtualid, creater, " + "departmentname, departmentcode,departmentmark, supdeptment, supdepid, allsupdepid, subcompany, " + "subcompanyid, canceled, virtualtype, tlevel, showorder, versiondate,versionid) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - insertData(insertVirtualDeptSql,insertParamList); + insertData(recordSetTrans,insertVirtualDeptSql,insertParamList); //虚拟人员版本存储 rs.executeQuery("select resourceid,workyear,usekind,a.managerstr,status,sex,accounttype,belongto,loginid," + @@ -819,12 +818,10 @@ public class ChartServiceImpl extends Service implements ChartService { // "departmentid,managerstr," + // //"virtualtype," + // "versiondate,versionid) values (?,?,?,?,?,?,?)"; - insertData(insertVirtualHrmSql,insertParamList); + insertData(recordSetTrans,insertVirtualHrmSql,insertParamList); } - private void insertData(String insertSql,List> insertParamList) { - RecordSetTrans recordSetTrans = new RecordSetTrans(); - recordSetTrans.setAutoCommit(false);//关闭自动提交 + private void insertData(RecordSetTrans recordSetTrans,String insertSql,List> insertParamList) { try { recordSetTrans.executeBatchSql(insertSql,insertParamList); recordSetTrans.commit();