From 1ec65a7b983a7d519c3602d20a855ac1bac1825e Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 16:24:40 +0800
Subject: [PATCH] 修改电价辅助类的命名空间
---
WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.cs | 133 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 66 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.cs b/WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.cs
index abac8dd..35906c7 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.cs
@@ -1,6 +1,5 @@
-锘縰sing DevExpress.XtraEditors.Controls;
-using PBS.Model;
-using System.Data;
+锘縰sing PBS.Model;
+using PBS.Vmo;
namespace PBS.WinFrmUI
{
@@ -16,56 +15,94 @@
{
bool isExist = true;
this.dxErrorProvider1.ClearErrors();
- if (this.cbArea.Text == "璇烽�夋嫨")
- {
- this.dxErrorProvider1.SetError(this.cbArea, "蹇呭～椤�");
- isExist = false;
- }
- if (this.cbCity.Text == "璇烽�夋嫨")
- {
- this.dxErrorProvider1.SetError(this.cbCity, "蹇呭～椤�");
- isExist = false;
- }
- if (this.cbDist.Text == "璇烽�夋嫨")
- {
- this.dxErrorProvider1.SetError(this.cbDist, "蹇呭～椤�");
- isExist = false;
- }
- if (string.IsNullOrEmpty(this.txtName.Text.Trim()))
- {
- this.dxErrorProvider1.SetError(this.txtName, "蹇呭～椤�");
- isExist = false;
- }
return isExist;
}
- public PlaceBuildParasInfo GetData()
+ public PlaceBuildParasInfoVmo GetData()
{
if (!Valid())
{
return null;
}
- var m = new PlaceBuildParasInfo()
+ /*var m = new PlaceBuildParasInfo()
{
// Address = txtAddress.Text,
// Area = (long?)this.cbArea.EditValue,
// City = (long?)this.cbCity.EditValue,
// Dist = (long?)this.cbDist.EditValue,
- AreaSquare = string.IsNullOrEmpty(txtAreaSquare.Text) ? decimal.Zero : decimal.Parse(txtAreaSquare.Text),
+ AreaSquare = string.IsNullOrEmpty(txtAreaSquare.Text) ? null : double.Parse(txtAreaSquare.Text),
CompletionTime = txtCompletionTime.Text,
Developer = txtDeveloper.Text,
- GreeningRate = string.IsNullOrEmpty(this.textGreeningRate.Text) ? decimal.Zero : decimal.Parse(textGreeningRate.Text),
+ GreeningRate = string.IsNullOrEmpty(this.textGreeningRate.Text) ? null : double.Parse(textGreeningRate.Text),
// Name = txtName.Text,
- PlotRatio = string.IsNullOrEmpty(txtPlotRatio.Text) ? decimal.Zero : decimal.Parse(txtPlotRatio.Text),
+ PlotRatio = string.IsNullOrEmpty(txtPlotRatio.Text) ? null : double.Parse(txtPlotRatio.Text),
PropertyType = 1,
ProperTyYears = string.IsNullOrEmpty(txtProperTyYears.Text) ? 0 : int.Parse(txtProperTyYears.Text),
TotalHouseHolds = string.IsNullOrEmpty(txtTotalHouseHolds.Text) ? 0 : int.Parse(txtTotalHouseHolds.Text)
- };
+ };*/
+ var m = new PlaceBuildParasInfoVmo();
+ // 澶勭悊 AreaSquare
+ if (string.IsNullOrEmpty(txtAreaSquare.Text) || !double.TryParse(txtAreaSquare.Text, out double areaSquare))
+ {
+ m.AreaSquare = null;
+ }
+ else
+ {
+ m.AreaSquare = areaSquare;
+ }
+ // 澶勭悊 CompletionTime
+ m.CompletionTime = txtCompletionTime.Text;
+
+ // 澶勭悊 Developer
+ m.Developer = txtDeveloper.Text;
+
+ // 澶勭悊 GreeningRate
+ if (string.IsNullOrEmpty(textGreeningRate.Text) || !double.TryParse(textGreeningRate.Text, out double greeningRate))
+ {
+ m.GreeningRate = null;
+ }
+ else
+ {
+ m.GreeningRate = greeningRate;
+ }
+
+ // 澶勭悊 PlotRatio
+ if (string.IsNullOrEmpty(txtPlotRatio.Text) || !double.TryParse(txtPlotRatio.Text, out double plotRatio))
+ {
+ m.PlotRatio = null;
+ }
+ else
+ {
+ m.PlotRatio = plotRatio;
+ }
+
+ // 澶勭悊 PropertyType
+ m.PropertyType = 1;
+
+ // 澶勭悊 ProperTyYears
+ if (string.IsNullOrEmpty(txtProperTyYears.Text) || !int.TryParse(txtProperTyYears.Text, out int properTyYears))
+ {
+ m.ProperTyYears = 0;
+ }
+ else
+ {
+ m.ProperTyYears = properTyYears;
+ }
+
+ // 澶勭悊 TotalHouseHolds
+ if (string.IsNullOrEmpty(txtTotalHouseHolds.Text) || !int.TryParse(txtTotalHouseHolds.Text, out int totalHouseHolds))
+ {
+ m.TotalHouseHolds = 0;
+ }
+ else
+ {
+ m.TotalHouseHolds = totalHouseHolds;
+ }
return m;
}
- public void SetData(PlaceBuildParasInfo model)
+ public void SetData(PlaceBuildParasInfoVmo model)
{
if (model == null) return;
// txtAddress.Text = model.Address;
@@ -80,42 +117,6 @@
// cbArea.EditValue = model.Area;
// cbCity.EditValue = model.City;
// cbDist.EditValue = model.Dist;
- }
-
- public string getText()
- {
- return "a";
- }
-
- private void BuildWizardForm_Load(object sender, EventArgs e)
- {
- /* var allProvince = new BLL.Region().GetAll().Where(x => x.Type == eRegionType.Province).ToList();
- foreach (var item in allProvince)
- {
- var imageItem = new ImageComboBoxItem(item.Name, item.ID);
- cbArea.Properties.Items.Add(imageItem);
- //鍩庡競娣诲姞鐪佷唤鍙槸涓轰簡涓存椂鐢�,鍚庢湡浼氭洿鏀�
- cbCity.Properties.Items.Add(imageItem);
- }
- ValueChangeEvent(); //涓轰簡缂栬緫椤甸潰鐨勬椂鍊欏彲浠ラ�変腑鎵�閫夐」*/
- }
-
- private void cbArea_SelectedIndexChanged(object sender, EventArgs e)
- {
- ValueChangeEvent();
- }
-
- private void ValueChangeEvent()
- {
- /* if (cbArea.EditValue != null)
- {
- var AllDist = new BLL.Region().GetChildrenByID((long)cbArea.EditValue);
- foreach (var item in AllDist)
- {
- var imageItem = new ImageComboBoxItem(item.Name, item.ID);
- cbDist.Properties.Items.Add(imageItem);
- }
- }*/
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3