From e237862aa7204822a89340fc28e8613f993bb9ce Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 七月 2026 15:35:43 +0800
Subject: [PATCH] fix: 代码格式化,安全生产数据倒序
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 2
src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentLedgerService.java | 4
src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRectificationServiceImpl.java | 9
src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentLedgerController.java | 43 +++-
src/main/java/com/ruoyi/safe/specialequipment/task/SpecialEquipmentReminderTask.java | 3
src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRecord.java | 80 ++++++--
src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRecordServiceImpl.java | 7
src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRecordService.java | 4
src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRecordController.java | 35 +++
src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentLedger.java | 142 +++++++++++----
src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRectificationMapper.xml | 1
src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRectificationService.java | 4
src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentLedgerMapper.java | 2
src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRecordMapper.xml | 1
src/main/resources/mapper/safe/specialequipment/SpecialEquipmentLedgerMapper.xml | 1
src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRectification.java | 87 +++++++--
src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRectificationMapper.java | 2
src/main/resources/mapper/safe/SafeContingencyPlanMapper.xml | 1
src/main/resources/mapper/safe/SafeHiddenMapper.xml | 1
src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRectificationController.java | 37 +++
src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentLedgerServiceImpl.java | 9
src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRecordMapper.java | 2
src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java | 9
src/main/resources/mapper/safe/SafeTrainingMapper.xml | 2
24 files changed, 377 insertions(+), 111 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index c631021..f74c55c 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -173,7 +173,7 @@
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new QueryWrapper<SalesLedgerProduct>()
.lambda().eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId()).eq(SalesLedgerProduct::getType, 2));
for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
- stockUtils.addStockWithBatchNo(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId(),purchaseLedger.getPurchaseContractNumber()+"-"+salesLedgerProduct.getId());
+ stockUtils.addStockWithBatchNo(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId(), purchaseLedger.getPurchaseContractNumber() + "-" + salesLedgerProduct.getId());
}
}
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
index f3f83f7..a8e2b85 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeFacilityInspectionServiceImpl.java
@@ -17,6 +17,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -65,14 +66,14 @@
// 鏀堕泦鎵�鏈夎鏂絀D
List<Integer> facilityIds = records.stream()
.map(SafeFacilityInspection::getFacilityId)
- .filter(id -> id != null)
+ .filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
// 鏀堕泦鎵�鏈夊贰妫�浜篒D
List<Long> inspectorIds = records.stream()
.map(SafeFacilityInspection::getInspectorId)
- .filter(id -> id != null)
+ .filter(Objects::nonNull)
.map(Integer::longValue)
.distinct()
.collect(Collectors.toList());
@@ -81,7 +82,7 @@
Map<Integer, SafeFacilityLedger> facilityMap = Map.of();
if (!facilityIds.isEmpty()) {
facilityMap = safeFacilityLedgerService.listByIds(facilityIds).stream()
- .collect(Collectors.toMap(SafeFacilityLedger::getId, f -> f, (v1, v2) -> v1));
+ .collect(Collectors.toMap(SafeFacilityLedger::getId, f -> f, (v1, _) -> v1));
}
// 鎵归噺鏌ヨ宸℃浜轰俊鎭�
@@ -89,7 +90,7 @@
if (!inspectorIds.isEmpty()) {
List<SysUser> users = sysUserMapper.selectUserByIds(inspectorIds);
userMap = users.stream()
- .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (v1, v2) -> v1));
+ .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName, (v1, _) -> v1));
}
// 濉厖瀛楁
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentLedgerController.java b/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentLedgerController.java
index acbe1fb..6e9fb2f 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentLedgerController.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentLedgerController.java
@@ -1,4 +1,5 @@
package com.ruoyi.safe.specialequipment.controller;
+
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -11,24 +12,46 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
import java.util.List;
+
@RestController
@Tag(name = "瀹夊叏鐢熶骇--鐗圭璁惧鐢靛瓙鍙拌处")
@RequestMapping("/safe/specialEquipment/ledger")
@AllArgsConstructor
public class SpecialEquipmentLedgerController extends BaseController {
private final SpecialEquipmentLedgerService service;
- @GetMapping("/listPage") @Operation(summary = "鐗圭璁惧鍙拌处-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SpecialEquipmentLedger req) { return AjaxResult.success(service.listPage(page, req)); }
- @GetMapping("/list") @Operation(summary = "鐗圭璁惧鍙拌处-鍒楄〃鏌ヨ")
- public AjaxResult list(SpecialEquipmentLedger req) { return AjaxResult.success(service.list(Wrappers.lambdaQuery(req))); }
- @PostMapping("/add") @Log(title = "鐗圭璁惧鍙拌处-鏂板", businessType = BusinessType.INSERT)
+
+ @GetMapping("/listPage")
+ @Operation(summary = "鐗圭璁惧鍙拌处-鍒嗛〉鏌ヨ")
+ public AjaxResult listPage(Page page, SpecialEquipmentLedger req) {
+ return AjaxResult.success(service.listPage(page, req));
+ }
+
+ @GetMapping("/list")
+ @Operation(summary = "鐗圭璁惧鍙拌处-鍒楄〃鏌ヨ")
+ public AjaxResult list(SpecialEquipmentLedger req) {
+ return AjaxResult.success(service.list(Wrappers.lambdaQuery(req)));
+ }
+
+ @PostMapping("/add")
+ @Log(title = "鐗圭璁惧鍙拌处-鏂板", businessType = BusinessType.INSERT)
@Operation(summary = "鐗圭璁惧鍙拌处-鏂板")
- public AjaxResult add(@RequestBody SpecialEquipmentLedger req) { return service.save(req) ? success() : error(); }
- @PostMapping("/update") @Log(title = "鐗圭璁惧鍙拌处-淇敼", businessType = BusinessType.UPDATE)
+ public AjaxResult add(@RequestBody SpecialEquipmentLedger req) {
+ return service.save(req) ? success() : error();
+ }
+
+ @PostMapping("/update")
+ @Log(title = "鐗圭璁惧鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "鐗圭璁惧鍙拌处-淇敼")
- public AjaxResult update(@RequestBody SpecialEquipmentLedger req) { return service.updateById(req) ? success() : error(); }
- @DeleteMapping("/delete") @Log(title = "鐗圭璁惧鍙拌处-鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult update(@RequestBody SpecialEquipmentLedger req) {
+ return service.updateById(req) ? success() : error();
+ }
+
+ @DeleteMapping("/delete")
+ @Log(title = "鐗圭璁惧鍙拌处-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鐗圭璁惧鍙拌处-鍒犻櫎")
- public AjaxResult delete(@RequestBody List<Long> ids) { return service.removeByIds(ids) ? success() : error(); }
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ return service.removeByIds(ids) ? success() : error();
+ }
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRecordController.java b/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRecordController.java
index b62eb70..f6c0f06 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRecordController.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRecordController.java
@@ -1,4 +1,5 @@
package com.ruoyi.safe.specialequipment.controller;
+
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -10,22 +11,40 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
import java.util.List;
+
@RestController
@Tag(name = "瀹夊叏鐢熶骇--鐗圭璁惧妫�楠岀淮淇濊褰�")
@RequestMapping("/safe/specialEquipment/record")
@AllArgsConstructor
public class SpecialEquipmentRecordController extends BaseController {
private final SpecialEquipmentRecordService service;
- @GetMapping("/listPage") @Operation(summary = "妫�楠岀淮淇濊褰�-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SpecialEquipmentRecord req) { return AjaxResult.success(service.listPage(page, req)); }
- @PostMapping("/add") @Log(title = "妫�楠岀淮淇濊褰�-鏂板", businessType = BusinessType.INSERT)
+
+ @GetMapping("/listPage")
+ @Operation(summary = "妫�楠岀淮淇濊褰�-鍒嗛〉鏌ヨ")
+ public AjaxResult listPage(Page page, SpecialEquipmentRecord req) {
+ return AjaxResult.success(service.listPage(page, req));
+ }
+
+ @PostMapping("/add")
+ @Log(title = "妫�楠岀淮淇濊褰�-鏂板", businessType = BusinessType.INSERT)
@Operation(summary = "妫�楠岀淮淇濊褰�-鏂板")
- public AjaxResult add(@RequestBody SpecialEquipmentRecord req) { return service.save(req) ? success() : error(); }
- @PostMapping("/update") @Log(title = "妫�楠岀淮淇濊褰�-淇敼", businessType = BusinessType.UPDATE)
+ public AjaxResult add(@RequestBody SpecialEquipmentRecord req) {
+ return service.save(req) ? success() : error();
+ }
+
+ @PostMapping("/update")
+ @Log(title = "妫�楠岀淮淇濊褰�-淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "妫�楠岀淮淇濊褰�-淇敼")
- public AjaxResult update(@RequestBody SpecialEquipmentRecord req) { return service.updateById(req) ? success() : error(); }
- @DeleteMapping("/delete") @Log(title = "妫�楠岀淮淇濊褰�-鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult update(@RequestBody SpecialEquipmentRecord req) {
+ return service.updateById(req) ? success() : error();
+ }
+
+ @DeleteMapping("/delete")
+ @Log(title = "妫�楠岀淮淇濊褰�-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "妫�楠岀淮淇濊褰�-鍒犻櫎")
- public AjaxResult delete(@RequestBody List<Long> ids) { return service.removeByIds(ids) ? success() : error(); }
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ return service.removeByIds(ids) ? success() : error();
+ }
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRectificationController.java b/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRectificationController.java
index 82c2d02..567dbfa 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRectificationController.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/controller/SpecialEquipmentRectificationController.java
@@ -1,4 +1,5 @@
package com.ruoyi.safe.specialequipment.controller;
+
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -10,23 +11,43 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
import java.time.LocalDate;
import java.util.List;
+
@RestController
@Tag(name = "瀹夊叏鐢熶骇--鐗圭璁惧闅愭偅鏁存敼")
@RequestMapping("/safe/specialEquipment/rectification")
@AllArgsConstructor
public class SpecialEquipmentRectificationController extends BaseController {
private final SpecialEquipmentRectificationService service;
- @GetMapping("/listPage") @Operation(summary = "闅愭偅鏁存敼-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SpecialEquipmentRectification req) { return AjaxResult.success(service.listPage(page, req)); }
- @PostMapping("/add") @Log(title = "闅愭偅鏁存敼-鏂板", businessType = BusinessType.INSERT)
+
+ @GetMapping("/listPage")
+ @Operation(summary = "闅愭偅鏁存敼-鍒嗛〉鏌ヨ")
+ public AjaxResult listPage(Page page, SpecialEquipmentRectification req) {
+ return AjaxResult.success(service.listPage(page, req));
+ }
+
+ @PostMapping("/add")
+ @Log(title = "闅愭偅鏁存敼-鏂板", businessType = BusinessType.INSERT)
@Operation(summary = "闅愭偅鏁存敼-鏂板")
- public AjaxResult add(@RequestBody SpecialEquipmentRectification req) { return service.save(req) ? success() : error(); }
- @PostMapping("/close") @Log(title = "闅愭偅鏁存敼-闂幆", businessType = BusinessType.UPDATE)
+ public AjaxResult add(@RequestBody SpecialEquipmentRectification req) {
+ return service.save(req) ? success() : error();
+ }
+
+ @PostMapping("/close")
+ @Log(title = "闅愭偅鏁存敼-闂幆", businessType = BusinessType.UPDATE)
@Operation(summary = "闅愭偅鏁存敼-闂幆")
- public AjaxResult close(@RequestBody SpecialEquipmentRectification req) { req.setRectificationStatus(4); req.setClosedDate(LocalDate.now()); return service.updateById(req) ? success() : error(); }
- @DeleteMapping("/delete") @Log(title = "闅愭偅鏁存敼-鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult close(@RequestBody SpecialEquipmentRectification req) {
+ req.setRectificationStatus(4);
+ req.setClosedDate(LocalDate.now());
+ return service.updateById(req) ? success() : error();
+ }
+
+ @DeleteMapping("/delete")
+ @Log(title = "闅愭偅鏁存敼-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "闅愭偅鏁存敼-鍒犻櫎")
- public AjaxResult delete(@RequestBody List<Long> ids) { return service.removeByIds(ids) ? success() : error(); }
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ return service.removeByIds(ids) ? success() : error();
+ }
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentLedgerMapper.java b/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentLedgerMapper.java
index b303143..c3e13ed 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentLedgerMapper.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentLedgerMapper.java
@@ -1,9 +1,11 @@
package com.ruoyi.safe.specialequipment.mapper;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.safe.specialequipment.pojo.SpecialEquipmentLedger;
import org.apache.ibatis.annotations.Param;
+
public interface SpecialEquipmentLedgerMapper extends BaseMapper<SpecialEquipmentLedger> {
IPage<SpecialEquipmentLedger> listPage(Page page, @Param("req") SpecialEquipmentLedger req);
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRecordMapper.java b/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRecordMapper.java
index 8cf15f8..5184e43 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRecordMapper.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRecordMapper.java
@@ -1,9 +1,11 @@
package com.ruoyi.safe.specialequipment.mapper;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.safe.specialequipment.pojo.SpecialEquipmentRecord;
import org.apache.ibatis.annotations.Param;
+
public interface SpecialEquipmentRecordMapper extends BaseMapper<SpecialEquipmentRecord> {
IPage<SpecialEquipmentRecord> listPage(Page page, @Param("req") SpecialEquipmentRecord req);
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRectificationMapper.java b/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRectificationMapper.java
index 747e8f3..ff137ef 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRectificationMapper.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/mapper/SpecialEquipmentRectificationMapper.java
@@ -1,9 +1,11 @@
package com.ruoyi.safe.specialequipment.mapper;
+
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.safe.specialequipment.pojo.SpecialEquipmentRectification;
import org.apache.ibatis.annotations.Param;
+
public interface SpecialEquipmentRectificationMapper extends BaseMapper<SpecialEquipmentRectification> {
IPage<SpecialEquipmentRectification> listPage(Page page, @Param("req") SpecialEquipmentRectification req);
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentLedger.java b/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentLedger.java
index 2d079b6..1a8a016 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentLedger.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentLedger.java
@@ -1,50 +1,120 @@
package com.ruoyi.safe.specialequipment.pojo;
+
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+import java.io.Serializable;
import java.time.*;
+
@Data
@Schema(description = "鐗圭璁惧鐢靛瓙鍙拌处")
@TableName("special_equipment_ledger")
-public class SpecialEquipmentLedger {
+public class SpecialEquipmentLedger implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
- @TableId(type = IdType.AUTO) private Long id;
- @Excel(name = "璁惧缂栧彿") private String equipmentNo;
- @Excel(name = "璁惧鍚嶇О") private String equipmentName;
- @Excel(name = "璁惧绫诲埆") private String equipmentType;
- @Excel(name = "瑙勬牸鍨嬪彿") private String modelSpec;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍒堕�犳棩鏈�", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate manufactureDate;
- @Excel(name = "瀹夎浣嶇疆") private String installLocation;
- @Excel(name = "浣跨敤鍗曚綅") private String useUnit;
- @Excel(name = "鐧昏璇佸彿") private String certificateNo;
- @Excel(name = "妫�楠屽懆鏈�(澶�)") private Integer inspectionCycleDays;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "涓嬫妫�楠屾棩鏈�", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate nextInspectionDate;
- @Excel(name = "缁翠繚鍛ㄦ湡(澶�)") private Integer maintenanceCycleDays;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "涓嬫缁翠繚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate nextMaintenanceDate;
- @Excel(name = "棰勮鎻愬墠澶╂暟") private Integer alarmDays;
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @Excel(name = "璁惧缂栧彿")
+ private String equipmentNo;
+
+ @Excel(name = "璁惧鍚嶇О")
+ private String equipmentName;
+
+ @Excel(name = "璁惧绫诲埆")
+ private String equipmentType;
+
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String modelSpec;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍒堕�犳棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate manufactureDate;
+
+ @Excel(name = "瀹夎浣嶇疆")
+ private String installLocation;
+
+ @Excel(name = "浣跨敤鍗曚綅")
+ private String useUnit;
+
+ @Excel(name = "鐧昏璇佸彿")
+ private String certificateNo;
+
+ @Excel(name = "妫�楠屽懆鏈�(澶�)")
+ private Integer inspectionCycleDays;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "涓嬫妫�楠屾棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate nextInspectionDate;
+
+ @Excel(name = "缁翠繚鍛ㄦ湡(澶�)")
+ private Integer maintenanceCycleDays;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "涓嬫缁翠繚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate nextMaintenanceDate;
+
+ @Excel(name = "棰勮鎻愬墠澶╂暟")
+ private Integer alarmDays;
+
private Long managerId;
- @Excel(name = "璐熻矗浜�") private String managerName;
- @Excel(name = "瀹夊叏鍛�") private String safetyOfficer;
- @Excel(name = "椋庨櫓绛夌骇") private String riskLevel;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏈�鏂版楠屾棩鏈�", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate latestInspectionDate;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏈�鏂扮淮淇濇棩鏈�", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate latestMaintenanceDate;
- @Excel(name = "闅愭偅鐘舵��", readConverterExp = "0=鏃犻殣鎮�,1=寰呮暣鏀�,2=鏁存敼涓�,3=宸查棴鐜�") private Integer hazardStatus;
- @Excel(name = "闅愭偅鎻忚堪") private String hazardDescription;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏁存敼鎴鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate rectificationDeadline;
- @Excel(name = "澶囨敞") private String remarks;
- @TableField(fill = FieldFill.INSERT) private Long createUser;
- @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime;
- @TableField(fill = FieldFill.UPDATE) private Long updateUser;
- @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime;
- @TableField(fill = FieldFill.INSERT) private Long tenantId;
- @TableField(fill = FieldFill.INSERT) private Long deptId;
+
+ @Excel(name = "璐熻矗浜�")
+ private String managerName;
+
+ @Excel(name = "瀹夊叏鍛�")
+ private String safetyOfficer;
+
+ @Excel(name = "椋庨櫓绛夌骇")
+ private String riskLevel;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏈�鏂版楠屾棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate latestInspectionDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏈�鏂扮淮淇濇棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate latestMaintenanceDate;
+
+ @Excel(name = "闅愭偅鐘舵��", readConverterExp = "0=鏃犻殣鎮�,1=寰呮暣鏀�,2=鏁存敼涓�,3=宸查棴鐜�")
+ private Integer hazardStatus;
+
+ @Excel(name = "闅愭偅鎻忚堪")
+ private String hazardDescription;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏁存敼鎴鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate rectificationDeadline;
+
+ @Excel(name = "澶囨敞")
+ private String remarks;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.UPDATE)
+ private Long updateUser;
+
+ @TableField(fill = FieldFill.UPDATE)
+ private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRecord.java b/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRecord.java
index 78f4787..c11ab1a 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRecord.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRecord.java
@@ -1,34 +1,76 @@
package com.ruoyi.safe.specialequipment.pojo;
+
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+import java.io.Serializable;
import java.time.*;
+
@Data
@Schema(description = "鐗圭璁惧妫�楠岀淮淇濊褰�")
@TableName("special_equipment_record")
-public class SpecialEquipmentRecord {
+public class SpecialEquipmentRecord implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
- @TableId(type = IdType.AUTO) private Long id;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
private Long equipmentId;
- @Excel(name = "璁板綍绫诲瀷", readConverterExp = "1=妫�楠�,2=缁翠繚") private Integer recordType;
- @Excel(name = "璁板綍缂栧彿") private String recordNo;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁板綍鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate recordDate;
- @Excel(name = "鎵ц缁撴灉") private String executeResult;
- @Excel(name = "闂鎻忚堪") private String problemDescription;
- @Excel(name = "澶勭悊鎺柦") private String disposeMeasure;
+
+ @Excel(name = "璁板綍绫诲瀷", readConverterExp = "1=妫�楠�,2=缁翠繚")
+ private Integer recordType;
+
+ @Excel(name = "璁板綍缂栧彿")
+ private String recordNo;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璁板綍鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate recordDate;
+
+ @Excel(name = "鎵ц缁撴灉")
+ private String executeResult;
+
+ @Excel(name = "闂鎻忚堪")
+ private String problemDescription;
+
+ @Excel(name = "澶勭悊鎺柦")
+ private String disposeMeasure;
+
private Long executorId;
- @Excel(name = "鎵ц浜�") private String executorName;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "涓嬫鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate nextDueDate;
- @Excel(name = "闄勪欢璇存槑") private String attachmentRemark;
- @TableField(fill = FieldFill.INSERT) private Long createUser;
- @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime;
- @TableField(fill = FieldFill.UPDATE) private Long updateUser;
- @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime;
- @TableField(fill = FieldFill.INSERT) private Long tenantId;
- @TableField(fill = FieldFill.INSERT) private Long deptId;
+
+ @Excel(name = "鎵ц浜�")
+ private String executorName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "涓嬫鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate nextDueDate;
+
+ @Excel(name = "闄勪欢璇存槑")
+ private String attachmentRemark;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.UPDATE)
+ private Long updateUser;
+
+ @TableField(fill = FieldFill.UPDATE)
+ private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRectification.java b/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRectification.java
index e22e8cc..f11cb90 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRectification.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/pojo/SpecialEquipmentRectification.java
@@ -1,36 +1,81 @@
package com.ruoyi.safe.specialequipment.pojo;
+
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+import java.io.Serializable;
import java.time.*;
+
@Data
@Schema(description = "鐗圭璁惧闅愭偅鏁存敼")
@TableName("special_equipment_rectification")
-public class SpecialEquipmentRectification {
+public class SpecialEquipmentRectification implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
- @TableId(type = IdType.AUTO) private Long id;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
private Long equipmentId;
- @Excel(name = "闅愭偅鎻忚堪") private String hazardDescription;
- @Excel(name = "椋庨櫓绛夌骇") private String riskLevel;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍙戠幇鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate discoveredDate;
+
+ @Excel(name = "闅愭偅鎻忚堪")
+ private String hazardDescription;
+
+ @Excel(name = "椋庨櫓绛夌骇")
+ private String riskLevel;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍙戠幇鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate discoveredDate;
+
private Long responsibleUserId;
- @Excel(name = "鏁存敼璐d换浜�") private String responsibleUserName;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏁存敼鏈熼檺", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate rectificationDeadline;
- @Excel(name = "鏁存敼鐘舵��", readConverterExp = "1=寰呮暣鏀�,2=鏁存敼涓�,3=寰呭鏍�,4=宸查棴鐜�") private Integer rectificationStatus;
- @Excel(name = "鏁存敼鎺柦") private String rectificationMeasures;
- @Excel(name = "鏁存敼缁撴灉") private String rectificationResult;
- @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "闂幆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate closedDate;
- @Excel(name = "澶囨敞") private String remarks;
- @TableField(fill = FieldFill.INSERT) private Long createUser;
- @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime;
- @TableField(fill = FieldFill.UPDATE) private Long updateUser;
- @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime;
- @TableField(fill = FieldFill.INSERT) private Long tenantId;
- @TableField(fill = FieldFill.INSERT) private Long deptId;
+
+ @Excel(name = "鏁存敼璐d换浜�")
+ private String responsibleUserName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏁存敼鏈熼檺", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate rectificationDeadline;
+
+ @Excel(name = "鏁存敼鐘舵��", readConverterExp = "1=寰呮暣鏀�,2=鏁存敼涓�,3=寰呭鏍�,4=宸查棴鐜�")
+ private Integer rectificationStatus;
+
+ @Excel(name = "鏁存敼鎺柦")
+ private String rectificationMeasures;
+
+ @Excel(name = "鏁存敼缁撴灉")
+ private String rectificationResult;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "闂幆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate closedDate;
+
+ @Excel(name = "澶囨敞")
+ private String remarks;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.UPDATE)
+ private Long updateUser;
+
+ @TableField(fill = FieldFill.UPDATE)
+ private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentLedgerService.java b/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentLedgerService.java
index d04cf17..d6c2581 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentLedgerService.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentLedgerService.java
@@ -1,8 +1,12 @@
package com.ruoyi.safe.specialequipment.service;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.safe.specialequipment.pojo.SpecialEquipmentLedger;
+
public interface SpecialEquipmentLedgerService extends IService<SpecialEquipmentLedger> {
+
IPage<SpecialEquipmentLedger> listPage(Page page, SpecialEquipmentLedger req);
+
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRecordService.java b/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRecordService.java
index 357f36a..3af93f5 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRecordService.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRecordService.java
@@ -1,8 +1,12 @@
package com.ruoyi.safe.specialequipment.service;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.safe.specialequipment.pojo.SpecialEquipmentRecord;
+
public interface SpecialEquipmentRecordService extends IService<SpecialEquipmentRecord> {
+
IPage<SpecialEquipmentRecord> listPage(Page page, SpecialEquipmentRecord req);
+
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRectificationService.java b/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRectificationService.java
index 00cf01d..0a9faa8 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRectificationService.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/service/SpecialEquipmentRectificationService.java
@@ -1,8 +1,12 @@
package com.ruoyi.safe.specialequipment.service;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.safe.specialequipment.pojo.SpecialEquipmentRectification;
+
public interface SpecialEquipmentRectificationService extends IService<SpecialEquipmentRectification> {
+
IPage<SpecialEquipmentRectification> listPage(Page page, SpecialEquipmentRectification req);
+
}
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentLedgerServiceImpl.java b/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentLedgerServiceImpl.java
index 354e463..c1be3ad 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentLedgerServiceImpl.java
@@ -1,4 +1,5 @@
package com.ruoyi.safe.specialequipment.service.impl;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,12 +9,18 @@
import com.ruoyi.safe.specialequipment.service.SpecialEquipmentLedgerService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
import java.time.LocalDateTime;
+
@Service
@RequiredArgsConstructor
public class SpecialEquipmentLedgerServiceImpl extends ServiceImpl<SpecialEquipmentLedgerMapper, SpecialEquipmentLedger> implements SpecialEquipmentLedgerService {
private final SpecialEquipmentLedgerMapper mapper;
- public IPage<SpecialEquipmentLedger> listPage(Page page, SpecialEquipmentLedger req) { return mapper.listPage(page, req); }
+
+ public IPage<SpecialEquipmentLedger> listPage(Page page, SpecialEquipmentLedger req) {
+ return mapper.listPage(page, req);
+ }
+
public boolean save(SpecialEquipmentLedger entity) {
entity.setHazardStatus(entity.getHazardStatus() == null ? 0 : entity.getHazardStatus());
entity.setTenantId(SecurityUtils.getLoginUser().getTenantId());
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRecordServiceImpl.java b/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRecordServiceImpl.java
index ade0335..56de862 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRecordServiceImpl.java
@@ -1,4 +1,5 @@
package com.ruoyi.safe.specialequipment.service.impl;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,14 +11,18 @@
import com.ruoyi.safe.specialequipment.service.SpecialEquipmentRecordService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
import java.time.LocalDateTime;
+
@Service
@RequiredArgsConstructor
public class SpecialEquipmentRecordServiceImpl extends ServiceImpl<SpecialEquipmentRecordMapper, SpecialEquipmentRecord> implements SpecialEquipmentRecordService {
private final SpecialEquipmentRecordMapper mapper;
private final SpecialEquipmentLedgerMapper ledgerMapper;
- public IPage<SpecialEquipmentRecord> listPage(Page page, SpecialEquipmentRecord req) { return mapper.listPage(page, req); }
+ public IPage<SpecialEquipmentRecord> listPage(Page page, SpecialEquipmentRecord req) {
+ return mapper.listPage(page, req);
+ }
public boolean save(SpecialEquipmentRecord entity) {
entity.setTenantId(SecurityUtils.getLoginUser().getTenantId());
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRectificationServiceImpl.java b/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRectificationServiceImpl.java
index 0deae68..ae4dc00 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRectificationServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/service/impl/SpecialEquipmentRectificationServiceImpl.java
@@ -1,4 +1,5 @@
package com.ruoyi.safe.specialequipment.service.impl;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,12 +9,18 @@
import com.ruoyi.safe.specialequipment.service.SpecialEquipmentRectificationService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
import java.time.LocalDateTime;
+
@Service
@RequiredArgsConstructor
public class SpecialEquipmentRectificationServiceImpl extends ServiceImpl<SpecialEquipmentRectificationMapper, SpecialEquipmentRectification> implements SpecialEquipmentRectificationService {
private final SpecialEquipmentRectificationMapper mapper;
- public IPage<SpecialEquipmentRectification> listPage(Page page, SpecialEquipmentRectification req) { return mapper.listPage(page, req); }
+
+ public IPage<SpecialEquipmentRectification> listPage(Page page, SpecialEquipmentRectification req) {
+ return mapper.listPage(page, req);
+ }
+
public boolean save(SpecialEquipmentRectification entity) {
entity.setTenantId(SecurityUtils.getLoginUser().getTenantId());
entity.setCreateUser(SecurityUtils.getLoginUser().getUserId());
diff --git a/src/main/java/com/ruoyi/safe/specialequipment/task/SpecialEquipmentReminderTask.java b/src/main/java/com/ruoyi/safe/specialequipment/task/SpecialEquipmentReminderTask.java
index 8acb7d0..5d99ca0 100644
--- a/src/main/java/com/ruoyi/safe/specialequipment/task/SpecialEquipmentReminderTask.java
+++ b/src/main/java/com/ruoyi/safe/specialequipment/task/SpecialEquipmentReminderTask.java
@@ -1,4 +1,5 @@
package com.ruoyi.safe.specialequipment.task;
+
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.approve.pojo.NotificationManagement;
import com.ruoyi.approve.service.NotificationManagementService;
@@ -7,11 +8,13 @@
import lombok.RequiredArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+
@Component
@RequiredArgsConstructor
public class SpecialEquipmentReminderTask {
diff --git a/src/main/resources/mapper/safe/SafeContingencyPlanMapper.xml b/src/main/resources/mapper/safe/SafeContingencyPlanMapper.xml
index d979545..c92002e 100644
--- a/src/main/resources/mapper/safe/SafeContingencyPlanMapper.xml
+++ b/src/main/resources/mapper/safe/SafeContingencyPlanMapper.xml
@@ -33,6 +33,7 @@
<if test="c.planType != null and c.planType != ''">
and scp.plan_type like concat('%', #{c.planType}, '%')
</if>
+ order by scp.id desc
</select>
</mapper>
diff --git a/src/main/resources/mapper/safe/SafeHiddenMapper.xml b/src/main/resources/mapper/safe/SafeHiddenMapper.xml
index c1af4bd..6b8757e 100644
--- a/src/main/resources/mapper/safe/SafeHiddenMapper.xml
+++ b/src/main/resources/mapper/safe/SafeHiddenMapper.xml
@@ -41,6 +41,7 @@
<if test="c.riskLevel != null and c.riskLevel != ''">
and sh.risk_level like concat('%', #{c.riskLevel}, '%')
</if>
+ order by sh.id desc
</select>
</mapper>
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index 14f0a37..a8ba900 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -45,7 +45,7 @@
<if test="c.trainingDate != null ">
AND DATE_FORMAT(st.training_date, '%Y%m%d') = DATE_FORMAT(#{c.trainingDate}, '%Y%m%d')
</if>
- GROUP BY st.id, su.nick_name
+ GROUP BY st.id desc
</select>
<select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
select st.*,
diff --git a/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentLedgerMapper.xml b/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentLedgerMapper.xml
index 4eab076..1f1bde0 100644
--- a/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentLedgerMapper.xml
+++ b/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentLedgerMapper.xml
@@ -78,6 +78,7 @@
<if test="req.hazardStatus != null">
and l.hazard_status = #{req.hazardStatus}
</if>
+ order by l.create_time desc
</select>
</mapper>
diff --git a/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRecordMapper.xml b/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRecordMapper.xml
index 228981c..b32f4a3 100644
--- a/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRecordMapper.xml
+++ b/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRecordMapper.xml
@@ -36,6 +36,7 @@
<if test="req.equipmentId != null">
and equipment_id = #{req.equipmentId}
</if>
+ order by id desc
</select>
</mapper>
diff --git a/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRectificationMapper.xml b/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRectificationMapper.xml
index 75039e2..d9a6db1 100644
--- a/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRectificationMapper.xml
+++ b/src/main/resources/mapper/safe/specialequipment/SpecialEquipmentRectificationMapper.xml
@@ -37,6 +37,7 @@
<if test="req.equipmentId != null">
and equipment_id = #{req.equipmentId}
</if>
+ order by id
</select>
</mapper>
--
Gitblit v1.9.3