From 6ad80ed766ca364fae07a98fd8f42086c9b0aecd Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 11 十月 2024 08:47:26 +0800
Subject: [PATCH] 统一文件在Git上的大小写

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
index da2a843..d6ec9a7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
@@ -2,28 +2,28 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.springboot.entity.GlassInfo;
-import com.example.springboot.entity.RolePermission;
 
 
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 @Repository
 public interface GlassInfoMapper extends BaseMapper<GlassInfo> {
 
-    @Select("SELECT * FROM glassinfo where width<=#{maxwidth} and width>=#{minwidth} and height<=#{maxheight} and height>=#{minheight}")
+    @Select("select gi.* from flowcard as fd LEFT JOIN glassinfo as gi on fd.flowcard=gi.flowcard where fd.orderstate=1 and gi.flowcard is not null and  gi.width<=#{maxwidth} and gi.width>=#{minwidth} and gi.height<=#{maxheight} and gi.height>=#{minheight} and gi.measurenumber<number")
     List<GlassInfo> selectGlassInfos(@Param("maxwidth") double maxwidth, @Param("minwidth") double minwidth, @Param("maxheight") double maxheight, @Param("minheight") double minheight);
 
     // @Select("SELECT COUNT(*) FROM role_permission WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
     // boolean checkExists(@Param("roleId") int roleId, @Param("permissionId") int permissionId);
 
+    @Select("SELECT g.* FROM flowcard as f left join glassinfo as g on f.flowcard=g.flowcard WHERE f.orderstate = #{orderstate}")
+    List<GlassInfo> selectOrderState(@Param("orderstate") int orderstate);
 
-    // @Update("UPDATE role_permission SET state = #{state} WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
-    // void updateState(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);
+    @Update("UPDATE glassinfo SET measurenumber = measurenumber+1 WHERE id = #{id}")
+    void updatemeasurenumber(@Param("id") int roleId);
 
     // @Insert("INSERT INTO role_permission (role_id, permission_id, state) VALUES (#{roleId}, #{permissionId}, #{state})")
     // void insert(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);

--
Gitblit v1.8.0