From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java | 181 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 172 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
index b5d72fa..ba0272d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
@@ -129,6 +131,16 @@
}
/**
+ * 鏍规嵁妯″瀷浼犲叆鐨勭紪鐮� 鍒ゆ柇鏀圭紪鐮佸叕鍙�/涓績/宸ユ鐨勫摢涓�绾�
+ * 鑾峰彇褰撳墠鐧诲綍浜哄伐娈电骇瀵瑰簲鐨勭紪鐮�
+ * qsw 2024-3-18
+ */
+ @Override
+ public String findAreaProductionCode(String userId) {
+ return this.baseMapper.findAreaProductionCode(userId);
+ }
+
+ /**
* 璁惧妫�瀹氬伐鍗� 鍒涘缓鏃堕�氳繃璁惧鑾峰彇璁惧绮惧害鍙傛暟
* qsw 2023-7-18
*/
@@ -202,12 +214,32 @@
}
/**
+ *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁�
+ * qsw 2024-5-25
+ */
+ @Override
+ public IPage<Map<String, Object>> getEquipmentByTechnologyStatus(Integer pageNo, Integer pageSize,String workCenterId, String areaId,String technologyStatus) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.getEquipmentByTechnologyStatus(pageData,workCenterId,areaId,technologyStatus);
+ }
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
@Override
public List<Map<String, Object>> getReportRepairEquipmentList(String workCenterId,String areaId) {
return this.baseMapper.getReportRepairEquipmentList(workCenterId,areaId);
+ }
+
+ /**
+ *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻鏄庣粏灞曠ず
+ * qsw 2024-5-25
+ */
+ @Override
+ public IPage<Map<String, Object>> getEquipmentByReportRepair(Integer pageNo, Integer pageSize, String workCenterId, String areaId, String isStop) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.getEquipmentByReportRepair(pageData,workCenterId,areaId,isStop);
}
/**
@@ -220,12 +252,32 @@
}
/**
+ *棣栭〉鏈湀涓変繚璁″垝鏄庣粏
+ * qsw 2024-3-14
+ */
+ @Override
+ public IPage<Map<String, Object>> showThisMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.showThisMonthMaintenanceList(pageData,workCenterId,areaId);
+ }
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
@Override
public List<Map<String, Object>> getNextMonthMaintenanceList(String workCenterId,String areaId) {
return this.baseMapper.getNextMonthMaintenanceList(workCenterId,areaId);
+ }
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝鏄庣粏灞曠ず
+ * qsw 2024-3-14
+ */
+ @Override
+ public IPage<Map<String, Object>> showNextMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.showNextMonthMaintenanceList(pageData,workCenterId,areaId);
}
/**
@@ -238,6 +290,16 @@
}
/**
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒掓槑缁�
+ * qsw 2024-3-14
+ */
+ @Override
+ public IPage<Map<String, Object>> showNextNextMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.showNextNextMonthMaintenanceList(pageData,workCenterId,areaId);
+ }
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
* qsw 2024-3-14
*/
@@ -246,12 +308,53 @@
return this.baseMapper.getThisMonthMaintenanceFinishList(workCenterId,areaId);
}
+ @Override
+ public IPage<Map<String, Object>> showThisMonthMaintenanceFinishList(Integer pageNo, Integer pageSize, String workCenterId, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.showThisMonthMaintenanceFinishList(pageData,workCenterId,areaId);
+ }
+
+ /**
+ *宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺
+ * qsw 2024-3-20
+ */
+ @Override
+ public List<Map<String, Object>> get3MaintenancePostponeCount(String areaId) {
+ return this.baseMapper.get3MaintenancePostponeCount(areaId);
+ }
+
+ @Override
+ public IPage<Map<String, Object>> show3MaintenancePostponeCount(Integer pageNo, Integer pageSize, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.show3MaintenancePostponeCount(pageData,areaId);
+ }
+
+ /**
+ *宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
+ * qsw 2024-3-20
+ */
+ @Override
+ public List<Map<String, Object>> get3MaintenanceOverdueCount(String areaId) {
+ return this.baseMapper.get3MaintenanceOverdueCount(areaId);
+ }
+
+ /**
+ * 宸ユ绾� 涓変繚瓒呮湡鏁伴噺鏄庣粏
+ * qsw 2024-3-20
+ */
+ @Override
+ public IPage<Map<String, Object>> show3MaintenanceOverdueCount(Integer pageNo, Integer pageSize, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.show3MaintenanceOverdueCount(pageData,areaId);
+ }
+
/**
*棣栭〉浜屼繚璁″垝灞曠ず
* qsw 2024-3-15
*/
@Override
public List<Map<String, Object>> getTwoMaintenancePlanList(String productionCode) {
+ Boolean flag = true;
List<Map<String, Object>> list = new ArrayList<>();
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
Integer userType = user.getUserType();
@@ -264,20 +367,80 @@
if(ORG_TYPE_2.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
areaList = areaService.lambdaQuery().eq(Area::getType, "1").eq(Area::getId,area.getId()).eq(Area::getDelFlag, "0").list();
+ } else if(ORG_TYPE_3.equals(orgType)){
+ //宸ユ绾х洿鎺ユ樉绀哄伐娈典笅瑕佷繚鍏荤殑璁惧鏄庣粏
+ flag = false;
+ String siteProductionCode = this.baseMapper.findSiteProductionCode(productionCode);
+ Area areaOne = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, siteProductionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(areaOne != null && area != null){
+ String maintenanceDate = this.baseMapper.findMaintenanceDate(areaOne.getId());
+ list = this.baseMapper.getAreTwoMaintenancePlanDetails(area.getId(), maintenanceDate);
+ }
}
-// else if(ORG_TYPE_3.equals(orgType)){
-// Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
-// list = calibrationOrderService.getThisMonthMaintenanceFinishList("",area.getId());
-// }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ String code = this.baseMapper.findProductionCode(user.getId());
+ Area area = null;
+ if(StringUtils.isBlank(productionCode)){
+ area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ areaList = areaService.lambdaQuery().eq(Area::getType, "1").eq(Area::getId,area.getId()).eq(Area::getDelFlag, "0").list();
+ }
+ }else{
+ //宸ユ绾х洿鎺ユ樉绀哄伐娈典笅瑕佷繚鍏荤殑璁惧鏄庣粏
+ flag = false;
+ Area areaOne = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(areaOne != null && area != null){
+ String maintenanceDate = this.baseMapper.findMaintenanceDate(areaOne.getId());
+ list = this.baseMapper.getAreTwoMaintenancePlanDetails(area.getId(), maintenanceDate);
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ //宸ユ绾х洿鎺ユ樉绀哄伐娈典笅瑕佷繚鍏荤殑璁惧鏄庣粏
+ flag = false;
+ String areaProductionCode = this.baseMapper.findAreaProductionCode(user.getId());
+ String code = this.baseMapper.findSiteProductionCode(productionCode);
+ Area areaOne = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(areaOne != null && area != null){
+ String maintenanceDate = this.baseMapper.findMaintenanceDate(areaOne.getId());
+ list = this.baseMapper.getAreTwoMaintenancePlanDetails(area.getId(), maintenanceDate);
}
}
- for (Area area : areaList) {
- String id = area.getId();
- List<Map<String, Object>> centerTwoMaintenancePlanList = this.baseMapper.getCenterTwoMaintenancePlanList(id);
- if(centerTwoMaintenancePlanList.size()>0){
- list.add(centerTwoMaintenancePlanList.get(0));
+ if(flag == true){
+ for (Area area : areaList) {
+ String id = area.getId();
+ List<Map<String, Object>> centerTwoMaintenancePlanList = this.baseMapper.getCenterTwoMaintenancePlanList(id);
+ if(centerTwoMaintenancePlanList.size()>0){
+ list.add(centerTwoMaintenancePlanList.get(0));
+ }
}
}
return list;
}
+
+ @Override
+ public List<Map<String, Object>> getAreaEquipmentList(String equipmentNum, String areaId,List<String> equipmentIds) {
+ return this.baseMapper.getAreaEquipmentList(equipmentNum,areaId,equipmentIds);
+ }
+
+ /**
+ *棣栭〉 绗洓绾� 瀵瑰簲宸ュ尯涓嬶紝璁惧鍙拌处淇℃伅灞曠ず锛�
+ * qsw 2024-4-22
+ */
+ @Override
+ public List<Map<String, Object>> getOperationCertificate(String username) {
+ return this.baseMapper.getOperationCertificate(username);
+ }
+
+ /**
+ *棣栭〉 绗洓绾� 瀵瑰簲宸ュ尯涓嬶紝璁惧鍙拌处淇℃伅灞曠ず锛�
+ * qsw 2024-4-22
+ */
+ @Override
+ public List<Map<String, Object>> getEquipmentReportRepairCount(String equipmentId) {
+ return this.baseMapper.getEquipmentReportRepairCount(equipmentId);
+ }
}
--
Gitblit v1.9.3