shilei
/
haojing
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

liuliang

Browse Source
feature-LeeD-20221025
liuliang 2 years ago
parent 9e927a8a8b
commit 34054f5545
8 changed files with 241 additions and 148 deletions
Show Stats Download Patch File Download Diff File

7
src/com/api/signature/GetDocSignatureWebAction.java
Unescape Escape View File

@ -1,7 +0,0 @@
package com.api.signature;
import javax.ws.rs.Path;
@Path("/docSign")
public class GetDocSignatureWebAction extends com.engine.haojing.web.GetDocSignatureWebAction {
}

9
src/com/api/signature/GetDocSignatureWebActionApi.java
Unescape Escape View File

@ -0,0 +1,9 @@
package com.api.signature;
import com.engine.signature.GetDocSignatureWebAction;
import javax.ws.rs.Path;
@Path("/docSign")
public class GetDocSignatureWebActionApi extends GetDocSignatureWebAction {
}

4
src/com/customization/dito/sendtodo/SendPortalTodoCmd.java
Unescape Escape View File

@ -86,8 +86,8 @@ public class SendPortalTodoCmd extends AbstractCommandProxy<Map<String,Object>>
} }
SendPortalTodoRunnable sendPortalTodoRunnable = new SendPortalTodoRunnable(src,new_requestid,requestid,nodeid,user); // SendPortalTodoRunnable sendPortalTodoRunnable = new SendPortalTodoRunnable(src,new_requestid,requestid,nodeid,user);
new Thread(sendPortalTodoRunnable).start(); // new Thread(sendPortalTodoRunnable).start();
} }
return result; return result;

10
src/com/customization/dito/sendtodo/SendPortalTodoUtil.java
Unescape Escape View File

