diff --git a/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterprisePollutionDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterprisePollutionDTO.java
index 8e0e047..6ff27d5 100644
--- a/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterprisePollutionDTO.java
+++ b/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterprisePollutionDTO.java
@@ -31,7 +31,9 @@ public class EnterprisePollutionDTO implements Serializable {
private String pollutionFacilities;
@ApiModelProperty(name = "pollutionControlFacilities", value = "治污设施安装情况")
private String pollutionControlFacilities;
- @ApiModelProperty(name = "checkStatus", value = "环评及验收情况，1：有环评，2：无环评，3：已验收，4：未验收")
+ @ApiModelProperty(name = "eiaStatus", value = "环评状态，1：有环评，2：无环评")
+ private String eiaStatus;
+ @ApiModelProperty(name = "checkStatus", value = "验收状态，1：已验收，2：未验收")
private String checkStatus;
@ApiModelProperty(name = "relatedDocuments", value = "相关文件")
private String relatedDocuments;
@@ -84,6 +86,14 @@ public class EnterprisePollutionDTO implements Serializable {
this.pollutionControlFacilities = pollutionControlFacilities;
}
+ public String getEiaStatus() {
+ return eiaStatus == null ? "" : eiaStatus.trim();
+ }
+
+ public void setEiaStatus(String eiaStatus) {
+ this.eiaStatus = eiaStatus;
+ }
+
public String getCheckStatus() {
return checkStatus == null ? "" : checkStatus.trim();
}
@@ -115,6 +125,8 @@ public class EnterprisePollutionDTO implements Serializable {
.append(pollutionFacilities).append('\"');
sb.append(",\"pollutionControlFacilities\":\"")
.append(pollutionControlFacilities).append('\"');
+ sb.append(",\"eiaStatus\":\"")
+ .append(eiaStatus).append('\"');
sb.append(",\"checkStatus\":\"")
.append(checkStatus).append('\"');
sb.append(",\"relatedDocuments\":\"")
diff --git a/src/main/java/com/cm/inspection/pojo/vos/enterprise/EnterprisePollutionVO.java b/src/main/java/com/cm/inspection/pojo/vos/enterprise/EnterprisePollutionVO.java
index 1930117..bb6f078 100644
--- a/src/main/java/com/cm/inspection/pojo/vos/enterprise/EnterprisePollutionVO.java
+++ b/src/main/java/com/cm/inspection/pojo/vos/enterprise/EnterprisePollutionVO.java
@@ -28,7 +28,9 @@ public class EnterprisePollutionVO {
private String pollutionFacilities;
@ApiModelProperty(name = "pollutionControlFacilities", value = "治污设施安装情况")
private String pollutionControlFacilities;
- @ApiModelProperty(name = "checkStatus", value = "环评及验收情况，1：有环评，2：无环评，3：已验收，4：未验收")
+ @ApiModelProperty(name = "eiaStatus", value = "环评状态，1：有环评，2：无环评")
+ private String eiaStatus;
+ @ApiModelProperty(name = "checkStatus", value = "验收状态，1：已验收，2：未验收")
private String checkStatus;
@ApiModelProperty(name = "relatedDocuments", value = "相关文件")
private String relatedDocuments;
@@ -73,6 +75,14 @@ public class EnterprisePollutionVO {
this.pollutionControlFacilities = pollutionControlFacilities;
}
+ public String getEiaStatus() {
+ return eiaStatus == null ? "" : eiaStatus.trim();
+ }
+
+ public void setEiaStatus(String eiaStatus) {
+ this.eiaStatus = eiaStatus;
+ }
+
public String getCheckStatus() {
return checkStatus == null ? "" : checkStatus.trim();
}
@@ -102,6 +112,8 @@ public class EnterprisePollutionVO {
.append(pollutionFacilities).append('\"');
sb.append(",\"pollutionControlFacilities\":\"")
.append(pollutionControlFacilities).append('\"');
+ sb.append(",\"eiaStatus\":\"")
+ .append(eiaStatus).append('\"');
sb.append(",\"checkStatus\":\"")
.append(checkStatus).append('\"');
sb.append(",\"relatedDocuments\":\"")
diff --git a/src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml b/src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml
index 1926624..8d6ea9f 100644
--- a/src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml
+++ b/src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml
@@ -62,6 +62,7 @@
+
@@ -401,6 +402,7 @@
pollution_factor_other,
pollution_facilities,
pollution_control_facilities,
+ eia_status,
check_status,
related_documents
) VALUES(
@@ -410,6 +412,7 @@
#{pollutionFactorOther},
#{pollutionFacilities},
#{pollutionControlFacilities},
+ #{eiaStatus},
#{checkStatus},
#{relatedDocuments}
)
@@ -420,25 +423,28 @@
UPDATE
gen_enterprise_pollution
SET
-
+
pollution_factor = #{pollutionFactor},
-
+
pollution_factor_dangerous = #{pollutionFactorDangerous},
-
+
pollution_factor_other = #{pollutionFactorOther},
-
+
pollution_facilities = #{pollutionFacilities},
-
+
pollution_control_facilities = #{pollutionControlFacilities},
-
+
+ eia_status = #{eiaStatus},
+
+
check_status = #{checkStatus},
-
+
related_documents = #{relatedDocuments},
enterprise_id = #{enterpriseId}
@@ -723,6 +729,7 @@
pollution_factor_other,
pollution_facilities,
pollution_control_facilities,
+ eia_status,
check_status,
related_documents
FROM
@@ -740,6 +747,7 @@
pollution_factor_other,
pollution_facilities,
pollution_control_facilities,
+ eia_status,
check_status,
related_documents
FROM
diff --git a/src/main/resources/static/route/enterprise/update-enterprise-pollution.html b/src/main/resources/static/route/enterprise/update-enterprise-pollution.html
index f27a453..9ee3040 100644
--- a/src/main/resources/static/route/enterprise/update-enterprise-pollution.html
+++ b/src/main/resources/static/route/enterprise/update-enterprise-pollution.html
@@ -117,13 +117,20 @@
+