From 949aa83539dde6e1de1ee64d68597e19db56bc61 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Sun, 5 Jan 2025 11:42:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4documentState=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/gather/device/device/pojo/po/PqDev.java | 5 ----- .../com/njcn/gather/device/device/pojo/vo/PqDevExcel.java | 4 ++-- .../java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java | 2 +- .../gather/device/device/service/impl/PqDevServiceImpl.java | 6 +++--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java b/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java index 0bbafdeb..4a4297e9 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java +++ b/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java @@ -162,11 +162,6 @@ public class PqDev extends BaseEntity implements Serializable { */ private Integer reportState; - /** - * 归档状态 - */ - private Integer documentState; - /** * 报告路径 */ diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevExcel.java b/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevExcel.java index 80021001..1db1cdec 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevExcel.java +++ b/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevExcel.java @@ -134,8 +134,8 @@ public class PqDevExcel implements Serializable { @Excel(name = "报告状态（未生成\\已生成\\未检）", width = 15, replace = {"未生成_0", "已生成_1", "未检_2"}, orderNum = "27", needMerge = true) private Integer reportState; - @Excel(name = "归档状态（未归档\\归档）", width = 15, replace = {"未归档_0", "归档_1"}, orderNum = "28", needMerge = true) - private Integer documentState; +// @Excel(name = "归档状态（未归档\\归档）", width = 15, replace = {"未归档_0", "归档_1"}, orderNum = "28", needMerge = true) +// private Integer documentState; @Excel(name = "报告路径", width = 20, orderNum = "29", needMerge = true) private String reportPath; diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java b/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java index a281a790..9c2aade8 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java +++ b/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java @@ -76,7 +76,7 @@ public class PqDevVO { private Integer reportState; - private Integer documentState; +// private Integer documentState; private String reportPath; diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java index b472f4d6..7cd3547d 100644 --- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java +++ b/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java @@ -83,7 +83,7 @@ public class PqDevServiceImpl extends ServiceImpl implements pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue()); pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue()); pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue()); - pqDev.setDocumentState(DevDocumentStateEnum.UNDOCUMENTED.getValue()); +// pqDev.setDocumentState(DevDocumentStateEnum.UNDOCUMENTED.getValue()); pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue()); String id = UUID.randomUUID().toString().replaceAll("-", ""); pqDev.setId(id); @@ -374,7 +374,7 @@ public class PqDevServiceImpl extends ServiceImpl implements pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue()); pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue()); pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue()); - pqDev.setDocumentState(DevDocumentStateEnum.UNDOCUMENTED.getValue()); +// pqDev.setDocumentState(DevDocumentStateEnum.UNDOCUMENTED.getValue()); pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue()); }); } @@ -430,7 +430,7 @@ public class PqDevServiceImpl extends ServiceImpl implements PqDev pqDev = this.getById(id); if (ObjectUtil.isNotNull(pqDev) && !pqDev.getCheckState().equals(CheckStateEnum.CHECKED.getValue())) { return this.lambdaUpdate() - .set(PqDev::getDocumentState, DevDocumentStateEnum.DOCUMENTED.getValue()) +// .set(PqDev::getDocumentState, DevDocumentStateEnum.DOCUMENTED.getValue()) .set(PqDev::getCheckState, CheckStateEnum.DOCUMENTED.getValue()) .eq(PqDev::getId, id) .update();