ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除documentState字段

Browse Source
This commit is contained in:
caozehui
2025-01-05 11:42:20 +08:00
parent 11c95b6b42
commit 949aa83539
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java
View File

@@ -162,11 +162,6 @@ public class PqDev extends BaseEntity implements Serializable {
*/ */
private Integer reportState; private Integer reportState;
/**
* 归档状态
*/
private Integer documentState;
/** /**
* 报告路径 * 报告路径
*/ */

4
device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevExcel.java
View File

@@ -134,8 +134,8 @@ public class PqDevExcel implements Serializable {
@Excel(name = "报告状态（未生成\\已生成\\未检）", width = 15, replace = {"未生成_0", "已生成_1", "未检_2"}, orderNum = "27", needMerge = true) @Excel(name = "报告状态（未生成\\已生成\\未检）", width = 15, replace = {"未生成_0", "已生成_1", "未检_2"}, orderNum = "27", needMerge = true)
private Integer reportState; private Integer reportState;
@Excel(name = "归档状态（未归档\\归档）", width = 15, replace = {"未归档_0", "归档_1"}, orderNum = "28", needMerge = true) // @Excel(name = "归档状态（未归档\\归档）", width = 15, replace = {"未归档_0", "归档_1"}, orderNum = "28", needMerge = true)
private Integer documentState; // private Integer documentState;
@Excel(name = "报告路径", width = 20, orderNum = "29", needMerge = true) @Excel(name = "报告路径", width = 20, orderNum = "29", needMerge = true)
private String reportPath; private String reportPath;

2
device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java
View File

@@ -76,7 +76,7 @@ public class PqDevVO {
private Integer reportState; private Integer reportState;
private Integer documentState; // private Integer documentState;
private String reportPath; private String reportPath;

6
device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue()); pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue()); pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue());
pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue()); pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue());
pqDev.setDocumentState(DevDocumentStateEnum.UNDOCUMENTED.getValue()); // pqDev.setDocumentState(DevDocumentStateEnum.UNDOCUMENTED.getValue());
pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue()); pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
String id = UUID.randomUUID().toString().replaceAll("-", ""); String id = UUID.randomUUID().toString().replaceAll("-", "");
pqDev.setId(id); pqDev.setId(id);
@@ -374,7 +374,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue()); pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue()); pqDev.setCheckState(CheckStateEnum.UNCHECKED.getValue());
pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue()); pqDev.setReportState(DevReportStateEnum.UNCHECKED.getValue());
pqDev.setDocumentState(DevDocumentStateEnum.UNDOCUMENTED.getValue()); // pqDev.setDocumentState(DevDocumentStateEnum.UNDOCUMENTED.getValue());
pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue()); pqDev.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
}); });
} }
@@ -430,7 +430,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
PqDev pqDev = this.getById(id); PqDev pqDev = this.getById(id);
if (ObjectUtil.isNotNull(pqDev) && !pqDev.getCheckState().equals(CheckStateEnum.CHECKED.getValue())) { if (ObjectUtil.isNotNull(pqDev) && !pqDev.getCheckState().equals(CheckStateEnum.CHECKED.getValue())) {
return this.lambdaUpdate() return this.lambdaUpdate()
.set(PqDev::getDocumentState, DevDocumentStateEnum.DOCUMENTED.getValue()) // .set(PqDev::getDocumentState, DevDocumentStateEnum.DOCUMENTED.getValue())
.set(PqDev::getCheckState, CheckStateEnum.DOCUMENTED.getValue()) .set(PqDev::getCheckState, CheckStateEnum.DOCUMENTED.getValue())
.eq(PqDev::getId, id) .eq(PqDev::getId, id)
.update(); .update();