From 84dcc04fac7d063995352577c0b1563c60ab8149 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 14 Apr 2023 14:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepositoryRecordController.java | 5 ++++ .../controller/GroupController.java | 2 ++ .../depository_manage/OtherTest.java | 23 ++++++++----------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 44727343..d50f7150 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -666,6 +666,7 @@ public class DepositoryRecordController { String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); + QyWxApprovalMap.put("otherDepartmentIdList", jsonObject.getString("otherDepartmentIdList")); QyWxApprovalMap.put("mainId", id.toString()); redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); // 设置过期为7天 @@ -1100,6 +1101,7 @@ public class DepositoryRecordController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", id.toString()); + QyWxApprovalMap.put("otherDepartmentIdList", jsonObject.getString("otherDepartmentIdList")); redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); // 设置过期为7天 redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); @@ -1153,6 +1155,7 @@ public class DepositoryRecordController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", id.toString()); + QyWxApprovalMap.put("otherDepartmentIdList", jsonObject.getString("otherDepartmentIdList")); redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); // 设置过期为7天 redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); @@ -1513,6 +1516,7 @@ public class DepositoryRecordController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", id.toString()); + QyWxApprovalMap.put("otherDepartmentIdList", jsonObject.getString("otherDepartmentIdList")); redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); // 设置过期为7天 redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); @@ -1832,6 +1836,7 @@ public class DepositoryRecordController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", finalId.toString()); + QyWxApprovalMap.put("otherDepartmentIdList", jsonObject.getString("otherDepartmentIdList")); redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); // 设置过期为7天 redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index 5301182f..3258aedf 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -670,6 +670,7 @@ public class GroupController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", id.toString()); + QyWxApprovalMap.put("otherDepartmentIdList", jsonObject.getString("otherDepartmentIdList")); redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); // 设置过期为7天 redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); @@ -895,6 +896,7 @@ public class GroupController { Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); QyWxApprovalMap.put("mainId", id.toString()); + QyWxApprovalMap.put("otherDepartmentIdList", jsonObject.getString("otherDepartmentIdList")); redisTemplateForHash.opsForHash().putAll(sp_no, QyWxApprovalMap); // 设置过期为7天 redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java index 996b7f25..97a0805e 100644 --- a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java @@ -8,6 +8,9 @@ import com.dreamchaser.depository_manage.entity.Depository; import com.dreamchaser.depository_manage.entity.UserByPort; import com.dreamchaser.depository_manage.entity.qywxDepartment; import com.dreamchaser.depository_manage.mapper.DepositoryMapper; +import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; +import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver; +import com.dreamchaser.depository_manage.service.DepositoryRecordService; import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import org.junit.Test; @@ -24,23 +27,15 @@ import java.util.concurrent.*; public class OtherTest { @Autowired - DepositoryMapper depositoryMapper; + DepositoryRecordService depositoryRecordService; @Test public void Test(){ - // 获取当前选中的仓库 - Depository depositoryById = depositoryMapper.findDepositoryById(48); - // 获取当前仓库所属的部门 - String adminorg = depositoryById.getAdminorg(); - // 获取当前部门id对应的企业微信id - JSONObject portByQyWx = PortConfig.getUserPortByQyWx(ObjectFormatUtil.toInteger(adminorg)); - Integer wechatorganizationid = portByQyWx.getInteger("wechatorganizationid"); - - // 获取当前部门信息 - qywxDepartment wxDepartment = QyWxConfig.getQyWxDepartment("0a7ffa452096d330934052105a67794a", wechatorganizationid); - // 获取部门负责人id列表 - List userIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); - System.out.println(JSONObject.toJSONString(userIdList)); + ApprovalInfo_Details finalApprovalInfo_details = new ApprovalInfo_Details(); + ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); + approver.setUserId("PangFuZhen"); + finalApprovalInfo_details.setApprover(approver); +// depositoryRecordService.reviewByQyWxApprovalOut("",); }