diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java index b81ce3553..7ecef895c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java @@ -1,6 +1,7 @@ package org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt; import java.util.List; @@ -29,5 +30,5 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper * @param startPoint 点位信息(包含:尺寸、类型、位置) * @return / */ - List getNotTaskShaftCacheEmpty(BstIvtShafttubeivt startPoint); + List getNotTaskShaftCacheEmpty(@Param("startPoint") BstIvtShafttubeivt startPoint); } 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 e24dfa711..1d497c5ad 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 @@ -40,9 +40,11 @@ FROM `bst_ivt_shafttubeivt` b WHERE b.have_qzz = '0' AND b.point_type = '6' - AND b.qzz_size = #{qzz_size} - AND b.qzz_generation = #{qzz_generation} - AND b.point_location = #{point_location} + AND b.qzz_size = #{startPoint.qzz_size} + + AND b.qzz_generation = #{startPoint.qzz_generation} + + AND b.point_location = #{startPoint.point_location} AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status '07' AND t.point_code1 = b.point_code) ORDER BY b.sort_seq ASC