From d6427dc57b579d8881024110e82354c363c596cc Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 3 Aug 2023 08:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=8E=E6=96=87=E8=BD=A9=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  4 +--
 .idea/inspectionProfiles/Project_Default.xml  |  1 +
 .idea/jarRepositories.xml                     |  5 ++++
 .../controller/StockTakingController.java     |  4 +--
 .../impl/DepositoryRecordServiceImpl.java     | 28 +++++++++----------
 .../service/impl/QyWxOperationService.java    |  8 +++---
 .../service/impl/StockTakingServiceImpl.java  | 16 +++++------
 src/main/resources/application.yml            |  2 +-
 .../pages/QyWxScanCode/QyWxScanBarCodeIn.html |  2 +-
 9 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 65eef206..3017bdce 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -8,13 +8,13 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="depository" />
-        <module name="depository_manage" />
+        <module name="depositroy" />
         <module name="depository_manage (2)" />
+        <module name="depository_manage" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="depository_manage (1)" target="1.5" />
-      <module name="depositroy" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 106ba307..5ec24e97 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SerializableHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreAnonymousInnerClasses" value="false" />
       <option name="superClassString" value="java.awt.Component" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 712ab9d9..4a4de1ed 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="spring-milestones" />
+      <option name="name" value="Spring Milestones" />
+      <option name="url" value="https://repo.spring.io/milestone" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
index 62bcf731..61be5e73 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
@@ -87,7 +87,7 @@ public class StockTakingController {
             }
 //            QyWxDepartmentManager.append(workwechat+",");
         }
-        QyWxDepartmentManager.append("PangFuZhen").append(",");
+        QyWxDepartmentManager.append("LiWenXuan").append(",");
         map.put("state", 3);
         map.put("departmentManagerState", 3);
         map.remove("departmentManagerId");
@@ -463,7 +463,7 @@ public class StockTakingController {
                 }
 //            QyWxDepartmentManager.append(workwechat+",");
             }
-            QyWxDepartmentManager.append("PangFuZhen");
+            QyWxDepartmentManager.append("LiWenXuan");
             if (map.containsKey("mainIdList")) {
                 List<Object> mainIdList = ObjectFormatUtil.objToList(map.get("mainIdList"),Object.class);
                 for (Object main : mainIdList
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index fbf50cb3..70f184f5 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -2476,7 +2476,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             }
 //                    depositoryManagerByQyWx.append(workwechat+",");
         }
-        depositoryManagerByQyWx.append("PangFuZhen,");
+        depositoryManagerByQyWx.append("LiWenXuan,");
         JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent, userKey, token);
 
         // 删除redis中本订单
@@ -2672,7 +2672,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 }
 //                        QyWxUid.append(workwechat+",");
                             }
-                            QyWxUid.append("PangFuZhen,");
+                            QyWxUid.append("LiWenXuan,");
                             // 将当前子单的管理员插入到子单记录中
                             minRecord.put("manager", minRecordManage.toString());
                             // 添加子订单到redis中
@@ -2756,7 +2756,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                                 }
 //                        QyWxUid.append(workwechat+",");
                             }
-                            QyWxUid.append("PangFuZhen,");
+                            QyWxUid.append("LiWenXuan,");
                             minRecord.put("manager", minRecordManage.toString());
                             // 添加子订单到redis中
                             redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);
@@ -3426,7 +3426,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 }
 
 
-                QyWxUid.append("PangFuZhen,");
+                QyWxUid.append("LiWenXuan,");
                 if (record.getDepositoryManager() == null) {
                     map.put("depositoryManager", depositoryManager.toString());
                 } else {
@@ -3508,7 +3508,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         QyWxUid.append(workwechat).append(",");
                 }
                 String s = QyWxUid.toString();
-                s = "PangFuZhen,";
+                s = "LiWenXuan,";
                 qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token);
             });
         } else if (map.containsKey("balancePosterPass") && !flagForHasOtherDepository) {
@@ -3546,7 +3546,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         QyWxUid.append(workwechat).append(",");
                 }
 
