Merge branch 'script_gj' into 'master'
Script gj See merge request !670
This commit is contained in:
+12
-4
@@ -26,8 +26,8 @@ public class BuildingRatioController {
|
||||
public Object doAddAction(BuildingRatioModel model) throws Exception {
|
||||
if (StringUtils.isBlank(model.getCity_name()) || StringUtils.isBlank(model.getRegion())
|
||||
|| StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getBuilding_name())
|
||||
|| model.getRatio() == null) {
|
||||
model.setMsg("城市,区域,小区,楼栋名称,楼栋系数不能为空");
|
||||
|| model.getRatio() == null || StringUtils.isBlank(model.getCreate_user())) {
|
||||
model.setMsg("城市,区域,小区,楼栋名称,楼栋系数,创建人不能为空");
|
||||
model.forward("/buildingRatio/add");
|
||||
return model;
|
||||
}
|
||||
@@ -41,6 +41,8 @@ public class BuildingRatioController {
|
||||
buildingRatio.setRatio(model.getRatio());
|
||||
buildingRatio.setC_date(date);
|
||||
buildingRatio.setM_date(date);
|
||||
buildingRatio.setCreate_user(model.getCreate_user());
|
||||
buildingRatio.setNote(model.getNote());
|
||||
this.buildingRatioService.save(buildingRatio);
|
||||
|
||||
model.setMsg("新建成功!");
|
||||
@@ -73,8 +75,8 @@ public class BuildingRatioController {
|
||||
StringUtils.isBlank(model.getRegion()) ||
|
||||
StringUtils.isBlank(model.getDistrict()) ||
|
||||
StringUtils.isBlank(model.getBuilding_name()) ||
|
||||
model.getRatio() == null) {
|
||||
model.setMsg("城市,区域,小区,楼栋名称,楼栋系数不能为空");
|
||||
model.getRatio() == null || StringUtils.isBlank(model.getCreate_user())) {
|
||||
model.setMsg("城市,区域,小区,楼栋名称,楼栋系数,创建人不能为空");
|
||||
model.forward("/buildingRatio/edit");
|
||||
return model;
|
||||
}
|
||||
@@ -88,6 +90,8 @@ public class BuildingRatioController {
|
||||
data_buildingRatio.put("building_name", model.getBuilding_name());
|
||||
data_buildingRatio.put("ratio", model.getRatio());
|
||||
data_buildingRatio.put("m_date", new Date());
|
||||
data_buildingRatio.put("create_user", model.getCreate_user());
|
||||
data_buildingRatio.put("note", model.getNote());
|
||||
|
||||
this.buildingRatioService.saveOrUpdateByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name(), data_buildingRatio);
|
||||
|
||||
@@ -114,6 +118,8 @@ public class BuildingRatioController {
|
||||
bo.setRatio(buildingRatio.getRatio());
|
||||
bo.setC_date(buildingRatio.getC_date());
|
||||
bo.setM_date(buildingRatio.getM_date());
|
||||
bo.setCreate_user(buildingRatio.getCreate_user());
|
||||
bo.setNote(buildingRatio.getNote());
|
||||
|
||||
buildingRatioBoList.add(bo);
|
||||
}
|
||||
@@ -142,6 +148,8 @@ public class BuildingRatioController {
|
||||
bo.setDistrict(buildingRatio.getDistrict());
|
||||
bo.setBuilding_name(buildingRatio.getBuilding_name());
|
||||
bo.setRatio(buildingRatio.getRatio());
|
||||
bo.setCreate_user(buildingRatio.getCreate_user());
|
||||
bo.setNote(buildingRatio.getNote());
|
||||
|
||||
model.setBuildingRatioBo(bo);
|
||||
if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) {
|
||||
|
||||
+18
-9
@@ -17,7 +17,8 @@ public class BuildingRatioModel extends BaseModel{
|
||||
private String region;
|
||||
private String district;
|
||||
private String building_name;
|
||||
private String building_id;
|
||||
private String create_user;
|
||||
private String note;
|
||||
private Double ratio;
|
||||
private String msg;
|
||||
private List<BuildingRatioBo> buildingRatioBoList;
|
||||
@@ -67,14 +68,6 @@ public class BuildingRatioModel extends BaseModel{
|
||||
this.building_name = building_name;
|
||||
}
|
||||
|
||||
public String getBuilding_id() {
|
||||
return building_id;
|
||||
}
|
||||
|
||||
public void setBuilding_id(String building_id) {
|
||||
this.building_id = building_id;
|
||||
}
|
||||
|
||||
public Double getRatio() {
|
||||
return ratio;
|
||||
}
|
||||
@@ -122,4 +115,20 @@ public class BuildingRatioModel extends BaseModel{
|
||||
public void setMsg(String msg) {
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public String getCreate_user() {
|
||||
return create_user;
|
||||
}
|
||||
|
||||
public void setCreate_user(String create_user) {
|
||||
this.create_user = create_user;
|
||||
}
|
||||
|
||||
public String getNote() {
|
||||
return note;
|
||||
}
|
||||
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,6 +50,14 @@
|
||||
<td>楼栋系数</td>
|
||||
<td><input name="ratio" value="${ratio!}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>创建人</td>
|
||||
<td><input name="create_user" value="${session.realName!""}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>备注</td>
|
||||
<td><input name="note" value="${note!}" /></td>
|
||||
</tr>
|
||||
</form>
|
||||
<tr>
|
||||
<td colspan="2"><input onclick="submitForm();" type="submit" value="新增"/></td>
|
||||
|
||||
@@ -55,6 +55,14 @@
|
||||
<td>楼栋系数</td>
|
||||
<td><input name="ratio" value="${buildingRatioBo.ratio!}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>创建人</td>
|
||||
<td><input name="create_user" value="${session.realName!buildingRatioBo.create_user}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>备注</td>
|
||||
<td><input name="note" value="${buildingRatioBo.note!}" /></td>
|
||||
</tr>
|
||||
</form>
|
||||
<tr>
|
||||
<td></td>
|
||||
|
||||
@@ -48,15 +48,21 @@
|
||||
<th align="center" width="60px">
|
||||
楼栋名称
|
||||
</th>
|
||||
<th align="center" width="100px">
|
||||
<th align="center" width="60px">
|
||||
楼栋系数
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
创建人
|
||||
</th>
|
||||
<th align="center" width="200px">
|
||||
创建日期
|
||||
</th>
|
||||
<th align="center" width="200px">
|
||||
修改日期
|
||||
</th>
|
||||
<th align="center" width="100px">
|
||||
备注
|
||||
</th>
|
||||
<th align="center">
|
||||
操作
|
||||
</th>
|
||||
@@ -83,6 +89,9 @@
|
||||
<td align="center">
|
||||
${bo.ratio!}
|
||||
</td>
|
||||
<td align="center">
|
||||
${bo.create_user!}
|
||||
</td>
|
||||
<td align="center">
|
||||
<#if bo.c_date??>
|
||||
${bo.c_date?string("yyyy年MM月dd日 HH:mm:ss")}
|
||||
@@ -93,6 +102,9 @@
|
||||
${bo.m_date?string("yyyy年MM月dd日 HH:mm:ss")}
|
||||
</#if>
|
||||
</td>
|
||||
<td align="center">
|
||||
${bo.note!}
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="../buildingRatio/edit?id=${bo.id!}">编辑</a>
|
||||
<a href="../buildingRatio/doDelete?id=${bo.id}" onclick="return confirm('确定要删除 ${bo.city_name!}-${bo.region!}-${bo.district!}-${bo.building_name!}?')">删除</a>
|
||||
|
||||
+18
@@ -33,6 +33,8 @@ public class BuildingRatio implements MongoEntity {
|
||||
private Date c_date;
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date m_date;
|
||||
private String create_user;
|
||||
private String note;
|
||||
|
||||
@Id
|
||||
@GeneratedValue
|
||||
@@ -92,4 +94,20 @@ public class BuildingRatio implements MongoEntity {
|
||||
public void setM_date(Date m_date) {
|
||||
this.m_date = m_date;
|
||||
}
|
||||
@Column(name = "create_user")
|
||||
public String getCreate_user() {
|
||||
return create_user;
|
||||
}
|
||||
|
||||
public void setCreate_user(String create_user) {
|
||||
this.create_user = create_user;
|
||||
}
|
||||
@Column(name = "note")
|
||||
public String getNote() {
|
||||
return note;
|
||||
}
|
||||
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,8 @@ public class BuildingRatioBo implements Serializable {
|
||||
private Double ratio;
|
||||
private Date c_date;
|
||||
private Date m_date;
|
||||
|
||||
private String create_user;
|
||||
private String note;
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
@@ -82,4 +83,20 @@ public class BuildingRatioBo implements Serializable {
|
||||
public void setM_date(Date m_date) {
|
||||
this.m_date = m_date;
|
||||
}
|
||||
|
||||
public String getCreate_user() {
|
||||
return create_user;
|
||||
}
|
||||
|
||||
public void setCreate_user(String create_user) {
|
||||
this.create_user = create_user;
|
||||
}
|
||||
|
||||
public String getNote() {
|
||||
return note;
|
||||
}
|
||||
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user