From 8e64f19220268a9e375c955afa4e8f404ed88859 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 25 五月 2024 16:54:36 +0800
Subject: [PATCH] 主页 技术状态、三保、报修明细接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java | 52 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml | 206 +++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java | 50 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java | 74 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 373 ++++++++++++++++++++++++++++
5 files changed, 753 insertions(+), 2 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 2f108ad..30b0141 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
@@ -1210,4 +1210,377 @@
return Result.ok(list);
}
+
+ /**
+ *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁�
+ * qsw 2024-5-23
+ */
+ @GetMapping("showEquipmentByTechnologyStatus")
+ public Result<?> getEquipmentByTechnologyStatus(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode,String technologyStatus) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, "", "", technologyStatus);
+ }else{
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_2.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, area.getId(), "", technologyStatus);
+ }
+ }else if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, "", area.getId(), technologyStatus);
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ String code = calibrationOrderService.findProductionCode(user.getId());
+ if(StringUtils.isBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, area.getId(), "", technologyStatus);
+ }
+ }else{
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, "", area.getId(), technologyStatus);
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, "", area.getId(), technologyStatus);
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+
+ /**
+ *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻鏄庣粏灞曠ず
+ * qsw 2024-5-25
+ */
+ @GetMapping("showEquipmentByReportRepair")
+ public Result<?> getEquipmentByReportRepair(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode,String isStop) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, "", "", isStop);
+ }else{
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_2.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, area.getId(), "", isStop);
+ }
+ }else if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, "", area.getId(), isStop);
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ String code = calibrationOrderService.findProductionCode(user.getId());
+ if(StringUtils.isBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, area.getId(), "", isStop);
+ }
+ }else{
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, "", area.getId(), isStop);
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, "", area.getId(), isStop);
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ *棣栭〉鏈湀涓変繚璁″垝鏄庣粏
+ * qsw 2024-3-14
+ */
+ @GetMapping("showThisMonthMaintenanceList")
+ public Result<?> showThisMonthMaintenanceList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, "", "");
+ }else{
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_2.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, area.getId(), "");
+ }
+ }else if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ String code = calibrationOrderService.findProductionCode(user.getId());
+ if(StringUtils.isBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, area.getId(), "");
+ }
+ }else{
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝鏄庣粏灞曠ず
+ * qsw 2024-3-14
+ */
+ @GetMapping("showNextMonthMaintenanceList")
+ public Result<?> showNextMonthMaintenanceList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, "", "");
+ }else{
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_2.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, area.getId(), "");
+ }
+ }else if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ String code = calibrationOrderService.findProductionCode(user.getId());
+ if(StringUtils.isBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, area.getId(), "");
+ }
+ }else{
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒掓槑缁�
+ * qsw 2024-3-14
+ */
+ @GetMapping("showNextNextMonthMaintenanceList")
+ public Result<?> showNextNextMonthMaintenanceList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+// List<Map<String, Object>> list = null;
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, "", "");
+ }else{
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_2.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, area.getId(), "");
+ }
+ }else if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ String code = calibrationOrderService.findProductionCode(user.getId());
+ if(StringUtils.isBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, area.getId(), "");
+ }
+ }else{
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚璁惧鏄庣粏
+ * qsw 2024-3-14
+ */
+ @GetMapping("showThisMonthMaintenanceFinishList")
+ public Result<?> showThisMonthMaintenanceFinishList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, "", "");
+ }else{
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_2.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, area.getId(), "");
+ }
+ }else if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ String code = calibrationOrderService.findProductionCode(user.getId());
+ if(StringUtils.isBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, area.getId(), "");
+ }
+ }else{
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ * 宸ユ绾� 涓変繚寤舵湡鏁伴噺鏄庣粏
+ * qsw 2024-3-20
+ */
+ @GetMapping("show3MaintenancePostponeList")
+ public Result<?> show3MaintenancePostponeList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isNotBlank(productionCode)){
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.show3MaintenancePostponeCount(pageNo, pageSize,area.getId());
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ if(StringUtils.isNotBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.show3MaintenancePostponeCount(pageNo, pageSize,area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.show3MaintenancePostponeCount(pageNo, pageSize,area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ * 宸ユ绾� 涓変繚瓒呮湡鏁伴噺鏄庣粏
+ * qsw 2024-3-20
+ */
+ @GetMapping("show3MaintenanceOverdueList")
+ public Result<?> show3MaintenanceOverdueList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isNotBlank(productionCode)){
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.show3MaintenanceOverdueCount(pageNo, pageSize, area.getId());
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ if(StringUtils.isNotBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.show3MaintenanceOverdueCount(pageNo, pageSize, area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.show3MaintenanceOverdueCount(pageNo, pageSize, area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+
+
+
}
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 a710239..c828a63 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
@@ -90,10 +90,22 @@
List<Map<String, Object>> getEquipmentTechnologyStatusList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
+ *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁�
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> getEquipmentByTechnologyStatus(IPage<Map> pageData,@Param("workCenterId")String workCenterId,@Param("areaId")String areaId,@Param("technologyStatus")String technologyStatus);
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
List<Map<String, Object>> getReportRepairEquipmentList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
+
+ /**
+ *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻鏄庣粏灞曠ず
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> getEquipmentByReportRepair(IPage<Map> pageData,@Param("workCenterId")String workCenterId,@Param("areaId")String areaId,@Param("isStop")String isStop);
/**
*棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
@@ -102,10 +114,22 @@
List<Map<String, Object>> getThisMonthMaintenanceList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
+ *棣栭〉鏈湀涓変繚璁″垝鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> showThisMonthMaintenanceList(IPage<Map> pageData,@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
List<Map<String, Object>> getNextMonthMaintenanceList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> showNextMonthMaintenanceList(IPage<Map> pageData,@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
*棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
@@ -114,10 +138,23 @@
List<Map<String, Object>> getNextNextMonthMaintenanceList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
+ *棣栭〉涓嬩笅鏈堜笁淇濊鍒掓槑缁�
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> showNextNextMonthMaintenanceList(IPage<Map> pageData,@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
* qsw 2024-3-14
*/
List<Map<String, Object>> getThisMonthMaintenanceFinishList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
+
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚璁惧鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> showThisMonthMaintenanceFinishList(IPage<Map> pageData,@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
*宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺
@@ -126,12 +163,25 @@
List<Map<String, Object>> get3MaintenancePostponeCount(@Param("areaId")String areaId);
/**
+ *宸ユ绾� 涓変繚寤舵湡鏁伴噺鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> show3MaintenancePostponeCount(IPage<Map> pageData,@Param("areaId")String areaId);
+
+
+ /**
*宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
* qsw 2024-3-20
*/
List<Map<String, Object>> get3MaintenanceOverdueCount(@Param("areaId")String areaId);
/**
+ *宸ユ绾� 涓変繚瓒呮湡鏁伴噺鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> show3MaintenanceOverdueCount(IPage<Map> pageData,@Param("areaId")String areaId);
+
+ /**
*棣栭〉浜岀骇淇濆吇灞曠ず椤甸潰 鑾峰彇姣忎竴涓腑蹇冧笅浜岀骇淇濆吇璁″垝
* qsw 2024-3-15
*/
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 ab99082..103b5f5 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
@@ -81,6 +81,34 @@
( SELECT COUNT ( 0 ) FROM mom_eam_equipment WHERE del_flag = '0' and technology_status = 'disabled' <if test="workCenterId != null and workCenterId != ''"> and work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and area_id = #{areaId} </if> ) as disabledCount
</select>
+
+ <select id="getEquipmentByTechnologyStatus" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t2.name as factoryName,
+ t3.name as productName,
+ t1.num as equipmentNum,
+ t1.name as equipmentName,
+ t1.model as equipmentNodel,
+ t1.specification,
+ t4.item_text as technologyStatus
+ FROM
+ mom_eam_equipment t1
+ left join mom_base_area t2 on t1.work_center_id = t2.id
+ left join mom_base_area t3 on t1.area_id = t3.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status') t4 ON t4.item_value = t1.technology_status
+ WHERE t1.del_flag = '0'
+ <if test="workCenterId != null and workCenterId != ''">
+ and t1.work_center_id = #{workCenterId}
+ </if>
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
+ </if>
+ <if test="technologyStatus != null and technologyStatus != ''">
+ and t1.technology_status = #{technologyStatus}
+ </if>
+ </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 t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10) <if test="workCenterId != null and workCenterId != ''"> and t2.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t2.area_id = #{areaId} </if> ) as failurTotalCount,
@@ -88,26 +116,176 @@
( select COUNT(0) from mom_eam_equipment_report_repair t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id where t1.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) <if test="workCenterId != null and workCenterId != ''"> and t2.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t2.area_id = #{areaId} </if> ) as stopCount
</select>
+ <select id="getEquipmentByReportRepair" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t5.name AS factoryName,
+ t3.name AS productName,
+ t2.num AS equipmentNum,
+ t2.name AS equipmentName,
+ t2.model AS equipmentNodel,
+ t2.specification,
+ t4.item_text AS technologyStatus
+ FROM
+ mom_eam_equipment_report_repair t1
+ LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN mom_base_area t5 ON t2.work_center_id = t5.id
+ LEFT JOIN mom_base_area t3 ON t2.area_id = t3.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t4 ON t4.item_value = t2.technology_status
+ WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10)
+ <if test="workCenterId != null and workCenterId != ''">
+ and t2.work_center_id = #{workCenterId}
+ </if>
+ <if test="areaId != null and areaId != ''">
+ and t2.area_id = #{areaId}
+ </if>
+ <if test="isStop != null and isStop != ''">
+ and t1.is_stop = #{isStop}
+ </if>
+ </select>
+
<select id="getThisMonthMaintenanceList" parameterType="String" resultType="Map">
- select count(0) as totalCount 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) <if test="workCenterId != null and workCenterId != ''"> and t1.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t1.area_id = #{areaId} </if>
+ select count(0) as totalCount 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) <if test="workCenterId != null and workCenterId != ''"> and t1.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t1.area_id = #{areaId} </if>
+ </select>
+
+ <select id="showThisMonthMaintenanceList" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t2.name as factoryName,
+ t3.name as productName,
+ t1.num as equipmentNum,
+ t1.name as equipmentName,
+ t1.model as equipmentNodel,
+ t1.specification,
+ t4.item_text as technologyStatus
+ FROM
+ mom_eam_equipment t1
+ left join mom_base_area t2 on t1.work_center_id = t2.id
+ left join mom_base_area t3 on t1.area_id = t3.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status') t4 ON t4.item_value = t1.technology_status
+ 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)
+ <if test="workCenterId != null and workCenterId != ''">
+ and t1.work_center_id = #{workCenterId}
+ </if>
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
+ </if>
</select>
<select id="getNextMonthMaintenanceList" parameterType="String" resultType="Map">
select count(0) as totalCount 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) <if test="workCenterId != null and workCenterId != ''"> and t1.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t1.area_id = #{areaId} </if>
</select>
+ <select id="showNextMonthMaintenanceList" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t2.name as factoryName,
+ t3.name as productName,
+ t1.num as equipmentNum,
+ t1.name as equipmentName,
+ t1.model as equipmentNodel,
+ t1.specification,
+ t4.item_text as technologyStatus
+ FROM
+ mom_eam_equipment t1
+ left join mom_base_area t2 on t1.work_center_id = t2.id
+ left join mom_base_area t3 on t1.area_id = t3.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status') t4 ON t4.item_value = t1.technology_status
+ 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)
+ <if test="workCenterId != null and workCenterId != ''">
+ and t1.work_center_id = #{workCenterId}
+ </if>
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
+ </if>
+ </select>
+
<select id="getNextNextMonthMaintenanceList" parameterType="String" resultType="Map">
select count(0) as totalCount 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) <if test="workCenterId != null and workCenterId != ''"> and t1.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t1.area_id = #{areaId} </if>
</select>
+ <select id="showNextNextMonthMaintenanceList" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t2.name as factoryName,
+ t3.name as productName,
+ t1.num as equipmentNum,
+ t1.name as equipmentName,
+ t1.model as equipmentNodel,
+ t1.specification,
+ t4.item_text as technologyStatus
+ FROM
+ mom_eam_equipment t1
+ left join mom_base_area t2 on t1.work_center_id = t2.id
+ left join mom_base_area t3 on t1.area_id = t3.id
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status') t4 ON t4.item_value = t1.technology_status
+ 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)
+ <if test="workCenterId != null and workCenterId != ''">
+ and t1.work_center_id = #{workCenterId}
+ </if>
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
+ </if>
+ </select>
+
<select id="getThisMonthMaintenanceFinishList" parameterType="String" resultType="Map">
select count(0) as totalCount from mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
- where t1.del_flag = '0' and t1.status = '5' and t4.maintenance_type = '3' and SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7) <if test="workCenterId != null and workCenterId != ''"> and t2.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t2.area_id = #{areaId} </if>
+ where t1.del_flag = '0' and t1.status = '5' and t4.maintenance_type = '3'
+ and SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
+ <if test="workCenterId != null and workCenterId != ''">and t2.work_center_id = #{workCenterId} </if>
+ <if test="areaId != null and areaId != ''">and t2.area_id = #{areaId} </if>
+ </select>
+
+ <select id="showThisMonthMaintenanceFinishList" parameterType="Map" resultType="Map">
+ SELECT
+ t1.id,
+ t20.name AS factoryName,
+ t30.name AS productName,
+ t2.num AS equipmentNum,
+ t2.name AS equipmentName,
+ t2.model AS equipmentNodel,
+ t2.specification,
+ t40.item_text AS technologyStatus
+ FROM
+ mom_eam_daily_maintenance_order t1
+ LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN mom_eam_maintenance_cycle t4 ON t1.maintenance_cycle_id = t4.id
+ LEFT JOIN mom_base_area t20 ON t2.work_center_id = t20.id
+ LEFT JOIN mom_base_area t30 ON t2.area_id = t30.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t40 ON t40.item_value = t2.technology_status
+ WHERE t1.del_flag = '0' AND t1.status = '5' AND t4.maintenance_type = '3'
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.actual_end_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
+ <if test="workCenterId != null and workCenterId != ''">
+ and t2.work_center_id = #{workCenterId}
+ </if>
+ <if test="areaId != null and areaId != ''">
+ and t2.area_id = #{areaId}
+ </if>
</select>
<select id="get3MaintenancePostponeCount" parameterType="String" resultType="Map">
select count(0) as totalCount from (select DISTINCT t2.id from mom_eam_plan_change_apply t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id
where SUBSTRING(CONVERT(VARCHAR(10), t2.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7) and t2.area_id = #{areaId} ) t4
+ </select>
+
+ <select id="show3MaintenancePostponeCount" parameterType="Map" resultType="Map">
+ SELECT DISTINCT
+ t2.id,
+ t20.name AS factoryName,
+ t30.name AS productName,
+ t2.num AS equipmentNum,
+ t2.name AS equipmentName,
+ t2.model AS equipmentNodel,
+ t2.specification,
+ t4.item_text AS technologyStatus
+ FROM
+ mom_eam_plan_change_apply t1
+ LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN mom_base_area t20 ON t2.work_center_id = t20.id
+ LEFT JOIN mom_base_area t30 ON t2.area_id = t30.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t4 ON t4.item_value = t2.technology_status
+ where SUBSTRING(CONVERT(VARCHAR(10), t2.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
+ and t2.area_id = #{areaId}
</select>
<select id="get3MaintenanceOverdueCount" parameterType="String" resultType="Map">
@@ -126,6 +304,30 @@
<if test="areaId != null and areaId != ''"> and t2.area_id = #{areaId} </if>
</select>
+ <select id="show3MaintenanceOverdueCount" parameterType="Map" resultType="Map">
+ SELECT DISTINCT
+ t2.id,
+ t20.name AS factoryName,
+ t30.name AS productName,
+ t2.num AS equipmentNum,
+ t2.name AS equipmentName,
+ t2.model AS equipmentNodel,
+ t2.specification,
+ t40.item_text AS technologyStatus
+ FROM
+ mom_eam_daily_maintenance_order t1
+ LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN mom_eam_maintenance_cycle t4 ON t1.maintenance_cycle_id = t4.id
+ LEFT JOIN mom_base_area t20 ON t2.work_center_id = t20.id
+ LEFT JOIN mom_base_area t30 ON t2.area_id = t30.id
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t40 ON t40.item_value = t2.technology_status
+ WHERE t1.del_flag = '0' AND t1.status = '3' AND t4.maintenance_type = '3'
+ and SUBSTRING(CONVERT(VARCHAR(10), t1.plan_start_time, 120), 1, 10) < SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10)
+ and SUBSTRING(CONVERT(VARCHAR(10), t2.next_third_maintenance_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10)
+ <if test="areaId != null and areaId != ''"> and t2.area_id = #{areaId} </if>
+
+ </select>
+
<select id="getCenterTwoMaintenancePlanList" parameterType="String" resultType="Map">
SELECT
top 1
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 c32fd45..9c734fb 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.CalibrationOrderDetail;
import org.jeecg.modules.eam.entity.CalibrationOrder;
@@ -121,11 +122,24 @@
*/
List<Map<String, Object>> getEquipmentTechnologyStatusList(String workCenterId,String areaId);
+
+ /**
+ *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁�
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> getEquipmentByTechnologyStatus(Integer pageNo, Integer pageSize, String workCenterId, String areaId,String technologyStatus);
+
/**
*棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
List<Map<String, Object>> getReportRepairEquipmentList(String workCenterId,String areaId);
+
+ /**
+ *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁�
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> getEquipmentByReportRepair(Integer pageNo, Integer pageSize, String workCenterId, String areaId,String isStop);
/**
*棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
@@ -134,10 +148,22 @@
List<Map<String, Object>> getThisMonthMaintenanceList(String workCenterId,String areaId);
/**
+ *棣栭〉鏈湀涓変繚璁″垝鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> showThisMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId);
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
List<Map<String, Object>> getNextMonthMaintenanceList(String workCenterId,String areaId);
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> showNextMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId);
/**
*棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
@@ -146,10 +172,23 @@
List<Map<String, Object>> getNextNextMonthMaintenanceList(String workCenterId,String areaId);
/**
+ *棣栭〉涓嬩笅鏈堜笁淇濊鍒掓槑缁�
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> showNextNextMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId);
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
* qsw 2024-3-14
*/
List<Map<String, Object>> getThisMonthMaintenanceFinishList(String workCenterId,String areaId);
+
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚璁惧鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> showThisMonthMaintenanceFinishList(Integer pageNo, Integer pageSize, String workCenterId, String areaId);
/**
*宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺
@@ -157,6 +196,13 @@
*/
List<Map<String, Object>> get3MaintenancePostponeCount(String areaId);
+
+ /**
+ *宸ユ绾� 涓変繚寤舵湡鏁伴噺鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> show3MaintenancePostponeCount(Integer pageNo, Integer pageSize, String areaId);
+
/**
*宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
* qsw 2024-3-20
@@ -164,6 +210,12 @@
List<Map<String, Object>> get3MaintenanceOverdueCount(String areaId);
/**
+ *宸ユ绾� 涓変繚瓒呮湡鏁伴噺鏄庣粏
+ * qsw 2024-5-25
+ */
+ IPage<Map<String, Object>> show3MaintenanceOverdueCount(Integer pageNo, Integer pageSize, String areaId);
+
+ /**
*棣栭〉浜屼繚璁″垝灞曠ず
* qsw 2024-3-15
*/
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 ba59e67..ba0272d 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
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
@@ -212,12 +214,32 @@
}
/**
+ *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁�
+ * qsw 2024-5-25
+ */
+ @Override
+ public IPage<Map<String, Object>> getEquipmentByTechnologyStatus(Integer pageNo, Integer pageSize,String workCenterId, String areaId,String technologyStatus) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.getEquipmentByTechnologyStatus(pageData,workCenterId,areaId,technologyStatus);
+ }
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
@Override
public List<Map<String, Object>> getReportRepairEquipmentList(String workCenterId,String areaId) {
return this.baseMapper.getReportRepairEquipmentList(workCenterId,areaId);
+ }
+
+ /**
+ *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻鏄庣粏灞曠ず
+ * qsw 2024-5-25
+ */
+ @Override
+ public IPage<Map<String, Object>> getEquipmentByReportRepair(Integer pageNo, Integer pageSize, String workCenterId, String areaId, String isStop) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.getEquipmentByReportRepair(pageData,workCenterId,areaId,isStop);
}
/**
@@ -230,12 +252,32 @@
}
/**
+ *棣栭〉鏈湀涓変繚璁″垝鏄庣粏
+ * qsw 2024-3-14
+ */
+ @Override
+ public IPage<Map<String, Object>> showThisMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.showThisMonthMaintenanceList(pageData,workCenterId,areaId);
+ }
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
@Override
public List<Map<String, Object>> getNextMonthMaintenanceList(String workCenterId,String areaId) {
return this.baseMapper.getNextMonthMaintenanceList(workCenterId,areaId);
+ }
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝鏄庣粏灞曠ず
+ * qsw 2024-3-14
+ */
+ @Override
+ public IPage<Map<String, Object>> showNextMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.showNextMonthMaintenanceList(pageData,workCenterId,areaId);
}
/**
@@ -248,12 +290,28 @@
}
/**
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒掓槑缁�
+ * qsw 2024-3-14
+ */
+ @Override
+ public IPage<Map<String, Object>> showNextNextMonthMaintenanceList(Integer pageNo, Integer pageSize, String workCenterId, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.showNextNextMonthMaintenanceList(pageData,workCenterId,areaId);
+ }
+
+ /**
*棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
* qsw 2024-3-14
*/
@Override
public List<Map<String, Object>> getThisMonthMaintenanceFinishList(String workCenterId,String areaId) {
return this.baseMapper.getThisMonthMaintenanceFinishList(workCenterId,areaId);
+ }
+
+ @Override
+ public IPage<Map<String, Object>> showThisMonthMaintenanceFinishList(Integer pageNo, Integer pageSize, String workCenterId, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.showThisMonthMaintenanceFinishList(pageData,workCenterId,areaId);
}
/**
@@ -265,6 +323,12 @@
return this.baseMapper.get3MaintenancePostponeCount(areaId);
}
+ @Override
+ public IPage<Map<String, Object>> show3MaintenancePostponeCount(Integer pageNo, Integer pageSize, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.show3MaintenancePostponeCount(pageData,areaId);
+ }
+
/**
*宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
* qsw 2024-3-20
@@ -275,6 +339,16 @@
}
/**
+ * 宸ユ绾� 涓変繚瓒呮湡鏁伴噺鏄庣粏
+ * qsw 2024-3-20
+ */
+ @Override
+ public IPage<Map<String, Object>> show3MaintenanceOverdueCount(Integer pageNo, Integer pageSize, String areaId) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return this.baseMapper.show3MaintenanceOverdueCount(pageData,areaId);
+ }
+
+ /**
*棣栭〉浜屼繚璁″垝灞曠ず
* qsw 2024-3-15
*/
--
Gitblit v1.9.3