diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
index 4ffe6a7..a4f0651 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
@@ -18,6 +18,7 @@
+
@@ -36,6 +37,7 @@
file_name as fileName ,
file_code as fileCode ,
sys_code as sysCode ,
+ record_status, as recordStatus,
content
@@ -55,6 +57,7 @@
a.file_name as fileName ,
a.file_code as fileCode ,
a.sys_code as sysCode ,
+ a.record_status as recordStatus,
a.content
from biz_quality_technical_analysis_rep a
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
index 4ffe6a7..a4f0651 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
@@ -18,6 +18,7 @@
+
@@ -36,6 +37,7 @@
file_name as fileName ,
file_code as fileCode ,
sys_code as sysCode ,
+ record_status, as recordStatus,
content
@@ -55,6 +57,7 @@
a.file_name as fileName ,
a.file_code as fileCode ,
a.sys_code as sysCode ,
+ a.record_status as recordStatus,
a.content
from biz_quality_technical_analysis_rep a
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTechnicalAnalysisRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTechnicalAnalysisRepVO.java
index fa0fb3a..969f70d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTechnicalAnalysisRepVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTechnicalAnalysisRepVO.java
@@ -17,38 +17,27 @@
public class BizQualityTechnicalAnalysisRepVO {
private static final long serialVersionUID = 1L;
- /**
- * 创建时间
- */
@ApiModelProperty(value = "创建时间起始", dataType = "Date")
private String createTimeStart;
@ApiModelProperty(value = "创建时间结束", dataType = "Date")
private String createTimeEnd;
- /**
- * 实验室代码A:全站:0;X:西昌:1;H:海口:2
- */
+
@ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String")
private String bizLabCode;
- /**
- * 质量负责人ID
- */
+
@ApiModelProperty(value = "质量负责人ID", dataType = "Long")
- private Long commanderId;
- /**
- * 质量负责人姓名
- */
+ private String commanderId;
+
@ApiModelProperty(value = "质量负责人姓名", dataType = "String")
private String commanderName;
- /**
- * 文件名称
- */
+
@ApiModelProperty(value = "文件名称", dataType = "String")
private String fileName;
- /**
- * 文件编码
- */
+
@ApiModelProperty(value = "文件编码", dataType = "String")
private String fileCode;
+ @ApiModelProperty(value = "状态(0 草稿 1 发布)", dataType = "String")
+ private String recordStatus;
public QueryWrapper genQuery() {
QueryWrapper query = new QueryWrapper<>();
@@ -61,9 +50,7 @@
if (StrUtil.isNotEmpty(bizLabCode)) {
query.eq("biz_lab_code", bizLabCode);
}
- if (commanderId != null) {
- query.eq("commander_id", commanderId);
- }
+
if (StrUtil.isNotEmpty(commanderName)) {
query.like("commander_name", commanderName);
}
@@ -73,6 +60,12 @@
if (StrUtil.isNotEmpty(fileCode)) {
query.eq("file_code", fileCode);
}
+ if (StrUtil.isNotEmpty(recordStatus)) {
+ query.eq("record_status", recordStatus);
+ }
+ if (StrUtil.isNotEmpty(commanderId)) {
+ query.eq("commander_id", commanderId);
+ }
return query;
}
}
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
index 4ffe6a7..a4f0651 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTechnicalAnalysisRepMapper.xml
@@ -18,6 +18,7 @@
+
@@ -36,6 +37,7 @@
file_name as fileName ,
file_code as fileCode ,
sys_code as sysCode ,
+ record_status, as recordStatus,
content
@@ -55,6 +57,7 @@
a.file_name as fileName ,
a.file_code as fileCode ,
a.sys_code as sysCode ,
+ a.record_status as recordStatus,
a.content
from biz_quality_technical_analysis_rep a
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTechnicalAnalysisRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTechnicalAnalysisRepVO.java
index fa0fb3a..969f70d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTechnicalAnalysisRepVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTechnicalAnalysisRepVO.java
@@ -17,38 +17,27 @@
public class BizQualityTechnicalAnalysisRepVO {
private static final long serialVersionUID = 1L;
- /**
- * 创建时间
- */
@ApiModelProperty(value = "创建时间起始", dataType = "Date")
private String createTimeStart;
@ApiModelProperty(value = "创建时间结束", dataType = "Date")
private String createTimeEnd;
- /**
- * 实验室代码A:全站:0;X:西昌:1;H:海口:2
- */
+
@ApiModelProperty(value = "实验室代码A:全站:0;X:西昌:1;H:海口:2", dataType = "String")
private String bizLabCode;
- /**
- * 质量负责人ID
- */
+
@ApiModelProperty(value = "质量负责人ID", dataType = "Long")
- private Long commanderId;
- /**
- * 质量负责人姓名
- */
+ private String commanderId;
+
@ApiModelProperty(value = "质量负责人姓名", dataType = "String")
private String commanderName;
- /**
- * 文件名称
- */
+
@ApiModelProperty(value = "文件名称", dataType = "String")
private String fileName;
- /**
- * 文件编码
- */
+
@ApiModelProperty(value = "文件编码", dataType = "String")
private String fileCode;
+ @ApiModelProperty(value = "状态(0 草稿 1 发布)", dataType = "String")
+ private String recordStatus;
public QueryWrapper genQuery() {
QueryWrapper query = new QueryWrapper<>();
@@ -61,9 +50,7 @@
if (StrUtil.isNotEmpty(bizLabCode)) {
query.eq("biz_lab_code", bizLabCode);
}
- if (commanderId != null) {
- query.eq("commander_id", commanderId);
- }
+
if (StrUtil.isNotEmpty(commanderName)) {
query.like("commander_name", commanderName);
}
@@ -73,6 +60,12 @@
if (StrUtil.isNotEmpty(fileCode)) {
query.eq("file_code", fileCode);
}
+ if (StrUtil.isNotEmpty(recordStatus)) {
+ query.eq("record_status", recordStatus);
+ }
+ if (StrUtil.isNotEmpty(commanderId)) {
+ query.eq("commander_id", commanderId);
+ }
return query;
}
}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java
index 487a088..d4c93e8 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTechnicalAnalysisRep.java
@@ -125,7 +125,12 @@
@TableField("content")
private String content;
-
+ /**
+ * 状态(0,草稿 1公开)
+ */
+ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "String")
+ @TableField("record_status")
+ private String recordStatus;
@Override
public String toString() {
return "BizQualityTechnicalAnalysisRep{"