From 5780c58879296cfced72012c8831c1d3cf4dafb2 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 十一月 2024 00:33:13 +0800
Subject: [PATCH] 增加任务队列 任务日志,客户名称字段

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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..7ace4e6 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,30 @@
 
 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}")
-    List<GlassInfo> selectGlassInfos(@Param("maxwidth") double maxwidth, @Param("minwidth") double minwidth, @Param("maxheight") double maxheight, @Param("minheight") double 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.films=#{Films} and gi.thickness>=#{Thickness}  and gi.measurenumber<gi.number")
+    List<GlassInfo> selectGlassInfos(@Param("maxwidth") double maxwidth, @Param("minwidth") double minwidth, @Param("maxheight") double maxheight, @Param("minheight") double minheight,Integer Thickness,String Films);
 
     // @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} and state!=2")
+    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);
+    @Update("UPDATE glassinfo SET measurenumber = measurenumber-1 WHERE glasstype = #{glasstype}")
+    void updateGlassNumber(@Param("glasstype") int glasstype);
 
     // @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