From 0b9b18958daf55f7b523fea3b63a025063e68488 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Wed, 8 Feb 2023 08:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=A4=84=E7=90=86=E4=B8=8E=E5=87=BA=E5=BA=93=E6=97=B6?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=89=A9=E6=96=99=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/controller/QyWxOperationController.java | 2 +-
 .../service/impl/DepositoryRecordServiceImpl.java             | 3 +--
 .../templates/pages/scanQrCode/ScanBarOrQrCodeOut.html        | 4 ++--
 .../pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html   | 2 +-
 .../java/com/dreamchaser/depository_manage/TestOther.java     | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java
index 8034e569..e345b378 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java
@@ -533,7 +533,7 @@ public class QyWxOperationController {
                 // 定义当前流程审批时间
                 String as_SpTime = "";
                 // 定义当前审批流程是是否为第一个节点
-                boolean flagForFirst = spRecord_list.size() > 0; // 当审批节点大于1时默认是第一个
+                boolean flagForFirst = spRecord_list.size() > 1; // 当审批节点大于1时默认是第一个
 
 
                 // 获取审批申请状态变化类型：1-提单；2-同意；3-驳回；4-转审；5-催办；6-撤销；8-通过后撤销；10-添加备注
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 de33c274..24395425 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
@@ -1872,6 +1872,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     if(flagForDepartmentHeadPass){
                         map.put("state", "部门负责人审核通过");
                         map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime));
+                        map.put("depositoryManagerTime", "0");
                         map.put("departmenthead", userByPort.getId());
                         map.put("departmentheadPass", 1);
                     }
@@ -2326,8 +2327,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 }
             }).start();
         }
-
-
         map.put("id", id);
         return depositoryRecordMapper.updateApplicationOutRecord(map);
     }
diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
index 92975f50..4db5412d 100644
--- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
+++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
@@ -310,7 +310,7 @@
                                 shade: 0.2,
                                 maxmin: true,
                                 shadeClose: true,
-                                area: ['50%', '50%'],
+                                area: ['70%', '70%'],
                                 content: '/ScanBarOrQrCodeOut_selectMaterial?pid=' + place.id + '&mcode=' + mcode + '&depositoryId=' + place.did,
                                 end: function () {
                                     let flagForSelect = layui.$("#flagForSelect").val();
@@ -398,7 +398,7 @@
                                 shade: 0.2,
                                 maxmin: true,
                                 shadeClose: true,
-                                area: ['50%', '50%'],
+                                area: ['70%', '70%'],
                                 content: '/ScanBarOrQrCodeOut_selectMaterial?pid=' + 0 + '&mcode=' + mcode + '&depositoryId=' + depository.id,
                                 end: function () {
                                     let flagForSelect = layui.$("#flagForSelect").val();
diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html
index aa4b072f..1928c706 100644
--- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html
+++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut_selectMaterial.html
@@ -14,7 +14,7 @@
 <input th:value="${mcode}" style="display:none;" id="mcode">
 <div class="layui-btn-container">
     <button class="layui-btn layui-btn-primary select_this" th:each="material,iterStar:${materialList}" th:value="${material.getCode()}"
-            th:text="${material.getMname()}">
+            th:text="${material.getMname()+','+(material.getVersion() == null ? '' :material.getVersion())}">
         <i class="layui-icon layui-icon-down layui-font-12"></i>
     </button>
 </div>
diff --git a/src/test/java/com/dreamchaser/depository_manage/TestOther.java b/src/test/java/com/dreamchaser/depository_manage/TestOther.java
index 49119aec..05c14a87 100644
--- a/src/test/java/com/dreamchaser/depository_manage/TestOther.java
+++ b/src/test/java/com/dreamchaser/depository_manage/TestOther.java
@@ -24,5 +24,6 @@ public class TestOther {
 
     @Test
     public void Test() {
+        new ArrayList<String>(Collections.singleton("PangFuZhen"));
     }
 }