调整字段

This commit is contained in:
wenc000 2020-10-21 10:48:35 +08:00
parent 1668733b38
commit 6317c19141
4 changed files with 53 additions and 14 deletions

View File

@ -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\":\"")

View File

@ -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\":\"")

View File

@ -62,6 +62,7 @@
<result column="pollution_factor_other" property="pollutionFactorOther"/>
<result column="pollution_facilities" property="pollutionFacilities"/>
<result column="pollution_control_facilities" property="pollutionControlFacilities"/>
<result column="eia_status" property="eiaStatus"/>
<result column="check_status" property="checkStatus"/>
<result column="related_documents" property="relatedDocuments"/>
</resultMap>
@ -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
<if test="pollutionFactor != null and pollutionFactor != ''">
<if test="pollutionFactor != null">
pollution_factor = #{pollutionFactor},
</if>
<if test="pollutionFactorDangerous != null and pollutionFactorDangerous != ''">
<if test="pollutionFactorDangerous != null">
pollution_factor_dangerous = #{pollutionFactorDangerous},
</if>
<if test="pollutionFactorOther != null and pollutionFactorOther != ''">
<if test="pollutionFactorOther != null">
pollution_factor_other = #{pollutionFactorOther},
</if>
<if test="pollutionFacilities != null and pollutionFacilities != ''">
<if test="pollutionFacilities != null">
pollution_facilities = #{pollutionFacilities},
</if>
<if test="pollutionControlFacilities != null and pollutionControlFacilities != ''">
<if test="pollutionControlFacilities != null">
pollution_control_facilities = #{pollutionControlFacilities},
</if>
<if test="checkStatus != null and checkStatus != ''">
<if test="eiaStatus != null">
eia_status = #{eiaStatus},
</if>
<if test="checkStatus != null">
check_status = #{checkStatus},
</if>
<if test="relatedDocuments != null and relatedDocuments != ''">
<if test="relatedDocuments != null">
related_documents = #{relatedDocuments},
</if>
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

View File

@ -117,13 +117,20 @@
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">环评及验收情况</label>
<label class="layui-form-label">环评状态</label>
<div class="layui-input-block">
<div style="border: 1px solid #e6e6e6;">
<input type="radio" name="checkStatus" value="1" title="有环评" checked>
<input type="radio" name="checkStatus" value="2" title="无环评">
<input type="radio" name="checkStatus" value="3" title="已验收">
<input type="radio" name="checkStatus" value="4" title="未验收">
<input type="radio" name="eiaStatus" value="1" title="有环评" checked>
<input type="radio" name="eiaStatus" value="2" title="无环评">
</div>
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">验收状态</label>
<div class="layui-input-block">
<div style="border: 1px solid #e6e6e6;">
<input type="radio" name="checkStatus" value="1" title="已验收" checked>
<input type="radio" name="checkStatus" value="2" title="未验收">
</div>
</div>
</div>