diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java
index cb2d5246..70c6335e 100644
--- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java
+++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java
@@ -25,49 +25,34 @@ public class BsSgcJsjdWarnResult extends BaseEntity
{
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
private String createUid;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
private String updateUid;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
private String proCode;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
private String proNo;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
private String owerDept;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
+ //预警事项
private String warnType;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
private String warnSubType;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
+ //结果类型(1,不用处理。2,处理)
private String resultType;
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- @ApiModelProperty("${comment}")
+
+ //问题描述
private String warnResult;
/** 是否处理(0:未处理,1:已处理) */
diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
index d5dbef38..0dd1c90b 100644
--- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
@@ -12,7 +12,8 @@
pi.project_type,
pi.CONSTRUCTION_NATURE,
pi.is_major,
- pi.total
+ pi.total,
+ pi.pro_no
from bs_sgc_jsjd_bui_pro_info pi
left join bs_slgc_qqjd_spe_pro_proposal pp on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no
@@ -68,6 +69,7 @@
+