From 621f1bdaa9d84ea7e1fba28d883c4927a14ee485 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 09 九月 2024 14:34:51 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 7 +++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java | 4 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 6 ++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml | 3 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java | 4 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java | 4 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOverallEquipmentEfficiencyVo.java | 5 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java | 4 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 6 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java | 4 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java | 4 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 9 +++++++++
12 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java
index 4bd5a50..bf5624e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyListDto.java
@@ -30,6 +30,10 @@
* 璁惧绫诲瀷
*/
private String equipmentType;
+ /**
+ * 璁惧鍨嬪彿
+ */
+ private String equipmentModel;
/**
* 鍒╃敤鐜囨暟鎹�
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java
index 105506d..c245be1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEfficiencyShiftListDto.java
@@ -34,6 +34,10 @@
*/
private String shiftSubName;
/**
+ * 璁惧鍨嬪彿
+ */
+ private String equipmentModel;
+ /**
* 鍒╃敤鐜囨暟鎹�
*/
private List<MdcEfficiencyShiftResultDto> dataList;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
index 434328f..ce1784a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquDepDto.java
@@ -36,4 +36,8 @@
* 璁惧绫诲瀷
*/
private String equipmentType;
+ /**
+ * 璁惧鍨嬪彿
+ */
+ private String equipmentModel;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
index ebba0d4..769e810 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquProDto.java
@@ -37,5 +37,9 @@
* 璁惧绫诲瀷
*/
private String equipmentType;
+ /**
+ * 璁惧鍨嬪彿
+ */
+ private String equipmentModel;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index afb4a9a..eb934e8 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -167,4 +167,11 @@
@TableField(exist = false)
@ApiModelProperty(value = "閫夋嫨鐨勪骇绾縤d闆嗗悎")
private String selectedProduction;
+
+ /**
+ * 閲嶈绋嬪害
+ */
+ @Dict(dicCode = "device_importance_level")
+ @ApiModelProperty(value = "閲嶈绋嬪害")
+ private Integer deviceImportanceLevel;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
index 73d3381..267045c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -37,6 +37,9 @@
<if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
AND t2.device_category = #{vo.deviceCategory}
</if>
+ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
+ AND t2.device_importance_level = #{vo.deviceImportanceLevel}
+ </if>
<if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
AND t2.equipment_id IN
<foreach collection="vo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
@@ -83,6 +86,9 @@
</if>
<if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
AND t2.device_category = #{vo.deviceCategory}
+ </if>
+ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
+ AND t2.device_importance_level = #{vo.deviceImportanceLevel}
</if>
<if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
AND t2.equipment_id IN
@@ -137,6 +143,9 @@
<if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
AND t2.device_category = #{vo.deviceCategory}
</if>
+ <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
+ AND t2.device_importance_level = #{vo.deviceImportanceLevel}
+ </if>
</where>
GROUP BY
t2.equipment_id,
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index e29c675..4f47d99 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -132,7 +132,8 @@
sd.org_type,
me.equipment_id,
me.equipment_name,
- me.equipment_type
+ me.equipment_type,
+ me.equipment_model
FROM
mdc_equipment_depart med
LEFT JOIN sys_depart sd ON med.dep_id = sd.id
@@ -155,7 +156,8 @@
mp.org_type,
me.equipment_id,
me.equipment_name,
- me.equipment_type
+ me.equipment_type,
+ me.equipment_model
FROM
mdc_production_equipment mpe
LEFT JOIN mdc_production mp ON mpe.production_id = mp.id
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
index d44e329..08c7fcc 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverallEquipmentEfficiencyMapper.xml
@@ -73,6 +73,9 @@
#{ equipmentType }
</foreach>
</if>
+ <if test="mdcOverallEquipmentEfficiency.deviceImportanceLevel != null and mdcOverallEquipmentEfficiency.deviceImportanceLevel != '' ">
+ AND t2.device_importance_level = #{mdcOverallEquipmentEfficiency.deviceImportanceLevel}
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index c8dd286..f981ce3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -123,6 +123,7 @@
mdcEfficiencyListDto.setEquipmentId(mdcEquDepDto.getEquipmentId());
mdcEfficiencyListDto.setEquipmentName(mdcEquDepDto.getEquipmentName());
mdcEfficiencyListDto.setEquipmentType(mdcEquDepDto.getEquipmentType());
+ mdcEfficiencyListDto.setEquipmentModel(mdcEquDepDto.getEquipmentModel());
switch (mdcEquDepDto.getOrgType()) {
case "1":
mdcEfficiencyListDto.setLevel1(mdcEquDepDto.getDepartName());
@@ -212,6 +213,7 @@
mdcEfficiencyListDto.setEquipmentId(mdcEquProDto.getEquipmentId());
mdcEfficiencyListDto.setEquipmentName(mdcEquProDto.getEquipmentName());
mdcEfficiencyListDto.setEquipmentType(mdcEquProDto.getEquipmentType());
+ mdcEfficiencyListDto.setEquipmentModel(mdcEquProDto.getEquipmentModel());
switch (mdcEquProDto.getOrgType()) {
case "1":
mdcEfficiencyListDto.setLevel1(mdcEquProDto.getProductionName());
@@ -471,6 +473,7 @@
mdcEfficiencyListDto.setEquipmentId(mdcEquDepDto.getEquipmentId());
mdcEfficiencyListDto.setEquipmentName(mdcEquDepDto.getEquipmentName());
mdcEfficiencyListDto.setEquipmentType(mdcEquDepDto.getEquipmentType());
+ mdcEfficiencyListDto.setEquipmentModel(mdcEquDepDto.getEquipmentModel());
switch (mdcEquDepDto.getOrgType()) {
case "1":
mdcEfficiencyListDto.setLevel1(mdcEquDepDto.getDepartName());
@@ -560,6 +563,7 @@
mdcEfficiencyListDto.setEquipmentId(mdcEquProDto.getEquipmentId());
mdcEfficiencyListDto.setEquipmentName(mdcEquProDto.getEquipmentName());
mdcEfficiencyListDto.setEquipmentType(mdcEquProDto.getEquipmentType());
+ mdcEfficiencyListDto.setEquipmentModel(mdcEquProDto.getEquipmentModel());
switch (mdcEquProDto.getOrgType()) {
case "1":
mdcEfficiencyListDto.setLevel1(mdcEquProDto.getProductionName());
@@ -841,6 +845,7 @@
mdcEfficiencyShiftListDto.setEquipmentId(mdcEquDepDto.getEquipmentId());
mdcEfficiencyShiftListDto.setEquipmentName(mdcEquDepDto.getEquipmentName());
mdcEfficiencyShiftListDto.setEquipmentType(mdcEquDepDto.getEquipmentType());
+ mdcEfficiencyShiftListDto.setEquipmentModel(mdcEquDepDto.getEquipmentModel());
mdcEfficiencyShiftListDto.setShiftSubName(shiftSubName);
switch (mdcEquDepDto.getOrgType()) {
case "1":
@@ -952,6 +957,7 @@
mdcEfficiencyShiftListDto.setEquipmentId(mdcEquProDto.getEquipmentId());
mdcEfficiencyShiftListDto.setEquipmentName(mdcEquProDto.getEquipmentName());
mdcEfficiencyShiftListDto.setEquipmentType(mdcEquProDto.getEquipmentType());
+ mdcEfficiencyShiftListDto.setEquipmentModel(mdcEquProDto.getEquipmentModel());
mdcEfficiencyShiftListDto.setShiftSubName(shiftSubName);
switch (mdcEquProDto.getOrgType()) {
case "1":
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
index f4f140b..6b24514 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportQueryVo.java
@@ -58,5 +58,9 @@
* 璁惧绉嶇被
*/
private String deviceCategory;
+ /**
+ * 閲嶈绋嬪害
+ */
+ private Integer deviceImportanceLevel;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
index dee9778..30dfcbb 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyReportShiftQueryVo.java
@@ -61,5 +61,9 @@
* 璁惧绉嶇被
*/
private String deviceCategory;
+ /**
+ * 閲嶈绋嬪害
+ */
+ private Integer deviceImportanceLevel;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOverallEquipmentEfficiencyVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOverallEquipmentEfficiencyVo.java
index b903c98..521e233 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOverallEquipmentEfficiencyVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOverallEquipmentEfficiencyVo.java
@@ -70,4 +70,9 @@
private List<String> equipmentTypeList;
+ /**
+ * 閲嶈绋嬪害
+ */
+ private Integer deviceImportanceLevel;
+
}
--
Gitblit v1.9.3