From 654dc30c50b1c176966ad8e6e7d791b92531de83 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 25 七月 2024 09:53:25 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java | 19 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardMapper.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java | 14
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java | 28 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java | 224 ++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java | 23 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 51 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 159 +++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 22 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyInspectionStandardServiceImpl.java | 21 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java | 15 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 12
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml | 42 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java | 24 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 19 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java | 19 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml | 73 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java | 17 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml | 8
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java | 2
29 files changed, 811 insertions(+), 27 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 655df90..3a07433 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -159,6 +159,9 @@
if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
}
+ if(StringUtils.isNotBlank(equipment.getWorkCenterId())){
+ queryWrapper.eq("work_center_id",equipment.getWorkCenterId());
+ }
queryWrapper.isNull("line_id");
queryWrapper.eq("status","1");
queryWrapper.eq("del_flag",0);
@@ -292,6 +295,22 @@
return Result.OK(pageList);
}
+ /**
+ * 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
+ * qsw 2023-7-14
+ */
+ @GetMapping(value = "/getEquipmentTZList")
+ @PermissionData
+ public Result<IPage<Equipment>> getEquipmentTZList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.getEquipmentTZList(page, equipment);
+ return Result.OK(pageList);
+ }
+
@GetMapping(value = "/pageEquipment")
public Result<IPage<Equipment>> pageEquipment(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
IPage<Equipment> pageList = equipmentService.pageEquipment(pageNo, pageSize, params);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java
index 8acf2b2..db85b64 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java
@@ -186,6 +186,9 @@
return jsonObject;
}
+ /**
+ * 鐢熶骇璁惧骞冲潎鏁呴殰闂撮殧鏃堕棿MTBF
+ */
@GetMapping("/get2MTBF")
public JSONObject get2MTBF(@RequestParam Map<String, Object> query) throws ParseException {
List<Map<String, Object>> equipmentList = faultIntervalTimeService.getEquipmentList(query);
@@ -238,6 +241,227 @@
}
+ /**
+ * A绫荤敓浜ц澶囧钩鍧囨晠闅滈棿闅旀椂闂碝TBF
+ */
+ @GetMapping("/getAMTBF")
+ public JSONObject getAMTBF(@RequestParam Map<String, Object> query) throws ParseException {
+ query.put("abc","A");
+ List<Map<String, Object>> equipmentList = faultIntervalTimeService.getEquipmentList(query);
+ List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>();
+ for (Map<String, Object> map : equipmentList) {
+ query.put("equipmentId",map.get("id"));
+
+ List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getEquipmentMTBF(query);
+
+ FaultIntervalTime faultIntervalTime = new FaultIntervalTime();
+ faultIntervalTime.setEquipmentId((String)map.get("id"));
+ faultIntervalTime.setEquipmentNum((String)map.get("num"));
+ faultIntervalTime.setEquipmentName((String)map.get("name"));
+ faultIntervalTime.setEquipmentModel((String)map.get("model"));
+ faultIntervalTime.setUserDepart((String)map.get("departName"));
+ if(equipmentMTBF.size()>0){
+ faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString());
+ faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString());
+ faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString());
+ faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString());
+ faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString());
+ faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString());
+ faultIntervalTimeList.add(faultIntervalTime);
+ }else{
+ List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getMTBFTotalAvailableTime(query);
+ if(query.get("startTime") != "" && query.get("endTime") != ""){
+ faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ }else{
+ faultIntervalTime.setTotalAvailableTime("0");
+ faultIntervalTime.setNoFaultTime("0");
+ faultIntervalTime.setAverageFaultIntervalTime("0");
+ }
+ faultIntervalTime.setFaultTime("0");
+ faultIntervalTime.setFaultNumber("0");
+ faultIntervalTime.setAverageRepairTime("0");
+ faultIntervalTime.setRepairTime("0");
+ faultIntervalTimeList.add(faultIntervalTime);
+ }
+
+ }
+// Map<String,Object> result= new HashMap<>();
+// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>();
+// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",faultIntervalTimeList);
+ return jsonObject;
+ }
+
+
+ /**
+ * 鍏抽敭銆侀噸瑕佺敓浜ц澶囧钩鍧囨晠闅滈棿闅旀椂闂碝TBF
+ */
+ @GetMapping("/getGJZYMTBF")
+ public JSONObject getGJZYMTBF(@RequestParam Map<String, Object> query) throws ParseException {
+ query.put("specificEquipment","true");
+ List<Map<String, Object>> equipmentList = faultIntervalTimeService.getEquipmentList(query);
+ List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>();
+ for (Map<String, Object> map : equipmentList) {
+ query.put("equipmentId",map.get("id"));
+
+ List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getEquipmentMTBF(query);
+
+ FaultIntervalTime faultIntervalTime = new FaultIntervalTime();
+ faultIntervalTime.setEquipmentId((String)map.get("id"));
+ faultIntervalTime.setEquipmentNum((String)map.get("num"));
+ faultIntervalTime.setEquipmentName((String)map.get("name"));
+ faultIntervalTime.setEquipmentModel((String)map.get("model"));
+ faultIntervalTime.setUserDepart((String)map.get("departName"));
+ if(equipmentMTBF.size()>0){
+ faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString());
+ faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString());
+ faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString());
+ faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString());
+ faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString());
+ faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString());
+ faultIntervalTimeList.add(faultIntervalTime);
+ }else{
+ List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getMTBFTotalAvailableTime(query);
+ if(query.get("startTime") != "" && query.get("endTime") != ""){
+ faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ }else{
+ faultIntervalTime.setTotalAvailableTime("0");
+ faultIntervalTime.setNoFaultTime("0");
+ faultIntervalTime.setAverageFaultIntervalTime("0");
+ }
+ faultIntervalTime.setFaultTime("0");
+ faultIntervalTime.setFaultNumber("0");
+ faultIntervalTime.setAverageRepairTime("0");
+ faultIntervalTime.setRepairTime("0");
+ faultIntervalTimeList.add(faultIntervalTime);
+ }
+
+ }
+// Map<String,Object> result= new HashMap<>();
+// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>();
+// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",faultIntervalTimeList);
+ return jsonObject;
+ }
+
+ /**
+ * 鍚勭敓浜у崟浣� 鐢熶骇璁惧骞冲潎鏁呴殰闂撮殧鏃堕棿MTBF
+ */
+ @GetMapping("/getCenterMTBF")
+ public JSONObject getCenterMTBF(@RequestParam Map<String, Object> query) throws ParseException {
+ List<Map<String, Object>> workCenterList = faultIntervalTimeService.getWorkCenterList(query);
+ List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>();
+ for (Map<String, Object> map : workCenterList) {
+ query.put("workCenterId",map.get("workCenterId"));
+
+ List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getCenterEquipmentMTBF(query);
+
+ FaultIntervalTime faultIntervalTime = new FaultIntervalTime();
+// faultIntervalTime.setEquipmentId((String)map.get("id"));
+// faultIntervalTime.setEquipmentNum((String)map.get("num"));
+// faultIntervalTime.setEquipmentName((String)map.get("name"));
+// faultIntervalTime.setEquipmentModel((String)map.get("model"));
+ faultIntervalTime.setUserDepart((String)map.get("workCenterName"));
+ if(equipmentMTBF.size()>0){
+ faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString());
+ faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString());
+ faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString());
+ faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString());
+ faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString());
+ faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString());
+ faultIntervalTimeList.add(faultIntervalTime);
+ }else{
+ List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getCenterMTBFTotalAvailableTime(query);
+ if(query.get("startTime") != "" && query.get("endTime") != ""){
+ faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ }else{
+ faultIntervalTime.setTotalAvailableTime("0");
+ faultIntervalTime.setNoFaultTime("0");
+ faultIntervalTime.setAverageFaultIntervalTime("0");
+ }
+ faultIntervalTime.setFaultTime("0");
+ faultIntervalTime.setFaultNumber("0");
+ faultIntervalTime.setAverageRepairTime("0");
+ faultIntervalTime.setRepairTime("0");
+ faultIntervalTimeList.add(faultIntervalTime);
+ }
+
+ }
+// Map<String,Object> result= new HashMap<>();
+// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>();
+// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",faultIntervalTimeList);
+ return jsonObject;
+ }
+
+
+
+ /**
+ * 鍚勭敓浜у崟浣� A绫昏澶囧钩鍧囨晠闅滈棿闅旀椂闂碝TBF
+ */
+ @GetMapping("/getCenterAMTBF")
+ public JSONObject getCenterAMTBF(@RequestParam Map<String, Object> query) throws ParseException {
+ query.put("abc","A");
+ List<Map<String, Object>> workCenterList = faultIntervalTimeService.getWorkCenterList(query);
+ List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>();
+ for (Map<String, Object> map : workCenterList) {
+ query.put("workCenterId",map.get("workCenterId"));
+
+ List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getCenterEquipmentMTBF(query);
+
+ FaultIntervalTime faultIntervalTime = new FaultIntervalTime();
+// faultIntervalTime.setEquipmentId((String)map.get("id"));
+// faultIntervalTime.setEquipmentNum((String)map.get("num"));
+// faultIntervalTime.setEquipmentName((String)map.get("name"));
+// faultIntervalTime.setEquipmentModel((String)map.get("model"));
+ faultIntervalTime.setUserDepart((String)map.get("workCenterName"));
+ if(equipmentMTBF.size()>0){
+ faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString());
+ faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString());
+ faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString());
+ faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString());
+ faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString());
+ faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString());
+ faultIntervalTimeList.add(faultIntervalTime);
+ }else{
+ List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getCenterMTBFTotalAvailableTime(query);
+ if(query.get("startTime") != "" && query.get("endTime") != ""){
+ faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
+ }else{
+ faultIntervalTime.setTotalAvailableTime("0");
+ faultIntervalTime.setNoFaultTime("0");
+ faultIntervalTime.setAverageFaultIntervalTime("0");
+ }
+ faultIntervalTime.setFaultTime("0");
+ faultIntervalTime.setFaultNumber("0");
+ faultIntervalTime.setAverageRepairTime("0");
+ faultIntervalTime.setRepairTime("0");
+ faultIntervalTimeList.add(faultIntervalTime);
+ }
+
+ }
+// Map<String,Object> result= new HashMap<>();
+// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>();
+// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",faultIntervalTimeList);
+ return jsonObject;
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
index 22c39b9..668ff5a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceOrderActualMaterialController.java
@@ -125,13 +125,13 @@
orderActualMaterial.setEquipmentId(equipmentId);
maintenanceOrderActualMaterialService.save(orderActualMaterial);
//鏇存柊鍑哄簱鍗曠殑鍙娇鐢ㄦ暟閲�
- List<SparePartOutboundDetail> sparePartOutboundDetailList = sparePartOutboundDetailService.lambdaQuery().eq(SparePartOutboundDetail::getSparePartOutboundId,orderActualMaterial.getOutboundOrderId())
- .eq(SparePartOutboundDetail::getSparePartId,orderActualMaterial.getSparePartId()).eq(SparePartOutboundDetail::getDelFlag, CommonConstant.DEL_FLAG_0).list();
- if(CollectionUtils.isNotEmpty(sparePartOutboundDetailList)){
- SparePartOutboundDetail sparePartOutboundDetail = sparePartOutboundDetailList.get(0);
- sparePartOutboundDetail.setUseQuantity(orderActualMaterial.getQuantity());
- sparePartOutboundDetailService.updateById(sparePartOutboundDetail);
- }
+// List<SparePartOutboundDetail> sparePartOutboundDetailList = sparePartOutboundDetailService.lambdaQuery().eq(SparePartOutboundDetail::getSparePartOutboundId,orderActualMaterial.getOutboundOrderId())
+// .eq(SparePartOutboundDetail::getSparePartId,orderActualMaterial.getSparePartId()).eq(SparePartOutboundDetail::getDelFlag, CommonConstant.DEL_FLAG_0).list();
+// if(CollectionUtils.isNotEmpty(sparePartOutboundDetailList)){
+// SparePartOutboundDetail sparePartOutboundDetail = sparePartOutboundDetailList.get(0);
+// sparePartOutboundDetail.setUseQuantity(orderActualMaterial.getQuantity());
+// sparePartOutboundDetailService.updateById(sparePartOutboundDetail);
+// }
}
return Result.OK("娣诲姞鎴愬姛锛�");
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
index 96a5797..5a0f8fd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
@@ -17,6 +17,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.RepairOrderMapper;
@@ -44,6 +45,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -375,7 +377,9 @@
repairOrder.getCreateStartTime(),
repairOrder.getCreateEndTime(),
repairOrder.getEquipmentImportanceId(),
- repairOrder.getFaultCause());
+ repairOrder.getFaultCause(),
+ null
+ );
// Step.3 AutoPoi 瀵煎嚭Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
@@ -1845,6 +1849,22 @@
return Result.ok(faultCauseBar);
}
+ /**
+ * 璁惧鏁呴殰鎶樼幇鍥�
+ * qsw 2024-7-24
+ */
+ @GetMapping("getEquipmentFaultCause")
+ public Result<?> getEquipmentFaultCause(@RequestParam Map<String, Object> params) {
+ String faultStartTime = (String)params.get("faultStartTime");
+ if(StringUtils.isBlank(faultStartTime)){
+ Date dayAfter = DateUtils.getDayAfter(new Date(),15);
+ params.put("faultStartTime",DateUtils.date2Str(DateUtils.getDayAfter(new Date(),-15),new SimpleDateFormat("yyyy-MM-dd hh:MM:ss")));
+ params.put("faultEndTime", DateUtils.getCurrentDateStr()+" 23:59:59");
+ }
+ List<Map<String, Object>> equipmentFaultCause = repairOrderService.getEquipmentFaultCause(params);
+ return Result.ok(equipmentFaultCause);
+ }
+
/**
* MTPF
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java
index 4013862..d0c2d42 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java
@@ -61,7 +61,6 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- @TableLogic
private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardMapper.java
index 4c24882..532c6ca 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardMapper.java
@@ -16,7 +16,7 @@
*/
public interface DailyInspectionStandardMapper extends BaseMapper<DailyInspectionStandard> {
- IPage<Map<String, Object>> getInspectionStandardPage(IPage<Map> pageData, @Param("num") String num,@Param("name") String name,@Param("versionStatus") String versionStatus);
+ IPage<Map<String, Object>> getInspectionStandardPage(IPage<Map> pageData, @Param("num") String num,@Param("name") String name,@Param("versionStatus") String versionStatus,@Param("workCenterIds")List<String> workCenterIds);
/**
*鍒涘缓鏃ュ父鐐规宸ュ崟鑾峰彇锛屾棩甯哥偣妫�鏍囧噯
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
index a989f0c..c51560f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
@@ -88,5 +88,28 @@
@Param("equipNums") List<String> equipNums,
@Param("sql")String sql
);
+
+ List<Equipment> getEquipmentTZList( Page<Equipment> page,
+ @Param("num") String num,
+ @Param("name")String name,
+ @Param("model")String model,
+ @Param("workCenterIds")List<String> workCenterIds,
+ @Param("factoryModelId")String factoryModelId,
+ @Param("areaId")String areaId,
+ @Param("manageId")String manageId,
+ @Param("useId")String useId,
+ @Param("equipmentImportanceId")String equipmentImportanceId,
+ @Param("technologyStatus")String technologyStatus,
+ @Param("equipmentStatus")String equipmentStatus,
+ @Param("specificEquipment")String specificEquipment,
+ @Param("warrantyStart")Date warrantyStart,
+ @Param("warrantyEnd")Date warrantyEnd,
+ @Param("lineId")String lineId,
+ @Param("isLineEquip")String isLineEquip,
+ @Param("isLine")String isLine,
+ @Param("equipmentCategoryId")String equipmentCategoryId,
+ @Param("equipNums") List<String> equipNums,
+ @Param("sql")String sql
+ );
List<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId,@Param("type")String type);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java
index d2cbf45..aaccf81 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java
@@ -17,7 +17,13 @@
List<Map<String, Object>> getEquipmentList(@Param("params")Map<String, Object> params);
+ List<Map<String, Object>> getWorkCenterList(@Param("params")Map<String, Object> params);
+
List<Map<String, Object>> getEquipmentMTBF(@Param("params")Map<String, Object> params);
List<Map<String, Object>> getMTBFTotalAvailableTime(@Param("params")Map<String, Object> params);
+
+ List<Map<String, Object>> getCenterEquipmentMTBF(@Param("params")Map<String, Object> params);
+
+ List<Map<String, Object>> getCenterMTBFTotalAvailableTime(@Param("params")Map<String, Object> params);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
index 8ce2920..c854be1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
@@ -44,7 +44,8 @@
@Param("createStartTime")Date createStartTime,
@Param("createEndTime")Date createEndTime,
@Param("equipmentImportanceId")String equipmentImportanceId,
- @Param("faultCause")String faultCause
+ @Param("faultCause")String faultCause,
+ @Param("workCenterIds")List<String> workCenterIds
);
@@ -62,5 +63,7 @@
List<Map<String, Object>> getFaultCauseBar(@Param("params") Map<String,Object> params);
+ List<Map<String, Object>> getEquipmentFaultCause(@Param("params") Map<String,Object> params);
+
IPage<Map<String, Object>> getMTPF(IPage<Map> pageData,@Param("params") Map<String,Object> params);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
index 6c73eb5..1808c68 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml
@@ -57,6 +57,12 @@
<if test="versionStatus == 'null' ">
and t1.version_status='2'
</if>
+ <if test="workCenterIds != null">
+ and t2.work_center_id in
+ <foreach collection="workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
<select id="getInspectionStandardMapList" resultType="java.util.Map">
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index c12f8ec..9391997 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -127,6 +127,12 @@
<if test="params.finishEndTime != null">
and t1.actual_end_time <= #{params.finishEndTime}
</if>
+ <if test="params.workCenterIds != null">
+ and t3.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
@@ -220,6 +226,12 @@
<if test="params.finishEndTime != null">
and t1.actual_end_time <= #{params.finishEndTime}
</if>
+ <if test="params.workCenterIds != null">
+ and t3.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 66462e6..2b4251a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -327,6 +327,165 @@
</if>
order by t1.create_time desc
</select>
+
+ <select id="getEquipmentTZList" resultType="org.jeecg.modules.eam.entity.Equipment">
+ select
+ t1.id id,
+ t1.num num,
+ t1.name name,
+ t1.model model,
+ t1.specification specification,
+ t1.equipment_status equipmentStatus,
+ t1.technology_status technologyStatus,
+ t1.asset_number assetNumber,
+ t1.equipment_category_id equipmentCategoryId,
+ t1.specific_equipment specificEquipment,
+ t1.equipment_photo equipmentPhoto,
+ t1.constructor_id constructorId,
+ t1.supplier_id supplierId,
+ t1.factory_number factoryNumber,
+ t1.leave_factory_date leaveFactoryDate,
+ t1.acceptance_check_date acceptanceCheckDate,
+ t1.affiliation_id affiliationId,
+ t1.manage_id manageId,
+ t1.manager manager,
+ t1.use_id useId,
+ t1.functionary functionary,
+ t1.location location,
+ t1.equipment_importance_id equipmentImportanceId,
+ t1.process_parameters processParameters,
+ t1.process_parameters_template_id processParametersTemplateId,
+ t1.precision_parameters precisionParameters,
+ t1.precision_parameters_template_id precisionParametersTemplateId,
+ t1.verification verification,
+ t1.verification_period verificationPeriod,
+ t1.last_verification_date lastVerificationDate,
+ t1.next_verification_date nextVerificationDate,
+ t1.status status,
+ t1.remark remark,
+ t1.equipment_uda1 equipmentUda1,
+ t1.equipment_uda2 equipmentUda2,
+ t1.equipment_uda3 equipmentUda3,
+ t1.equipment_uda4 equipmentUda4,
+ t1.equipment_uda5 equipmentUda5,
+ t1.create_by createBy,
+ t1.create_time createTime,
+ t1.update_by updateBy,
+ t1.update_time updateTime,
+ t1.del_flag delFlag,
+ t1.team_id teamId,
+ t1.source_id sourceId,
+ t1.fund_source fundSource,
+ t1.factory_no factoryNo,
+ t1.mfr mfr,
+ t1.source_country sourceCountry,
+ t1.gpo gpo,
+ t1.key_equipment_identification keyEquipmentIdentification,
+ t1.security_configuration securityConfiguration,
+ t1.cooling_system coolingSystem,
+ t1.fire_extinguisher fireExtinguisher,
+ t1.fire_extinguisher_validity_period fireExtinguisherValidityPeriod,
+ t1.operating_system operatingSystem,
+ t1.system system,
+ t1.port port,
+ t1.coordinate_num coordinateNum,
+ t1.project_approval_no projectApprovalNo,
+ t1.standard_a standardA,
+ t1.standard_b standardB,
+ t1.standard_c standardC,
+ t1.standard_d standardD,
+ t1.standard_e standardE,
+ t1.standard_f standardF,
+ t1.factory_model_id factoryModelId,
+ t1.work_center_id workCenterId,
+ t1.warranty_start warrantyStart,
+ t1.warranty_end warrantyEnd,
+ t1.property_status propertyStatus,
+ t1.check_period checkPeriod,
+ t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
+ t1.technology_status_qualification_time technologyStatusQualificationTime,
+ t1.technology_status_verification_type technologyStatusVerificationType,
+ t1.line_id lineId,
+ t1.is_meta isMeta,
+ t1.id showId,
+ t1.is_line isLine,
+ t1.is_line_equip isLineEquip,
+ t1.is_judging isJudging,
+ t1.area_id areaId,
+ t3.sumOfEquipment
+ from mom_eam_equipment t1
+ left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
+ left join(select count(id) sumOfEquipment,line_id from mom_eam_equipment where del_flag=0 group by line_id) t3 on t3.line_id = t1.id
+ where t1.del_flag = 0
+ <if test="equipmentCategoryId != null and equipmentCategoryId != ''">
+ and t1.equipment_category_id = #{equipmentCategoryId}
+ </if>
+ <if test="num != null and num != ''">
+ and t1.num like concat('%',#{num},'%')
+ </if>
+ <if test="name != null and name != ''">
+ and t1.name like concat('%',#{name},'%')
+ </if>
+ <if test="model != null and model != ''">
+ and t1.model like concat('%',#{model},'%')
+ </if>
+ <if test="workCenterIds != null">
+ and t1.work_center_id in
+ <foreach collection="workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
+ -- 鏍规嵁areaId鏌ヨ璁惧
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
+ </if>
+ <if test="factoryModelId != null and factoryModelId != ''">
+ and t1.factory_model_id = #{factoryModelId}
+ </if>
+ <if test="manageId != null and manageId != ''">
+ and t1.manage_id = #{manageId}
+ </if>
+ <if test="useId != null and useId != ''">
+ and t1.use_id = #{useId}
+ </if>
+ <if test="equipmentImportanceId != null and equipmentImportanceId != ''">
+ and t1. equipment_importance_id = #{equipmentImportanceId}
+ </if>
+ <if test="technologyStatus != null and technologyStatus != ''">
+ and t1.technology_status = #{technologyStatus}
+ </if>
+ <if test="equipmentStatus != null and equipmentStatus != ''">
+ and t1.equipment_status = #{equipmentStatus}
+ </if>
+ <if test="isLineEquip != null and isLineEquip != ''">
+ and t1.is_line_equip = #{isLineEquip}
+ </if>
+ <if test="isLine != null and isLine != ''">
+ and t1.is_line = #{isLine}
+ </if>
+ <if test="specificEquipment != null and specificEquipment != ''">
+ and t1.specific_equipment = #{specificEquipment}
+ </if>
+ <if test="equipNums.size!=0">
+ and t1.num in
+ <foreach collection="equipNums" open="(" separator="," close=")" item="num">
+ #{num}
+ </foreach>
+ </if>
+ <if test="warrantyStart != null">
+ and DATEDIFF(day,t1.warranty_start,#{warrantyStart})=0
+ </if>
+ <if test="warrantyEnd != null">
+ and DATEDIFF(day,t1.warranty_end,#{warrantyEnd})=0
+ </if>
+ <if test="sql != null and sql != ''">
+ and t2.equipment_category_uda1 = #{sql}
+ </if>
+ <if test="lineId != null and lineId != ''">
+ and t1.line_id = #{lineId}
+ </if>
+ order by t1.create_time desc
+ </select>
<!-- order by (CASE WHEN t1.is_meta='yes' then GETDATE() else t1.create_time end) desc-->
<select id="getStandardList" resultType="org.jeecg.modules.eam.entity.DailyInspectionStandardDetail">
select t9.* from ( select
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index 50d892f..ff0ba3f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -114,6 +114,12 @@
#{num}
</foreach>
</if>
+ <if test="params.workCenterIds != null">
+ and t2.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
<select id="exportList" resultType="org.jeecg.modules.eam.vo.RepairReportExportVo">
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml
index 2190582..b6f68df 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml
@@ -12,17 +12,41 @@
t2.depart_name as departName
FROM
mom_eam_equipment t1
- LEFT JOIN sys_depart t2 ON t1.use_id = t2.id
+ LEFT JOIN mom_base_area t2 ON t1.work_center_id = t2.id
WHERE
t1.del_flag = '0'
- <if test="params.useDepartName != null and params.useDepartName != ''">
- and t2.depart_name like concat('%',#{params.useDepartName},'%')
- </if>
- <if test="params.useDepartName == ''">
- and t2.depart_name = '-1'
- </if>
-
+ <if test="params.useDepartName != null and params.useDepartName != ''">
+ and t2.name =#{params.useDepartName}
+ </if>
+ <if test="params.abc != null and params.abc != ''">
+ and t1.equipment_importance_id =#{params.abc}
+ </if>
+ <if test="params.specificEquipment != null and params.specificEquipment != ''">
+ and t1.specific_equipment in ('0','1','2')
+ </if>
</select>
+
+ <select id="getWorkCenterList" parameterType="Map" resultType="Map">
+ SELECT COUNT
+ ( t1.work_center_id ),
+ t1.work_center_id as workCenterId,
+ t2.name as workCenterName
+ FROM
+ mom_eam_equipment t1
+ LEFT JOIN mom_base_area t2 ON t1.work_center_id = t2.id
+ WHERE t2.type = '1' and t1.work_center_id IS NOT NULL
+ <if test="params.abc != null and params.abc != ''">
+ and t1.equipment_importance_id =#{params.abc}
+ </if>
+ <if test="params.useDepartName != null and params.useDepartName != ''">
+ and t2.name =#{params.useDepartName}
+ </if>
+ GROUP BY t1.work_center_id,t2.name
+ </select>
+
+ <!-- <if test="params.useDepartName == ''">-->
+ <!-- and t2.depart_name = '-1'-->
+ <!-- </if>-->
<select id="getEquipmentMTBF" parameterType="Map" resultType="Map">
SELECT
@@ -55,4 +79,37 @@
<select id="getMTBFTotalAvailableTime" parameterType="Map" resultType="Map">
select datediff( HOUR, #{params.startTime}, #{params.endTime} ) + 24 AS totalAvailableTime
</select>
+
+ <select id="getCenterEquipmentMTBF" parameterType="Map" resultType="Map">
+ SELECT
+ COUNT(tt.workCenterId) AS faultNumber,
+ tt.totalAvailableTime * COUNT(tt.workCenterId) as totalAvailableTime,
+ SUM(tt.faultTime) * COUNT(tt.workCenterId) AS faultTime,
+ SUM(tt.repairTime) * COUNT(tt.workCenterId) AS repairTime,
+ SUM(tt.noFaultTime) * COUNT(tt.workCenterId) AS noFaultTime,
+ SUM(tt.repairTime) /COUNT(tt.workCenterId) * COUNT(tt.workCenterId) AS averageRepairTime,
+ SUM(tt.noFaultTime) /COUNT(tt.workCenterId) * COUNT(tt.workCenterId) AS averageFaultIntervalTime
+ FROM(
+ SELECT
+ t3.work_center_id as workCenterId,
+ datediff( HOUR, #{params.startTime}, #{params.endTime} ) + 24 AS totalAvailableTime,
+ datediff( HOUR, isnull( t1.fault_time, GETDATE( ) ), isnull( t1.accept_time, GETDATE( ) ) ) AS faultTime,
+ datediff( HOUR, isnull( t2.actual_start_time, GETDATE( ) ), isnull( t2.actual_end_time, GETDATE( ) ) ) AS repairTime,
+ (datediff( HOUR, #{params.startTime}, #{params.endTime}) + 24) - datediff( HOUR, isnull( t1.fault_time, GETDATE( ) ), isnull( t1.accept_time, GETDATE( ) ) ) AS noFaultTime
+ FROM
+ mom_eam_equipment_report_repair t1
+ LEFT JOIN mom_eam_repair_order t2 ON t2.report_repair_id = t1.id
+ left join mom_eam_equipment t3 on t1.equipment_id = t3.id
+ WHERE 1=1
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.fault_time, 120 ), 1, 10 ) >= #{params.startTime}
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.fault_time, 120 ), 1, 10 ) <= #{params.endTime}
+ AND t3.work_center_id = #{params.workCenterId}
+ ) AS tt
+ GROUP BY
+ tt.workCenterId,tt.totalAvailableTime
+ </select>
+
+ <select id="getCenterMTBFTotalAvailableTime" parameterType="Map" resultType="Map">
+ select datediff( HOUR, #{params.startTime}, #{params.endTime} ) + 24 AS totalAvailableTime
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
index 5e41e47..90a5d0a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
@@ -72,6 +72,12 @@
<if test="params.inspectionEndTime != null">
and t1.actual_end_time <= #{params.inspectionEndTime}
</if>
+ <if test="params.workCenterIds != null">
+ and t2.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
index 0c8ec70..b7e4140 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
@@ -9,7 +9,7 @@
t1.maintenance_order_id maintenanceOrderId,
t1.equipment_id equipmentId,
t1.outbound_order_detail_id outboundOrderDetailId,
- t2.id as sparePartId,
+ t1.spare_part_id as sparePartId,
t1.quantity,
t1.is_lock isLock,
t2.num as sparePartNum,
@@ -21,7 +21,9 @@
t2.specification as specification,
t3.name as mainUnitName,
t4.name as constructorName,
- t6.num num
+ t6.num num,
+ t1.smoam_uda1 smoamUda1,
+ t1.smoam_uda2 smoamUda2
FROM
mom_eam_maintenance_order_actual_material t1
LEFT JOIN mom_eam_spare_part t2 ON t1.spare_part_id = t2.id
@@ -29,7 +31,7 @@
left join mom_base_constructor t4 on t4.id = t2.constructor_id
left join mom_eam_spare_part_outbound_detail t5 on t1.outbound_order_detail_id = t5.id
left join mom_eam_spare_part_outbound t6 on t6.id = t5.spare_part_outbound_id
- WHERE t1.del_flag = 0 and t2.del_flag = 0
+ WHERE t1.del_flag = 0
<if test="params.maintenanceOrderId != null and params.maintenanceOrderId != ''">
and t1.maintenance_order_id = #{params.maintenanceOrderId}
</if>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
index aab28b6..ff19c5e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
@@ -164,6 +164,12 @@
<if test="params.maintenanceType != null and params.maintenanceType != ''">
and t1.maintenance_type = #{params.maintenanceType}
</if>
+ <if test="params.workCenterIds != null">
+ and t2.work_center_id in
+ <foreach collection="params.workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
ORDER BY t1.create_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index f741f23..3d66031 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -122,6 +122,13 @@
<if test="createEndTime != null">
and t1.create_time <= #{createEndTime}
</if>
+
+ <if test="workCenterIds != null">
+ and t2.work_center_id in
+ <foreach collection="workCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
order by t1.create_time desc
</select>
@@ -232,8 +239,11 @@
t1.del_flag = 0
AND t2.del_flag = 0
<if test="params.equipmentNum != null and params.equipmentNum != ''">
- and t11.num = #{params.equipmentNum}
+ and t11.num like concat('%',#{params.equipmentNum},'%')
</if>
+ <if test="params.useId != null and params.useId != ''">
+ and t11.use_id = #{params.useId}
+ </if>
<if test="params.faultStartTime != null">
and t2.create_time >= #{params.faultStartTime}
</if>
@@ -261,7 +271,10 @@
t1.del_flag = 0
AND t2.del_flag = 0
<if test="params.equipmentNum != null and params.equipmentNum != ''">
- and t11.num = #{params.equipmentNum}
+ and t11.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useId != null and params.useId != ''">
+ and t11.use_id = #{params.useId}
</if>
<if test="params.faultStartTime != null">
and t2.create_time >= #{params.faultStartTime}
@@ -271,6 +284,26 @@
</if>
) t4 ON t3.item_value = t4.repair_order_fault_analysis_uda2
group by t3.item_text
+ </select>
+
+ <select id="getEquipmentFaultCause" parameterType="Map" resultType="Map">
+ select count(SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10)) as '璁惧鏁呴殰娆℃暟',
+ SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10) as type from mom_eam_equipment_report_repair t1
+ left join mom_eam_equipment t2 on t1.equipment_id = t2.id
+ where 1=1
+ <if test="params.equipmentNum != null and params.equipmentNum != ''">
+ and t2.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useId != null and params.useId != ''">
+ and t2.use_id = #{params.useId}
+ </if>
+ <if test="params.faultStartTime != null">
+ and t1.fault_time >= #{params.faultStartTime}
+ </if>
+ <if test="params.faultEndTime != null">
+ and t1.fault_time <= #{params.faultEndTime}
+ </if>
+ GROUP BY SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10)
</select>
<select id="getMTPF" parameterType="Map" resultType="Map">
@@ -290,7 +323,10 @@
t1.del_flag = 0
AND t2.del_flag = 0
<if test="params.equipmentNum != null and params.equipmentNum != ''">
- and t11.num = #{params.equipmentNum}
+ and t11.num like concat('%',#{params.equipmentNum},'%')
+ </if>
+ <if test="params.useId != null and params.useId != ''">
+ and t11.use_id = #{params.useId}
</if>
<if test="params.faultStartTime != null">
and t2.create_time >= #{params.faultStartTime}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
index 96ea5ab..0e71864 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
@@ -61,6 +61,8 @@
public IPage<Equipment> pageEquipment(Integer pageNo, Integer pageSize, Map<String, Object> params);
Page<Equipment> getEquipmentList(Page<Equipment> page, Equipment equipment);
+
+ Page<Equipment> getEquipmentTZList(Page<Equipment> page, Equipment equipment);
IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId,String type);
IPage<Map<String, Object>> getEquipmentListAllStandard(Integer pageNo, Integer pageSize, Map<String, Object> params);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java
index 8d06cfe..c93b0a7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java
@@ -18,9 +18,15 @@
List<Map<String, Object>> getEquipmentList(Map<String, Object> params);
+ List<Map<String, Object>> getWorkCenterList(Map<String, Object> params);
+
List<Map<String, Object>> getEquipmentMTBF(Map<String, Object> params);
List<Map<String, Object>> getMTBFTotalAvailableTime(Map<String, Object> params);
+ List<Map<String, Object>> getCenterEquipmentMTBF(Map<String, Object> params);
+
+ List<Map<String, Object>> getCenterMTBFTotalAvailableTime(Map<String, Object> params);
+
public List<FaultIntervalTime> getMTBF(Map<String, String> query) throws ParseException;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java
index 9388993..8f54d0b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IRepairOrderService.java
@@ -61,5 +61,7 @@
List<Map<String, Object>> getFaultCauseBar(Map<String, Object> params);
+ List<Map<String, Object>> getEquipmentFaultCause(Map<String, Object> params);
+
IPage<Map<String, Object>> getMTPF(Integer pageNo, Integer pageSize, Map<String, Object> params);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyInspectionStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyInspectionStandardServiceImpl.java
index 8808d27..940d668 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyInspectionStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyInspectionStandardServiceImpl.java
@@ -4,11 +4,17 @@
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;
import org.jeecg.modules.eam.entity.DailyInspectionStandard;
import org.jeecg.modules.eam.mapper.DailyInspectionStandardMapper;
import org.jeecg.modules.eam.service.IDailyInspectionStandardService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -21,13 +27,26 @@
@Service
public class DailyInspectionStandardServiceImpl extends ServiceImpl<DailyInspectionStandardMapper, DailyInspectionStandard> implements IDailyInspectionStandardService {
+ @Autowired
+ private ISysUserService sysUserService;
+
@Override
public IPage<Map<String, Object>> getInspectionStandardList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
String num = String.valueOf(params.get("num"));
String name = String.valueOf(params.get("name"));
String versionStatus = String.valueOf(params.get("versionStatus"));
- return super.baseMapper.getInspectionStandardPage(pageData,num,name,versionStatus);
+
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ }
+
+ return super.baseMapper.getInspectionStandardPage(pageData,num,name,versionStatus,workCenterIds);
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java
index 4db2428..f53a6f1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java
@@ -1,16 +1,23 @@
package org.jeecg.modules.eam.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.mapper.DailyMaintenanceOrderMapper;
import org.jeecg.modules.eam.model.DepartVo;
import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -23,15 +30,36 @@
@Service
public class DailyMaintenanceOrderServiceImpl extends ServiceImpl<DailyMaintenanceOrderMapper, DailyMaintenanceOrder> implements IDailyMaintenanceOrderService {
+ @Autowired
+ private ISysUserService sysUserService;
+
@Override
public IPage<Map<String, Object>> getDailyMaintenanceOrderList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ params.put("workCenterIds",workCenterIds);
+ }
return super.getBaseMapper().getDailyMaintenanceOrderList(pageData,params);
}
@Override
public IPage<Map<String, Object>> getDailyMaintenanceOrder3List(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ params.put("workCenterIds",workCenterIds);
+ }
return super.getBaseMapper().getDailyMaintenanceOrder3List(pageData,params);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 713e1ae..bff7304 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentCategory;
@@ -11,6 +13,9 @@
import org.jeecg.modules.eam.mapper.EamEquipmentMapper;
import org.jeecg.modules.eam.model.DepartVo;
import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,6 +34,9 @@
*/
@Service
public class EamEquipmentServiceImpl extends ServiceImpl<EamEquipmentMapper, Equipment> implements IEamEquipmentService {
+
+ @Autowired
+ private ISysUserService sysUserService;
@Override
public List<DepartVo> getSysDeparts() {
@@ -103,6 +111,7 @@
@Override
public Page<Equipment> getEquipmentList(Page<Equipment> page, Equipment equipment) {
+
String sql = equipment.getEquipmentCategoryUda1();
List<String> equipNums = new ArrayList<>();
if(StringUtils.isNotBlank(equipment.getNums())){
@@ -134,6 +143,48 @@
}
@Override
+ public Page<Equipment> getEquipmentTZList(Page<Equipment> page, Equipment equipment) {
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+// strings = new ArrayList<>();
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ }
+ String sql = equipment.getEquipmentCategoryUda1();
+ List<String> equipNums = new ArrayList<>();
+ if(StringUtils.isNotBlank(equipment.getNums())){
+ equipNums = Arrays.asList(equipment.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
+ }
+ return page.setRecords(baseMapper.getEquipmentTZList(
+ page,
+ equipment.getNum(),
+ equipment.getName(),
+ equipment.getModel(),
+ workCenterIds,
+ equipment.getFactoryModelId(),
+ equipment.getAreaId(),
+ equipment.getManageId(),
+ equipment.getUseId(),
+ equipment.getEquipmentImportanceId(),
+ equipment.getTechnologyStatus(),
+ equipment.getEquipmentStatus(),
+ equipment.getSpecificEquipment(),
+ equipment.getWarrantyStart(),
+ equipment.getWarrantyEnd(),
+ equipment.getLineId(),
+ equipment.getIsLineEquip(),
+ equipment.getIsLine(),
+ equipment.getEquipmentCategoryId(),
+ equipNums,
+ sql
+
+ ));
+ }
+
+ @Override
public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId,String type) {
return page.setRecords(baseMapper.getStandardList(page,mainId,type));
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
index 70413d9..f267245 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
@@ -7,9 +7,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
import org.jeecg.common.system.base.entity.SysUploadRela;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
import org.jeecg.modules.eam.mapper.EquipmentReportRepairMapper;
import org.jeecg.modules.eam.service.IEquipmentReportRepairService;
@@ -23,6 +25,7 @@
import org.jeecg.modules.system.mapper.SysRoleMapper;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.mapper.SysUserRoleMapper;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -51,6 +54,9 @@
private SysUserRoleMapper sysUserRoleMapper;
@Autowired
private SysRoleMapper sysRoleMapper;
+
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 鏁呴殰鎶ヤ慨娣诲姞
*
@@ -122,6 +128,17 @@
}
}
}
+
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ params.put("workCenterIds",workCenterIds);
+ }
+
List<String> equipNums = new ArrayList<>();
if(StringUtils.isNotBlank((String)params.get("nums"))){
equipNums = Arrays.asList(((String) params.get("nums")).trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java
index edeed8a..aab9cb0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java
@@ -205,4 +205,19 @@
public List<Map<String, Object>> getEquipmentList(Map<String, Object> params) {
return this.baseMapper.getEquipmentList(params);
}
+
+ @Override
+ public List<Map<String, Object>> getCenterEquipmentMTBF(Map<String, Object> params) {
+ return this.baseMapper.getCenterEquipmentMTBF(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCenterMTBFTotalAvailableTime(Map<String, Object> params) {
+ return this.baseMapper.getCenterMTBFTotalAvailableTime(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getWorkCenterList(Map<String, Object> params) {
+ return this.baseMapper.getWorkCenterList(params);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
index c0ad510..6fcf60b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
@@ -1,15 +1,22 @@
package org.jeecg.modules.eam.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.InspectionOrder;
import org.jeecg.modules.eam.mapper.InspectionOrderMapper;
import org.jeecg.modules.eam.model.InspectionCycleVo;
import org.jeecg.modules.eam.service.IInspectionOrderService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -21,6 +28,9 @@
*/
@Service
public class InspectionOrderServiceImpl extends ServiceImpl<InspectionOrderMapper, InspectionOrder> implements IInspectionOrderService {
+
+ @Autowired
+ private ISysUserService sysUserService;
//鏍规嵁璁惧鑾峰彇鐐规鍛ㄦ湡 锛堟墜鍔ㄧ敓鎴愭棩甯哥偣妫�宸ュ崟锛�
@Override
@@ -37,6 +47,15 @@
@Override
public IPage<Map<String, Object>> getInspectionOrderList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ params.put("workCenterIds",workCenterIds);
+ }
return super.getBaseMapper().getInspectionOrderList(pageData,params);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java
index 16750b7..e3174e8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java
@@ -1,8 +1,11 @@
package org.jeecg.modules.eam.service.impl;
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;
import org.jeecg.modules.eam.entity.DailyInspectionStandard;
import org.jeecg.modules.eam.entity.MaintenanceStandard;
import org.jeecg.modules.eam.mapper.DailyInspectionStandardMapper;
@@ -10,8 +13,12 @@
import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.IDailyInspectionStandardService;
import org.jeecg.modules.eam.service.IMaintenanceStandardService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -24,9 +31,21 @@
@Service
public class MaintenanceStandardServiceImpl extends ServiceImpl<MaintenanceStandardMapper, MaintenanceStandard> implements IMaintenanceStandardService {
+ @Autowired
+ private ISysUserService sysUserService;
+
@Override
public IPage<Map<String, Object>> getMaintenanceStandardList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ params.put("workCenterIds",workCenterIds);
+ }
return super.baseMapper.getMaintenanceStandardList(pageData,params);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
index 1607d57..3c67ca7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
@@ -5,7 +5,9 @@
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.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
@@ -19,6 +21,7 @@
import org.jeecg.modules.eam.vo.EquipmentAvailabilityVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +66,9 @@
@Autowired
private IEquipmentReportRepairService equipmentReportRepairService;
+ @Autowired
+ private ISysUserService sysUserService;
+
@Override
@@ -101,6 +107,16 @@
}else{
repairOrder.setTeamId("");
}
+
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ }
+
List<String> equipNums = new ArrayList<>();
if(StringUtils.isNotBlank(repairOrder.getNums())){
equipNums = Arrays.asList(repairOrder.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
@@ -123,7 +139,8 @@
repairOrder.getCreateStartTime(),
repairOrder.getCreateEndTime(),
repairOrder.getEquipmentImportanceId(),
- repairOrder.getFaultCause()
+ repairOrder.getFaultCause(),
+ workCenterIds
));
}
@@ -148,6 +165,11 @@
}
@Override
+ public List<Map<String, Object>> getEquipmentFaultCause(Map<String, Object> params) {
+ return this.baseMapper.getEquipmentFaultCause(params);
+ }
+
+ @Override
public IPage<Map<String, Object>> getMTPF(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
return this.baseMapper.getMTPF(pageData,params);
--
Gitblit v1.9.3