From b7ba48abfd854a5ebea95b9ae92c89bc0a0b1f69 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Mon, 24 Feb 2025 10:38:20 +0800 Subject: [PATCH] service --- .../AutoCreateWorkflowService.java | 2 +- .../njwebservice/OutToDoWorkflowService.java | 27 ++++++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java index f35386c..322f32f 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java @@ -449,7 +449,7 @@ public class AutoCreateWorkflowService { id = Long.parseLong(rs.getString("id")); } log.error("人员ID："+id); - return id == null ? null :(Long) recordMap.get("id"); + return id; } } \ No newline at end of file diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java index 5091b00..0bbeab8 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java @@ -1,7 +1,9 @@ package com.weaver.seconddev.njwebservice; +import com.alibaba.fastjson.JSONObject; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.common.hrm.util.HrmCommonUtil; +import com.weaver.common.hrm.util.HrmContextUtil; import com.weaver.common.hrm.util.Util; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.framework.rpc.annotation.RpcReference; @@ -41,6 +43,8 @@ public class OutToDoWorkflowService { @Autowired private HrmCommonUtil hrmCommonUtil; + @Autowired + private HrmContextUtil hrmContextUtil; @Autowired private ConfigProp configProp; @RpcReference(group = "workflow") @@ -94,8 +98,10 @@ public class OutToDoWorkflowService { param.setWorkcode(Util.null2String(rs.getString("id"))); Long userId = Util.getLongValue(rs.getString("id")); log.error("用户id:"+userId); - WorkflowRequestInfo[] info = new OutToDoWorkflowService().getWorkflowRequestListByType(Integer.parseInt(param.getPageNo()), Integer.parseInt(param.getPageSize()), - Integer.parseInt(param.getRecordCount()), userId, param.getConditions(),"todo"); + + 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:"+info.length); res.setMsg("find:" + info.length); @@ -125,13 +131,26 @@ public class OutToDoWorkflowService { return res; } - public WorkflowRequestInfo[] getWorkflowRequestListByType(int pageNo, int pageSize, int recordCount, Long userId, String[] conditions,String type) { + public WorkflowRequestInfo[] getWorkflowRequestListByType(int pageNo, int pageSize, int recordCount, Long userId, String[] conditions,String type , String jtzhkey) { List wris = new ArrayList(); RecordSet recordSet=new RecordSet(); try { - SimpleEmployee employee = hrmCommonUtil.getSimpleEmployee(userId); + + log.error("userId = " + userId +" jtzhkey = " +jtzhkey); + log.error("pageNo = " +pageNo ); + log.error("pageSize = " +pageSize ); + SimpleEmployee employee = hrmContextUtil.build(userId,jtzhkey); +// SimpleEmployee employee = hrmCommonUtil.getSimpleEmployee(userId); + log.error("employee id= " +employee.getId()); + log.error("employee = " +employee); + RequestListConditionApiEntity conditionEntity=new RequestListConditionApiEntity(); + log.error("conditionEntity = " +conditionEntity.toString()); + log.error("wflRequestListRest = " + JSONObject.toJSONString(wflRequestListRest)); + log.error("employee = " +employee); + log.error("pageNo = " +pageNo); + log.error("pageSize = " +pageSize); WeaResult> weaResult=null; if("todo".equals(type)){//代办 weaResult=wflRequestListRest.getToDoWorkflowRequestList(employee, conditionEntity,pageNo, pageSize);