From e84289c3e54f05e371b96cf87ac83206fd2005b2 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Thu, 7 Sep 2023 19:15:18 +0800 Subject: [PATCH] =?UTF-8?q?#EC=5FHJ6#=20=E4=BA=BA=E5=91=98Excel=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BC=98=E5=8C=96=E9=BB=98=E8=AE=A4=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/cmd/ImportExcelResourceUtil.java | 67 +++++++++++++------ .../dito/excel/cmd/ImportOrgExcelCmd.java | 25 ++++--- .../dito/excel/cmd/ImportOrgExcelUtil.java | 26 ++++--- 3 files changed, 76 insertions(+), 42 deletions(-) diff --git a/src/com/engine/dito/excel/cmd/ImportExcelResourceUtil.java b/src/com/engine/dito/excel/cmd/ImportExcelResourceUtil.java index 861f63c6..45c1f5ab 100644 --- a/src/com/engine/dito/excel/cmd/ImportExcelResourceUtil.java +++ b/src/com/engine/dito/excel/cmd/ImportExcelResourceUtil.java @@ -45,7 +45,12 @@ public class ImportExcelResourceUtil { String createrid = "1" ; String lastmodid = "1" ; String creator = "1"; - String pwd = "1"; + + String pwd = PropBean.getUfPropValue("user_pwd") ; + String password = DigestUtils.md5Hex(pwd).toUpperCase(); //MD5加密 + String currentDate = TimeUtil.getCurrentDateString();//当前日期 + String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间 + for (int i = 0; i < datalists.size(); i++) { @@ -58,11 +63,6 @@ public class ImportExcelResourceUtil { String STAFF_CODE = Util.null2String(h.get("staff_code")); - String currentDate = TimeUtil.getCurrentDateString();//当前日期 - String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间 - - String password = DigestUtils.md5Hex(pwd).toUpperCase(); //MD5加密 - String STAFF_ID = Util.null2String(h.get("staff_id")); String E_MAIL = Util.null2String(h.get("e_mail")); @@ -153,10 +153,10 @@ public class ImportExcelResourceUtil { BaseBean bb = new BaseBean(); RecordSet rs = new RecordSet(); String userid = "" ; - String sql = " select loginid,id,jobtitle as userid from hrmresource where workcode=?" ; + String sql = " select id,loginid,jobtitle from hrmresource where workcode=?" ; rs.executeQuery(sql,new Object[]{STAFF_CODE}); if(rs.next()){ - userid = Util.null2String(rs.getString("userid")); + userid = Util.null2String(rs.getString("id")); jobTitleId = Util.null2String(rs.getString("jobtitle")); } @@ -177,20 +177,45 @@ public class ImportExcelResourceUtil { bb.writeLog("seqorder:"+seqorder); if (StringUtils.isNotEmpty(seqorder)) { - String cusUpdateSql = " update cus_fielddata set "+cus_staff+"=?,"+cus_eid+"=? where scope=? and scopeid=? and id=?"; - bb.writeLog(cusUpdateSql); - bb.writeLog("cusUpdateSql:"+cusUpdateSql); - flag = rs.executeUpdate(cusUpdateSql, new Object[]{STAFF_ID, EID, scope,scopeid,userid}); - bb.writeLog("flag:"+flag); - if(!flag) - { - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage", JSONObject.toJSONString(dataMap)); - dataMap.put("errmessage","更新人员自定义信息失败"); - dataMap.put("systable",tableName); - recordErrorData(dataMap); + bb.writeLog("cus_staff:"+cus_staff); + bb.writeLog("cus_eid:"+cus_eid); + bb.writeLog("STAFF_ID:"+STAFF_ID); + bb.writeLog("EID:"+EID); + bb.writeLog("scope:"+scope); + bb.writeLog("scopeid:"+scopeid); + bb.writeLog("userid:"+userid); + + if(StringUtils.isNotBlank(STAFF_ID)){ + String cusUpdateSql = " update cus_fielddata set "+cus_staff+"=? where scope=? and scopeid=? and id=?"; + bb.writeLog("cusUpdateSql:"+cusUpdateSql); + flag = rs.executeUpdate(cusUpdateSql, new Object[]{STAFF_ID, scope,scopeid,userid}); + bb.writeLog("flag:"+flag); + if(!flag) + { + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage", JSONObject.toJSONString(dataMap)); + dataMap.put("errmessage","更新人员自定义信息失败"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } + } + + if(StringUtils.isNotBlank(EID)){ + String cusUpdateSql = " update cus_fielddata set "+cus_eid+"=? where scope=? and scopeid=? and id=?"; + bb.writeLog("cusUpdateSql:"+cusUpdateSql); + flag = rs.executeUpdate(cusUpdateSql, new Object[]{ EID, scope,scopeid,userid}); + bb.writeLog("flag:"+flag); + if(!flag) + { + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage", JSONObject.toJSONString(dataMap)); + dataMap.put("errmessage","更新人员自定义信息失败"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + } } } else { String cusInsertSql = " insert into cus_fielddata(scope,scopeid,id,"+cus_staff+","+cus_eid+") values(?,?,?,?,?)"; diff --git a/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java b/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java index 0819ff10..41a932e5 100644 --- a/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java +++ b/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java @@ -179,21 +179,24 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand> } }else if("3".equals(type)){ //人员 - String jobtitlestable = "hrmresource" ; - String jobtitlesbaktable = "hrmresource_allbak" ; + String hrmresourcetable = "hrmresource" ; + String hrmresourcebaktable = "hrmresource_allbak" ; String cusfielddatatable = "cus_fielddata"; String cusfielddatatabakble = "cus_fielddata_allbak" ; - boolean isExist = importOrgExcelUtil.backupTableByData(jobtitlestable,jobtitlesbaktable); - bb.writeLog("isExist:"+isExist); - if(isExist){ - isExist = importOrgExcelUtil.backupTableByData(cusfielddatatable,cusfielddatatabakble); - bb.writeLog("isExist:"+isExist); - if(isExist){ - importExcelResourceUtil.operateHrmResourceExcel(datalists); - } - } +// try{ +// boolean isExist = importOrgExcelUtil.backupTableByData(hrmresourcetable,hrmresourcebaktable); +// bb.writeLog("isExist:"+isExist); +// if(isExist){ +// isExist = importOrgExcelUtil.backupTableByData(cusfielddatatable,cusfielddatatabakble); +// bb.writeLog("isExist:"+isExist); +// } +// }catch (Exception e){ +// bb.writeLog("operateExcel--e:"+e); +// } + + importExcelResourceUtil.operateHrmResourceExcel(datalists); }else if("4".equals(type)){ //角色 diff --git a/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java b/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java index 17a9e976..44a24411 100644 --- a/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java +++ b/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java @@ -1,26 +1,32 @@ package com.engine.dito.excel.cmd; import weaver.conn.RecordSet; +import weaver.general.BaseBean; import weaver.general.Util; public class ImportOrgExcelUtil { public boolean backupTableByData(String tName,String bName){ + boolean isExist = true; + BaseBean bb = new BaseBean(); RecordSet rs = new RecordSet(); - boolean isExist = checkTableIsExist(bName); - if(!isExist){ - String sql = " create table "+bName+" select * from "+tName ; - isExist = rs.executeUpdate(sql); - } - if(isExist){ - String sql = " delete from "+bName ; - isExist = rs.executeUpdate(sql); + try{ + isExist = checkTableIsExist(bName); + if(!isExist){ + String sql = " create table "+bName+" select * from "+tName ; + isExist = rs.executeUpdate(sql); + } if(isExist){ - sql = " insert into "+bName+" select * from "+tName ; + String sql = " delete from "+bName ; isExist = rs.executeUpdate(sql); + if(isExist){ + sql = " insert into "+bName+" select * from "+tName ; + isExist = rs.executeUpdate(sql); + } } + }catch (Exception e){ + bb.writeLog("backupTableByData-e:"+e); } - return isExist; }