From fddf1c716af76c2968e08ce11895eaa1c26319a5 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 十一月 2024 14:43:21 +0800
Subject: [PATCH] 增加翻译文件和bug解决
---
springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
index bb8c179..ff9ce1b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
@@ -1,6 +1,7 @@
package com.example.springboot.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.RolePermission;
@@ -20,6 +21,9 @@
@Select("SELECT * FROM queue order by time desc limit 1")
Queue selectLastQueue();
+ @Select("SELECT * FROM queue where state<2 order by time desc limit 1")
+ Queue selectLastQueue2();
+
@Select("SELECT * FROM queue where state<=0")
List<Queue> selectErrorQueues();
@@ -30,8 +34,8 @@
// @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);
- @Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time,thickness) "+
- "select id,flowcard,null,null,width,height,#{glasswidthmm},#{glassheightmm},glasstype,#{state},NOW(),thickness from glassinfo where id=#{glassid}")
+ @Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time,thickness,mateid) "+
+ "select id,flowcard,null,null,width,height,#{glasswidthmm},#{glassheightmm},glasstype,#{state},NOW(),thickness,mateid from glassinfo where id=#{glassid}")
int insert(@Param("glassid") Integer glassid, @Param("glasswidthmm") double glasswidthmm, @Param("glassheightmm") double glassheightmm,@Param("state") int state);
@Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time) "+
@@ -41,4 +45,8 @@
@Delete("delete from queue where state<=0")
void DeleteErrorQueue();
+ @Delete("delete from queue where state<1")
+ void DeleteQueue();
+ @Insert("INSERT into queue (flowcard,glassId,mateid,glasstype,glasswidth,glassheight,thickness,state,time) VALUES (#{flowcard},#{glassId},#{mateid},#{glasstype},#{glasswidth},#{glassheight},#{thickness},1,NOW())")
+ int insertQueueCode(String flowcard,String glassId,int mateid,int glasstype,double glasswidth,double glassheight,double thickness);
}
--
Gitblit v1.8.0