gongdoudou
/
lc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改上一步处理人判断条件（isremark == 2）

This commit is contained in:
pan-houxiang 2025-12-25 11:46:36 +08:00
parent 392637d84c
commit 9faa25557f
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lc123/cloud/app/plugin/form/sys/MaterialBillWorkflowDataListPlugin.java
View File

@ -50,6 +50,7 @@ public class MaterialBillWorkflowDataListPlugin extends AbstractListPlugin imple
for (DynamicObject material : billArr) { for (DynamicObject material : billArr) {
material = BusinessDataServiceHelper.loadSingle(material.getPkValue(), material.getDynamicObjectType().getName()); material = BusinessDataServiceHelper.loadSingle(material.getPkValue(), material.getDynamicObjectType().getName());
String userid = null; String userid = null;
String requestid = null;
//获取当前用户id对应的泛微用户ID //获取当前用户id对应的泛微用户ID
// Long id = RequestContext.get().getCurrUserId(); // Long id = RequestContext.get().getCurrUserId();
// Long id = tqq9_otheroutapply.getLong("id"); // Long id = tqq9_otheroutapply.getLong("id");
@ -64,9 +65,15 @@ public class MaterialBillWorkflowDataListPlugin extends AbstractListPlugin imple
} }
String number = material.getString("number"); String number = material.getString("number");
log.info("number:" + number); log.info("number:" + number);
String tqq9_fwrequestid = material.getString("tqq9_fwrequestid"); String tqq9_fwupdid = material.getString("tqq9_fwrequestid");//泛微修改流程id
String tqq9_fwrequestid = material.getString("tqq9_fwrequestid");//泛微流程id
if (StringUtils.isNotBlank(tqq9_fwupdid)){
requestid = tqq9_fwupdid;
} else if (StringUtils.isNotBlank(tqq9_fwrequestid)){
requestid = tqq9_fwrequestid;
}
String tqq9_fwstate = material.getString("tqq9_fwstate"); String tqq9_fwstate = material.getString("tqq9_fwstate");
if (StringUtils.isNotBlank(tqq9_fwrequestid) && "待审核".equals(tqq9_fwstate)) { if (StringUtils.isNotBlank(requestid) && "待审核".equals(tqq9_fwstate)) {
if (StringUtils.isBlank(userid)) { if (StringUtils.isBlank(userid)) {
//获取第三方配置表的泛微用户ID //获取第三方配置表的泛微用户ID
userid = ConfigUtils.getThirdConfigByNumber("FW_WorkFlowInfo_UserId"); userid = ConfigUtils.getThirdConfigByNumber("FW_WorkFlowInfo_UserId");
@ -78,7 +85,7 @@ public class MaterialBillWorkflowDataListPlugin extends AbstractListPlugin imple
String requestName = "FW_获取流程流转数据"; String requestName = "FW_获取流程流转数据";
//调用泛微接口获取下一步处理人 //调用泛微接口获取下一步处理人
String bodyString = FWRestfulUtils.getRequest(requestName, number, tqq9_fwrequestid, userid); String bodyString = FWRestfulUtils.getRequest(requestName, number, requestid, userid);
log.info("number:" + number + ",bodyString:" + bodyString); log.info("number:" + number + ",bodyString:" + bodyString);
JSONObject map = JSONObject.parseObject(bodyString); JSONObject map = JSONObject.parseObject(bodyString);
if (map != null) { if (map != null) {
@ -98,7 +105,7 @@ public class MaterialBillWorkflowDataListPlugin extends AbstractListPlugin imple
xybclrid = String.valueOf(data0.getInteger("userid")); xybclrid = String.valueOf(data0.getInteger("userid"));
xybNodeName = nodeName; xybNodeName = nodeName;
existXybCLR = true; existXybCLR = true;
}else if (!nodeName.contains("申请人") && !nodeName.contains("发起")) { }else if (isremark == 2 && !nodeName.contains("申请人") && !nodeName.contains("发起")) {
sybclrid = String.valueOf(data0.getInteger("userid")); sybclrid = String.valueOf(data0.getInteger("userid"));
existSybCLR = true; existSybCLR = true;
} }

12
lc123/cloud/app/plugin/operate/sys/MaterialUnsubmitOp.java
View File

@ -50,20 +50,20 @@ public class MaterialUnsubmitOp extends AbstractOperationServicePlugIn implement
if (StringUtils.isNotBlank(requestId) && "待审核".equals(tqq9_fwstate)) { if (StringUtils.isNotBlank(requestId) && "待审核".equals(tqq9_fwstate)) {
String userid = null; String userid = null;
String requestName = "FW—流程撤回"; String requestName = "FW—流程撤回";
//获取当前用户id对应的泛微用户ID
//Long id = RequestContext.get().getCurrUserId();
//获取创建人id对应的泛微用户ID //获取创建人id对应的泛微用户ID
DynamicObject creator = material.getDynamicObject("creator"); // DynamicObject creator = material.getDynamicObject("creator");
Long id = creator.getLong("id"); //获取上一步处理人对应的泛微用户ID
DynamicObject tqq9_sybclr = material.getDynamicObject("tqq9_sybclr");
Long id = tqq9_sybclr.getLong("id");
QFilter f1 = new QFilter("id", "=", id); QFilter f1 = new QFilter("id", "=", id);
QFilter f2 = new QFilter("entryentity.ispartjob", "=", false); QFilter f2 = new QFilter("entryentity.ispartjob", "=", false);
DynamicObject bos_user = QueryServiceHelper.queryOne("bos_user", "id,entryentity.tqq9_fwuserid", new QFilter[]{f1, f2}); DynamicObject bos_user = QueryServiceHelper.queryOne("bos_user", "id,entryentity.tqq9_fwuserid", new QFilter[]{f1, f2});
if (bos_user != null) { if (bos_user != null) {
userid = bos_user.getString("entryentity.tqq9_fwuserid"); userid = bos_user.getString("entryentity.tqq9_fwuserid");
} }
if (org.apache.commons.lang3.StringUtils.isBlank(userid)) { if (StringUtils.isBlank(userid)) {
logger.info("没有获取到泛微用户ID，当前用户ID:" + id); logger.info("没有获取到泛微用户ID，当前用户ID:" + id);
return; continue;
} }
String bodyString = FWRestfulUtils.postRequest(requestName, number, isremind, requestId, userid, WL_UnSubmit_URL); String bodyString = FWRestfulUtils.postRequest(requestName, number, isremind, requestId, userid, WL_UnSubmit_URL);
logger.info("number:" + number + ",bodyString:" + bodyString); logger.info("number:" + number + ",bodyString:" + bodyString);

2
lc123/cloud/app/plugin/trd/FWImpl.java
View File

@ -7484,7 +7484,7 @@ public class FWImpl {
xybclrid = String.valueOf(data0.getInteger("userid")); xybclrid = String.valueOf(data0.getInteger("userid"));
xybNodeName = nodeName; xybNodeName = nodeName;
existXybCLR = true; existXybCLR = true;
}else if (!nodeName.contains("申请人") && !nodeName.contains("发起")) { }else if (isremark == 2 && !nodeName.contains("申请人") && !nodeName.contains("发起")) {
sybclrid = String.valueOf(data0.getInteger("userid")); sybclrid = String.valueOf(data0.getInteger("userid"));
existSybCLR = true; existSybCLR = true;
} }