@ -660,12 +660,16 @@ public class SendPortalTodoUtil {
emailArray += StringUtils.isEmpty(emailArray) ? email : ","+email ; emailArray += StringUtils.isEmpty(emailArray) ? email : ","+email ;
} }
} }
requestObject.put("taskObjectList",taskObjectList); if (taskObjectList.size() >0){
// if (taskObjectList.size() > 0){ requestObject.put("taskObjectList",taskObjectList);
}else {
requestObject.put("actionType","3");
}
//if (taskObjectList.size() > 0){
String auth = username + ":" + passwd; String auth = username + ":" + passwd;
//bb.writeLog("requestObject:"+requestObject.toJSONString()); //bb.writeLog("requestObject:"+requestObject.toJSONString());
msgdata = httpRequestUtil.doPostByAuth(portal_todourl,requestObject.toJSONString(),auth); msgdata = httpRequestUtil.doPostByAuth(portal_todourl,requestObject.toJSONString(),auth);
// } //}
} }
bb.writeLog("msgdata:"+msgdata); bb.writeLog("msgdata:"+msgdata);
if(!"".equals(msgdata)){ if(!"".equals(msgdata)){

40
src/com/customization/dito/sendtodo/SendPortalWithAddDoneCmd.java
Unescape Escape View File

@ -114,6 +114,41 @@ public class SendPortalWithAddDoneCmd {
if(rs.next()){ if(rs.next()){
num = rs.getInt("num"); num = rs.getInt("num");
} }
//判断是否为转发节点
sql = "SELECT c1."+PropBean.getUfPropValue("cus_staff")+" as staffid FROM workflow_currentoperator t1 left join cus_fielddata c1 on c1.id = t1.userid and c1.scopeid= "+scopeid+" and c1.scope = '"+scope+"' WHERE t1.preisremark=1 and t1.REQUESTID=? and t1.USERID=?";
rs.executeQuery(sql);
if (rs.next()){
//删除转发的待办
JSONObject jsonObject = new JSONObject();
jsonObject.put("center",center);
jsonObject.put("title",doneMap.get("requestname"));
jsonObject.put("creator",doneMap.get("creater"));
jsonObject.put("taskCode","weaver"+requestid);
jsonObject.put("taskType","0");
jsonObject.put("actionType","1");
jsonObject.put("createDate",processTime);
jsonObject.put("messageTitle",getShortMessageTitle(doneMap.get("requestname").toString()));
jsonObject.put("messageContent",doneMap.get("requestname"));
jsonObject.put("terminal","1");
jsonObject.put("urlPc",urlPc);
jsonObject.put("urlApp",urlApp);
jsonObject.put("urlDing",urlDing);
jsonObject.put("nodeName",doneMap.get("nodename"));
jsonObject.put("ticketType",doneMap.get("workflowname"));
JSONArray list = new JSONArray();
JSONObject taskObject = new JSONObject();
list.add(taskObject);
taskObject.put("objectAction","1");
taskObject.put("objectType","0");
taskObject.put("objectCode",doneMap.get("loginid"));
taskObject.put("objectId",rs.getString("staffid"));
taskObject.put("operatorCode",doneMap.get("loginid"));
jsonObject.put("taskObjectList",list);
}
if (num == 0){ if (num == 0){
bb.writeLog("num :"+num+",userid"+doneMap.get("id")); bb.writeLog("num :"+num+",userid"+doneMap.get("id"));
@ -121,6 +156,7 @@ public class SendPortalWithAddDoneCmd {
String workflowname = Util.null2String(doneMap.get("workflowname")); String workflowname = Util.null2String(doneMap.get("workflowname"));
String requestname = Util.null2String(doneMap.get("requestname")); String requestname = Util.null2String(doneMap.get("requestname"));
String loginid = Util.null2String(doneMap.get("loginid")); String loginid = Util.null2String(doneMap.get("loginid"));
String creater = Util.null2String(doneMap.get("creater"));
String nodeName = Util.null2String(doneMap.get("nodename")); String nodeName = Util.null2String(doneMap.get("nodename"));
JSONObject requestObject = new JSONObject(); JSONObject requestObject = new JSONObject();
requestObject.put("center", center); requestObject.put("center", center);
@ -128,8 +164,8 @@ public class SendPortalWithAddDoneCmd {
requestObject.put("nodeId", nodeid); requestObject.put("nodeId", nodeid);
requestObject.put("ticketType", workflowname); requestObject.put("ticketType", workflowname);
requestObject.put("title", requestname); requestObject.put("title", requestname);
requestObject.put("creator", loginid); requestObject.put("creator", creater);
requestObject.put("processStaff", loginid); requestObject.put("processStaff", creater);
requestObject.put("processTime", processTime); requestObject.put("processTime", processTime);
requestObject.put("isRecall", isRecall); requestObject.put("isRecall", isRecall);
requestObject.put("actionType", actionType); requestObject.put("actionType", actionType);

57
src/com/customization/dito/sendtodo/SendPortalWithAddTodoCmd.java
Unescape Escape View File

@ -77,11 +77,16 @@ public class SendPortalWithAddTodoCmd {
String terminal = "1" ; String terminal = "1" ;
String taskType = "0"; String taskType = "0";
String actionType = "2" ; String actionType = "0" ;
String objectAction = "0" ; String objectAction = "0" ;
String objectType = "0"; String objectType = "0";
try { try {
bb.writeLog("SendPortalWithAddTodoCmd sleep start");
Thread.sleep(1000);
bb.writeLog("sleep end ");
String sql = ""; String sql = "";
String processTime = DateUtil.getCurrentTime("yyyy-MM-dd HH:mm:ss"); String processTime = DateUtil.getCurrentTime("yyyy-MM-dd HH:mm:ss");
@ -150,28 +155,28 @@ public class SendPortalWithAddTodoCmd {
for (Map<String,Object> todoMap: todolist){ for (Map<String,Object> todoMap: todolist){
JSONObject taskObject = new JSONObject(); JSONObject taskObject = new JSONObject();
sql = " select count(0) num "+ // sql = " select count(0) num "+
" from workflow_requestbase t1\n" + // " from workflow_requestbase t1\n" +
" inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" + // " inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" +
" left join cus_fielddata c1 on c1.id = t2.userid and c1.scopeid= "+scopeid+" and c1.scope = '"+scope+"' "+ // " left join cus_fielddata c1 on c1.id = t2.userid and c1.scopeid= "+scopeid+" and c1.scope = '"+scope+"' "+
" 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" + // " 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" +
" left join workflow_nodebase d1 on d1.id = t2.nodeid "+ // " left join workflow_nodebase d1 on d1.id = t2.nodeid "+
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + // " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and t1.currentnodetype <> 3"+ // " and t1.currentnodetype <> 3"+
" and t2.isremark in ('2','9','8')\n" + // " and t2.isremark in ('2','9','8')\n" +
" and t2.preisremark in ('8','9')\n" + // " and t2.preisremark in ('8','9')\n" +
" and t2.islasttimes = 1\n" + // " and t2.islasttimes = 1\n" +
" and (t2.isprocessing = '' or t2.isprocessing is null)\n" + // " and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
" and t2.requestid = "+requestid + " and t2.userid = "+todoMap.get("id"); // " and t2.requestid = "+requestid + " and t2.userid = "+todoMap.get("id");
rs.executeQuery(sql); // rs.executeQuery(sql);
int num = 0; // int num = 0;
if(rs.next()){ // if(rs.next()){
num = rs.getInt("num"); // num = rs.getInt("num");
} // }
if (num > 0){ // if (num > 0){
continue; // continue;
} // }
bb.writeLog("num :"+num+",userid:"+todoMap.get("id")); // bb.writeLog("num :"+num+",userid:"+todoMap.get("id"));
sql = " select t2.userid,h1.loginid,h1.lastname,h1.email,t2.isremark,t1.requestid,t2.nodeid,d1.nodename,c1."+cus_staff+" as staffid "+ sql = " select t2.userid,h1.loginid,h1.lastname,h1.email,t2.isremark,t1.requestid,t2.nodeid,d1.nodename,c1."+cus_staff+" as staffid "+
" from workflow_requestbase t1\n" + " from workflow_requestbase t1\n" +
@ -180,8 +185,10 @@ public class SendPortalWithAddTodoCmd {
" 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" + " 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" +
" left join workflow_nodebase d1 on d1.id = t2.nodeid "+ " left join workflow_nodebase d1 on d1.id = t2.nodeid "+
" where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" +
" and t1.currentnodetype = 3"+ // " and t1.currentnodetype = 3"+
" and ((t2.isremark = '8' and t2.preisremark='8') or (t2.isremark = '9' and t2.preisremark='9'))\n" + // " and ((t2.isremark = '8' and t2.preisremark='8') or (t2.isremark = '9' and t2.preisremark='9'))\n" +
" and t2.isremark in ('2','9','8')\n" +
" and t2.preisremark in ('8','9')\n" +
" and t2.islasttimes = 1\n" + " and t2.islasttimes = 1\n" +
" and (t2.isprocessing = '' or t2.isprocessing is null)\n" + " and (t2.isprocessing = '' or t2.isprocessing is null)\n" +
" and t2.requestid = "+requestid+ " and t2.userid = "+todoMap.get("id"); " and t2.requestid = "+requestid+ " and t2.userid = "+todoMap.get("id");

261
src/weaver/interfaces/dito/mq/RocketmqUtil.java
Unescape Escape View File

@ -190,30 +190,33 @@ public class RocketmqUtil {
boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email, boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email,
pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode}); pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员信息更新sql执行错误"); dataMap.put("errmessage","人员信息更新sql执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
}else {
dataMap.put("errmessage","人员信息更新sql执行成功");
} }
recordErrorData(dataMap);
}else if("D".equals(actType)){ }else if("D".equals(actType)){
status = "5"; status = "5";
String userUpdateSql = " update hrmresource set status=? where workcode=? "; String userUpdateSql = " update hrmresource set status=? where workcode=? ";
bb.writeLog("userUpdateSql:"+userUpdateSql); bb.writeLog("userUpdateSql:"+userUpdateSql);
boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{status,staffCode}); boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{status,staffCode});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员离职更新sql执行错误"); dataMap.put("errmessage","人员离职更新sql执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","人员离职更新sql执行成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -244,14 +247,16 @@ public class RocketmqUtil {
creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime,
locationid,seclevel,createrid,lastmodid}); locationid,seclevel,createrid,lastmodid});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员新增sql执行错误"); dataMap.put("errmessage","人员新增sql执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","人员新增sql执行成功");
} }
recordErrorData(dataMap);
} }
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
@ -357,14 +362,16 @@ public class RocketmqUtil {
bb.writeLog("deptUpdateSql:"+deptUpdateSql); bb.writeLog("deptUpdateSql:"+deptUpdateSql);
boolean flag = rs.executeUpdate(deptUpdateSql,new Object[]{departmentmark,departmentmark,subcompanyid1,orgId,supdepid,orgCode}); boolean flag = rs.executeUpdate(deptUpdateSql,new Object[]{departmentmark,departmentmark,subcompanyid1,orgId,supdepid,orgCode});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","更新部门SQL语句执行错误"); dataMap.put("errmessage","更新部门SQL语句执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","更新部门SQL语句执行成功");
} }
recordErrorData(dataMap);
}else if("D".equalsIgnoreCase(actType)) }else if("D".equalsIgnoreCase(actType))
{ {
canceled = "1"; canceled = "1";
@ -382,15 +389,16 @@ public class RocketmqUtil {
bb.writeLog("deptUpdateSql:"+deptUpdateSql); bb.writeLog("deptUpdateSql:"+deptUpdateSql);
boolean flag = rs.executeUpdate(deptUpdateSql,new Object[]{departmentmark,departmentmark,canceled,subcompanyid1,orgId,supdepid,orgCode}); boolean flag = rs.executeUpdate(deptUpdateSql,new Object[]{departmentmark,departmentmark,canceled,subcompanyid1,orgId,supdepid,orgCode});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","封存部门SQL语句执行错误"); dataMap.put("errmessage","封存部门SQL语句执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","封存部门SQL语句执行成功");
} }
recordErrorData(dataMap);
} }
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
@ -407,14 +415,16 @@ public class RocketmqUtil {
bb.writeLog("deptInsertSql:"+deptInsertSql); bb.writeLog("deptInsertSql:"+deptInsertSql);
boolean flag = rs.executeUpdate(deptInsertSql,new Object[]{departmentmark,departmentmark,orgCode,subcompanyid1,supdepid,orgId}); boolean flag = rs.executeUpdate(deptInsertSql,new Object[]{departmentmark,departmentmark,orgCode,subcompanyid1,supdepid,orgId});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","新增部门SQL语句执行错误"); dataMap.put("errmessage","新增部门SQL语句执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","新增部门SQL语句执行成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -552,14 +562,16 @@ public class RocketmqUtil {
String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?";
boolean flag = rs.executeUpdate(delHrmrolemembersSql, releationId); boolean flag = rs.executeUpdate(delHrmrolemembersSql, releationId);
bb.writeLog("delHrmrolemembersSql : " + flag); bb.writeLog("delHrmrolemembersSql : " + flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if (!flag) { if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","角色成员新增失败"); dataMap.put("errmessage","角色成员新增失败");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","角色成员新增成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -573,14 +585,16 @@ public class RocketmqUtil {
String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)"; String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)";
boolean flag = rs.executeUpdate(insertHrmrolemembersSql, new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()}); boolean flag = rs.executeUpdate(insertHrmrolemembersSql, new Object[]{roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()});
bb.writeLog("insertHrmrolemembersSql : " + flag); bb.writeLog("insertHrmrolemembersSql : " + flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if (!flag) { if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","角色成员新增失败"); dataMap.put("errmessage","角色成员新增失败");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","角色成员新增成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -645,6 +659,7 @@ public class RocketmqUtil {
String systemUserCode = Util.null2String(jsonObject.get("systemUserCode")); String systemUserCode = Util.null2String(jsonObject.get("systemUserCode"));
String orgCode = Util.null2String(jsonObject.get("orgCode")); String orgCode = Util.null2String(jsonObject.get("orgCode"));
String actType = Util.null2String(jsonObject.get("actType")); String actType = Util.null2String(jsonObject.get("actType"));
String defaultFlag = Util.null2String(jsonObject.get("defaultFlag"));
String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间 String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间
String updateStaff = Util.null2String(jsonObject.get("updateStaff")); String updateStaff = Util.null2String(jsonObject.get("updateStaff"));
if(StringUtils.isEmpty(updateStaff)){ if(StringUtils.isEmpty(updateStaff)){
@ -685,32 +700,39 @@ public class RocketmqUtil {
{ {
if("A".equals(actType) || "M".equals(actType)) if("A".equals(actType) || "M".equals(actType))
{ {
String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? "; //当岗位为主岗位时才更新，1：主岗位
bb.writeLog("updateUserJobSql:"+updateUserJobSql); if ("1".equals(defaultFlag)){
boolean flag = rs.executeUpdate(updateUserJobSql,new Object[]{jobtitlesId,currentDateTime,updateStaff,userId}); String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? ";
bb.writeLog(" updateUserJobFlag: "+flag); bb.writeLog("updateUserJobSql:"+updateUserJobSql);
if(!flag){ boolean flag = rs.executeUpdate(updateUserJobSql,new Object[]{jobtitlesId,currentDateTime,updateStaff,userId});
bb.writeLog(" updateUserJobFlag: "+flag);
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString()); dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","更新人员岗位sql执行错误");
dataMap.put("systable",tableName); dataMap.put("systable",tableName);
if(!flag){
dataMap.put("errmessage","更新人员岗位sql执行错误");
}else {
dataMap.put("errmessage","更新人员岗位sql执行成功");
}
recordErrorData(dataMap); recordErrorData(dataMap);
} }
}else if("D".equals(actType)){ }else if("D".equals(actType)){
jobtitlesId = "" ; jobtitlesId = null;
String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? "; String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? ";
bb.writeLog("updateUserJobSql:"+updateUserJobSql); bb.writeLog("updateUserJobSql:"+updateUserJobSql);
boolean flag = rs.executeUpdate(updateUserJobSql,new Object[]{jobtitlesId,currentDateTime,updateStaff,userId}); boolean flag = rs.executeUpdate(updateUserJobSql,new Object[]{jobtitlesId,currentDateTime,updateStaff,userId});
bb.writeLog(" updateUserJobFlag: "+flag); bb.writeLog(" updateUserJobFlag: "+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","删除人员岗位sql执行错误"); dataMap.put("errmessage","删除人员岗位sql执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","删除人员岗位sql执行成功");
} }
recordErrorData(dataMap);
} }
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
@ -815,14 +837,16 @@ public class RocketmqUtil {
String updateHrmrolesSql = " update hrmroles set rolesmark=?,rolesname=? where id=?"; String updateHrmrolesSql = " update hrmroles set rolesmark=?,rolesname=? where id=?";
boolean flag = rs.executeUpdate(updateHrmrolesSql, new Object[]{sysRoleName, sysRoleName, rolesid}); boolean flag = rs.executeUpdate(updateHrmrolesSql, new Object[]{sysRoleName, sysRoleName, rolesid});
bb.writeLog("updateHrmroles : " + flag); bb.writeLog("updateHrmroles : " + flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if (!flag) { if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统角色更新SQL执行错误"); dataMap.put("errmessage","系统角色更新SQL执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","系统角色更新SQL执行成功");
} }
recordErrorData(dataMap);
}else if("D".equals(actType)) { }else if("D".equals(actType)) {
int membercount = 0; int membercount = 0;
String queryHrmRolesSql = " select id from hrmrolemembers where roleid = ?"; String queryHrmRolesSql = " select id from hrmrolemembers where roleid = ?";
@ -833,14 +857,16 @@ public class RocketmqUtil {
if(membercount == 0){ if(membercount == 0){
String deleteHrmRolesSql = " delete from hrmroles where id = ?"; String deleteHrmRolesSql = " delete from hrmroles where id = ?";
boolean flag = rs.executeUpdate(deleteHrmRolesSql,rolesid); boolean flag = rs.executeUpdate(deleteHrmRolesSql,rolesid);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统角色删除SQL执行错误"); dataMap.put("errmessage","系统角色删除SQL执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","系统角色删除SQL执行成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -862,14 +888,16 @@ public class RocketmqUtil {
String insertHrmrolesSql = " insert into hrmroles(rolesmark,rolesname,type,subcompanyid,ecology_pinyin_search,uuid) values(?,?,?,?,?,?)"; String insertHrmrolesSql = " insert into hrmroles(rolesmark,rolesname,type,subcompanyid,ecology_pinyin_search,uuid) values(?,?,?,?,?,?)";
boolean flag = rs.executeUpdate(insertHrmrolesSql,new Object[]{rolesmark,rolesname,type,subcompanyid,sysRoleCode, uuid}); boolean flag = rs.executeUpdate(insertHrmrolesSql,new Object[]{rolesmark,rolesname,type,subcompanyid,sysRoleCode, uuid});
bb.writeLog("insertHrmroles : "+flag); bb.writeLog("insertHrmroles : "+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","新增系统角色SQL执行错误"); dataMap.put("errmessage","新增系统角色SQL执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","新增系统角色SQL执行成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -1002,27 +1030,31 @@ public class RocketmqUtil {
String updateHrmjobactivitiesSql = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?"; String updateHrmjobactivitiesSql = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?";
boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql, new Object[]{jobtitlemark, jobtitlename, modified, modifier, jobtitleid}); boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql, new Object[]{jobtitlemark, jobtitlename, modified, modifier, jobtitleid});
bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); bb.writeLog("insertHrmjobactivitiesSql flag:" + flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if (!flag) { if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统岗位更新SQL执行错误"); dataMap.put("errmessage","系统岗位更新SQL执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","系统岗位更新SQL执行成功");
} }
recordErrorData(dataMap);
} else if ("D".equals(actType)) { } else if ("D".equals(actType)) {
String canceled = "1"; String canceled = "1";
String updateHrmjobactivitiesSql = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=?,canceled = ? where id=?"; String updateHrmjobactivitiesSql = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=?,canceled = ? where id=?";
boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql,new Object[]{jobtitlemark, jobtitlename, modified, modifier, canceled, jobtitleid}); boolean flag = rs.executeUpdate(updateHrmjobactivitiesSql,new Object[]{jobtitlemark, jobtitlename, modified, modifier, canceled, jobtitleid});
bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); bb.writeLog("insertHrmjobactivitiesSql flag:" + flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if (!flag) { if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统岗位封存SQL执行错误"); dataMap.put("errmessage","系统岗位封存SQL执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","系统岗位封存SQL执行成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -1037,14 +1069,16 @@ public class RocketmqUtil {
String insertHrmjobactivitiesSql = " insert into hrmjobtitles(jobtitlemark,jobtitlename,jobactivityid,jobdepartmentid,jobtitlecode,created,creater,modified,modifier,uuid) values(?,?,?,?,?,?,?,?,?,?)"; String insertHrmjobactivitiesSql = " insert into hrmjobtitles(jobtitlemark,jobtitlename,jobactivityid,jobdepartmentid,jobtitlecode,created,creater,modified,modifier,uuid) values(?,?,?,?,?,?,?,?,?,?)";
boolean flag = rs.executeUpdate(insertHrmjobactivitiesSql, new Object[]{jobtitlemark, jobtitlename, jobactivitiesid, departmentId, sysPostCode, created, creater, modified, modifier, uuid}); boolean flag = rs.executeUpdate(insertHrmjobactivitiesSql, new Object[]{jobtitlemark, jobtitlename, jobactivitiesid, departmentId, sysPostCode, created, creater, modified, modifier, uuid});
bb.writeLog("insertHrmjobactivitiesSql flag:" + flag); bb.writeLog("insertHrmjobactivitiesSql flag:" + flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if (!flag) { if (!flag) {
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","系统岗位新增SQL执行错误"); dataMap.put("errmessage","系统岗位新增SQL执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","系统岗位新增SQL执行成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -1176,28 +1210,32 @@ public class RocketmqUtil {
bb.writeLog("userUpdateSql:"+userUpdateSql); bb.writeLog("userUpdateSql:"+userUpdateSql);
boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email,pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode}); boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{lastname,deptId,subcompanyid1,creator,email,pwdSmsTel,jobTitleId,status,loginedNum,currentDate,currentDateTime,staffCode});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员更新SQL执行错误"); dataMap.put("errmessage","人员更新SQL执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","人员更新SQL执行成功");
} }
recordErrorData(dataMap);
}else if("D".equals(actType)){ }else if("D".equals(actType)){
status = "5"; status = "5";
String userUpdateSql = " update hrmresource set status=? where workcode=? "; String userUpdateSql = " update hrmresource set status=? where workcode=? ";
bb.writeLog("userUpdateSql:"+userUpdateSql); bb.writeLog("userUpdateSql:"+userUpdateSql);
boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{status,staffCode}); boolean flag = rs.executeUpdate(userUpdateSql,new Object[]{status,staffCode});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!flag){ if(!flag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员离职SQL执行错误"); dataMap.put("errmessage","人员离职SQL执行错误");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","人员离职SQL执行成功");
} }
recordErrorData(dataMap);
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime); dataMap.put("syndate",nowDateTime);
@ -1225,16 +1263,17 @@ public class RocketmqUtil {
creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, creator,email,pwdSmsTel,jobTitleId,status,loginedNum,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime,
locationid,seclevel,createrid,lastmodid}); locationid,seclevel,createrid,lastmodid});
bb.writeLog("flag:"+flag); bb.writeLog("flag:"+flag);
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(flag){ if(flag){
userid = id+""; userid = id+"";
dataMap.put("errmessage","人员新增SQL执行成功");
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","人员新增SQL执行错误"); dataMap.put("errmessage","人员新增SQL执行错误");
dataMap.put("systable",tableName);
recordErrorData(dataMap);
} }
recordErrorData(dataMap);
} }
}else{ }else{
Map<String,String> dataMap = new HashMap<String,String>(); Map<String,String> dataMap = new HashMap<String,String>();
@ -1258,26 +1297,30 @@ public class RocketmqUtil {
String cusUpdateSql = " update cus_fielddata set "+cus_staff+"=?,"+cus_eid+"=? 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); bb.writeLog(cusUpdateSql);
boolean deflag = rs.executeUpdate(cusUpdateSql, new Object[]{staffId, eId, scope,scopeid,userid}); boolean deflag = rs.executeUpdate(cusUpdateSql, new Object[]{staffId, eId, scope,scopeid,userid});
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!deflag){ if(!deflag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","更新人员自定义信息失败"); dataMap.put("errmessage","更新人员自定义信息失败");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","更新人员自定义信息成功");
} }
recordErrorData(dataMap);
} else { } else {
String cusInsertSql = " insert into cus_fielddata(scope,scopeid,id,"+cus_staff+","+cus_eid+") values(?,?,?,?,?)"; String cusInsertSql = " insert into cus_fielddata(scope,scopeid,id,"+cus_staff+","+cus_eid+") values(?,?,?,?,?)";
bb.writeLog(cusInsertSql); bb.writeLog(cusInsertSql);
boolean deflag = rs.executeUpdate(cusInsertSql, new Object[]{scope, scopeid, userid, staffId, eId}); boolean deflag = rs.executeUpdate(cusInsertSql, new Object[]{scope, scopeid, userid, staffId, eId});
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("systable",tableName);
if(!deflag){ if(!deflag){
Map<String,String> dataMap = new HashMap<String,String>();
dataMap.put("syndate",nowDateTime);
dataMap.put("reqmessage",jsonObject.toJSONString());
dataMap.put("errmessage","新增人员自定义信息失败"); dataMap.put("errmessage","新增人员自定义信息失败");
dataMap.put("systable",tableName); }else {
recordErrorData(dataMap); dataMap.put("errmessage","新增人员自定义信息成功");
} }
recordErrorData(dataMap);
} }
} }
}else{ }else{

1
src/weaver/interfaces/dito/portal/SendRequestData2PortalInterfaces.java
Unescape Escape View File

@ -122,6 +122,7 @@ public class SendRequestData2PortalInterfaces implements SendRequestStatusDataIn
rsojson.put("isremark",rso.getIsremark()); rsojson.put("isremark",rso.getIsremark());
rsojson.put("id",rso.getUser().getUID()); rsojson.put("id",rso.getUser().getUID());
rsojson.put("loginid",rso.getUser().getLoginid()); rsojson.put("loginid",rso.getUser().getLoginid());
rsojson.put("creater",rso.getCreator().getLastname());
rsojson.put("noedid",rso.getNodeid()); rsojson.put("noedid",rso.getNodeid());
// rsojson.put("viewtype",rso.getViewtype()); // rsojson.put("viewtype",rso.getViewtype());
// rsojson.put("receivedatetime",rso.getReceivedate()+" "+rso.getReceivetime()+"/"+rso.getOperatedate()+" "+rso.getOperatetime()); // rsojson.put("receivedatetime",rso.getReceivedate()+" "+rso.getReceivetime()+"/"+rso.getOperatedate()+" "+rso.getOperatetime());

Write Preview
Loading…
Cancel
Save