From 9977b2cee60c56549e75b1c08e257dad0c2bde1e Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 22 Jul 2024 09:56:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=8B=E6=8C=81=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E7=A6=81=E7=94=A8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E3=80=81=E5=86=85=E5=8C=85=E9=97=B4=E6=B0=94=E8=83=80?=
 =?UTF-8?q?=E8=BD=B4=E5=9B=9E=E6=9A=82=E5=AD=98=E5=BA=93=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E7=BB=88=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dao/mapper/BstIvtShafttubeivtMapper.xml       | 2 +-
 .../tasks/slitter/service/impl/SlitterServiceImpl.java    | 3 +++
 .../src/main/resources/config/application-dev.yml         | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
index 5057355b1..4d5c5115e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
@@ -47,7 +47,7 @@
               AND b.qzz_generation = #{startPoint.qzz_generation}
           </if>
           AND b.point_location = #{startPoint.point_location}
-          AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code1 = b.point_code)
+          AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code)
         ORDER BY b.sort_seq ASC
     </select>
     <select id="getOtherCBJData" resultType="org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt">
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 570581b31..c318fc0e5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -1447,6 +1447,9 @@ public class SlitterServiceImpl implements SlitterService {
                 ? "空位" : "2".equals(point.getPoint_status())
                 ? "有气胀轴" : "3".equals(point.getPoint_status())
                 ? "有子卷" : "-");
+        if (SlitterConstant.SLITTER_NO.equals(point.getIs_used())) {
+            data.put("status", "已禁用");
+        }
         return res;
     }
 }
diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml
index 6b127a748..d7f37c34a 100644
--- a/lms/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml
@@ -6,11 +6,11 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:88lmsdb}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-#      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:88lmsdb}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:NLABC&hl123}
-#      password: ${DB_PWD:12356}
+#      password: ${DB_PWD:NLABC&hl123}
+      password: ${DB_PWD:12356}
       # 初始连接数
       initial-size: 5
       # 最小连接数