liang.cheng
/
weaver-hrm-organization
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

版本管理，事务控制bug优化

Browse Source
pull/195/head
Mlin 2 years ago
parent 1abbc7cddf
commit 0a809a29c9
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File

33
src/com/engine/organization/service/impl/ChartServiceImpl.java
Unescape Escape View File

@ -425,18 +425,17 @@ public class ChartServiceImpl extends Service implements ChartService {
if (rs.next()) { if (rs.next()) {
versionId = Util.null2String(rs.getString("id")); versionId = Util.null2String(rs.getString("id"));
} }
if ("0".equals(dimension)) { if ("0".equals(dimension)) {
//实体维度 //实体维度
trueDimension(versionId,currentUser,currentDate); trueDimension(recordSetTrans,versionId,currentUser,currentDate);
} else { } else {
virtualDimension(versionId,currentUser,currentDate,dimension); virtualDimension(recordSetTrans,versionId,currentUser,currentDate,dimension);
} }
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("api_status", true); result.put("api_status", true);
return result; 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(); RecordSet rs = new RecordSet();
rs.execute("delete from jcl_chart_subcompany where versionid = "+versionId); rs.execute("delete from jcl_chart_subcompany where versionid = "+versionId);
rs.execute("delete from jcl_chart_department 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.subcompanyname,\n" +
" a.subcompanydesc,\n" + " a.subcompanydesc,\n" +
" a.companyid as company,\n" + " a.companyid as company,\n" +
" b.supsubcomid as supsubcompanyid,\n" + " a.supsubcomid as supsubcompanyid,\n" +
" b.subcompanyname as supsubcompany,\n" + " b.subcompanyname as supsubcompany,\n" +
" a.canceled,\n" + " a.canceled,\n" +
" a.subcompanycode,\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" + String insertSubSql = "insert into jcl_chart_subcompany(creater, subcompanyid, subcompanyname, subcompanydesc, company,\n" +
" supsubcompanyid, supsubcompany, canceled, subcompanycode, limitusers,\n" + " supsubcompanyid, supsubcompany, canceled, subcompanycode, limitusers,\n" +
" tlevel, versiondate, isvirtual,versionId) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; " tlevel, versiondate, isvirtual,versionId) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
insertData(insertSubSql,insertParamList); insertData(recordSetTrans,insertSubSql,insertParamList);
//当前部门版本存储 //当前部门版本存储
rs.executeQuery(deptQuerySql); 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" + String insertDeptSql = "insert into jcl_chart_department(creater, departmentid, departmentmark, departmentname, subcompanyid,\n" +
" subcompany, supdepartmentid, supdepartment, canceled, departmentcode,\n" + " subcompany, supdepartmentid, supdepartment, canceled, departmentcode,\n" +
" coadjutant, fleader,versiondate, isvirtual,versionid) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; " 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," + 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("subcompanyid"));
insertList.add(rs.getString("subcompany")); insertList.add(rs.getString("subcompany"));
insertList.add(rs.getString("jobresponsibility")); 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("jobcode"));
insertList.add(rs.getString("description")); insertList.add(rs.getString("description"));
insertList.add(currentDate); 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," + String insertJobSql = "insert into jcl_chart_job(jobid,creater,jobname,departmentid,department,subcompanyid," +
"subcompany,jobresponsibility,canceled,jobcode,description,versiondate,versionid)values(?,?,?,?,?,?,?,?,?,?,?,?,?)"; "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," + 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, " + "department, subcompanyid, subcompany, costcenter,manager, assistant, workcode, classification, " +
"versiondate, policy, degree,versionid,lastname,companyworkyear) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," + "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(); RecordSet rs = new RecordSet();
List<Object> insertList; List<Object> insertList;
List<List<Object>> insertParamList = new ArrayList<>(); List<List<Object>> 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" + String insertVirtualComSql = "insert into jcl_chart_companyvirtual(companyvirtualid,creater,companyname,companycode,companydesc,showorder,\n" +
"canceled,virtualtype,virtualtypedesc,versiondate,versionid) values(?,?,?,?,?,?,?,?,?,?,?)"; "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," + 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, " + String insertVirtualSubComSql = "insert into jcl_chart_subcompanyvirtual(subcompanyvirtualid, creater, " +
"subcompanyname, subcompanycode,subcompanydesc, supsubcompany, supsubcompanyid, company, companyid," + "subcompanyname, subcompanycode,subcompanydesc, supsubcompany, supsubcompanyid, company, companyid," +
"canceled, virtualtype, tlevel, showorder, versiondate,versionid) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; "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," + 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, " + String insertVirtualDeptSql = "insert into jcl_chart_departmentvirtual(departmentvirtualid, creater, " +
"departmentname, departmentcode,departmentmark, supdeptment, supdepid, allsupdepid, subcompany, " + "departmentname, departmentcode,departmentmark, supdeptment, supdepid, allsupdepid, subcompany, " +
"subcompanyid, canceled, virtualtype, tlevel, showorder, versiondate,versionid) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; "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," + 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," + // "departmentid,managerstr," +
// //"virtualtype," + // //"virtualtype," +
// "versiondate,versionid) values (?,?,?,?,?,?,?)"; // "versiondate,versionid) values (?,?,?,?,?,?,?)";
insertData(insertVirtualHrmSql,insertParamList); insertData(recordSetTrans,insertVirtualHrmSql,insertParamList);
} }
private void insertData(String insertSql,List<List<Object>> insertParamList) { private void insertData(RecordSetTrans recordSetTrans,String insertSql,List<List<Object>> insertParamList) {
RecordSetTrans recordSetTrans = new RecordSetTrans();
recordSetTrans.setAutoCommit(false);//关闭自动提交
try { try {
recordSetTrans.executeBatchSql(insertSql,insertParamList); recordSetTrans.executeBatchSql(insertSql,insertParamList);
recordSetTrans.commit(); recordSetTrans.commit();

Write Preview
Loading…
Cancel
Save