From 2b4afe24e1136e4eb25e37b7a76565603ddc1a85 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 18 八月 2022 15:37:44 +0800
Subject: [PATCH] 统计fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java | 1
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java | 7 +++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 11 +++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java | 6 +-
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java | 2 +
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java | 13 ++++++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java | 12 ++++++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoQueryCriteria.java | 2
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoQueryCriteria.java | 2
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java | 12 ++++++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java | 5 ++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java | 14 ++++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetMngQueryCriteria.java | 2
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java | 13 ++++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 2
15 files changed, 93 insertions(+), 11 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java
index cdada2a..a7f0856 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java
@@ -186,6 +186,7 @@
map.put("45", "报废理由");
map.put("46", "报废填报日期(yyyy-MM-dd HH:mm:ss)");
map.put("47", "实际报废日期(yyyy-MM-dd HH:mm:ss)");
+ map.put("48", "保养周期");
String fileName = URLEncoder.encode("设备设施管理数据导入模板.xls", "UTF-8");
response.setContentType("application/vnd.ms-excel");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
@@ -278,6 +279,7 @@
map.put("45", "报废理由");
map.put("46", "报废填报日期(yyyy-MM-dd HH:mm:ss)");
map.put("47", "实际报废日期(yyyy-MM-dd HH:mm:ss)");
+ map.put("48", "保养周期");
String key = DateUtils.date2String(new Date(), DateUtils.PATTERN_ALLTIME_NOSIGN) ;
String fileName = URLEncoder.encode("设备设施管理"+key+".xls", "UTF-8");
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
index edaed14..b67dbbc 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
@@ -555,4 +555,15 @@
public void setAreaName(String areaName) {
this.areaName = areaName;
}
+
+ //保养周期
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
}
\ No newline at end of file
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
index bf930bb..a191098 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
@@ -216,4 +216,5 @@
public void setMemo(String memo) {
this.memo = memo;
}
+
}
\ No newline at end of file
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
index 5020ff6..94536de 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
@@ -147,7 +147,18 @@
//实际报废日期
@ExcelCell(index = 47)
private Timestamp actualDestoryDate;
-
+
+ //保养周期
+ @ExcelCell(index = 48)
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
//类型/类别外键
public Long getEquipmentTypeId() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoQueryCriteria.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoQueryCriteria.java
index 0d8a8c2..a0d6a2c 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoQueryCriteria.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoQueryCriteria.java
@@ -49,4 +49,4 @@
public void setPositionNum(String positionNum) {
this.positionNum = positionNum;
}
-}
+}
\ No newline at end of file
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
index 0e68549..c37834a 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
@@ -164,6 +164,18 @@
//要删除的检查标准
private String delCheckStandardeDetails;
+
+ //保养周期
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
+
public String getLeadingPersonName() {
return leadingPersonName;
}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoQueryCriteria.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoQueryCriteria.java
index 1047f88..e51cf06 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoQueryCriteria.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoQueryCriteria.java
@@ -27,4 +27,4 @@
public void setEquipmentTypeId(Integer equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
-}
+}
\ No newline at end of file
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
index edc1e7f..401642c 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
@@ -146,6 +146,18 @@
//区域名称
private String areaName;
+
+ //保养周期
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
+
public Long getAreaId() {
return areaId;
}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java
index e140344..7046adc 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java
@@ -150,7 +150,18 @@
//实际报废日期
@ExcelCell(index = 47)
private Timestamp actualDestoryDate;
-
+
+ //保养周期
+ @ExcelCell(index = 48)
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
//ID
public Long getId() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java
index 41cf464..a3b67b6 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.safePlatform.equipment.entity.EquipmentInfo;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
/**
@@ -13,4 +14,8 @@
@Repository
public interface EquipmentInfoRepository extends BaseMapper<EquipmentInfo> {
+ @Select("<script> select count(1) from equipment_info m INNER JOIN \n" +
+ "(select a.id,max(b.takecare_date) mdate from equipment_info a INNER JOIN equipment_takecare_detail b on a.id = b.equipment_id GROUP BY b.equipment_id) n \n" +
+ "on m.id = n.id where DATEDIFF(NOW(),n.mdate) >m.takecare_cycle</script> ")
+ Object countOverTime();
}
\ No newline at end of file
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
index ba3e45f..9a5f690 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
@@ -302,7 +302,12 @@
.select("stop_status as stopStatus,count(0) as count")
.groupBy("stop_status");
- return this.listMaps(wrapper);
+ List<Map<String, Object>> list = this.listMaps(wrapper);
+
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("-1",equipmentInfoRepository.countOverTime());//超时未保养
+ return list;
}
@Override
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
index bf3ec93..7a63cb2 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
@@ -137,7 +137,7 @@
Map<String,String> map = new LinkedHashMap<>();
map.put("1","安全目标指标");
map.put("2","目标指标编号");
- map.put("3","指标类型 1:年指标 2:月指标");
+ map.put("3","指标类型 1:年指标 2:月指标 3:半年 4:季度");
map.put("4","年度");
map.put("5","指标值");
map.put("6","指标级别 1:公司级 2:部门分厂级 3:工段班组级");
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
index 9be26a9..ddb716c 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
@@ -46,7 +46,19 @@
PageUtils.checkCheck(pageQuery);
return this.targetTypeService.queryAll(pageQuery);
}
-
+
+
+
+ /**
+ * 查询所有数据
+ *
+ * @param criteria 查询实体
+ * @return 所有数据
+ */
+ @PostMapping(value = "/page/listAll")
+ public ResultVO listAll(@RequestBody TargetTypeQueryCriteria criteria){
+ return new ResultVO<>(ResultCodes.OK,this.targetTypeService.queryAll(criteria));
+ }
/**
* 通过主键查询单条数据
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetMngQueryCriteria.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetMngQueryCriteria.java
index 19af780..6e49053 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetMngQueryCriteria.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetMngQueryCriteria.java
@@ -10,7 +10,7 @@
//目标指标编号
@Query(type = Query.Type.INNER_LIKE)
private String indexNum;
- //指标类型 1:年指标 2:月指标
+ //指标类型 1:年指标 2:月指标 3:半年 4:季度
@Query()
private Integer targetType;
//分解状态 1:已分解 2:未分解
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
index 5e2e7f2..ad27486 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
@@ -64,8 +64,8 @@
@Autowired
private TargetTypeRepository targetTypeRepository;
-
- @Override
+
+ @Override
public ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
Long pageSize = pageQuery.getPageSize();
@@ -205,4 +205,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2