From d687ff755f0f3022dcd1f57a03104b0e91536ab3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 五月 2025 08:33:29 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/MES_Projects
---
河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
index 416024b..9384d64 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java"
@@ -30,11 +30,12 @@
@Query("select t from PatternTask t where t.workState='宸插畬鎴�' and t.groups=?1")
public List<PatternTask> findbygroups(Long groups);
+
@Query("select t from PatternTask t where t.workState='宸插畬鎴�' and t.groups=?1 and t.rawFile.id=?2")
public List<PatternTask> findbygroups2(Long groups,Long id);
- @Query("select t from PatternTask t where t.groups=?1 order by t.id")
+ @Query("select t from PatternTask t where t.groups=?1")
public List<PatternTask> findIdGroup(Long groups);
@Query("select t from PatternTask t where t.groups=?1 group by t.rawWidth,t.rawHeight,t.rawThickness,t.color")
--
Gitblit v1.8.0