From 63a5530a85e6eaf7f8be733e87d32af2d16477a8 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 07 四月 2024 13:39:02 +0800
Subject: [PATCH] 设备管理 报表打印修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java | 9 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java | 16 ++
lxzn-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java | 34 +++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java | 6 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java | 66 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml | 53 ++++++++
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 | 53 +++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 51 +++++++-
13 files changed, 269 insertions(+), 34 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/lxzn-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 1bb9b57..5aeb5ce 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -141,8 +141,9 @@
filterChainDefinitionMap.put("/eam/repairOrder/equipmentAvailability", "anon");
//鐢熶骇鏁呴殰闂撮殧鏃堕棿鎶ヨ〃鎺掗櫎
filterChainDefinitionMap.put("/eam/faultIntervalTime/getMTBF", "anon");
+ filterChainDefinitionMap.put("/eam/faultIntervalTime/**","anon");
//璁惧鍙紑鍔ㄧ巼鎶ヨ〃鎺掗櫎
- filterChainDefinitionMap.put("/eam/repairOrder/getStartRate", "anon");
+ filterChainDefinitionMap.put("/eam/repairOrder/getStartRate", "anon");
//澶у睆妯℃澘渚嬪瓙
filterChainDefinitionMap.put("/test/bigScreen/**", "anon");
filterChainDefinitionMap.put("/bigscreen/template1/**", "anon");
@@ -163,6 +164,7 @@
//娴嬭瘯妯″潡鎺掗櫎
filterChainDefinitionMap.put("/test/seata/**", "anon");
+
// 娣诲姞鑷繁鐨勮繃婊ゅ櫒骞朵笖鍙栧悕涓簀wt
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
//濡傛灉cloudServer涓虹┖ 鍒欒鏄庢槸鍗曚綋 闇�瑕佸姞杞借法鍩熼厤缃�愬井鏈嶅姟璺ㄥ煙鍒囨崲銆�
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 6e711c3..8acf2b2 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
@@ -9,9 +9,13 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.FaultIntervalTime;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IFaultIntervalTimeService;
import org.jeecg.modules.eam.vo.EquipmentAvailabilityVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Description: mom_eam_fault_interval_time
@@ -37,8 +38,11 @@
@RequestMapping("/eam/faultIntervalTime")
@Slf4j
public class FaultIntervalTimeController extends JeecgController<FaultIntervalTime, IFaultIntervalTimeService> {
+
@Autowired
private IFaultIntervalTimeService faultIntervalTimeService;
+ @Autowired
+ private IEamEquipmentService equipmentService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -182,4 +186,58 @@
return jsonObject;
}
+ @GetMapping("/get2MTBF")
+ public JSONObject get2MTBF(@RequestParam Map<String, Object> query) throws ParseException {
+ 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;
+ }
+
+
+
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index 5b07bb6..51bfc63 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -610,11 +610,8 @@
@RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> dayInspectionProjectList = inspectionOrderService.findDayInspectionProjectList(pageNo, 1000, params);
List<Map<String, Object>> records = dayInspectionProjectList.getRecords();
-
List<Map<String, Object>> maps = new ArrayList<>();
-
for (Map<String, Object> record : records) {
-
if(maps.size()>0){
Boolean flag = false;
for (Map<String, Object> map : maps) {
@@ -641,13 +638,49 @@
hashMap.put(record.get("createTime").toString(),record.get("insResult"));
maps.add(hashMap);
}
-// hashMap.put("name",record.get("name"));
-// hashMap.put("equipmentNum",record.get("equipmentNum"));
-// hashMap.put("equipmentName",record.get("equipmentName"));
-// hashMap.put("detectionStandard",record.get("detectionStandard"));
-// hashMap.put(record.get("createTime").toString(),record.get("insResult"));
}
-// maps.add(hashMap);
+ return Result.ok(maps);
+ }
+
+ /**
+ *鐢熶骇璁惧鑷富缁存姢鍛ㄧ偣妫�琛� 鎶ヨ〃
+ * 2024-3-27 qsw
+ */
+ @GetMapping("findWeekInspectionProjectList")
+ public Result<?> findWeekInspectionProjectList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> dayInspectionProjectList = inspectionOrderService.findWeekInspectionProjectList(pageNo, 1000, params);
+ List<Map<String, Object>> records = dayInspectionProjectList.getRecords();
+ List<Map<String, Object>> maps = new ArrayList<>();
+ for (Map<String, Object> record : records) {
+ if(maps.size()>0){
+ Boolean flag = false;
+ for (Map<String, Object> map : maps) {
+ if(map.containsValue(record.get("name")) && map.containsValue(record.get("detectionStandard"))){
+ map.put(record.get("createTime").toString(),record.get("insResult"));
+ flag = true;
+ }
+ }
+ if(flag == false){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",record.get("name"));
+ hashMap.put("equipmentNum",record.get("equipmentNum"));
+ hashMap.put("equipmentName",record.get("equipmentName"));
+ hashMap.put("detectionStandard",record.get("detectionStandard"));
+ hashMap.put(record.get("createTime").toString(),record.get("insResult"));
+ maps.add(hashMap);
+ }
+ }else{
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",record.get("name"));
+ hashMap.put("equipmentNum",record.get("equipmentNum"));
+ hashMap.put("equipmentName",record.get("equipmentName"));
+ hashMap.put("detectionStandard",record.get("detectionStandard"));
+ hashMap.put(record.get("createTime").toString(),record.get("insResult"));
+ maps.add(hashMap);
+ }
+ }
return Result.ok(maps);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java
index 30cf1c6..c02fa0b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java
@@ -51,32 +51,32 @@
@ApiModelProperty(value = "yearMonth")
private String yearMonth;
/**totalAvailableTime*/
- @Excel(name = "totalAvailableTime", width = 15)
- @ApiModelProperty(value = "totalAvailableTime")
+ @Excel(name = "鎬诲彲鍒╃敤鏃堕棿锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "鎬诲彲鍒╃敤鏃堕棿锛堝皬鏃讹級")
private String totalAvailableTime;
/**noFaultTime*/
- @Excel(name = "noFaultTime", width = 15)
- @ApiModelProperty(value = "noFaultTime")
+ @Excel(name = "鏃犳晠闅滄椂闂达紙灏忔椂锛�", width = 15)
+ @ApiModelProperty(value = "鏃犳晠闅滄椂闂达紙灏忔椂锛�")
private String noFaultTime;
/**faultTime*/
- @Excel(name = "faultTime", width = 15)
- @ApiModelProperty(value = "faultTime")
+ @Excel(name = "鏁呴殰鏃堕棿锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "鏁呴殰鏃堕棿锛堝皬鏃讹級")
private String faultTime;
/**repairTime*/
- @Excel(name = "repairTime", width = 15)
- @ApiModelProperty(value = "repairTime")
+ @Excel(name = "淇鏃堕棿锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "淇鏃堕棿锛堝皬鏃讹級")
private String repairTime;
/**faultNumber*/
- @Excel(name = "faultNumber", width = 15)
- @ApiModelProperty(value = "faultNumber")
+ @Excel(name = "鏁呴殰娆℃暟", width = 15)
+ @ApiModelProperty(value = "鏁呴殰娆℃暟")
private String faultNumber;
/**averageRepairTime*/
- @Excel(name = "averageRepairTime", width = 15)
- @ApiModelProperty(value = "averageRepairTime")
+ @Excel(name = "MTTM锛堝钩鍧囦慨澶嶆椂闂达級锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "MTTM锛堝钩鍧囦慨澶嶆椂闂达級锛堝皬鏃讹級")
private String averageRepairTime;
/**averageFaultIntervalTime*/
- @Excel(name = "averageFaultIntervalTime", width = 15)
- @ApiModelProperty(value = "averageFaultIntervalTime")
+ @Excel(name = "MTBF锛堝钩鍧囨晠闅滈棿闅旀椂闂达級锛堝皬鏃讹級", width = 15)
+ @ApiModelProperty(value = "MTBF锛堝钩鍧囨晠闅滈棿闅旀椂闂达級锛堝皬鏃讹級")
private String averageFaultIntervalTime;
/**createBy*/
@ApiModelProperty(value = "createBy")
@@ -104,5 +104,11 @@
@TableField(exist = false)
private String userDepart;
+ @TableField(exist = false)
+ private String startTime;
+
+ @TableField(exist = false)
+ private String endTime;
+
}
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 1d7d6d6..d2cbf45 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
@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.FaultIntervalTime;
+
+import java.util.List;
+import java.util.Map;
/**
* @Description: mom_eam_fault_interval_time
@@ -11,4 +15,9 @@
*/
public interface FaultIntervalTimeMapper extends BaseMapper<FaultIntervalTime> {
+ List<Map<String, Object>> getEquipmentList(@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);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java
index a81915a..24b203e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java
@@ -38,5 +38,7 @@
IPage<Map<String, Object>> findDayInspectionProjectList(IPage<Map> pageData, @Param("params") Map<String,Object> params);
+ IPage<Map<String, Object>> findWeekInspectionProjectList(IPage<Map> pageData, @Param("params") Map<String,Object> params);
+
}
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 6307560..2190582 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
@@ -2,4 +2,57 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.FaultIntervalTimeMapper">
+ <select id="getEquipmentList" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t1.num,
+ t1.name,
+ t1.model,
+ t1.specification,
+ t2.depart_name as departName
+ FROM
+ mom_eam_equipment t1
+ LEFT JOIN sys_depart t2 ON t1.use_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>
+
+ </select>
+
+ <select id="getEquipmentMTBF" parameterType="Map" resultType="Map">
+ SELECT
+ COUNT(tt.equipmentId) AS faultNumber,
+ tt.totalAvailableTime,
+ SUM(tt.faultTime) AS faultTime,
+ SUM(tt.repairTime) AS repairTime,
+ SUM(tt.noFaultTime) AS noFaultTime,
+ SUM(tt.repairTime) /COUNT(tt.equipmentId) AS averageRepairTime,
+ SUM(tt.noFaultTime) /COUNT(tt.equipmentId) AS averageFaultIntervalTime
+ FROM(
+ SELECT
+ t1.equipment_id AS equipmentId,
+ 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
+ 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 t1.equipment_id = #{params.equipmentId}
+ ) AS tt
+ GROUP BY
+ tt.equipmentId,tt.totalAvailableTime
+ </select>
+
+ <select id="getMTBFTotalAvailableTime" 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 c2a8d35..5e41e47 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
@@ -197,7 +197,7 @@
t4.name as equipmentName,
t3.name,
t1.detection_standard as detectionStandard,
- t1.inspection_project_result as insResult,
+ case t1.inspection_project_result when '1' then '鈭�' when '2' then 'x' when '3' then '鈻�' when '4' then 'T' else '' end as insResult,
SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 9, 10 ) as createTime
FROM
mom_eam_inspection_order_detail t1
@@ -208,8 +208,10 @@
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'inspection_project_result') t6 on t1.inspection_project_result = t6.item_value
WHERE
t5.name = '1鏃�'
- AND t4.num = 'HQ1901124'
- AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
+ <if test="params.num != null and params.num != ''"> and t4.num = #{params.num} </if>
+ <if test="params.num == null "> and t4.num = '-1' </if>
+ <if test="params.dataTime != null and params.dataTime != ''"> AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{params.dataTime}, 120 ), 2, 7 ) </if>
+ <if test="params.dataTime == null ">AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 ) </if>
AND t1.inspection_standard_detail_id IN (
SELECT
tt2.id
@@ -220,9 +222,48 @@
LEFT JOIN mom_eam_inspection_cycle tt4 ON tt2.inspection_cycle_id = tt4.id
WHERE
tt4.name = '1鏃�'
- AND tt3.num = 'HQ1901124'
- AND tt1.version_status = '2'
- AND tt1.del_flag = '0'
+ <if test="params.num != null and params.num != ''"> and tt3.num = #{params.num} </if>
+ <if test="params.num == null "> and tt3.num = '-1' </if>
+ AND tt1.version_status = '2'
+ AND tt1.del_flag = '0'
+ )
+ </select>
+
+ <select id="findWeekInspectionProjectList" parameterType="Map" resultType="Map">
+ SELECT
+ t4.num as equipmentNum,
+ t4.name as equipmentName,
+ t3.name,
+ t1.detection_standard as detectionStandard,
+ case t1.inspection_project_result when '1' then '鈭�' when '2' then 'x' when '3' then '鈻�' when '4' then 'T' else '' end as insResult,
+ SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 9, 10 ) as createTime
+ FROM
+ mom_eam_inspection_order_detail t1
+ LEFT JOIN mom_eam_inspection_order t2 ON t1.inspection_order_id = t2.id
+ LEFT JOIN mom_eam_inspection_project t3 ON t1.inspection_project_id = t3.id
+ LEFT JOIN mom_eam_equipment t4 ON t2.equipment_id = t4.id
+ LEFT JOIN mom_eam_inspection_cycle t5 ON t2.inspection_cycle_id = t5.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'inspection_project_result') t6 on t1.inspection_project_result = t6.item_value
+ WHERE
+ t5.name = '1鍛�'
+ <if test="params.num != null and params.num != ''"> and t4.num = #{params.num} </if>
+ <if test="params.num == null "> and t4.num = '-1' </if>
+ <if test="params.dataTime != null and params.dataTime != ''"> AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{params.dataTime}, 120 ), 2, 7 ) </if>
+ <if test="params.dataTime == null ">AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 ) </if>
+ AND t1.inspection_standard_detail_id IN (
+ SELECT
+ tt2.id
+ FROM
+ mom_eam_daily_inspection_standard tt1
+ LEFT JOIN mom_eam_daily_inspection_standard_detail tt2 ON tt1.id= tt2.daily_inspection_standard_id
+ LEFT JOIN mom_eam_equipment tt3 ON tt1.equipment_id = tt3.id
+ LEFT JOIN mom_eam_inspection_cycle tt4 ON tt2.inspection_cycle_id = tt4.id
+ WHERE
+ tt4.name = '1鍛�'
+ <if test="params.num != null and params.num != ''"> and tt3.num = #{params.num} </if>
+ <if test="params.num == null "> and tt3.num = '-1' </if>
+ AND tt1.version_status = '2'
+ AND tt1.del_flag = '0'
)
</select>
</mapper>
\ No newline at end of file
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 e201a8b..8d06cfe 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
@@ -16,5 +16,11 @@
*/
public interface IFaultIntervalTimeService extends IService<FaultIntervalTime> {
+ List<Map<String, Object>> getEquipmentList(Map<String, Object> params);
+
+ List<Map<String, Object>> getEquipmentMTBF(Map<String, Object> params);
+
+ List<Map<String, Object>> getMTBFTotalAvailableTime(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/IInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java
index 5d188ee..061e975 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java
@@ -37,4 +37,6 @@
IPage<Map<String, Object>> findDayInspectionProjectList(Integer pageNo, Integer pageSize, Map<String, Object> params);
+ IPage<Map<String, Object>> findWeekInspectionProjectList(Integer pageNo, Integer pageSize, Map<String, Object> params);
+
}
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 d4dd5a8..edeed8a 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
@@ -189,4 +189,20 @@
}
return faultIntervalTimeList;
}
+
+
+ @Override
+ public List<Map<String, Object>> getEquipmentMTBF(Map<String, Object> params) {
+ return this.baseMapper.getEquipmentMTBF(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getMTBFTotalAvailableTime(Map<String, Object> params) {
+ return this.baseMapper.getMTBFTotalAvailableTime(params);
+ }
+
+ @Override
+ public List<Map<String, Object>> getEquipmentList(Map<String, Object> params) {
+ return this.baseMapper.getEquipmentList(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 39d18dd..c0ad510 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
@@ -61,4 +61,10 @@
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
return this.baseMapper.findDayInspectionProjectList(pageData,params);
}
+
+ @Override
+ public IPage<Map<String, Object>> findWeekInspectionProjectList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.findWeekInspectionProjectList(pageData,params);
+ }
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
index de0fdba..380873d 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
@@ -34,6 +34,7 @@
@Override
public String getToken(HttpServletRequest request) {
+
return TokenUtils.getTokenByRequest(request);
}
--
Gitblit v1.9.3