-//                QyWxUid.append("PangFuZhen,");
+//                QyWxUid.append("LiWenXuan,");
                 if (record.getDepositoryManager() == null) {
                     map.put("depositoryManager", depositoryManager.toString());
                 } else {
@@ -3628,7 +3628,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         QyWxUid.append(workwechat).append(",");
                 }
                 String s = QyWxUid.toString();
-//                s = "PangFuZhen,";
+//                s = "LiWenXuan,";
                 qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token);
             });
         } else {
@@ -3771,7 +3771,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             }
                         QyWxUid.append(workwechat+",");
                         }
-//                        QyWxUid.append("PangFuZhen,");
+//                        QyWxUid.append("LiWenXuan,");
                         minRecord.put("manager", minRecordManage.toString());
                         // 添加子订单到redis中
                         redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);
@@ -3859,7 +3859,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             }
                         QyWxUid.append(workwechat+",");
                         }
-//                        QyWxUid.append("PangFuZhen,");
+//                        QyWxUid.append("LiWenXuan,");
                         minRecord.put("manager", minRecordManage.toString());
                         // 添加子订单到redis中
                         redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);
@@ -3897,7 +3897,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             QyWxUid.append(workwechat).append(",");
                     }
                     String s = QyWxUid.toString();
-//                    s = "PangFuZhen,";
+//                    s = "LiWenXuan,";
                     qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token);
                 });
 
@@ -4117,7 +4117,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         }
                         QyWxUid.append(workwechat).append(",");
                     }
-//                    QyWxUid.append("PangFuZhen" + ",");
+//                    QyWxUid.append("LiWenXuan" + ",");
                     map.put("depositoryManager", depositoryManager.toString());
                 } else {
                     String[] split = depositoryManagerString.split(",");
@@ -4138,7 +4138,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         }
                         QyWxUid.append(workwechat + ",");
                     }
-//                    QyWxUid.append("PangFuZhen").append(",");
+//                    QyWxUid.append("LiWenXuan").append(",");
                 }
 
                 // 向仓储中心负责人发送新的消息
@@ -4286,7 +4286,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             }
                         QyWxUid.append(workwechat+",");
                         }
-//                        QyWxUid.append("PangFuZhen,");
+//                        QyWxUid.append("LiWenXuan,");
                         minRecord.put("manager", minRecordManage.toString());
                         // 添加子订单到redis中
                         redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);
@@ -4373,7 +4373,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                             }
                         QyWxUid.append(workwechat+",");
                         }
-//                        QyWxUid.append("PangFuZhen,");
+//                        QyWxUid.append("LiWenXuan,");
                         minRecord.put("manager", minRecordManage.toString());
                         // 添加子订单到redis中
                         redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord);
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
index b4ba3257..c797826d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
@@ -1929,7 +1929,7 @@ public class QyWxOperationService {
         // 用于设置第一个节点流程
         Approval_template_approver approval_template_approver_departMentHeader = new Approval_template_approver();
         approval_template_approver_departMentHeader.setAttr(1);
-//        userIdList = new ArrayList<>(Collections.singleton("PangFuZhen"));
+//        userIdList = new ArrayList<>(Collections.singleton("LiWenXuan"));
         approval_template_approver_departMentHeader.setUserid(userIdList);
 
 
@@ -2005,7 +2005,7 @@ public class QyWxOperationService {
                     }
                     otherDepartmentIdList.add(departmentHeadWorkwechat);
                 }
-//                otherDepartmentIdList = new ArrayList<String>(Collections.singleton("PangFuZhen"));
+//                otherDepartmentIdList = new ArrayList<String>(Collections.singleton("LiWenXuan"));
 
 
                 // 用于设置其他部门负责人审批
