From 3a75aff8c1dea47564393877d4f71adbb318e013 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 24 十月 2023 17:04:46 +0800
Subject: [PATCH] 1.设备台账大全
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java | 15 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java | 2 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 6 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 35 +++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java | 2 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 15 ++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 1
7 files changed, 73 insertions(+), 3 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 8c06ac4..d59dbe5 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
@@ -62,10 +62,10 @@
@Autowired
private IProcessParametersTemplateDetailService processParametersTemplateDetailService;
- @Autowired
+ @Autowired
private IEquipmentProcessParametersService equipmentProcessParametersService;
- @Autowired
+ @Autowired
private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;
@Autowired
@@ -761,6 +761,17 @@
}
return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
}
+ @GetMapping(value = "/getEquipmentStansdardList")
+ @PermissionData
+ public Result<IPage<DailyInspectionStandardDetail>> getEquipmentStansdardList(DailyInspectionStandardDetail standardDetail,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
+ Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
+ IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
+ return Result.OK(pageList);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java
index e2bd184..b680637 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java
@@ -1,11 +1,13 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -25,7 +27,6 @@
@ApiModel(value="mom_eam_daily_inspection_standard_detail瀵硅薄", description="mom_eam_daily_inspection_standard_detail")
public class DailyInspectionStandardDetail extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
-
/**鏃ュ父鐐规鏍囧噯id*/
@Excel(name = "鏃ュ父鐐规鏍囧噯id", width = 15)
@@ -94,4 +95,16 @@
@ApiModelProperty(value = "涓婃鐐规鏃堕棿")
private String lastInspectionTime;
+ @TableField(exist = false)
+ private String projectName;
+ @TableField(exist = false)
+ private String standard;
+ @TableField(exist = false)
+ @Dict(dicCode = "all_maintenance_type")
+ private String type;
+ @TableField(exist = false)
+ private String cycleName;
+ @TableField(exist = false)
+ private String equipmentId;
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 6a9c170..60b836c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -246,6 +246,7 @@
private String securityConfiguration;
@ApiModelProperty(value = "鍐峰嵈绯荤粺")
@Excel(name = "鍐峰嵈绯荤粺", width = 15,orderNum = "10")
+ @Dict(dicCode = "cooling_system")
private String coolingSystem;
@Excel(name = "鐏伀鍣�", width = 15,orderNum = "11")
@ApiModelProperty(value = "鐏伀鍣�")
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 0efbd24..c2f07f0 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.model.DepartVo;
@@ -79,4 +80,5 @@
@Param("warrantyEnd")Date warrantyEnd,
@Param("sql")String sql
);
+ List<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId);
}
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 3e657d1..3c4e12a 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
@@ -295,5 +295,40 @@
</if>
order by t1.create_time desc
</select>
+ <select id="getStandardList" resultType="org.jeecg.modules.eam.entity.DailyInspectionStandardDetail">
+ select t9.* from ( select
+ t1.id id,
+ t5.name projectName,
+ t5.detection_standard standard,
+ '1' as type,
+ t6.name cycleName,
+ t2.equipment_id equipmentId
+ from mom_eam_daily_inspection_standard_detail t1
+ left join mom_eam_daily_inspection_standard t2
+ on t2.id = t1.daily_inspection_standard_id
+ left join mom_eam_inspection_project t5
+ on t5.id = t1.inspection_project_id
+ left join mom_eam_maintenance_cycle t6
+ on t6.id = t1.inspection_cycle_id
+ where t2.version_status = '2'
+ union all
+ select
+ t3.id id,
+ t7.name projectName,
+ t7.standard standard,
+ t8.maintenance_type type,
+ t8.name cycleName,
+ t4.equipment_id equipmentId
+ from mom_eam_maintenance_standard_detail t3
+ left join mom_eam_maintenance_standard t4
+ on t4.id = t3.maintenance_standard_id
+ left join mom_eam_maintenance_project t7
+ on t7.id = t3.maintenance_project_id
+ left join mom_eam_maintenance_cycle t8
+ on t8.id = t3.maintenance_cycle_id
+ where t4.version_status = '2') t9 where
+ t9.equipmentId = #{mainId}
+ order by t9.type
+ </select>
</mapper>
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 0e55e05..c18230b 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.model.DepartVo;
@@ -60,4 +61,5 @@
public IPage<Equipment> pageEquipment(Integer pageNo, Integer pageSize, Map<String, Object> params);
Page<Equipment> getEquipmentList(Page<Equipment> page, Equipment equipment);
+ IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId);
}
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 475fd2d..72ed6fa 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,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentCategory;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
@@ -117,4 +118,9 @@
sql
));
}
+
+ @Override
+ public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId) {
+ return page.setRecords(baseMapper.getStandardList(page,mainId));
+ }
}
--
Gitblit v1.9.3