From d6ab2b87018bb2a820d85869ebea11cd79559798 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 15:02:34 +0800
Subject: [PATCH] 代码还原
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index f23de00..48ae3fc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -1,11 +1,9 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
-import com.mes.edgstoragecage.entity.EdgStorageCage;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.mapper.HangzhouMesMapper;
@@ -17,7 +15,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -27,44 +25,47 @@
public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
//鑾峰彇鍏ㄩ儴鏁版嵁
@Autowired
- private HangzhouMesMapper hangzhouMesMapper;
- @Autowired
private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+
//璇嗗埆 鐮存崯/鎷胯蛋
- public boolean identWorn(String glassid,int ControlsId){
- List<EdgStorageCageDetails> edgStorageCageDetails=edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
- if(edgStorageCageDetails.size()==1){
- edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0),new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
+ public boolean identWorn(String glassid, int ControlsId) {
+ List<EdgStorageCageDetails> edgStorageCageDetails = edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ if (edgStorageCageDetails.size() == 1) {
+ edgStorageCageDetailsMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
return true;
}
return false;
}
+
//鑾峰彇 鍒囧壊褰撳墠鐗堝浘
@Override
- public List<Map> selectCutTerritory(){
- List<Map> list= edgStorageCageDetailsMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+ public List<Map> selectCutTerritory() {
+ List<Map> list = edgStorageCageDetailsMapper.selectJoinList(
+ Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
+ .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
.leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
.leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("state",1)
+ .eq("state", 1)
.orderByAsc("t.layout_sequence")
);
return list;
}
+
//鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
@Override
- public List<Map> selectCurrentCutTerritory(String current){
- List<Map> list= edgStorageCageDetailsMapper.selectJoinList(
- Map.class,new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+ public List<Map> selectCurrentCutTerritory(String current) {
+ List<Map> list = edgStorageCageDetailsMapper.selectJoinList(
+ Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
+ .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
.leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
.leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("t.engineering_id",current)
+ .eq("t.engineering_id", current)
.orderByAsc("t.layout_sequence")
);
return list;
- };
+ }
+
+ ;
}
--
Gitblit v1.8.0