From a2f0f30bf158b6632e0d109276a78ca4831ea178 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:10:32 +0800
Subject: [PATCH] 问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java | 31 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml | 28 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java | 30 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java | 45 +++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java | 12 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 84 ++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java | 8
9 files changed, 234 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 0598abc..ba43288 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -88,6 +88,9 @@
// private IUploadService uploadService;
private ISysBaseAPI sysBaseApi;
+
+ @Autowired
+ private IAreaService areaService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -671,4 +674,85 @@
calibrationOrderService.updateById(calibrationOrder);
return Result.OK("缂栬緫鎴愬姛!");
}
+
+ /**
+ *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ * qsw 2024-3-13
+ */
+ @GetMapping("getEquipmentTechnologyStatusList")
+ public Result<?> getEquipmentTechnologyStatusList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getEquipmentTechnologyStatusList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ * qsw 2024-3-13
+ */
+ @GetMapping("getReportRepairEquipmentList")
+ public Result<?> getReportRepairEquipmentList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getReportRepairEquipmentList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉鏈湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @GetMapping("getThisMonthMaintenanceList")
+ public Result<?> getThisMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getThisMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @GetMapping("getNextMonthMaintenanceList")
+ public Result<?> getNextMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getNextMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ * qsw 2024-3-14
+ */
+ @GetMapping("getNextNextMonthMaintenanceList")
+ public Result<?> getNextNextMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getNextNextMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
index e4953d9..8807fe2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
@@ -63,16 +63,16 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "绠＄悊鍒跺害鍙�", width = 15)
+ @ApiModelProperty(value = "绠＄悊鍒跺害鍙�")
private String disUda1;
/**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
+ @Excel(name = "瀹℃牳缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃牳缁撴灉")
private String disUda2;
/**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁3")
+ @Excel(name = "瀹℃壒缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃壒缁撴灉")
private String disUda3;
/**澶囩敤瀛楁4*/
@Excel(name = "澶囩敤瀛楁4", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java
index e9a86e8..2127880 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java
@@ -64,12 +64,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "瀹℃牳缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃牳缁撴灉")
private String maintenanceStandardUda1;
/**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁2")
+ @Excel(name = "瀹℃壒缁撴灉", width = 15)
+ @ApiModelProperty(value = "瀹℃壒缁撴灉")
private String maintenanceStandardUda2;
/**澶囩敤瀛楁3*/
@Excel(name = "澶囩敤瀛楁3", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
index 901baca..8e1e778 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
@@ -23,4 +23,34 @@
*/
List<Map<String, Object>> getPrecisionParameterList(@Param("equipmentId")String equipmentId);
+ /**
+ *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ * qsw 2024-3-13
+ */
+ List<Map<String, Object>> getEquipmentTechnologyStatusList(@Param("factoryModelId")String factoryModelId);
+
+ /**
+ *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ * qsw 2024-3-13
+ */
+ List<Map<String, Object>> getReportRepairEquipmentList(@Param("factoryModelId")String factoryModelId);
+
+ /**
+ *棣栭〉鏈湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getThisMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getNextMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
+
+ /**
+ *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getNextNextMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
index 89c9269..7d03601 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
@@ -20,4 +20,32 @@
LEFT JOIN mom_base_unit t3 ON t2.unit_id = t3.id
WHERE t1.del_flag = 0 and t1.equipment_id = #{equipmentId}
</select>
+
+ <select id="getEquipmentTechnologyStatusList" parameterType="String" resultType="Map">
+ SELECT
+ ( SELECT COUNT ( 0 ) FROM mom_eam_equipment WHERE del_flag = '0' and technology_status = 'qualified' and factory_model_id = #{factoryModelId}) as qualifiedCount,
+ ( SELECT COUNT ( 0 ) FROM mom_eam_equipment WHERE del_flag = '0' and technology_status = 'limitedUse' and factory_model_id = #{factoryModelId}) as limitedUseCount,
+ ( SELECT COUNT ( 0 ) FROM mom_eam_equipment WHERE del_flag = '0' and technology_status = 'disabled' and factory_model_id = #{factoryModelId}) as disabledCount
+ </select>
+
+ <select id="getReportRepairEquipmentList" parameterType="String" resultType="Map">
+ SELECT
+ ( select COUNT(0) from mom_eam_equipment_report_repair t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id WHERE del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10) and t2.factory_model_id = #{factoryModelId}) as failurTotalCount,
+ ( select COUNT(0) from mom_eam_equipment_report_repair t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id where del_flag = '0' and t1.is_stop = '1' and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10) and t2.factory_model_id = #{factoryModelId}) as noStopCount,
+ ( select COUNT(0) from mom_eam_equipment_report_repair t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id where del_flag = '0' and t1.is_stop = '2' and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10) and t2.factory_model_id = #{factoryModelId}) as stopCount
+ </select>
+
+ <select id="getThisMonthMaintenanceList" parameterType="String" resultType="Map">
+ select count(0) from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7) and t2.factory_model_id = #{factoryModelId}
+ </select>
+
+ <select id="getNextMonthMaintenanceList" parameterType="String" resultType="Map">
+ select count(0) from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7) and t2.factory_model_id = #{factoryModelId}
+ </select>
+
+ <select id="getNextNextMonthMaintenanceList" parameterType="String" resultType="Map">
+ select count(0) from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7) and t2.factory_model_id = #{factoryModelId}
+ </select>
+
+
</mapper>
\ No newline at end of file
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 9f94cf3..d9d4034 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
@@ -33,7 +33,9 @@
t1.audit_person as auditPerson,
t1.approval_person as approvalPerson,
t1.lose_efficacy_person as loseEfficacyPerson,
- t1.dis_uda1 as disUda1
+ t1.dis_uda1 as disUda1,
+ t1.dis_uda2 as disUda2,
+ t1.dis_uda3 as disUda3
FROM
mom_eam_daily_inspection_standard t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
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 3588fc9..aab28b6 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
@@ -135,7 +135,9 @@
t1.write_person as writePerson,
t1.audit_person as auditPerson,
t1.approval_person as approvalPerson,
- t1.lose_efficacy_person as loseEfficacyPerson
+ t1.lose_efficacy_person as loseEfficacyPerson,
+ t1.maintenance_standard_uda1 as maintenanceStandardUda1,
+ t1.maintenance_standard_uda2 as maintenanceStandardUda2
FROM
mom_eam_maintenance_standard t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
index bdc4bc1..b888420 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
@@ -57,4 +57,35 @@
*/
List<Map<String, Object>> getPrecisionParameterList(String equipmentId);
+
+ /**
+ *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ * qsw 2024-3-13
+ */
+ List<Map<String, Object>> getEquipmentTechnologyStatusList(String factoryModelId);
+
+ /**
+ *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ * qsw 2024-3-13
+ */
+ List<Map<String, Object>> getReportRepairEquipmentList(String factoryModelId);
+
+ /**
+ *棣栭〉鏈湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getThisMonthMaintenanceList(String factoryModelId);
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getNextMonthMaintenanceList(String factoryModelId);
+
+ /**
+ *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getNextNextMonthMaintenanceList(String factoryModelId);
+
}
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 5d8e6a8..8840e5a 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
@@ -89,4 +89,49 @@
public List<Map<String, Object>> getPrecisionParameterList(String equipmentId) {
return this.baseMapper.getPrecisionParameterList(equipmentId);
}
+
+ /**
+ *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ * qsw 2024-3-13
+ */
+ @Override
+ public List<Map<String, Object>> getEquipmentTechnologyStatusList(String factoryModelId) {
+ return this.baseMapper.getEquipmentTechnologyStatusList(factoryModelId);
+ }
+
+ /**
+ *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ * qsw 2024-3-13
+ */
+ @Override
+ public List<Map<String, Object>> getReportRepairEquipmentList(String factoryModelId) {
+ return this.baseMapper.getReportRepairEquipmentList(factoryModelId);
+ }
+
+ /**
+ *棣栭〉鏈湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @Override
+ public List<Map<String, Object>> getThisMonthMaintenanceList(String factoryModelId) {
+ return this.baseMapper.getThisMonthMaintenanceList(factoryModelId);
+ }
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @Override
+ public List<Map<String, Object>> getNextMonthMaintenanceList(String factoryModelId) {
+ return this.baseMapper.getNextMonthMaintenanceList(factoryModelId);
+ }
+
+ /**
+ *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ * qsw 2024-3-14
+ */
+ @Override
+ public List<Map<String, Object>> getNextNextMonthMaintenanceList(String factoryModelId) {
+ return this.baseMapper.getNextNextMonthMaintenanceList(factoryModelId);
+ }
}
--
Gitblit v1.9.3