#HJ-23# 提交最新的代码

feature-LeeD-20221025
shilei 2 years ago
parent a249954a76
commit 984bf49d29

@ -66,7 +66,6 @@ public class SendPortalToReadUtil {
String title = Util.null2String(rs.getString("requestname")) ;
String creator = Util.null2String(rs.getString("loginid")) ;
String workcode = Util.null2String(rs.getString("loginid")) ;
String taskCode = Util.null2String(rs.getString("taskcode")) ;
String nodeId = Util.null2String(rs.getString("nodeid")) ;
String createdate = Util.null2String(rs.getString("createdate")) ;
@ -87,7 +86,6 @@ public class SendPortalToReadUtil {
requestObject.put("center",center);
requestObject.put("title",title);
requestObject.put("creator",creator);
requestObject.put("nodeId",nodeId);
requestObject.put("taskType",taskType);
requestObject.put("actionType",actionType);
@ -110,7 +108,7 @@ public class SendPortalToReadUtil {
" and t2.isremark in ('8','9')\n" +
" and t2.islasttimes = 1\n" +
" and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
" and t2.requestid = "+requestid +" and nodeid = "+noideid ;
" and t2.requestid = "+requestid ;
bb.writeLog("sendToReadDataByNode--sql:"+sql);
rs.executeQuery(sql);
@ -153,7 +151,7 @@ public class SendPortalToReadUtil {
taskArray.add(taskObject);
requestObject.put("taskCode",lcid+"_cs_"+nodeid+"_"+userid);
requestObject.put("taskObjectList",taskObjectList);
requestObject.put("taskObjectList",taskArray);
String auth = username + ":" + passwd;
bb.writeLog("SendPortalToReadUtil--requestObject:"+requestObject.toJSONString());
@ -276,7 +274,6 @@ public class SendPortalToReadUtil {
String title = Util.null2String(rs.getString("requestname"));
requestname = title;
String creator = Util.null2String(rs.getString("loginid"));
String taskCode = Util.null2String(rs.getString("taskcode"));
String nodeId = Util.null2String(rs.getString("nodeid"));
String workcode = Util.null2String(rs.getString("loginid"));
String createdate = Util.null2String(rs.getString("createdate"));
@ -295,7 +292,6 @@ public class SendPortalToReadUtil {
requestObject.put("center", center);
requestObject.put("title", title);
requestObject.put("creator", creator);
requestObject.put("taskCode", taskCode + "_cs_" + nodeId);
requestObject.put("nodeId", nodeId);
requestObject.put("taskType", taskType);
requestObject.put("actionType", actionType);
@ -318,7 +314,7 @@ public class SendPortalToReadUtil {
" and t2.isremark in ('8','9')\n" +
" and t2.islasttimes = 1\n" +
" and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
" and t2.REQUESTID = " + requestid + " and nodeid=" + noideid;
" and t2.REQUESTID = " + requestid ;
bb.writeLog("SendPortalToReadUtil-sendToReadDataByNode--sql:" + sql);
rs.executeQuery(sql);
@ -360,7 +356,7 @@ public class SendPortalToReadUtil {
taskArray.add(taskObject);
requestObject.put("taskCode", lcid + "_cs_" + nodeid + "_" + userid);
requestObject.put("taskObjectList", taskObjectList);
requestObject.put("taskObjectList", taskArray);
String auth = username + ":" + passwd;
bb.writeLog("SendPortalToReadUtil--requestObject:" + requestObject.toJSONString());

@ -1,71 +1,123 @@
package com.engine.dito.excel.cmd;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.formmode.setup.ModeRightInfo;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.interfaces.dito.comInfo.PropBean;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;
public class ImportExcelDeptUtil {
/***
*
* @param datalists
*/
public void operateHrmdepartmentExcel(List<Map<String, String>> datalists)
public Map<String,String> operateHrmdepartmentExcel(List<Map<String, String>> datalists)
{
int scount = 0;
int fcount = 0;
BaseBean bb = new BaseBean();
String subcompany = PropBean.getUfPropValue("excel.subcompany"); //"59";
String supdepid = PropBean.getUfPropValue("excel.supdepid"); //0;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String nowDateTime = sdf.format(new Date());
for (int i = 0; i < datalists.size(); i++)
{
Map<String, String> m = datalists.get(i);
m.forEach((key, value) -> {
System.out.println(key + ":" + value);
});
int ORG_LEVEL = Util.getIntValue(m.get("org_level"));
String ORG_ID = m.get("org_id");
String ORG_TYPE = m.get("org_type");
String PARENT_ORG_ID = m.get("parent_org_id");
String ORG_CODE = m.get("org_code");
String ORG_NAME = m.get("org_name");
//状态正常
String canceled = "";
//一级部门
if (ORG_LEVEL == 1) {
String subcompany = PropBean.getUfPropValue("excel.subcompany"); //"59";
String supdepid = PropBean.getUfPropValue("excel.supdepid"); //0;
boolean flag = insertDepartment(ORG_NAME, ORG_CODE, canceled, subcompany, supdepid, ORG_ID);
if (flag) {
scount++;
} else {
fcount++;
}
}
try{
int ORG_LEVEL = Util.getIntValue(m.get("org_level"));
String ORG_ID = m.get("org_id");
String PARENT_ORG_ID = m.get("parent_org_id");
String ORG_CODE = m.get("org_code");
String ORG_NAME = m.get("org_name");
bb.writeLog("ORG_LEVEL:"+ORG_LEVEL);
bb.writeLog("ORG_ID:"+ORG_ID);
bb.writeLog("PARENT_ORG_ID:"+PARENT_ORG_ID);
bb.writeLog("ORG_CODE:"+ORG_CODE);
bb.writeLog("ORG_NAME:"+ORG_NAME);
String STATUS_CD = m.get("status_cd");
//状态正常
String canceled = "";
//一级部门
if (ORG_LEVEL == 1)
{
if(StringUtils.isNotEmpty(subcompany) && StringUtils.isNotEmpty(supdepid))
{
boolean flag = insertDepartment(ORG_NAME, ORG_CODE, canceled, subcompany, supdepid, ORG_ID);
if(flag){
scount++;
}else{
fcount++;
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage", JSONObject.toJSONString(m));
dataMap.put("errmessage","更新部门SQL语句执行错误");
dataMap.put("systable","organization");
recordErrorData(dataMap);
}
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage", JSONObject.toJSONString(m));
dataMap.put("errmessage","一级部门获取上级部门及分部失败");
dataMap.put("systable","organization");
recordErrorData(dataMap);
}
}else if(ORG_LEVEL > 1){
Map<String, String> map = getSubcompanyid1(datalists, PARENT_ORG_ID);
subcompany = map.get("subcompanyid1");
supdepid = map.get("supdepid");
if(StringUtils.isNotEmpty(subcompany) && StringUtils.isNotEmpty(supdepid))
{
boolean flag = insertDepartment(ORG_NAME, ORG_CODE, canceled, subcompany, supdepid, ORG_ID);
if(flag){
scount++;
}else{
fcount++;
//下及部门
if (ORG_LEVEL > 1) {
Map<String, String> map = new HashMap<String, String>();
map = getSubcompanyid1(datalists, PARENT_ORG_ID);
String subcompany = map.get("subcompanyid1");
String supdepid = map.get("supdepid");
boolean flag = insertDepartment(ORG_NAME, ORG_CODE, canceled, subcompany, supdepid, ORG_ID);
if (flag) {
scount++;
} else {
fcount++;
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage", JSONObject.toJSONString(m));
dataMap.put("errmessage","新增部门SQL语句执行错误");
dataMap.put("systable","organization");
recordErrorData(dataMap);
}
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage", JSONObject.toJSONString(m));
dataMap.put("errmessage","获取上级部门及分部失败");
dataMap.put("systable","organization");
recordErrorData(dataMap);
}
}
}catch (Exception e){
}
}
Map<String,String> dataMap = new HashMap<String, String>();
dataMap.put("scount",scount+"");
dataMap.put("fcount",fcount+"");
return dataMap;
}
@ -80,22 +132,24 @@ public class ImportExcelDeptUtil {
RecordSet rs = new RecordSet();
String subcompanyid1 = "";
String supdepid = "";
for (int i = 0; i < lists.size(); i++) {
for (int i = 0; i < lists.size(); i++)
{
Map<String, String> m = lists.get(i);
String ORG_ID = m.get("org_id");
String ORG_CODE = m.get("org_code");
if (ORG_ID.equals(id)) {
if (ORG_ID.equals(id))
{
rs.execute("select id,subcompanyid1 from hrmdepartment where departmentcode = '" + ORG_CODE + "'");
while (rs.next()) {
if(rs.next())
{
supdepid = Util.null2String(rs.getString("id"));
subcompanyid1 = Util.null2String(rs.getString("subcompanyid1"));
res.put("supdepid", supdepid);
res.put("subcompanyid1", subcompanyid1);
}
}
}
res.put("supdepid", supdepid);
res.put("subcompanyid1", subcompanyid1);
return res;
}
@ -113,52 +167,126 @@ public class ImportExcelDeptUtil {
RecordSet rs = new RecordSet();
boolean flag = false;
BaseBean bb = new BaseBean();
String deptid = "" ;
String sql = "select id from hrmdepartment where departmentcode = ?";
rs.executeQuery(sql,ORG_CODE);
if (rs.next()){
deptid = Util.null2String(rs.getString("id"));
}
if(StringUtils.isEmpty(deptid)){
String deptUpdateSql = " update hrmdepartment set departmentmark=?,departmentname=?,canceled=?," +
" subcompanyid1=?,showorder=?, supdepid=? where id = ? ";
try{
String deptid = "" ;
String sql = "select id from hrmdepartment where departmentcode = ? ";
rs.executeQuery(sql,ORG_CODE);
if (rs.next()){
deptid = Util.null2String(rs.getString("id"));
}
flag = rs.executeUpdate(deptUpdateSql,new Object[]{ORG_NAME,ORG_NAME,canceled,subcompanyid1,ORG_ID,supdepid,deptid});
if(StringUtils.isNotEmpty(deptid))
{
String deptUpdateSql = " update hrmdepartment set departmentmark=?,departmentname=?,canceled=?," +
" subcompanyid1=?,showorder=?, supdepid=? where id = ? ";
}else{
String deptInsertSql = " insert into hrmdepartment(departmentmark,departmentname,departmentcode," +
" canceled,subcompanyid1,supdepid,showorder) values(?,?,?,?,?,?,?) ";
flag = rs.executeUpdate(deptInsertSql, new Object[]{ORG_NAME, ORG_NAME, ORG_CODE, canceled, subcompanyid1, supdepid, ORG_ID});
if(flag){
sql = "select id from hrmdepartment where departmentcode = ?";
rs.executeQuery(sql,ORG_CODE);
flag = rs.executeUpdate(deptUpdateSql,new Object[]{ORG_NAME,ORG_NAME,canceled,subcompanyid1,ORG_ID,supdepid,deptid});
}else{
String deptInsertSql = " insert into hrmdepartment(departmentmark,departmentname,departmentcode," +
" canceled,subcompanyid1,supdepid,showorder) values(?,?,?,?,?,?,?) ";
flag = rs.executeUpdate(deptInsertSql, new Object[]{ORG_NAME, ORG_NAME, ORG_CODE, canceled, subcompanyid1, supdepid, ORG_ID});
if(flag)
{
sql = "select id from hrmdepartment where departmentcode = ?";
rs.executeQuery(sql,ORG_CODE);
if (rs.next()){
deptid = Util.null2String(rs.getString("id"));
}
}
}
if(flag)
{
String departmentdefinedid = "" ;
sql = " select id from hrmdepartmentdefined where deptid= ?";
rs.executeQuery(sql,new Object[]{deptid});
if (rs.next()){
deptid = Util.null2String(rs.getString("id"));
departmentdefinedid = Util.null2String(rs.getString("id"));
}
bb.writeLog("departmentdefinedid:"+departmentdefinedid);
if(StringUtils.isNotEmpty(departmentdefinedid)){
sql = " update hrmdepartmentdefined set orgid = ? where deptid = ?" ;
bb.writeLog("sql:"+sql);
flag = rs.executeUpdate(sql,new Object[]{ORG_ID,deptid});
}else{
sql = " insert into hrmdepartmentdefined(deptid,orgid) values(?,?) " ;
bb.writeLog("sql:"+sql);
flag = rs.executeUpdate(sql,new Object[]{deptid,ORG_ID});
}
}
}catch (Exception e){
}
return flag;
}
if(flag){
String departmentdefinedid = "" ;
sql = " select id from hrmdepartmentdefined where deptid= ?";
rs.executeQuery(sql,new Object[]{deptid});
if (rs.next()){
departmentdefinedid = Util.null2String(rs.getString("id"));
/***
*
* @param dataMap
*/
public void recordErrorData(Map<String,String> dataMap){
String uftable = "uf_orgmq" ;
RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean();
ModeRightInfo mode=new ModeRightInfo();
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");//当前时间日期
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm:ss");
int formmodeid = 0 ;
String modedatacreater = "1" ;
String modedatacreatertype = "0" ;
String modedatacreatedate = sdf1.format(new Date());
String modedatacreatetime = sdf2.format(new Date());
String uuid = UUID.randomUUID().toString();
try {
String sql =" select k.id from modeinfo k \n" +
" 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")));
}
bb.writeLog("departmentdefinedid:"+departmentdefinedid);
if(StringUtils.isNotEmpty(departmentdefinedid)){
sql = " update hrmdepartmentdefined set orgid = ? where deptid = ?" ;
bb.writeLog("sql:"+sql);
rs.executeUpdate(sql,new Object[]{ORG_ID,deptid});
}else{
sql = " insert into hrmdepartmentdefined(deptid,orgid) values(?,?) " ;
bb.writeLog("sql:"+sql);
rs.executeUpdate(sql,new Object[]{deptid,ORG_ID});
String syndate = Util.null2String(dataMap.get("syndate"));
String reqmessage = Util.null2String(dataMap.get("reqmessage"));
String errmessage = Util.null2String(dataMap.get("errmessage"));
String systable = Util.null2String(dataMap.get("systable"));
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});
bb.writeLog("sql;"+sql);
if(flag){
bool++;
}
bb.writeLog("bool;"+bool);
if(bool>0)
{
String dataid = "";
sql = " select * from "+uftable+" where uuid=? ";
bb.writeLog("sql:" + sql);
rs.executeQuery(sql,new Object[]{uuid});
if (rs.next()) {
dataid = Util.null2String(rs.getString("id"));
}
bb.writeLog("sql:" + sql);
bb.writeLog("dataid:" + dataid);
bb.writeLog("modeid:" + formmodeid);
if (org.apache.commons.lang.StringUtils.isNotEmpty(dataid))
{
mode.setNewRight(true);
mode.editModeDataShare(Integer.valueOf(modedatacreater), formmodeid, Integer.parseInt(dataid));
}
}
}catch (Exception e){
bb.writeLog("e:"+e);
}
return flag;
}
}

@ -1,16 +1,18 @@
package com.engine.dito.excel.cmd;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import weaver.conn.RecordSet;
import weaver.formmode.setup.ModeRightInfo;
import weaver.general.BaseBean;
import weaver.general.TimeUtil;
import weaver.general.Util;
import weaver.interfaces.dito.comInfo.PropBean;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.text.SimpleDateFormat;
import java.util.*;
public class ImportExcelPostUtil {
@ -21,45 +23,82 @@ public class ImportExcelPostUtil {
*
* @param datalists
*/
public void operatePostExcel(List<Map<String, String>> datalists)
public Map<String,String> operatePostExcel(List<Map<String, String>> datalists)
{
int scount = 0;
int fcount = 0;
int ecount = 0;
String creater = "1";
String created = TimeUtil.getCurrentTimeString();
String modified = TimeUtil.getCurrentTimeString();
String modifier = "1";
for (int i = 0; i < datalists.size(); i++)
{
try{
Map<String, String> m = datalists.get(i);
String SYS_POST_CODE = Util.null2String(m.get("sys_post_code"));
String SYS_POST_NAME = Util.null2String(m.get("sys_post_name"));
String SYS_POST_DESC = Util.null2String(m.get("sys_post_desc"));
String ORG_ID = Util.null2String(m.get("org_id"));
String deptid = getHrmdepartmentId(ORG_ID);
boolean flag = insertPost(m,SYS_POST_NAME, creater, created, modified, modifier, SYS_POST_CODE, deptid,SYS_POST_DESC);
if (flag) {
scount++;
} else {
fcount++;
for (int i = 0; i < datalists.size(); i++) {
Map<String, String> m = datalists.get(i);
String SYS_POST_CODE = Util.null2String(m.get("SYS_POST_CODE"));
String SYS_POST_NAME = Util.null2String(m.get("SYS_POST_NAME"));
String IS_SYNC = Util.null2String(m.get("IS_SYNC"));
if (!"YES".equals(IS_SYNC)) {
continue;
}
String allname = SYS_POST_NAME;
String ORG_ID = Util.null2String(m.get("ORG_ID"));
Map<String, String> res = getSubcompanyid1(ORG_ID);
String deptid = Util.null2String(res.get("deptid"));
boolean flag = insertPost(allname, creater, created, modified, modifier, SYS_POST_CODE, deptid);
if (flag) {
scount++;
} else {
fcount++;
}
}catch (Exception e){
ecount++;
}
}
}
Map<String,String> map = new HashMap<String,String>();
map.put("scount",scount+"");
map.put("fcount",fcount+"");
map.put("ecount",ecount+"");
return map;
}
private boolean insertPost(String jobtitlename, String creater, String created, String modified, String modifier, String sysPostCode, String departmentId) {
/***
*
* @param
* @param creater
* @param created
* @param modified
* @param modifier
* @param sysPostCode
* @param departmentId
* @param SYS_POST_DESC
* @return
*/
private boolean insertPost(Map<String, String> m,String SYS_POST_NAME, String creater, String created, String modified, String modifier, String sysPostCode, String departmentId,String SYS_POST_DESC) {
RecordSet rs = new RecordSet();
String jobactivitiesid = "233";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String nowDateTime = sdf.format(new Date());
String tableName = "system_post" ;
String defaultJobActivityId = "" ;
String defaultJobActivityName = PropBean.getUfPropValue("defaultJobActivityName");
if(StringUtils.isNotEmpty(defaultJobActivityName))
{
String sql = " select * from hrmjobactivities where jobactivityname = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobActivityName});
if(rs.next()){
defaultJobActivityId = Util.null2String(rs.getString("id"));
}
if(StringUtils.isEmpty(defaultJobActivityId))
{
String defaultJobGroupsId = getDefaultJobGroupsId(created,creater) ;
if(StringUtils.isNotEmpty(defaultJobGroupsId))
{
defaultJobActivityId = getDefaultJobActivityId(defaultJobActivityName,created,creater,defaultJobGroupsId);
}
}
}
boolean iflag = false;
String jobtitlesid = "";
@ -68,15 +107,33 @@ public class ImportExcelPostUtil {
while (rs.next()){
jobtitlesid = Util.null2String(rs.getString("id"));
}
if(StringUtils.isNotEmpty(jobtitlesid)){
String updateHrmjobactivitiesSl = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?";
iflag = rs.executeUpdate(updateHrmjobactivitiesSl,jobtitlename,jobtitlename,modified,modifier,jobtitlesid);
String updateHrmjobactivitiesSl = " update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=?,jobdepartmentid = ? where id=?";
iflag = rs.executeUpdate(updateHrmjobactivitiesSl,SYS_POST_DESC,SYS_POST_NAME,modified,modifier,departmentId,jobtitlesid);
if(!iflag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",JSONObject.toJSONString(m));
dataMap.put("errmessage","系统岗位更新SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}
}else{
String uuid = UUID.randomUUID().toString();
String insertHrmjobactivitiesSql = " insert into hrmjobtitles(jobtitlemark,jobtitlename,jobactivityid,jobdepartmentid,jobtitlecode,created,creater,modified,modifier,uuid) values(?,?,?,?,?,?,?,?,?,?)";
iflag = rs.executeUpdate(insertHrmjobactivitiesSql, new Object[]{jobtitlename, jobtitlename, jobactivitiesid, departmentId, sysPostCode, created, creater, modified, modifier, uuid});
iflag = rs.executeUpdate(insertHrmjobactivitiesSql, new Object[]{SYS_POST_DESC, SYS_POST_NAME, defaultJobActivityId, departmentId, sysPostCode, created, creater, modified, modifier, uuid});
if(!iflag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",JSONObject.toJSONString(m));
dataMap.put("errmessage","系统岗位更新SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}
}
return iflag;
}
@ -86,18 +143,152 @@ public class ImportExcelPostUtil {
* @param ORG_ID
* @return
*/
private Map<String, String> getSubcompanyid1(String ORG_ID) {
Map<String, String> res = new HashMap<String, String>();
private String getHrmdepartmentId(String ORG_ID) {
String deptid = "" ;
RecordSet rs = new RecordSet();
String sql = " select h.id,h.SUBCOMPANYID1 from hrmdepartmentdefined t inner join hrmdepartment h on h.id = t.deptid where orgid = ? " ;
String sql = " select h.id from hrmdepartmentdefined t where t.orgid = ? " ;
rs.executeQuery(sql,new Object[]{ORG_ID});
if (rs.next()) {
String deptid = Util.null2String(rs.getString("id"));
String subcompanyid1 = Util.null2String(rs.getString("subcompanyid1"));
res.put("deptid", deptid);
res.put("subcompanyid1", subcompanyid1);
deptid = Util.null2String(rs.getString("id"));
}
return deptid;
}
/***
*
* @return
*/
public String getDefaultJobGroupsId(String created,String creater){
RecordSet rs = new RecordSet();
String defaultJobGroupsId = "" ;
try{
String defaultJobGroupsName = PropBean.getUfPropValue("defaultJobGroupsName");
if(StringUtils.isNotEmpty(defaultJobGroupsName))
{
String sql = " select id from hrmjobgroups where jobgroupname = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobGroupsName});
if(rs.next()){
defaultJobGroupsId = Util.null2String(rs.getString("id"));
}
if(StringUtils.isEmpty(defaultJobGroupsId))
{
String uuid = UUID.randomUUID().toString();
sql = " insert into hrmjobgroups(jobgroupname,jobgroupremark,created,creater,uuid) values(?,?,?,?,?) ";
boolean flag = rs.executeUpdate(sql,new Object[]{defaultJobGroupsName,defaultJobGroupsName,created,creater,uuid});
if(flag){
sql = " select id from hrmjobgroups where jobgroupname = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobGroupsName});
if(rs.next()){
defaultJobGroupsId = Util.null2String(rs.getString("id"));
}
}
}
}
}catch (Exception e){
}
return res;
return defaultJobGroupsId;
}
/**
*
* @return
*/
public String getDefaultJobActivityId(String defaultJobActivityName,String created,String creater,String defaultJobGroupsId){
RecordSet rs = new RecordSet();
String defaultJobActivityId = "" ;
try{
if(StringUtils.isNotEmpty(defaultJobActivityName))
{
String uuid = UUID.randomUUID().toString();
String sql = " insert into hrmjobactivities(jobactivitymark,jobactivityname,jobgroupid,created,creater,uuid) values(?,?,?,?,?,?) ";
boolean flag = rs.executeUpdate(sql,new Object[]{defaultJobActivityName,defaultJobActivityName,defaultJobGroupsId,created,creater,uuid});
if(flag){
sql = " select id from hrmjobgroups where jobgroupname = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobActivityName});
if(rs.next()){
defaultJobActivityId = Util.null2String(rs.getString("id"));
}
}
}
}catch (Exception e){
}
return defaultJobActivityId;
}
/***
*
* @param dataMap
*/
public void recordErrorData(Map<String,String> dataMap){
String uftable = "uf_orgmq" ;
RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean();
ModeRightInfo mode=new ModeRightInfo();
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");//当前时间日期
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm:ss");
int formmodeid = 0 ;
String modedatacreater = "1" ;
String modedatacreatertype = "0" ;
String modedatacreatedate = sdf1.format(new Date());
String modedatacreatetime = sdf2.format(new Date());
String uuid = UUID.randomUUID().toString();
try {
String sql =" select k.id from modeinfo k \n" +
" 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")));
}
String syndate = Util.null2String(dataMap.get("syndate"));
String reqmessage = Util.null2String(dataMap.get("reqmessage"));
String errmessage = Util.null2String(dataMap.get("errmessage"));
String systable = Util.null2String(dataMap.get("systable"));
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});
bb.writeLog("sql;"+sql);
if(flag){
bool++;
}
bb.writeLog("bool;"+bool);
if(bool>0)
{
String dataid = "";
sql = " select * from "+uftable+" where uuid=? ";
bb.writeLog("sql:" + sql);
rs.executeQuery(sql,new Object[]{uuid});
if (rs.next()) {
dataid = Util.null2String(rs.getString("id"));
}
bb.writeLog("sql:" + sql);
bb.writeLog("dataid:" + dataid);
bb.writeLog("modeid:" + formmodeid);
if (org.apache.commons.lang.StringUtils.isNotEmpty(dataid))
{
mode.setNewRight(true);
mode.editModeDataShare(Integer.valueOf(modedatacreater), formmodeid, Integer.parseInt(dataid));
}
}
}catch (Exception e){
bb.writeLog("e:"+e);
}
}
}

@ -1,96 +1,123 @@
package com.engine.dito.excel.cmd;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.formmode.setup.ModeRightInfo;
import weaver.general.BaseBean;
import weaver.general.TimeUtil;
import weaver.general.Util;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import weaver.interfaces.dito.comInfo.PropBean;
public class ImportExcelResourceUtil {
private final static Logger logger = LoggerFactory.getLogger(ImportExcelResourceUtil.class);
/***
*
* @param datalists
*/
public void operateHrmdepartmentExcel(List<Map<String, String>> datalists)
public Map<String,String> operateHrmResourceExcel(List<Map<String, String>> datalists)
{
int scount = 0;
int fcount = 0;
for (int i = 0; i < datalists.size(); i++) {
Map<String, String> h = datalists.get(i);
//部门id
String ORG_ID = Util.null2String(h.get("org_id"));
String STAFF_CODE = Util.null2String(h.get("staff_code"));
String systemlanguage = "8" ;
String locationid = "2" ;
String seclevel = "20" ;
String createrid = "1" ;
String lastmodid = "1" ;
String pwd = "1";
String creator = "1";
String jobTitleId = "464";
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 STAFF_NAME = Util.null2String(h.get("staff_name"));
String E_MAIL = Util.null2String(h.get("e_mail"));
String MOBILE_PHONE = Util.null2String(h.get("mobile_phone"));
String STATUS_CD = Util.null2String(h.get("status_cd"));
String status = "1";
if("1100".equals(STATUS_CD) || "1200".equals(STATUS_CD) || "1300".equals(STATUS_CD)){
status = "5";
int ecount = 0;
BaseBean bb = new BaseBean();
RecordSet rs = new RecordSet();
String jobTitleId = "" ;
String defaultJobCode = PropBean.getUfPropValue("defaultJobCode");
if(StringUtils.isNotEmpty(defaultJobCode)){
String sql = " select id from hrmjobtitles where jobtitlecode = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobCode});
if(rs.next()){
jobTitleId = Util.null2String(rs.getString("id"));
}
}
Map<String,String> res = getSubcompanyid1(ORG_ID);
String deptId = Util.null2String(res.get("deptid"));
String subcompanyid1 = Util.null2String(res.get("subcompanyid1"));
if(StringUtils.isEmpty(deptId)) continue;
bb.writeLog("jobTitleId:"+jobTitleId);
String systemlanguage = "8" ;
String locationid = "2" ;
String seclevel = "20" ;
String createrid = "1" ;
String lastmodid = "1" ;
String creator = "1";
String pwd = "1";
boolean flag = insertHrmresource( STAFF_CODE, password, STAFF_NAME, deptId, subcompanyid1, creator, E_MAIL, MOBILE_PHONE, jobTitleId, status,
STAFF_ID, systemlanguage, currentDate, currentDateTime, locationid, seclevel, createrid, lastmodid);
if(flag){
scount++;
}else{
fcount++;
for (int i = 0; i < datalists.size(); i++)
{
try{
Map<String, String> h = datalists.get(i);
//部门id
String STAFF_NAME = Util.null2String(h.get("staff_name"));
String ORG_CODE = Util.null2String(h.get("org_code"));
Map<String,String> deptMap = getDepartmentInfo(ORG_CODE);
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"));
String MOBILE_PHONE = Util.null2String(h.get("mobile_phone"));
String STATUS_CD = Util.null2String(h.get("status_cd"));
String EID = Util.null2String(h.get("eid"));
String status = "1";
if("1100".equals(STATUS_CD) || "1200".equals(STATUS_CD) || "1300".equals(STATUS_CD)){
status = "5";
}
String deptId = Util.null2String(deptMap.get("deptid"));
String subcompanyid1 = Util.null2String(deptMap.get("subcompanyid1"));
bb.writeLog("STAFF_NAME:"+STAFF_NAME);
bb.writeLog("STAFF_CODE:"+STAFF_CODE);
bb.writeLog("STAFF_ID:"+STAFF_ID);
bb.writeLog("STATUS_CD:"+STATUS_CD);
bb.writeLog("EID:"+EID);
bb.writeLog("deptId:"+deptId);
bb.writeLog("subcompanyid1:"+subcompanyid1);
if(StringUtils.isEmpty(deptId)) continue;
boolean flag = insertHrmresource( STAFF_CODE, password, STAFF_NAME, deptId, subcompanyid1, creator, E_MAIL, MOBILE_PHONE, jobTitleId, status,
STAFF_ID, systemlanguage, currentDate, currentDateTime, locationid, seclevel, createrid, lastmodid,EID,h);
bb.writeLog("flag:"+flag);
if(flag){
scount++;
}else{
fcount++;
}
}catch (Exception e){
ecount++;
}
}
}
bb.writeLog("scount:"+scount);
bb.writeLog("fcount:"+fcount);
bb.writeLog("ecount:"+ecount);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("scount",scount+"");
dataMap.put("fcount",fcount+"");
dataMap.put("ecount",ecount+"");
dataMap.put("count",datalists.size()+"");
/***
*
* @param ORG_ID
* @return
*/
private Map<String, String> getSubcompanyid1(String ORG_ID)
{
Map<String, String> res = new HashMap<String, String>();
RecordSet rs = new RecordSet();
String sql = " select h.id,h.SUBCOMPANYID1 from hrmdepartmentdefined t inner join hrmdepartment h on h.id = t.deptid where orgid = ? " ;
rs.executeQuery(sql,new Object[]{ORG_ID});
if (rs.next()) {
String deptid = Util.null2String(rs.getString("id"));
String subcompanyid1 = Util.null2String(rs.getString("subcompanyid1"));
res.put("deptid", deptid);
res.put("subcompanyid1", subcompanyid1);
}
return res;
return dataMap;
}
/***
*
* @param STAFF_CODE
@ -114,39 +141,236 @@ public class ImportExcelResourceUtil {
* @return
*/
private boolean insertHrmresource(String STAFF_CODE,String password,String STAFF_NAME,String deptId,String subcompanyid1,String creator,String E_MAIL,String MOBILE_PHONE,String jobTitleId,String status,
String STAFF_ID,String systemlanguage,String currentDate,String currentDateTime,String locationid,String seclevel,String createrid,String lastmodid) {
RecordSet rs = new RecordSet();
boolean flag = false;
String loginid = "";
String sql = " select loginid from hrmresource where workcode=?" ;
String STAFF_ID,String systemlanguage,String currentDate,String currentDateTime,String locationid,String seclevel,String createrid,String lastmodid,String EID,
Map<String,String> exMap) {
String tableName = "staff";
String scopeid = "-1";
String scope = "HrmCustomFieldByInfoType" ;
String cus_staff = PropBean.getUfPropValue("cus_staff") ;
String cus_eid = PropBean.getUfPropValue("cus_eid") ;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String nowDateTime = sdf.format(new Date());
boolean flag = false;
BaseBean bb = new BaseBean();
RecordSet rs = new RecordSet();
String userid = "" ;
String sql = " select loginid,id from hrmresource where workcode=?" ;
rs.executeQuery(sql,new Object[]{STAFF_CODE});
if(rs.next()){
loginid = Util.null2String(rs.getString("loginid"));
userid = Util.null2String(rs.getString("userid"));
}
if(!"".equals(loginid)){
if(StringUtils.isNotEmpty(userid))
{
String userUpdateSql = " update hrmresource set lastname=?,departmentid=?,subcompanyid1=?," +
" creater=?,email=?,mobile=?,jobtitle=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? ";
" creater=?,email=?,mobile=?,jobtitle=?,status=?,dsporder=?,lastmoddate=?,modified=? where id =? ";
flag = rs.executeUpdate(userUpdateSql,new Object[]{STAFF_NAME,deptId,subcompanyid1,creator,E_MAIL,MOBILE_PHONE,jobTitleId,status,STAFF_ID,currentDate,currentDateTime,userid});
bb.writeLog("userUpdateSql:"+userUpdateSql);
if(flag)
{
String seqorder = "" ;
rs.executeQuery(" select seqorder from cus_fielddata where scopeid = ? and scope = ? and id=? ",new Object[]{scopeid,scope,userid} );
if(rs.next()){
seqorder = Util.null2String(rs.getString("seqorder"));
}
bb.writeLog("seqorder:"+seqorder);
flag = rs.executeUpdate(userUpdateSql,new Object[]{STAFF_NAME,deptId,subcompanyid1,creator,E_MAIL,
MOBILE_PHONE,jobTitleId,status,STAFF_ID,currentDate,currentDateTime,STAFF_CODE});
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<String,String> dataMap = new HashMap<String,String>();
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(?,?,?,?,?)";
bb.writeLog("cusInsertSql:"+cusInsertSql);
flag= rs.executeUpdate(cusInsertSql, new Object[]{scope, scopeid, userid, STAFF_ID, EID});
bb.writeLog("deflag2:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",JSONObject.toJSONString(dataMap));
dataMap.put("errmessage","新增人员自定义信息失败");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}
}
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",JSONObject.toJSONString(exMap));
dataMap.put("errmessage","人员更新SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}
}else{
rs.executeProc("HrmResourceMaxId_Get", "");
rs.next();
String id = "" + rs.getInt(1);
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) " +
" values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
" creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," +
" locationid,seclevel,createrid,lastmodid) " +
" values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
flag = rs.executeUpdate(userInsertSql,new Object[]{id,STAFF_CODE,password,STAFF_CODE,STAFF_NAME,deptId,subcompanyid1,
creator,E_MAIL,MOBILE_PHONE,jobTitleId,status,STAFF_ID,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime,
locationid,seclevel,createrid,lastmodid});
bb.writeLog("flag:"+flag);
if(flag)
{
String seqorder = "" ;
rs.executeQuery(" select seqorder from cus_fielddata where scopeid = ? and scope = ? and id=? ",new Object[]{scopeid,scope,userid} );
if(rs.next()){
seqorder = Util.null2String(rs.getString("seqorder"));
}
bb.writeLog("seqorder2:"+seqorder);
if (StringUtils.isNotEmpty(seqorder)) {
String cusUpdateSql = " update cus_fielddata set "+cus_staff+"=?,"+cus_eid+"=? where scope=? and scopeid=? and id=?";
bb.writeLog(cusUpdateSql);
flag = rs.executeUpdate(cusUpdateSql, new Object[]{STAFF_ID, EID, scope,scopeid,id});
bb.writeLog("flag3:"+flag);
if(!flag)
{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage", JSONObject.toJSONString(exMap));
dataMap.put("errmessage","更新人员自定义信息失败");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}
} else {
String cusInsertSql = " insert into cus_fielddata(scope,scopeid,id,"+cus_staff+","+cus_eid+") values(?,?,?,?,?)";
bb.writeLog(cusInsertSql);
flag = rs.executeUpdate(cusInsertSql, new Object[]{scope, scopeid, id, STAFF_ID, EID});
bb.writeLog("flag4:"+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",JSONObject.toJSONString(exMap));
dataMap.put("errmessage","新增人员自定义信息失败");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}
}
}else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",JSONObject.toJSONString(exMap));
dataMap.put("errmessage","人员新增SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}
}
return flag;
}
/***
*
* @param ORG_CODE
* @return
*/
private Map<String, String> getDepartmentInfo(String ORG_CODE)
{
Map<String, String> res = new HashMap<String, String>();
RecordSet rs = new RecordSet();
String deptid = "" ;
String subcompanyid1 = "" ;
try {
String sql = " select id,subcompanyid1 from hrmdepartment h where h.DEPARTMENTCODE = ? " ;
rs.executeQuery(sql,new Object[]{ORG_CODE});
if (rs.next()) {
deptid = Util.null2String(rs.getString("id"));
subcompanyid1 = Util.null2String(rs.getString("subcompanyid1"));
}
}catch (Exception e){
}
res.put("deptid", deptid);
res.put("subcompanyid1", subcompanyid1);
return res;
}
/***
*
*/
public void recordErrorData(Map<String,String> dataMap){
String uftable = "uf_orgmq" ;
RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean();
ModeRightInfo mode=new ModeRightInfo();
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");//当前时间日期
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm:ss");
int formmodeid = 0 ;
String modedatacreater = "1" ;
String modedatacreatertype = "0" ;
String modedatacreatedate = sdf1.format(new Date());
String modedatacreatetime = sdf2.format(new Date());
String uuid = UUID.randomUUID().toString();
try {
String sql =" select k.id from modeinfo k \n" +
" 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")));
}
String syndate = Util.null2String(dataMap.get("syndate"));
String reqmessage = Util.null2String(dataMap.get("reqmessage"));
String errmessage = Util.null2String(dataMap.get("errmessage"));
String systable = Util.null2String(dataMap.get("systable"));
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});
bb.writeLog("sql;"+sql);
if(flag){
bool++;
}
bb.writeLog("bool;"+bool);
if(bool>0)
{
String dataid = "";
sql = " select * from "+uftable+" where uuid=? ";
bb.writeLog("sql:" + sql);
rs.executeQuery(sql,new Object[]{uuid});
if (rs.next()) {
dataid = Util.null2String(rs.getString("id"));
}
bb.writeLog("sql:" + sql);
bb.writeLog("dataid:" + dataid);
bb.writeLog("modeid:" + formmodeid);
if (org.apache.commons.lang.StringUtils.isNotEmpty(dataid))
{
mode.setNewRight(true);
mode.editModeDataShare(Integer.valueOf(modedatacreater), formmodeid, Integer.parseInt(dataid));
}
}
}catch (Exception e){
bb.writeLog("e:"+e);
}
}
}

@ -0,0 +1,300 @@
package com.engine.dito.excel.cmd;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.formmode.setup.ModeRightInfo;
import weaver.general.BaseBean;
import weaver.general.TimeUtil;
import weaver.general.Util;
import weaver.interfaces.dito.comInfo.PropBean;
import java.text.SimpleDateFormat;
import java.util.*;
public class ImportExcelUserPostUtil {
/***
*
* @param datalists
*/
public Map<String,String> operatePostExcel(List<Map<String, String>> datalists)
{
int scount = 0;
int fcount = 0;
int ecount = 0;
RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean();
String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间
String updateStaff = "1";
String tableName = "system_user_post";
for (int i = 0; i < datalists.size(); i++)
{
try{
Map<String, String> m = datalists.get(i);
String SYS_POST_CODE = Util.null2String(m.get("sys_post_code"));
String SYS_USER_CODE = Util.null2String(m.get("sys_user_code"));
String jobtitlesId = "" ;
if(StringUtils.isNotEmpty(SYS_POST_CODE))
{
String queryRoleIdSql = " select id from hrmjobtitles where jobtitlecode=? ";
bb.writeLog("queryRoleIdSql:" + queryRoleIdSql);
rs.executeQuery(queryRoleIdSql, new Object[]{SYS_POST_CODE});
if (rs.next()) {
jobtitlesId = rs.getString("id");
}
}
String userId = "" ;
if(StringUtils.isNotEmpty(SYS_USER_CODE))
{
String sql = " select id from hrmresource where workcode=?";
bb.writeLog("sql:" + sql);
rs.executeQuery(sql, new Object[]{SYS_USER_CODE});
if (rs.next()) {
userId = Util.null2String(rs.getString("id"));
}
}
if(StringUtils.isNotEmpty(userId))
{
String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? ";
bb.writeLog("updateUserJobSql:"+updateUserJobSql);
boolean flag = rs.executeUpdate(updateUserJobSql,new Object[]{jobtitlesId,currentDateTime,updateStaff,userId});
bb.writeLog(" updateUserJobFlag: "+flag);
if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",currentDateTime);
dataMap.put("reqmessage", JSONObject.toJSONString(m));
dataMap.put("errmessage","更新人员岗位sql执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}
}
}catch (Exception e){
ecount++;
}
}
Map<String,String> map = new HashMap<String,String>();
map.put("scount",scount+"");
map.put("fcount",fcount+"");
map.put("ecount",ecount+"");
return map;
}
/***
*
* @param
* @param creater
* @param created
* @param modified
* @param modifier
* @param sysPostCode
* @param departmentId
* @param SYS_POST_DESC
* @return
*/
private boolean insertUserPost(String SYS_POST_NAME, String creater, String created, String modified, String modifier, String sysPostCode, String departmentId,String SYS_POST_DESC) {
RecordSet rs = new RecordSet();
String defaultJobActivityId = "" ;
String defaultJobActivityName = PropBean.getUfPropValue("defaultJobActivityName");
if(StringUtils.isNotEmpty(defaultJobActivityName))
{
String sql = " select * from hrmjobactivities where jobactivityname = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobActivityName});
if(rs.next()){
defaultJobActivityId = Util.null2String(rs.getString("id"));
}
if(StringUtils.isEmpty(defaultJobActivityId))
{
String defaultJobGroupsId = getDefaultJobGroupsId(created,creater) ;
if(StringUtils.isNotEmpty(defaultJobGroupsId))
{
defaultJobActivityId = getDefaultJobActivityId(defaultJobActivityName,created,creater,defaultJobGroupsId);
}
}
}
boolean iflag = false;
String jobtitlesid = "";
String sql = "select id from hrmjobtitles where jobtitlecode = ?";
rs.executeQuery(sql,new Object[]{sysPostCode});
while (rs.next()){
jobtitlesid = Util.null2String(rs.getString("id"));
}
if(StringUtils.isNotEmpty(jobtitlesid)){
String updateHrmjobactivitiesSl = " update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?";
iflag = rs.executeUpdate(updateHrmjobactivitiesSl,SYS_POST_DESC,SYS_POST_NAME,modified,modifier,jobtitlesid);
}else{
String uuid = UUID.randomUUID().toString();
String insertHrmjobactivitiesSql = " insert into hrmjobtitles(jobtitlemark,jobtitlename,jobactivityid,jobdepartmentid,jobtitlecode,created,creater,modified,modifier,uuid) values(?,?,?,?,?,?,?,?,?,?)";
iflag = rs.executeUpdate(insertHrmjobactivitiesSql, new Object[]{SYS_POST_DESC, SYS_POST_NAME, defaultJobActivityId, departmentId, sysPostCode, created, creater, modified, modifier, uuid});
}
return iflag;
}
/***
*
* @param ORG_ID
* @return
*/
private Map<String, String> getSubcompanyid1(String ORG_ID) {
Map<String, String> res = new HashMap<String, String>();
RecordSet rs = new RecordSet();
String sql = " select h.id,h.subcompanyid1 from hrmdepartmentdefined t inner join hrmdepartment h on h.id = t.deptid where t.orgid = ? " ;
rs.executeQuery(sql,new Object[]{ORG_ID});
if (rs.next()) {
String deptid = Util.null2String(rs.getString("id"));
String subcompanyid1 = Util.null2String(rs.getString("subcompanyid1"));
res.put("deptid", deptid);
res.put("subcompanyid1", subcompanyid1);
}
return res;
}
/***
*
* @return
*/
public String getDefaultJobGroupsId(String created,String creater){
RecordSet rs = new RecordSet();
String defaultJobGroupsId = "" ;
try{
String defaultJobGroupsName = PropBean.getUfPropValue("defaultJobGroupsName");
if(StringUtils.isNotEmpty(defaultJobGroupsName))
{
String sql = " select id from hrmjobgroups where jobgroupname = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobGroupsName});
if(rs.next()){
defaultJobGroupsId = Util.null2String(rs.getString("id"));
}
if(StringUtils.isEmpty(defaultJobGroupsId))
{
String uuid = UUID.randomUUID().toString();
sql = " insert into hrmjobgroups(jobgroupname,jobgroupremark,created,creater,uuid) values(?,?,?,?,?) ";
boolean flag = rs.executeUpdate(sql,new Object[]{defaultJobGroupsName,defaultJobGroupsName,created,creater,uuid});
if(flag){
sql = " select id from hrmjobgroups where jobgroupname = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobGroupsName});
if(rs.next()){
defaultJobGroupsId = Util.null2String(rs.getString("id"));
}
}
}
}
}catch (Exception e){
}
return defaultJobGroupsId;
}
/**
*
* @return
*/
public String getDefaultJobActivityId(String defaultJobActivityName,String created,String creater,String defaultJobGroupsId){
RecordSet rs = new RecordSet();
String defaultJobActivityId = "" ;
try{
if(StringUtils.isNotEmpty(defaultJobActivityName))
{
String uuid = UUID.randomUUID().toString();
String sql = " insert into hrmjobactivities(jobactivitymark,jobactivityname,jobgroupid,created,creater,uuid) values(?,?,?,?,?,?) ";
boolean flag = rs.executeUpdate(sql,new Object[]{defaultJobActivityName,defaultJobActivityName,defaultJobGroupsId,created,creater,uuid});
if(flag){
sql = " select id from hrmjobgroups where jobgroupname = ?" ;
rs.executeQuery(sql,new Object[]{defaultJobActivityName});
if(rs.next()){
defaultJobActivityId = Util.null2String(rs.getString("id"));
}
}
}
}catch (Exception e){
}
return defaultJobActivityId;
}
/***
*
* @param dataMap
*/
public void recordErrorData(Map<String,String> dataMap){
String uftable = "uf_orgmq" ;
RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean();
ModeRightInfo mode=new ModeRightInfo();
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");//当前时间日期
SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm:ss");
int formmodeid = 0 ;
String modedatacreater = "1" ;
String modedatacreatertype = "0" ;
String modedatacreatedate = sdf1.format(new Date());
String modedatacreatetime = sdf2.format(new Date());
String uuid = UUID.randomUUID().toString();
try {
String sql =" select k.id from modeinfo k \n" +
" 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")));
}
String syndate = Util.null2String(dataMap.get("syndate"));
String reqmessage = Util.null2String(dataMap.get("reqmessage"));
String errmessage = Util.null2String(dataMap.get("errmessage"));
String systable = Util.null2String(dataMap.get("systable"));
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});
bb.writeLog("sql;"+sql);
if(flag){
bool++;
}
bb.writeLog("bool;"+bool);
if(bool>0)
{
String dataid = "";
sql = " select * from "+uftable+" where uuid=? ";
bb.writeLog("sql:" + sql);
rs.executeQuery(sql,new Object[]{uuid});
if (rs.next()) {
dataid = Util.null2String(rs.getString("id"));
}
bb.writeLog("sql:" + sql);
bb.writeLog("dataid:" + dataid);
bb.writeLog("modeid:" + formmodeid);
if (org.apache.commons.lang.StringUtils.isNotEmpty(dataid))
{
mode.setNewRight(true);
mode.editModeDataShare(Integer.valueOf(modedatacreater), formmodeid, Integer.parseInt(dataid));
}
}
}catch (Exception e){
bb.writeLog("e:"+e);
}
}
}

@ -3,9 +3,9 @@ package com.engine.dito.excel.cmd;
import com.engine.common.biz.AbstractCommonCommand;
import com.engine.common.entity.BizLogContext;
import com.engine.core.interceptor.CommandContext;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.interfaces.dito.comInfo.PropBean;
@ -38,15 +38,15 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand<Map<String,Object>>
}
public void bofore(){
BaseBean bb = new BaseBean();
ReadExcel readExcel = new ReadExcel();
RecordSet rs = new RecordSet();
String imagefileid = Util.null2String(this.params.get("imagefileid"));
String type = Util.null2String(this.params.get("type"));
bb.writeLog("imagefileid:"+imagefileid);
bb.writeLog("type:"+type);
if(StringUtils.isNotEmpty(imagefileid) && StringUtils.isNotEmpty(type)){
String imagefilename = "" ;
String filerealpath = "" ;
String iszip = "" ;
@ -58,39 +58,47 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand<Map<String,Object>>
iszip = Util.null2String(rs.getString("iszip"));
}
if(StringUtils.isNotEmpty(filerealpath) && StringUtils.isNotEmpty(iszip)){
bb.writeLog("filerealpath:"+filerealpath);
bb.writeLog("iszip:"+iszip);
bb.writeLog("imagefilename:"+imagefilename);
if(StringUtils.isNotEmpty(filerealpath) && StringUtils.isNotEmpty(imagefilename))
{
InputStream inputstream = null;
ZipInputStream zin = null;
FileOutputStream fileOutputStream = null;
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
Calendar calendar = Calendar.getInstance();
String dateTime = sdf.format(calendar.getTime());
String ecology_app_root = PropBean.getUfPropValue("ecology_app_root");
String excelupload = ecology_app_root + File.separatorChar +"filesystem"+File.separatorChar+"excelupload"+File.separatorChar+dateTime ;
bb.writeLog("excelupload:"+excelupload);
File exceluploadpath = new File(excelupload);
if(!exceluploadpath.exists()){
bb.writeLog("11111:");
exceluploadpath.mkdir();
}
try {
if ("0".equals(iszip)){
bb.writeLog("imagefilename:"+imagefilename);
if(StringUtils.isNotEmpty(imagefilename))
{
if("0".equals(iszip)){
inputstream = new BufferedInputStream(new FileInputStream(filerealpath));
}else{
zin = new ZipInputStream(new FileInputStream(filerealpath));
if (zin.getNextEntry() != null)
{
inputstream = new BufferedInputStream(zin);
}else{
ZipInputStream zin = new ZipInputStream(new FileInputStream(filerealpath));
if (zin.getNextEntry() != null)
{
inputstream = new BufferedInputStream(zin);
}
}
}
if(StringUtils.isNotEmpty(imagefilename))
{
String excel_upload_path = exceluploadpath.getPath() ;
bb.writeLog("excel_upload_path:"+excel_upload_path);
String excelpath = excel_upload_path + File.separatorChar + imagefilename ;
bb.writeLog("excelpath:"+excelpath);
int byteread;
byte bydata[] = new byte[8*1024];
fileOutputStream = new FileOutputStream(new File(excelpath)) ;
@ -99,24 +107,48 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand<Map<String,Object>>
fileOutputStream.flush() ;
}
List<Map<String, String>> datalists = readExcel.readExcel(excel_upload_path, imagefilename, 0, 0, 0);
operateExcel(type,datalists);
File excelFile = new File(excelpath);
if(excelFile.exists()){
List<Map<String, String>> datalists = readExcel.readExcel(excel_upload_path, imagefilename, 0, 0, 0);
operateExcel(type,datalists);
}
}
inputstream.close();
fileOutputStream.close();;
} catch (FileNotFoundException e) {
e.printStackTrace();
bb.writeLog("FileNotFoundException:"+e);
} catch (IOException e) {
e.printStackTrace();
bb.writeLog("IOException:"+e);
}finally {
try {
if(inputstream !=null){
inputstream.close();
}
} catch (IOException e) {
e.printStackTrace();
}
try {
if(fileOutputStream !=null){
fileOutputStream.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
}
public void operateExcel(String type,List<Map<String, String>> datalists){
BaseBean bb = new BaseBean();
ImportOrgExcelUtil importOrgExcelUtil = new ImportOrgExcelUtil();
ImportExcelResourceUtil importExcelResourceUtil = new ImportExcelResourceUtil();
ImportExcelDeptUtil importExcelDeptUtil = new ImportExcelDeptUtil();
ImportExcelPostUtil importExcelPostUtil = new ImportExcelPostUtil();
if("1".equals(type)){
//部门
@ -129,9 +161,8 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand<Map<String,Object>>
if(isExist){
isExist = importOrgExcelUtil.backupTableByData(departmentdefinedtable,departmentdefinedbaktable);
}
if(isExist){
importExcelDeptUtil.operateHrmdepartmentExcel(datalists);
}
}else if("2".equals(type)){
@ -141,9 +172,8 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand<Map<String,Object>>
String jobtitlesbaktable = "hrmjobtitles_allbak" ;
boolean isExist = importOrgExcelUtil.backupTableByData(jobtitlestable,jobtitlesbaktable);
if(isExist){
importExcelPostUtil.operatePostExcel(datalists);
}
}else if("3".equals(type)){
//人员
String jobtitlestable = "hrmresource" ;
@ -153,11 +183,15 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand<Map<String,Object>>
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);
}
}
}else if("4".equals(type)){
String hrmrolestable = "hrmroles";

@ -1,7 +1,7 @@
package com.engine.dito.excel.cmd;
import lombok.extern.slf4j.Slf4j;
import weaver.conn.RecordSet;
import weaver.general.Util;
public class ImportOrgExcelUtil {
@ -36,9 +36,14 @@ public class ImportOrgExcelUtil {
public boolean checkTableIsExist(String tName){
RecordSet rs = new RecordSet();
boolean isExist = false;
String sql = "SHOW TABLES IN DB_DZJ_DGM WHERE Tables_in_DB_DZJ_DGM = ?";
int cou = 0;
String sql = " select count(*) as cou from information_schema.tables where table_name ='"+tName+"' ";
rs.executeQuery(sql,new Object[]{tName});
if(rs.next()){
cou = Util.getIntValue(Util.null2String(rs.getString("cou")));
}
if(cou > 0)
{
isExist = true;
}
return isExist;

@ -18,6 +18,7 @@ import weaver.interfaces.dito.comInfo.PropBean;
import weaver.interfaces.dito.job.WorkflowAuthModelingUtil;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -35,155 +36,15 @@ public class RequestRemarkCmd extends AbstractCommonCommand<Map<String,Object>>
@Override
public Map<String, Object> execute(CommandContext commandContext) {
WorkflowAuthModelingUtil workflowAuthModelingUtil = new WorkflowAuthModelingUtil();
String lcids = Util.null2String(params.get("lcids")) ;
Map<String,Object> map = workflowAuthModelingUtil.executeData(lcids);
int userid = user.getUID();
String requestid = Util.null2String(params.get("requestid"));
String nodeid = Util.null2String(params.get("nodeid"));
Map<String,Object> map = new HashMap<String,Object>();
String resultCode = sendPortalDoneData(requestid,nodeid,userid+"");
map.put("resultcode",resultCode);
return map;
}
/***
*
*
*
* @param requestid
*/
public void sendTodoDataByNode(String requestid,String userid,String nodeid,String type)
{
String bpm_app_workflowurl = PropBean.getUfPropValue("bpm_app_workflowurl");
String bpm_app_requesturl = PropBean.getUfPropValue("bpm_app_requesturl");
String portal_todourl = PropBean.getUfPropValue("portal_todourl");
String username = PropBean.getUfPropValue("username");
String passwd = PropBean.getUfPropValue("passwd");
String center = PropBean.getUfPropValue("center");
String bpm_workflowurl = PropBean.getUfPropValue("bpm_workflowurl");
HttpRequestUtil httpRequestUtil = new HttpRequestUtil();
RecordSet rs = new RecordSet();
BaseBean bb = new BaseBean();
bb.writeLog("sendTodoDataByNode");
String terminal = "1" ;
String taskType = "0";
String objectId = "" ;
String actionType = "2" ;
String objectAction = "0" ;
String objectType = "0";
try {
JSONArray taskObjectList = new JSONArray();
int count = 0;
String sql =" select t2.userid,h1.loginid,h1.email,t2.isremark,t1.requestid,t2.nodeid\n" +
" from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
" left join (select id, lastname,loginid,email from hrmresource where STATUS = 1 union all select id,lastname,loginid,'' as email from hrmresourcemanager ) h1 on h1.id = t2.userid\n" +
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and t2.isremark in ('2','9')\n" +
" and t2.preisremark in ('8','9')\n" +
" and t2.requestid = "+requestid +" and t2.userid in ("+userid+") and t2.nodeid = "+nodeid;
bb.writeLog("sendTodoDataByNode--sql:"+sql);
rs.executeQuery(sql);
if (rs.next()){
String usercode = Util.null2String(rs.getString("loginid")) ;
String objectCode = usercode ;
String operatorCode = usercode ;
JSONObject taskObject = new JSONObject();
taskObject.put("objectAction",objectAction);
taskObject.put("objectType",objectType);
taskObject.put("objectCode",objectCode);
taskObject.put("objectId",objectId);
taskObject.put("operatorCode",operatorCode);
taskObjectList.add(taskObject);
count++;
}
if(count>0){
JSONObject requestObject = new JSONObject();
sql = " select t1.workflowid,t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" +
" t1.requestid as taskCode,t1.currentnodeid as nodeid,d1.nodename\n" +
" from workflow_requestbase t1\n" +
" inner join workflow_base t3 on t1.workflowid = t3.id\n" +
" left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+
" left join (select id, lastname,loginid from hrmresource where status = 1 union all select id, lastname,loginid from hrmresourcemanager ) h1 on h1.id = t1.creater\n" +
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and t1.requestid = "+requestid ;
bb.writeLog("sendTodoDataByNode--sql:"+sql);
rs.executeQuery(sql);
if (rs.next()){
String workflowid = Util.null2String(rs.getString("workflowid")) ;
String workflowname = getWorkflowname(workflowid);
String title = Util.null2String(rs.getString("requestname")) ;
String creator = Util.null2String(rs.getString("loginid")) ;
String taskCode = Util.null2String(rs.getString("taskcode")) ;
String nodeId = Util.null2String(rs.getString("nodeid")) ;
String workcode = Util.null2String(rs.getString("loginid")) ;
String createdate = Util.null2String(rs.getString("createdate")) ;
String createtime = Util.null2String(rs.getString("createtime")) ;
String messageTitle = Util.null2String(rs.getString("requestname")) ;
messageTitle = getShortMessageTitle(messageTitle);
String messageContent = Util.null2String(rs.getString("requestname")) ;
String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ;
String app_requestUrl = bpm_app_requesturl+requestid;
app_requestUrl = URLEncoder.encode(app_requestUrl,"UTF-8");
String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl;
String replace = bpm_app_workflowurl.replace("/bpm", "");
String urlDing = replace+bpm_app_requesturl+requestid;
bb.writeLog("urlDing", urlDing);
// String urlDing = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl;
String nodeName = Util.null2String(rs.getString("nodeName")) ;
requestObject.put("center",center);
requestObject.put("title",title);
requestObject.put("creator",creator);
requestObject.put("taskCode",taskCode+"_cs_"+nodeId+"_"+userid);
requestObject.put("nodeId",nodeId);
requestObject.put("taskType",taskType);
requestObject.put("actionType",actionType);
requestObject.put("createDate",createdate+" "+createtime);
requestObject.put("messageTitle",messageTitle);
requestObject.put("messageContent",messageContent);
requestObject.put("terminal",terminal);
requestObject.put("urlPc",urlPc);
requestObject.put("urlApp",urlApp);
requestObject.put("urlDing",urlDing);
requestObject.put("nodeName",nodeName);
requestObject.put("ticketType",workflowname);
}
requestObject.put("taskObjectList",taskObjectList);
String auth = username + ":" + passwd;
//bb.writeLog("requestObject:"+requestObject.toJSONString());
String msgdata = httpRequestUtil.doPostByAuth(portal_todourl,requestObject.toJSONString(),auth);
bb.writeLog("msgdata:"+msgdata);
if(!"".equals(msgdata))
{
JSONObject msgObject = JSONObject.parseObject(msgdata);
//{"resultCode":"1","resultMsg":"No Result"}
if(msgObject.containsKey("resultCode")){
String resultCode = msgObject.getString("resultCode");
if("0".equals(resultCode)){
}else{
}
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
/***
*
@ -191,8 +52,9 @@ public class RequestRemarkCmd extends AbstractCommonCommand<Map<String,Object>>
* @param nodeid
* @param userid
*/
public void sendPortalDoneData(String requestid, String nodeid,String userid) {
public String sendPortalDoneData(String requestid, String nodeid,String userid) {
String resultCode = "" ;
String bpm_app_workflowurl = PropBean.getUfPropValue("bpm_app_workflowurl");
String portal_doneurl = PropBean.getUfPropValue("portal_doneurl");
String bpm_app_requesturl = PropBean.getUfPropValue("bpm_app_requesturl");
@ -263,7 +125,7 @@ public class RequestRemarkCmd extends AbstractCommonCommand<Map<String,Object>>
JSONObject requestObject = new JSONObject();
requestObject.put("center", center);
requestObject.put("taskCode", requestid+"-cstj-"+nodeid+"-"+userid);
requestObject.put("taskCode", requestid+"_cs_"+nodeid+"_"+userid);
requestObject.put("nodeId", nodeid);
requestObject.put("ticketType", workflowname);
requestObject.put("title", title);
@ -284,10 +146,10 @@ public class RequestRemarkCmd extends AbstractCommonCommand<Map<String,Object>>
JSONObject msgObject = JSONObject.parseObject(msgdata);
//{"resultCode":"1","resultMsg":"No Result"}
if(msgObject.containsKey("resultCode")){
String resultCode = msgObject.getString("resultCode");
if(!"0".equals(resultCode)){
//sendPortalErrorUtil.doCreateSendPortalTodoErrorInfo();
}
resultCode = msgObject.getString("resultCode");
// if(!"0".equals(resultCode)){
// //sendPortalErrorUtil.doCreateSendPortalTodoErrorInfo();
// }
}
}
}
@ -295,8 +157,9 @@ public class RequestRemarkCmd extends AbstractCommonCommand<Map<String,Object>>
bb.writeLog("done Exception");
bb.writeLog(e.getMessage());
}
}
return resultCode;
}
private String getShortMessageTitle(String messageTitle) {

@ -1230,7 +1230,7 @@ public class RocketmqUtil {
if(StringUtils.isNotEmpty(userid))
{
String seqorder = "" ;
rs.executeQuery(" select seqorder from cus_fielddata where scopeid=? and id=? ",new Object[]{scopeid,userid} );
rs.executeQuery(" select seqorder from cus_fielddata where scopeid=? and scope = ? and id=? ",new Object[]{scopeid,scope,userid} );
if(rs.next()){
seqorder = Util.null2String(rs.getString("seqorder"));
}

Loading…
Cancel
Save