root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

Browse Source
This commit is contained in:
zhouz
2024-05-22 11:23:36 +08:00
parent c9a45ea457 ffc2323379
commit fbf5640d2d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java
View File

@@ -1,6 +1,7 @@
package org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.mapper; package org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
import java.util.List; import java.util.List;
@@ -29,5 +30,5 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper<BstIvtShafttubeivt>
* @param startPoint 点位信息（包含：尺寸、类型、位置） * @param startPoint 点位信息（包含：尺寸、类型、位置）
* @return / * @return /
*/ */
List<BstIvtShafttubeivt> getNotTaskShaftCacheEmpty(BstIvtShafttubeivt startPoint); List<BstIvtShafttubeivt> getNotTaskShaftCacheEmpty(@Param("startPoint") BstIvtShafttubeivt startPoint);
} }

8
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
View File

@@ -40,9 +40,11 @@
FROM `bst_ivt_shafttubeivt` b FROM `bst_ivt_shafttubeivt` b
WHERE b.have_qzz = '0' WHERE b.have_qzz = '0'
AND b.point_type = '6' AND b.point_type = '6'
AND b.qzz_size = #{qzz_size} AND b.qzz_size = #{startPoint.qzz_size}
AND b.qzz_generation = #{qzz_generation} <if test="startPoint.qzz_size != 6">
AND b.point_location = #{point_location} 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_code1 = b.point_code)
ORDER BY b.sort_seq ASC ORDER BY b.sort_seq ASC
</select> </select>