diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 32e05545..e1a17d96 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -743,25 +743,82 @@ public class ChartServiceImpl extends Service implements ChartService { insertData(insertVirtualDeptSql,insertParamList); //虚拟人员版本存储 - rs.executeQuery("select resourceid,a.managerid,b.SUBCOMPANYID1 as subcompanyid,b.departmentid,a.managerstr," + - "virtualtype from hrmresourcevirtual a left join hrmresource b on a.RESOURCEID=b.ID where a.virtualtype=?",fclass); + rs.executeQuery("select resourceid,workyear,usekind,a.managerstr,status,sex,accounttype,belongto,loginid," + + "maritalstatus,b.telephone,mobile,mobilecall,email,c.locationname,resourcetype,startdate,enddate," + + "d.id as jobtitleid,d.JOBTITLENAME as jobtitle,joblevel,seclevel,b.departmentid,e.departmentname as department," + + "b.subcompanyid1 as subcompanyid,f.subcompanyname as subcompany,b.costcenterid as costcenter," + + "b.managerid as manager,b.assistantid as assistant,workcode,classification,policy," + + "a.virtualtype from hrmresourcevirtual a \n" + + "left join hrmresource b on a.RESOURCEID=b.ID\n" + + "left join hrmlocations c on b.locationid=c.id\n" + + "left join hrmjobtitles d on b.jobtitle=d.id\n" + + "left join hrmdepartmentvirtual e on b.DEPARTMENTID=e.id\n" + + "left join hrmsubcompanyvirtual f on b.SUBCOMPANYID1=f.id where a.virtualtype=?",fclass); insertParamList = new ArrayList<>(); while (rs.next()) { insertList = new ArrayList<>(); insertList.add(StringUtils.isBlank(rs.getString("resourceid")) ? null : rs.getInt("resourceid")); - insertList.add(StringUtils.isBlank(rs.getString("managerid")) ? null : rs.getInt("managerid")); - insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid")); - insertList.add(StringUtils.isBlank(rs.getString("departmentid")) ? null : rs.getInt("departmentid")); + insertList.add(currentUser); + insertList.add(StringUtils.isBlank(rs.getString("workyear")) ? null : rs.getString("workyear")); + insertList.add(rs.getString("usekind")); insertList.add(rs.getString("managerstr")); - //insertList.add(rs.getString("virtualtype")); + insertList.add(StringUtils.isBlank(rs.getString("status")) ? null : rs.getInt("status")); + insertList.add(rs.getString("sex")); + insertList.add(StringUtils.isBlank(rs.getString("accounttype")) ? null : rs.getInt("accounttype")); + insertList.add(StringUtils.isBlank(rs.getString("belongto")) ? null : rs.getInt("belongto")); + insertList.add(rs.getString("loginid")); + insertList.add(rs.getString("maritalstatus")); + insertList.add(rs.getString("telephone")); + insertList.add(rs.getString("mobile")); + insertList.add(rs.getString("mobilecall")); + insertList.add(rs.getString("email")); + insertList.add(rs.getString("locationname")); + insertList.add(rs.getString("resourcetype")); + insertList.add(rs.getString("startdate")); + insertList.add(rs.getString("enddate")); + insertList.add(StringUtils.isBlank(rs.getString("jobtitleid")) ? null : rs.getInt("jobtitleid")); + insertList.add(rs.getString("jobtitle")); + insertList.add(StringUtils.isBlank(rs.getString("joblevel")) ? null : rs.getInt("joblevel")); + insertList.add(StringUtils.isBlank(rs.getString("seclevel")) ? null : rs.getInt("seclevel")); + insertList.add(StringUtils.isBlank(rs.getString("departmentid")) ? null : rs.getInt("departmentid")); + insertList.add(rs.getString("department")); + insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid")); + insertList.add(rs.getString("subcompany")); + insertList.add(rs.getString("costcenter")); + insertList.add(StringUtils.isBlank(rs.getString("manager")) ? null : rs.getInt("manager")); + insertList.add(StringUtils.isBlank(rs.getString("assistant")) ? null : rs.getInt("assistant")); + insertList.add(rs.getString("workcode")); + insertList.add(rs.getString("classification")); insertList.add(currentDate); + insertList.add(rs.getString("policy")); + insertList.add(rs.getString("degree")); insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); + insertList.add(rs.getString("lastname")); + insertList.add(StringUtils.isBlank(rs.getString("companyworkyear")) ? null : rs.getString("companyworkyear")); insertParamList.add(insertList); } - String insertVirtualHrmSql = "insert into jcl_chart_resource(resourceid,MANAGER,subcompanyid," + - "departmentid,managerstr," + - //"virtualtype," + - "versiondate,versionid) values (?,?,?,?,?,?,?)"; + String insertVirtualHrmSql = "insert into jcl_chart_resource(resourceid, creater, workyear, usekind, managerstr," + + "status, sex, accounttype,belongto, loginid, maritalstatus, telephone, mobile, mobilecall, email," + + "locationname, resourcetype, startdate, enddate, jobtitleid, jobtitle, joblevel,seclevel, departmentid," + + "department, subcompanyid, subcompany, costcenter,manager, assistant, workcode, classification, " + + "versiondate, policy, degree,versionid,lastname,companyworkyear) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," + + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; +// while (rs.next()) { +// insertList = new ArrayList<>(); +// insertList.add(StringUtils.isBlank(rs.getString("resourceid")) ? null : rs.getInt("resourceid")); +// insertList.add(StringUtils.isBlank(rs.getString("managerid")) ? null : rs.getInt("managerid")); +// insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid")); +// insertList.add(StringUtils.isBlank(rs.getString("departmentid")) ? null : rs.getInt("departmentid")); +// insertList.add(rs.getString("managerstr")); +// //insertList.add(rs.getString("virtualtype")); +// insertList.add(currentDate); +// insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); +// insertParamList.add(insertList); +// } +// String insertVirtualHrmSql = "insert into jcl_chart_resource(resourceid,MANAGER,subcompanyid," + +// "departmentid,managerstr," + +// //"virtualtype," + +// "versiondate,versionid) values (?,?,?,?,?,?,?)"; insertData(insertVirtualHrmSql,insertParamList); }