From 12b1be7dbbf4048d1dd601e9fc21572b2ca076bd Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 28 Nov 2022 14:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=96=99=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=A4=84=E7=90=86=E6=97=B6=E5=9B=A0oldid=E4=B8=8Eid?=
 =?UTF-8?q?=E4=B9=8B=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/controller/PageController.java          | 4 +++-
 .../depository_manage/scheduled/SaticScheduleTask.java        | 1 -
 .../templates/pages/application/application-in_back.html      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
index 64d6347a..ab2df868 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -568,11 +568,13 @@ public class PageController {
         Depository depositoryRecordById = new Depository();
         if (mid != null) {
             materialById = materialService.findMaterialById(mid);
-
         }
         if (depositoryId != null) {
             depositoryRecordById = depositoryService.findDepositoryRecordById(depositoryId);
         }
+        if(materialById.getShelfLife() == null){
+            mv.addObject("display","none");
+        }
         mv.addObject("materialById", materialById);
         mv.addObject("depository", depositoryRecordById);
         mv.setViewName("pages/application/application-in_back");
diff --git a/src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java b/src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java
index bb75531c..25a76ee3 100644
--- a/src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java
+++ b/src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java
@@ -20,7 +20,6 @@ public class SaticScheduleTask {
     // 每天凌晨0点执行一次
     @Scheduled(cron = "0 0 0 * * ?")
     private void getTransData(){
-        System.out.println("定时任务执行了");
         materialService.InitTreeMenus_Test();
     }
 
diff --git a/src/main/resources/templates/pages/application/application-in_back.html b/src/main/resources/templates/pages/application/application-in_back.html
index fccad9b7..95a354f3 100644
--- a/src/main/resources/templates/pages/application/application-in_back.html
+++ b/src/main/resources/templates/pages/application/application-in_back.html
@@ -63,11 +63,11 @@
                                                    class="layui-input" lay-verify="required">
                                         </div>
                                     </div>
-                                    <div class="layui-form-item">
+                                    <div class="layui-form-item" th:style="'display:'+${display}">
                                         <label class="layui-form-label">生产日期:</label>
                                         <div class="layui-input-block">
                                             <input type="text" name="producedDate" id="producedDate"  placeholder="请填写生产日期" onclick="selectDate(this)"
-                                                   autocomplete="off" class="layui-input" lay-verify="required">
+                                                   autocomplete="off" class="layui-input" >
                                         </div>
                                     </div>
                                     <div class="layui-form-item">