@@ -2226,7 +2226,7 @@ public class QyWxOperationService {
         // 用于设置部门负责人流程
         Approval_template_approver approval_template_approver_departMentHeader = new Approval_template_approver();
         approval_template_approver_departMentHeader.setAttr(1);
-//        userIdList = new ArrayList<>(Collections.singleton("PangFuZhen"));
+//        userIdList = new ArrayList<>(Collections.singleton("LiWenXuan"));
         approval_template_approver_departMentHeader.setUserid(userIdList);
 
 
@@ -3022,7 +3022,7 @@ public class QyWxOperationService {
             user = userToken.getWechat();
         }
         notifyerList.add(user);
-//        workwechat = "PangFuZhen";
+//        workwechat = "LiWenXuan";
         notifyerList.add(workwechat);
         approvalTemplate.setNotifyer(notifyerList);
 
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
index 43d1d96b..9fe2b148 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
@@ -567,7 +567,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                         if (workwechat == null || "".equals(workwechat)) {
                             workwechat = originator.getWechat();
                         }
-//                    JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent, userKey, token);
+//                    JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinId, userAgent, userKey, token);
                         JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent, userKey, token);
 //                         将当前返回结果保存到redis中
                         if (jsonObject != null) {
@@ -618,7 +618,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                 QyWxUid1.append(workwechat).append(",");
             }
             String s = QyWxUid1.toString();
-//            s = "PangFuZhen,";
+//            s = "LiWenXuan,";
             qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(mainId), s, userAgent, 2, userKey, token);
         });
 
@@ -1125,7 +1125,7 @@ public class StockTakingServiceImpl implements StockTakingService {
         // 开启一个线程用于发送抄送信息给负责人
         SendQyWxMessageThreadPool.execute(() -> {
             String s = QyWxUid.toString();
-//            s = "PangFuZhen,";
+//            s = "LiWenXuan,";
             JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, userToken, mainRecord, userAgent, userKey, token);
         });
 
@@ -1670,7 +1670,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                 QyWxUid.append(workwechat).append(",");
             }
             String s = QyWxUid.toString();
-//            s = "PangFuZhen,";
+//            s = "LiWenXuan,";
             JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, null, finalMainRecord, userAgent, userKey, token);
         });
 
@@ -1876,7 +1876,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                             if (workwechat == null || "".equals(workwechat)) {
                                 workwechat = originator.getWechat();
                             }
-//                        JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token);
+//                        JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token);
                             JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token);
 //                             将当前返回结果保存到redis中
                             if (jsonObject != null) {
@@ -2752,7 +2752,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                     workwechat = userByPort.getWechat();
                 }
                 departMentHeadQyWxName.append(workwechat+",");
-//                departMentHeadQyWxName.append("PangFuZhen,");
+//                departMentHeadQyWxName.append("LiWenXuan,");
                 JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent, userKey, token);
             }
 
@@ -2943,7 +2943,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                         if(workwechat == null || "".equals(workwechat)){
                             workwechat = originator.getWechat();
                         }
-//                        JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent, userkey, token);
+//                        JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinIds, userAgent, userkey, token);
                         JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent,userkey,token);
                         if (jsonObject != null) {
                             // 将当前返回结果保存到redis中
@@ -2971,7 +2971,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                         if(workwechat == null || "".equals(workwechat)){
                             workwechat = originator.getWechat();
                         }
-//                        qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent, userkey, token);
+//                        qyWxOperationService.sendStockTakingErrMessageToHead("LiWenXuan,", errIds, mainRecord, null, userAgent, userkey, token);
                         qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent,userkey,token);
                     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 316b50ed..abd3be29 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
+    active: test
 server:
   port: 11111
\ No newline at end of file
diff --git a/src/main/resources/templates/pages/QyWxScanCode/QyWxScanBarCodeIn.html b/src/main/resources/templates/pages/QyWxScanCode/QyWxScanBarCodeIn.html
index 9d812a57..0259b5ef 100644
--- a/src/main/resources/templates/pages/QyWxScanCode/QyWxScanBarCodeIn.html
+++ b/src/main/resources/templates/pages/QyWxScanCode/QyWxScanBarCodeIn.html
@@ -89,7 +89,7 @@
 
                        wx.invoke('openUserProfile', {
                            "type": 1, //1表示该userid是企业成员，2表示该userid是外部联系人
-                           "userid": "PangFuZhen" //可以是企业成员，也可以是外部联系人
+                           "userid": "LiWenXuan" //可以是企业成员，也可以是外部联系人
                        }, function(res) {
                            if(res.err_msg != "openUserProfile:ok") {
                                //错误处理