Skip to content

cfld-liyeyun-admin
cfld-liyeyun-admin
Commit 40664914 authored by yaobaizheng's avatar yaobaizheng
Browse files
Options

//立业云后台提交

parent df537675
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 37 deletions
ruoyi-system/src/main/java/com/ruoyi/system/domain/DevelopmentInfo.java
View file @ 40664914
......@@ -426,6 +426,10 @@ public class DevelopmentInfo extends BaseEntity
@Excel(name = "原因")
private String reason;
/** 组织机构 */
@Excel(name = "组织机构")
private String organization;
public void setId(Long id)
{
this.id = id;
......@@ -1344,6 +1348,14 @@ public class DevelopmentInfo extends BaseEntity
this.reason = reason;
}
public String getOrganization() {
return organization;
}
public void setOrganization(String organization) {
this.organization = organization;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......@@ -1451,6 +1463,7 @@ public class DevelopmentInfo extends BaseEntity
.append("sewageWaterType", getSewageWaterType())
.append("sewageWaterPrice", getSewageWaterPrice())
.append("reason", getReason())
.append("organization", getOrganization())
.toString();
}
}
ruoyi-system/src/main/resources/mapper/developmentInfo/DevelopmentInfoMapper.xml
View file @ 40664914
......@@ -107,6 +107,8 @@
<result property="submitTime" column="submit_time"/>
<result property="sewageWaterType" column="sewage_water_type"/>
<result property="sewageWaterPrice" column="sewage_water_price"/>
<result property="organization" column="organization"/>
<result property="reason" column="reason"/>
</resultMap>
<sql id="selectDevelopmentInfoVo">
......@@ -212,7 +214,9 @@
is_system,
submit_time,
sewage_water_type,
sewage_water_price
sewage_water_price,
organization,
reason
from development_info
</sql>
......
ruoyi-system/src/main/resources/templates/parkInfo/info/detail.html
View file @ 40664914
......@@ -17,30 +17,30 @@
<input name="name" th:field="*{name}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属集团id(1-产业新城；2-幸福产城)：</label>
<div class="col-sm-8">
<input name="groupId" th:field="*{groupId}" class="form-control" type="text" >
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">所属集团id(1-产业新城；2-幸福产城)：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="groupId" th:field="*{groupId}" class="form-control" type="text" >-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">所属集团：</label>
<div class="col-sm-8">
<input name="groupName" th:field="*{groupName}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属片区id：</label>
<div class="col-sm-8">
<input name="zoneId" th:field="*{zoneId}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属片区：</label>
<div class="col-sm-8">
<input name="zoneName" th:field="*{zoneName}" class="form-control" type="text" >
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">所属片区id：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="zoneId" th:field="*{zoneId}" class="form-control" type="text" >-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">所属片区：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="zoneName" th:field="*{zoneName}" class="form-control" type="text" >-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">园区级别：</label>
<div class="col-sm-8">
......@@ -54,36 +54,36 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">省份code：</label>
<div class="col-sm-8">
<input name="provinceCode" th:field="*{provinceCode}" class="form-control" type="text" >
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">省份code：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="provinceCode" th:field="*{provinceCode}" class="form-control" type="text" >-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">省份：</label>
<div class="col-sm-8">
<input name="provinceName" th:field="*{provinceName}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">城市code：</label>
<div class="col-sm-8">
<input name="cityCode" th:field="*{cityCode}" class="form-control" type="text" >
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">城市code：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="cityCode" th:field="*{cityCode}" class="form-control" type="text" >-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">城市：</label>
<div class="col-sm-8">
<input name="cityName" th:field="*{cityName}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">区/县code：</label>
<div class="col-sm-8">
<input name="regionCode" th:field="*{regionCode}" class="form-control" type="text" >
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">区/县code：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="regionCode" th:field="*{regionCode}" class="form-control" type="text" >-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">区/县：</label>
<div class="col-sm-8">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment