|
|
|
@ -58,17 +58,13 @@ public class OutToDoWorkflowService {
|
|
|
|
|
|
|
|
|
|
public String outToDoWorkflowCount(ToDoCountReq param) {
|
|
|
|
|
|
|
|
|
|
log.error("outToDoWorkflowCount入参:"+param);
|
|
|
|
|
// ToDoCountReq param = JSON.parseObject(json, ToDoCountReq.class);
|
|
|
|
|
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
|
|
|
|
|
String poolname = CONN_TYPE.hrm.getType();
|
|
|
|
|
String sql = "select ID from eteams.employee where status = 'normal' and job_num = '"+param.getWorkcode()+"'";
|
|
|
|
|
rs.executeSql(sql,poolname);
|
|
|
|
|
if (rs.next()){
|
|
|
|
|
Long userId = Util.getLongValue(rs.getString("id"));
|
|
|
|
|
log.error("outToDoWorkflowCount userId:"+userId);
|
|
|
|
|
int toDoWorkflowRequestCount = workflowService.getToDoWorkflowRequestCount(userId, param.getConditions());
|
|
|
|
|
log.error("待办数量:"+toDoWorkflowRequestCount);
|
|
|
|
|
return String.valueOf(toDoWorkflowRequestCount);
|
|
|
|
|
}else {
|
|
|
|
|
return "未找到该用户";
|
|
|
|
@ -76,15 +72,9 @@ public class OutToDoWorkflowService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public ToDoRequestRes outToDoWorkflowList(ToDoRequestReq param) {
|
|
|
|
|
// String pc_url = Util.null2String(this.getPropValue("htportaloaUrl", "pc_url")).trim();
|
|
|
|
|
// String mobile_url = Util.null2String(this.getPropValue("htportaloaUrl", "mobile_url")).trim();
|
|
|
|
|
|
|
|
|
|
log.error("outToDoWorkflowList入参:"+param);
|
|
|
|
|
// ToDoRequestReq param = JSON.parseObject(json, ToDoRequestReq.class);
|
|
|
|
|
|
|
|
|
|
String jtzhkey = configProp.getJtzhkey();
|
|
|
|
|
String jtzhadmin = configProp.getJtzhadmin();
|
|
|
|
|
log.error("jtzhkey:"+jtzhkey+" jtzhadmin:"+jtzhadmin);
|
|
|
|
|
|
|
|
|
|
TenantRpcContext.setTargetTenantKey(jtzhkey);
|
|
|
|
|
TenantRpcContext.setTargetEmployeeId(jtzhadmin);
|
|
|
|
@ -101,12 +91,10 @@ public class OutToDoWorkflowService {
|
|
|
|
|
} else {
|
|
|
|
|
param.setWorkcode(Util.null2String(rs.getString("id")));
|
|
|
|
|
Long userId = Util.getLongValue(rs.getString("id"));
|
|
|
|
|
log.error("用户id:"+userId);
|
|
|
|
|
|
|
|
|
|
OutToDoWorkflowService outToDoWorkflowService = I18nContextUtil.getBean(OutToDoWorkflowService.class);
|
|
|
|
|
WorkflowRequestInfo[] info = outToDoWorkflowService.getWorkflowRequestListByType(Integer.parseInt(param.getPageNo()), Integer.parseInt(param.getPageSize()),
|
|
|
|
|
Integer.parseInt(param.getRecordCount()), userId, param.getConditions(),"todo",jtzhkey);
|
|
|
|
|
log.error("info:"+ JSONArray.toJSONString(info));
|
|
|
|
|
|
|
|
|
|
res.setMsg("find:" + info.length);
|
|
|
|
|
ToDoWorkFlow[] todo = new ToDoWorkFlow[info.length];
|
|
|
|
@ -122,10 +110,39 @@ public class OutToDoWorkflowService {
|
|
|
|
|
wftodo.requestId = Util.null2String(info[i].getRequestId());
|
|
|
|
|
wftodo.requestLevel = Util.null2String(info[i].getRequestLevel());
|
|
|
|
|
wftodo.requestName = Util.null2String(info[i].getRequestName());
|
|
|
|
|
wftodo.workflowId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowId());
|
|
|
|
|
wftodo.workflowName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowName());
|
|
|
|
|
wftodo.workflowTypeId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeId());
|
|
|
|
|
wftodo.workflowTypeName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeName());
|
|
|
|
|
|
|
|
|
|
String workflowId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowId());
|
|
|
|
|
String workflowName = "";
|
|
|
|
|
if(StringUtils.isNotEmpty(workflowId)){
|
|
|
|
|
wftodo.workflowId = workflowId;
|
|
|
|
|
sql = "select workflowname from e10_core_business.dbo.wfp_base where id = 100003460000008174";
|
|
|
|
|
rs.executeQuery(sql);
|
|
|
|
|
if(rs.next()){
|
|
|
|
|
workflowName = rs.getString("workflowname");
|
|
|
|
|
}
|
|
|
|
|
wftodo.workflowName = workflowName;
|
|
|
|
|
}else{
|
|
|
|
|
wftodo.workflowId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowId());
|
|
|
|
|
wftodo.workflowName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String workflowTypeId= Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeId());
|
|
|
|
|
String workflowTypeName = "";
|
|
|
|
|
if(StringUtils.isNotEmpty(workflowTypeId)){
|
|
|
|
|
wftodo.workflowTypeId = workflowTypeId;
|
|
|
|
|
sql = "select typename from e10_core_business.dbo.wfp_type where id = " + workflowTypeId;
|
|
|
|
|
rs.executeQuery(sql);
|
|
|
|
|
if(rs.next()){
|
|
|
|
|
workflowTypeName = rs.getString("typename");
|
|
|
|
|
}
|
|
|
|
|
wftodo.workflowTypeName = workflowTypeName;
|
|
|
|
|
}else{
|
|
|
|
|
wftodo.workflowTypeId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeId());
|
|
|
|
|
wftodo.workflowTypeName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wftodo.mobileurl = mobile_url + configProp.getHtportaloaUrl_pc_url() +"/mobile/workflow/flowpage/view/"+ wftodo.requestId;
|
|
|
|
|
wftodo.pcurl = pc_url + configProp.getHtportaloaUrl_pc_url() +"/sp/workflow/flowpage/fullView/"+ wftodo.requestId;
|
|
|
|
|
todo[i] = wftodo;
|
|
|
|
@ -140,9 +157,7 @@ public class OutToDoWorkflowService {
|
|
|
|
|
RecordSet recordSet=new RecordSet();
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
|
|
log.error("userId = " + userId +" jtzhkey = " +jtzhkey);
|
|
|
|
|
SimpleEmployee employee = hrmContextUtil.build(userId,jtzhkey);
|
|
|
|
|
log.error("employee id= " +employee.getId());
|
|
|
|
|
|
|
|
|
|
RequestListConditionApiEntity conditionEntity=new RequestListConditionApiEntity();
|
|
|
|
|
|
|
|
|
@ -223,8 +238,7 @@ public class OutToDoWorkflowService {
|
|
|
|
|
|
|
|
|
|
private String formatDate (String timeStr){
|
|
|
|
|
|
|
|
|
|
log.error("outToDoWorkflowCount formatDate :"+ timeStr);
|
|
|
|
|
SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
|
|
|
|
|
SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
|
|
|
|
|
SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
String output = "";
|
|
|
|
|
try {
|
|
|
|
@ -237,7 +251,8 @@ public class OutToDoWorkflowService {
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
log.error("output :"+ output);
|
|
|
|
|
System.out.println("output :"+ output);
|
|
|
|
|
return output;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|