diff --git a/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java b/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java index 5d836c27..bd57465d 100644 --- a/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java +++ b/src/weaver/interfaces/dito/mq/HrmRocketmqUtil.java @@ -107,6 +107,7 @@ public class HrmRocketmqUtil { dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("reqobject",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("zxyj",sql); dataMap.put("zxcs",convertObject2String(objects)); @@ -116,7 +117,8 @@ public class HrmRocketmqUtil { Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",datasObject.toJSONString()); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("reqobject",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数personno、managerno在cus_fielddata查询为空"); dataMap.put("personno",personno); @@ -127,7 +129,8 @@ public class HrmRocketmqUtil { Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",datasObject.toJSONString()); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("reqobject",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数personno、managerno未空"); recordErrorData(dataMap); @@ -137,7 +140,8 @@ public class HrmRocketmqUtil { Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",datasObject.toJSONString()); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("reqobject",datasObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数status不为1"); dataMap.put("personno",personno); @@ -149,7 +153,7 @@ public class HrmRocketmqUtil { Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",masterInfoObject.toJSONString()); + dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("systable","hrmresource"); dataMap.put("errmessage","入参参数缺少datas"); recordErrorData(dataMap); @@ -207,14 +211,24 @@ public class HrmRocketmqUtil { String errmessage = Util.null2String(dataMap.get("errmessage")); String systable = Util.null2String(dataMap.get("systable")); + String reqobject = Util.null2String(dataMap.get("reqobject")); + if(!reqobject.contains("\\\"")){ + reqobject = reqobject.replace("\"","\""); + } + String zxyj = Util.null2String(dataMap.get("zxyj")); + String zxcs = Util.null2String(dataMap.get("zxcs")); + String zxjg = Util.null2String(dataMap.get("zxjg")); + String personno = Util.null2String(dataMap.get("personno")); + + if(!reqmessage.contains("\\\"")){ reqmessage = reqmessage.replace("\"","\""); } int bool = 0; - sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable)" + - " values(?,?,?,?,?,?,?,?,?,?)" ; - boolean flag = rs.executeUpdate(sql,new Object[]{uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable}); + sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable,reqobject,zxyj,zxcs,zxjg,personno)" + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" ; + boolean flag = rs.executeUpdate(sql,new Object[]{uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable,reqobject,zxyj,zxcs,zxjg,personno}); bb.writeLog("sql;"+sql); if(flag){ bool++; diff --git a/src/weaver/interfaces/dito/mq/RocketmqUtil.java b/src/weaver/interfaces/dito/mq/RocketmqUtil.java index ea75742a..dedb0aa2 100644 --- a/src/weaver/interfaces/dito/mq/RocketmqUtil.java +++ b/src/weaver/interfaces/dito/mq/RocketmqUtil.java @@ -511,7 +511,7 @@ public class RocketmqUtil { if(hrmResourceCount == 0 ){ String deptUpdateSql = " update hrmdepartment set departmentmark=?,departmentname=?,canceled=?," + - " subcompanyid1=?,showorder=?, supdepid=? where departmentcode=? "; + " subcompanyid1=?,showorder=?, supdepid=? where departmentcode=? "; bb.writeLog("deptUpdateSql:"+deptUpdateSql); Object[] objects = new Object[]{departmentmark,departmentmark,canceled,subcompanyid1,orgId,supdepid,orgCode}; @@ -691,8 +691,8 @@ public class RocketmqUtil { if (StringUtils.isNotEmpty(systemUserCode)) { String sql =" select h.id,d.departmentcode from hrmresource h \n" + - " inner join hrmdepartment d on d.id = h.departmentid \n" + - " where loginid='"+systemUserCode+"'"; + " inner join hrmdepartment d on d.id = h.departmentid \n" + + " where loginid='"+systemUserCode+"'"; bb.writeLog("sql:"+sql); rs.executeQuery(sql); if (rs.next()) { @@ -707,112 +707,136 @@ public class RocketmqUtil { // if(StringUtils.isNotBlank(departmentcode)) // { - if(StringUtils.isNotEmpty(roleCode)) { + if(StringUtils.isNotEmpty(roleCode)) { - String queryRoleIdSql = " select id from hrmroles where rolesmark=?"; - rs.executeQuery(queryRoleIdSql, new Object[]{roleCode}); - if (rs.next()) { - roleId = rs.getString("id"); - } + String queryRoleIdSql = " select id from hrmroles where rolesmark=?"; + rs.executeQuery(queryRoleIdSql, new Object[]{roleCode}); + if (rs.next()) { + roleId = rs.getString("id"); } - bb.writeLog("userId:" + userId + " roleId:" + roleId); - - if (StringUtils.isNotEmpty(userId) && StringUtils.isNotEmpty(roleId)) { - //查看是否已存在角色用户关系 - String releationId = ""; - String ifExistSql = "select id from hrmrolemembers where roleid=? and resourceid=?"; - rs.executeQuery(ifExistSql,new Object[]{roleId, userId}); - if (rs.next()) { - releationId = rs.getString("id"); - } - bb.writeLog("userId:" + userId + " roleId:" + roleId + "releationId:" + releationId); - if (StringUtils.isNotEmpty(releationId)) { - if ("D".equals(actType)) { - // 不包含 角色 - if(!set.contains(roleCode)){ - - String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; - bb.writeLog("delHrmrolemembersSql:"+delHrmrolemembersSql); + } + bb.writeLog("userId:" + userId + " roleId:" + roleId); - Object[] objects = new Object[]{releationId}; + if (StringUtils.isNotEmpty(userId) && StringUtils.isNotEmpty(roleId)) { + //查看是否已存在角色用户关系 + String releationId = ""; + String ifExistSql = "select id from hrmrolemembers where roleid=? and resourceid=?"; + rs.executeQuery(ifExistSql,new Object[]{roleId, userId}); + if (rs.next()) { + releationId = rs.getString("id"); + } + bb.writeLog("userId:" + userId + " roleId:" + roleId + "releationId:" + releationId); + if (StringUtils.isNotEmpty(releationId)) { + if ("D".equals(actType)) { + // 不包含 角色 + if(!set.contains(roleCode)){ - boolean flag = rs.executeUpdate(delHrmrolemembersSql, objects); - bb.writeLog("delHrmrolemembersSql : " + flag); - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("systable",tableName); - if (!flag) { - dataMap.put("errmessage","角色成员删除失败"); - }else { - dataMap.put("errmessage","角色成员删除成功"); - } - dataMap.put("staffcode",systemUserCode); + String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; + bb.writeLog("delHrmrolemembersSql:"+delHrmrolemembersSql); - dataMap.put("zxyj",delHrmrolemembersSql); - dataMap.put("zxcs",convertObject2String(objects)); + Object[] objects = new Object[]{releationId}; - recordErrorData(dataMap); - }else{ - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","角色成员系统已存在，操作类型为"+actType+",statusCd为:"+statusCd); - dataMap.put("systable",tableName); - dataMap.put("staffcode",systemUserCode); - recordErrorData(dataMap); + boolean flag = rs.executeUpdate(delHrmrolemembersSql, objects); + bb.writeLog("delHrmrolemembersSql : " + flag); + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("systable",tableName); + if (!flag) { + dataMap.put("errmessage","角色成员删除失败"); + }else { + dataMap.put("errmessage","角色成员删除成功"); } - }else if("M".equals(actType)){ - if("1100".equals(statusCd)){ - String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; - bb.writeLog("delHrmrolemembersSql:"+delHrmrolemembersSql); + dataMap.put("staffcode",systemUserCode); - Object[] objects = new Object[]{releationId}; + dataMap.put("zxyj",delHrmrolemembersSql); + dataMap.put("zxcs",convertObject2String(objects)); - boolean flag = rs.executeUpdate(delHrmrolemembersSql, objects); - bb.writeLog("delHrmrolemembersSql : " + flag); - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("systable",tableName); + recordErrorData(dataMap); + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","角色成员系统已存在，操作类型为"+actType+",statusCd为:"+statusCd); + dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); + recordErrorData(dataMap); + } + }else if("M".equals(actType)){ + if("1100".equals(statusCd)){ + String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; + bb.writeLog("delHrmrolemembersSql:"+delHrmrolemembersSql); - if (!flag) { - dataMap.put("errmessage","角色成员删除失败"); - }else { - dataMap.put("errmessage","角色成员删除成功"); - } - dataMap.put("staffcode",systemUserCode); + Object[] objects = new Object[]{releationId}; - dataMap.put("zxyj",delHrmrolemembersSql); - dataMap.put("zxcs",convertObject2String(objects)); + boolean flag = rs.executeUpdate(delHrmrolemembersSql, objects); + bb.writeLog("delHrmrolemembersSql : " + flag); + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("systable",tableName); - recordErrorData(dataMap); - }else{ - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","角色成员系统已存在，操作类型为"+actType+",statusCd为:"+statusCd); - dataMap.put("systable",tableName); - dataMap.put("staffcode",systemUserCode); - recordErrorData(dataMap); + if (!flag) { + dataMap.put("errmessage","角色成员删除失败"); + }else { + dataMap.put("errmessage","角色成员删除成功"); } + dataMap.put("staffcode",systemUserCode); + + dataMap.put("zxyj",delHrmrolemembersSql); + dataMap.put("zxcs",convertObject2String(objects)); + + recordErrorData(dataMap); }else{ Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","角色成员系统已存在，操作类型为A"); + dataMap.put("errmessage","角色成员系统已存在，操作类型为"+actType+",statusCd为:"+statusCd); dataMap.put("systable",tableName); dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } - } else { - if ("A".equals(actType)) { + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","角色成员系统已存在，操作类型为A"); + dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); + recordErrorData(dataMap); + } + } else { + if ("A".equals(actType)) { + + String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)"; + bb.writeLog("insertHrmrolemembersSql:"+insertHrmrolemembersSql); + Object[] objects = new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()} ; + boolean flag = rs.executeUpdate(insertHrmrolemembersSql,objects); + bb.writeLog("insertHrmrolemembersSql : " + flag); + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("systable",tableName); + if (!flag) { + dataMap.put("errmessage","角色成员新增失败"); + }else { + dataMap.put("errmessage","角色成员新增成功"); + } + dataMap.put("staffcode",systemUserCode); + + dataMap.put("zxyj",insertHrmrolemembersSql); + dataMap.put("zxcs",convertObject2String(objects)); + + recordErrorData(dataMap); + }else if("M".equals(actType)){ + if("1000".equals(statusCd)){ String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)"; bb.writeLog("insertHrmrolemembersSql:"+insertHrmrolemembersSql); + Object[] objects = new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()} ; - boolean flag = rs.executeUpdate(insertHrmrolemembersSql,objects); + boolean flag = rs.executeUpdate(insertHrmrolemembersSql, objects); bb.writeLog("insertHrmrolemembersSql : " + flag); Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); @@ -829,58 +853,34 @@ public class RocketmqUtil { dataMap.put("zxcs",convertObject2String(objects)); recordErrorData(dataMap); - }else if("M".equals(actType)){ - if("1000".equals(statusCd)){ - String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)"; - bb.writeLog("insertHrmrolemembersSql:"+insertHrmrolemembersSql); - - Object[] objects = new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()} ; - - boolean flag = rs.executeUpdate(insertHrmrolemembersSql, objects); - bb.writeLog("insertHrmrolemembersSql : " + flag); - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("systable",tableName); - if (!flag) { - dataMap.put("errmessage","角色成员新增失败"); - }else { - dataMap.put("errmessage","角色成员新增成功"); - } - dataMap.put("staffcode",systemUserCode); - - dataMap.put("zxyj",insertHrmrolemembersSql); - dataMap.put("zxcs",convertObject2String(objects)); - - recordErrorData(dataMap); - }else{ - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","角色成员系统不存在，操作类型为"+actType+",statusCd为:"+statusCd); - dataMap.put("systable",tableName); - dataMap.put("staffcode",systemUserCode); - recordErrorData(dataMap); - } }else{ Map dataMap = new HashMap(); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","角色成员系统不存在，操作类型为D"); + dataMap.put("errmessage","角色成员系统不存在，操作类型为"+actType+",statusCd为:"+statusCd); dataMap.put("systable",tableName); dataMap.put("staffcode",systemUserCode); recordErrorData(dataMap); } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","角色成员系统不存在，操作类型为D"); + dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); + recordErrorData(dataMap); } - }else{ - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","人员角色数据，人员或者角色系统不存在"); - dataMap.put("systable",tableName); - dataMap.put("staffcode",systemUserCode); - recordErrorData(dataMap); } + }else{ + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","人员角色数据，人员或者角色系统不存在"); + dataMap.put("systable",tableName); + dataMap.put("staffcode",systemUserCode); + recordErrorData(dataMap); + } // } else{ // Map dataMap = new HashMap(); // dataMap.put("syndate",nowDateTime); @@ -987,28 +987,28 @@ public class RocketmqUtil { { //当岗位为主岗位时才更新，1：主岗位 // if ("1".equals(defaultFlag)){ - String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? "; - bb.writeLog("updateUserJobSql:"+updateUserJobSql); - Object[] objects = new Object[]{jobtitlesId,currentDateTime,updateStaff,userId}; + String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? "; + bb.writeLog("updateUserJobSql:"+updateUserJobSql); + Object[] objects = new Object[]{jobtitlesId,currentDateTime,updateStaff,userId}; - boolean flag = rs.executeUpdate(updateUserJobSql,objects); - bb.writeLog(" updateUserJobFlag: "+flag); - Map dataMap = new HashMap(); - dataMap.put("syndate",nowDateTime); - dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("systable",tableName); - if(!flag){ - dataMap.put("errmessage","更新人员岗位sql执行错误"); - }else { - dataMap.put("errmessage","更新人员岗位sql执行成功"); - } + boolean flag = rs.executeUpdate(updateUserJobSql,objects); + bb.writeLog(" updateUserJobFlag: "+flag); + Map dataMap = new HashMap(); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("systable",tableName); + if(!flag){ + dataMap.put("errmessage","更新人员岗位sql执行错误"); + }else { + dataMap.put("errmessage","更新人员岗位sql执行成功"); + } - dataMap.put("staffcode",systemUserCode); + dataMap.put("staffcode",systemUserCode); - dataMap.put("zxyj",updateUserJobSql); - dataMap.put("zxcs",convertObject2String(objects)); + dataMap.put("zxyj",updateUserJobSql); + dataMap.put("zxcs",convertObject2String(objects)); - recordErrorData(dataMap); + recordErrorData(dataMap); // } }else if("D".equals(actType)){ jobtitlesId = null; @@ -1317,7 +1317,7 @@ public class RocketmqUtil { String actType = Util.null2String(jsonObject.get("actType")); //String allname = "~`~`7 " + sysPostName + "`~`8 " + sysPostName + "`~`~"; - + String jobtitlemark = sysPostName; String jobtitlename = sysPostName; @@ -1615,7 +1615,7 @@ public class RocketmqUtil { bb.writeLog("status:"+status); String userUpdateSql = " update hrmresource set loginid=?,lastname=?,departmentid=?,subcompanyid1=?," + - " creater=?,email=?,mobile=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; + " creater=?,email=?,mobile=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; Object[] objects = new Object[]{loginid,lastname,deptId,subcompanyid1,creator,email,pwdSmsTel,status,loginedNum,currentDate,currentDateTime,staffCode}; @@ -1641,9 +1641,10 @@ public class RocketmqUtil { recordErrorData(dataMap); }else if("D".equals(actType)){ status = "5"; - String userUpdateSql = " update hrmresource set status=? where workcode=? "; + String staffCodenew = loginid+"_cf_0"; + String userUpdateSql = " update hrmresource set status=?,loginid=?,workcode=? where id=? "; - Object[] objects = new Object[]{status,staffCode}; + Object[] objects = new Object[]{status,staffCodenew,staffCodenew,userid}; bb.writeLog("userUpdateSql:"+userUpdateSql); boolean flag = rs.executeUpdate(userUpdateSql,objects); @@ -1677,12 +1678,13 @@ public class RocketmqUtil { if(status1count == 0) { int status5count = 0; List loginList = new ArrayList(); - sql = " select id,status from hrmresource where (loginid = '"+staffCode+"' or loginid like '"+staffCode+"_cf%') and status = 5"; + sql = " select id from hrmresource where loginid like '"+staffCode+"%' and status = 5" ; +// sql = " select id,status from hrmresource where (loginid = '"+staffCode+"' or loginid like '"+staffCode+"_cf%') and status = 5"; bb.writeLog("loginidisnotnull-sql:" + sql); rs.executeQuery(sql); while (rs.next()) { String user_id = Util.null2String(rs.getString("id")); - String upsql = " update hrmresource set loginid='" + staffCode + "_cf_" + status5count + "',workcode='"+staffCode+"_cf_"+status5count+"' where id = " + user_id; + String upsql = " update hrmresource set loginid='" + staffCode + "_cf_" + status5count + "',workcode='"+staffCode+"_cf_"+status5count+"' where id = " + user_id +" and status = 5 "; bb.writeLog("loginidisnotnull-upsql:" + upsql); loginList.add(upsql); status5count++; @@ -1704,9 +1706,9 @@ public class RocketmqUtil { if(StringUtils.isNotEmpty(id)) { String userInsertSql = " insert into hrmresource(id,loginid,password,workcode,lastname,departmentid,subcompanyid1," + - " creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + - " locationid,seclevel,createrid,lastmodid,outkey) " + - " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + " creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + + " locationid,seclevel,createrid,lastmodid,outkey) " + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; Object[] objects = new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, @@ -1764,12 +1766,12 @@ public class RocketmqUtil { { int status5count = 0; List loginList = new ArrayList(); - sql = " select id from hrmresource where loginid = '"+staffCode+"' and status = 5" ; + sql = " select id from hrmresource where loginid like '"+staffCode+"%' and status = 5" ; bb.writeLog("staff-sql:"+sql); rs.executeQuery(sql); while (rs.next()){ String user_id = Util.null2String(rs.getString("id")) ; - String upsql = " update hrmresource set loginid='" + staffCode + "_cf_" + status5count + "',workcode='"+staffCode+"_cf_"+status5count+"' where id = " + user_id; + String upsql = " update hrmresource set loginid='" + staffCode + "_cf_" + status5count + "',workcode='"+staffCode+"_cf_"+status5count+"' where id = " + user_id +" and status = 5"; bb.writeLog("upsql:"+upsql); loginList.add(upsql); status5count ++ ; @@ -1791,9 +1793,9 @@ public class RocketmqUtil { if(StringUtils.isNotEmpty(id)) { String userInsertSql = " insert into hrmresource(id,loginid,password,workcode,lastname,departmentid,subcompanyid1," + - " creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + - " locationid,seclevel,createrid,lastmodid,outkey) " + - " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + " creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + + " locationid,seclevel,createrid,lastmodid,outkey) " + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; Object[] objects = new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, @@ -1839,13 +1841,102 @@ public class RocketmqUtil { String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工在系统中已存在，操作类型为A，请检查数据" ; recordErrorMessage(staffCode,context); } + }else if("M".equalsIgnoreCase(actType)){ + + int status1count = 0; + sql = " select id from hrmresource where loginid = '"+staffCode+"' and status in(0,1,2,3) " ; + bb.writeLog("staff-M-sql:"+sql); + rs.executeQuery(sql); + if(rs.next()){ + status1count++; + } + bb.writeLog("staff-M-status1count:"+status1count); + if(status1count == 0) + { + int status5count = 0; + List loginList = new ArrayList(); + sql = " select id from hrmresource where loginid like '"+staffCode+"%' and status = 5" ; + bb.writeLog("staff-M-sql:"+sql); + rs.executeQuery(sql); + while (rs.next()){ + String user_id = Util.null2String(rs.getString("id")) ; + String upsql = " update hrmresource set loginid='" + staffCode + "_cf_" + status5count + "',workcode='"+staffCode+"_cf_"+status5count+"' where id = " + user_id +" and status = 5 " ; + bb.writeLog("upsql-M:"+upsql); + loginList.add(upsql); + status5count ++ ; + } + bb.writeLog("staff-M-status5count:"+status5count); + + if(status5count > 0){ + for(String upsql : loginList){ + boolean isTrue = rs.executeUpdate(upsql); + bb.writeLog("isTrue-M:"+isTrue); + } + } + + rs.executeProc("HrmResourceMaxId_Get", ""); + rs.next(); + String id = "" + rs.getInt(1); + bb.writeLog("id-M:"+id); + + if(StringUtils.isNotEmpty(id)) + { + String userInsertSql = " insert into hrmresource(id,loginid,password,workcode,lastname,departmentid,subcompanyid1," + + " creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + + " locationid,seclevel,createrid,lastmodid,outkey) " + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + + Object[] objects = new Object[]{id,staffCode,password,staffCode,lastname,deptId,subcompanyid1, + creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, + locationid,seclevel,createrid,lastmodid,staffId} ; + bb.writeLog("userInsertSql-M:"+userInsertSql); + + + + boolean flag = rs.executeUpdate(userInsertSql,objects); + bb.writeLog("flag-M:"+flag); + + + Map dataMap = new HashMap(); + dataMap.put("staffcodecount",datacount+""); + dataMap.put("staffcode",staffCode); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("systable",tableName); + + dataMap.put("zxyj",userInsertSql); + dataMap.put("zxcs",convertObject2String(objects)); + + if(flag){ + userid = id+""; + dataMap.put("errmessage","人员M新增SQL执行成功"); + }else{ + dataMap.put("errmessage","人员M新增SQL执行错误"); + } + recordErrorData(dataMap); + } + }else{ + bb.writeLog("staff-M-status1count:"+status1count); + Map dataMap = new HashMap(); + dataMap.put("staffcodecount",datacount+""); + dataMap.put("staffcode",staffCode); + dataMap.put("syndate",nowDateTime); + dataMap.put("reqmessage",jsonObject.toJSONString()); + dataMap.put("errmessage","工号:"+staffCode+"的员工现为在职，无法进行M新增，操作类型为M"); + dataMap.put("systable",tableName); + recordErrorData(dataMap); + + String context = "人员staffname:"+staffName+",staffcode:"+staffCode+"的员工在系统中已存在，操作类型为M新增，请检查数据" ; + recordErrorMessage(staffCode,context); + } + }else{ Map dataMap = new HashMap(); dataMap.put("staffcodecount",datacount+""); dataMap.put("staffcode",staffCode); dataMap.put("syndate",nowDateTime); dataMap.put("reqmessage",jsonObject.toJSONString()); - dataMap.put("errmessage","人员在系统中不存在，操作类型为M或者D"); + dataMap.put("errmessage","人员在系统中不存在，操作类型为D"); dataMap.put("systable",tableName); recordErrorData(dataMap); @@ -1862,10 +1953,10 @@ public class RocketmqUtil { seqorder = Util.null2String(rs.getString("seqorder")); } if (StringUtils.isNotEmpty(seqorder)) { - String cusUpdateSql = " update cus_fielddata set "+cus_staff+"=?,"+cus_eid+"=?,"+cus_sysuserid+"=? where scope=? and scopeid=? and id=?"; + String cusUpdateSql = " update cus_fielddata set "+cus_staff+"=?,"+cus_eid+"=? where scope=? and scopeid=? and id=?"; bb.writeLog(cusUpdateSql); - Object[] objects = new Object[]{staffId, eId, sysUserId, scope,scopeid,userid} ; + Object[] objects = new Object[]{staffId, eId, scope,scopeid,userid} ; boolean deflag = rs.executeUpdate(cusUpdateSql, objects); Map dataMap = new HashMap(); @@ -1971,8 +2062,8 @@ public class RocketmqUtil { try { String sql =" select k.id from modeinfo k \n" + - " inner join workflow_bill l on formid = l.id\n" + - " where l.tablename = ? " ; + " inner join workflow_bill l on formid = l.id\n" + + " where l.tablename = ? " ; rs.executeQuery(sql,new Object[]{uftable}); if(rs.next()){ formmodeid = Util.getIntValue(Util.null2String(rs.getString("id"))); @@ -1990,7 +2081,7 @@ public class RocketmqUtil { int bool = 0; sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable,staffcodecount,staffcode,zxyj,zxcs)" + - " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)" ; + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)" ; boolean flag = rs.executeUpdate(sql,new Object[]{uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable,staffcodecount,staffcode,zxyj,zxcs}); bb.writeLog("sql;"+sql); if(flag){ @@ -2046,8 +2137,8 @@ public class RocketmqUtil { BaseBean bb = new BaseBean(); bb.writeLog("recordErrorMessage"); try{ - int code = Util.getIntValue(PropBean.getUfPropValue("MQError"),0); - if(code<0){ + int code = Util.getIntValue(PropBean.getUfPropValue("MQMessageType"),0); + if(code>0){ MessageType messageType = MessageType.newInstance(code); // 消息来源（见文档第四点补充 必填） Set userIdList = new HashSet(); // 接收人id 必填 userIdList.add("1");