修改系统审批功能

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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java

@@ -670,6 +670,7 @@ public class GroupController {
                 Map<String, Object> 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<String, Object> 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);

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<String> 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("",);
     }