From 7c5b03f261845c4e0ec2b4f1f59e21222d055232 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 18 三月 2024 17:44:56 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 94 insertions(+), 12 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 37ac0f2..b5d72fa 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
@@ -1,11 +1,19 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.eam.entity.Area;
import org.jeecg.modules.eam.entity.CalibrationOrder;
import org.jeecg.modules.eam.entity.CalibrationOrderDetail;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.mapper.CalibrationOrderDetailMapper;
import org.jeecg.modules.eam.mapper.CalibrationOrderMapper;
import org.jeecg.modules.eam.model.MaintenanceCycleVo;
+import org.jeecg.modules.eam.service.IAreaService;
import org.jeecg.modules.eam.service.ICalibrationOrderService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +21,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -26,10 +35,29 @@
@Service
public class CalibrationOrderServiceImpl extends ServiceImpl<CalibrationOrderMapper, CalibrationOrder> implements ICalibrationOrderService {
+
+ /**
+ * 鐢ㄦ埛绫诲瀷(1 鏅�氭垚鍛� 2 宸ユ 3 鍒嗗巶/涓績 4 鍏徃锛�
+ */
+ private static final Integer USER_TYPE_1 = 1;
+ private static final Integer USER_TYPE_2 = 2;
+ private static final Integer USER_TYPE_3 = 3;
+ private static final Integer USER_TYPE_4 = 4;
+
+ /**
+ * 杞﹂棿灞傜骇绫诲瀷(1 鍏徃 2 鍒嗗巶銆佷腑蹇� 3 宸ユ锛�
+ */
+ private static final String ORG_TYPE_1 = "1";
+ private static final String ORG_TYPE_2 = "2";
+ private static final String ORG_TYPE_3 = "3";
+
@Autowired
private CalibrationOrderMapper calibrationOrderMapper;
@Autowired
private CalibrationOrderDetailMapper calibrationOrderDetailMapper;
+
+ @Autowired
+ private IAreaService areaService;
@Override
@@ -81,6 +109,25 @@
}
//qsw 2023-7-18================================================================================
+
+ /**
+ * 鏍规嵁妯″瀷浼犲叆鐨勭紪鐮� 鍒ゆ柇鏀圭紪鐮佸叕鍙�/涓績/宸ユ鐨勫摢涓�绾�
+ * qsw 2024-3-18
+ */
+ @Override
+ public String findOrgType(String productionCode) {
+ return this.baseMapper.findOrgType(productionCode);
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍浜烘槸涓績鍙婂搴旂殑缂栫爜
+ * qsw 2024-3-18
+ */
+ @Override
+ public String findProductionCode(String userId) {
+ return this.baseMapper.findProductionCode(userId);
+ }
+
/**
* 璁惧妫�瀹氬伐鍗� 鍒涘缓鏃堕�氳繃璁惧鑾峰彇璁惧绮惧害鍙傛暟
* qsw 2023-7-18
@@ -150,8 +197,8 @@
* qsw 2024-3-13
*/
@Override
- public List<Map<String, Object>> getEquipmentTechnologyStatusList(String factoryModelId) {
- return this.baseMapper.getEquipmentTechnologyStatusList(factoryModelId);
+ public List<Map<String, Object>> getEquipmentTechnologyStatusList(String workCenterId,String areaId) {
+ return this.baseMapper.getEquipmentTechnologyStatusList(workCenterId,areaId);
}
/**
@@ -159,8 +206,8 @@
* qsw 2024-3-13
*/
@Override
- public List<Map<String, Object>> getReportRepairEquipmentList(String factoryModelId) {
- return this.baseMapper.getReportRepairEquipmentList(factoryModelId);
+ public List<Map<String, Object>> getReportRepairEquipmentList(String workCenterId,String areaId) {
+ return this.baseMapper.getReportRepairEquipmentList(workCenterId,areaId);
}
/**
@@ -168,8 +215,8 @@
* qsw 2024-3-14
*/
@Override
- public List<Map<String, Object>> getThisMonthMaintenanceList(String factoryModelId) {
- return this.baseMapper.getThisMonthMaintenanceList(factoryModelId);
+ public List<Map<String, Object>> getThisMonthMaintenanceList(String workCenterId,String areaId) {
+ return this.baseMapper.getThisMonthMaintenanceList(workCenterId,areaId);
}
/**
@@ -177,8 +224,8 @@
* qsw 2024-3-14
*/
@Override
- public List<Map<String, Object>> getNextMonthMaintenanceList(String factoryModelId) {
- return this.baseMapper.getNextMonthMaintenanceList(factoryModelId);
+ public List<Map<String, Object>> getNextMonthMaintenanceList(String workCenterId,String areaId) {
+ return this.baseMapper.getNextMonthMaintenanceList(workCenterId,areaId);
}
/**
@@ -186,8 +233,8 @@
* qsw 2024-3-14
*/
@Override
- public List<Map<String, Object>> getNextNextMonthMaintenanceList(String factoryModelId) {
- return this.baseMapper.getNextNextMonthMaintenanceList(factoryModelId);
+ public List<Map<String, Object>> getNextNextMonthMaintenanceList(String workCenterId,String areaId) {
+ return this.baseMapper.getNextNextMonthMaintenanceList(workCenterId,areaId);
}
/**
@@ -195,7 +242,42 @@
* qsw 2024-3-14
*/
@Override
- public List<Map<String, Object>> getThisMonthMaintenanceFinishList(String factoryModelId) {
- return this.baseMapper.getThisMonthMaintenanceFinishList(factoryModelId);
+ public List<Map<String, Object>> getThisMonthMaintenanceFinishList(String workCenterId,String areaId) {
+ return this.baseMapper.getThisMonthMaintenanceFinishList(workCenterId,areaId);
+ }
+
+ /**
+ *棣栭〉浜屼繚璁″垝灞曠ず
+ * qsw 2024-3-15
+ */
+ @Override
+ public List<Map<String, Object>> getTwoMaintenancePlanList(String productionCode) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ List<Area> areaList = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ areaList = areaService.lambdaQuery().eq(Area::getType, "1").eq(Area::getDelFlag, "0").list();
+ }else{
+ String orgType = this.baseMapper.findOrgType(productionCode);
+ 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)){
+// Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+// list = calibrationOrderService.getThisMonthMaintenanceFinishList("",area.getId());
+// }
+ }
+ }
+ 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;
}
}
--
Gitblit v1.9.3