From 5554c00adc17a70854df1c7a5d55f43d7b2f5b40 Mon Sep 17 00:00:00 2001
From: lst <lst@peony.cn>
Date: Tue, 16 Jul 2024 10:04:12 +0800
Subject: [PATCH] 修改字段名称

---
 backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java |   2 +-
 backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java                | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------
 backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml                         |   4 ++--
 3 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
index 3d3d669..81d2aea 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
@@ -105,7 +105,7 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL
         for (WProjectLibraryInventory projectLibraryInventory : list) {
             HashMap<String, Object> mapSon = new HashMap<>();
             mapSon.put("projectNo", projectLibraryInventory.getFProjectNo());
-            mapSon.put("projectCompany", projectLibraryInventory.getFProjectCompany());
+            mapSon.put("projectCompany", projectLibraryInventory.getfOrgName());
             mapSon.put("warehouseEntryDate", ObjectUtils.isNotEmpty(projectLibraryInventory.getFWarehouseEntryDate()) ? projectLibraryInventory.getFWarehouseEntryDate().format(dateTimeFormatter) : "");
             mapSon.put("projectName", projectLibraryInventory.getFProjectName());
             mapSon.put("projectCategory", projectLibraryInventory.getFProjectCategory());
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
index bb9f043..9cccb54 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
@@ -33,9 +33,9 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory
     private String refId;
 
     @ApiModelProperty(value = "项目公司或代表处")
-    @TableField("F_project_company")
-    @JsonProperty("fProjectCompany")
-    private String fProjectCompany;
+    @TableField("F_org_name")
+    @JsonProperty("fOrgName")
+    private String fOrgName;
 
     @ApiModelProperty(value = "入库时间")
     @TableField("F_warehouse_entry_date")
@@ -265,13 +265,7 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory
         this.refId = refId;
     }
 
-    public String getFProjectCompany() {
-        return fProjectCompany;
-    }
 
-    public void setFProjectCompany(String fProjectCompany) {
-        this.fProjectCompany = fProjectCompany;
-    }
 
     public LocalDateTime getFWarehouseEntryDate() {
         return fWarehouseEntryDate;
@@ -509,6 +503,63 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory
         return fCreateBy;
     }
 
+    public String getfOrgName() {
+        return fOrgName;
+    }
+
+    @Override
+    public String toString() {
+        return "WProjectLibraryInventory{" +
+                "id='" + id + '\'' +
+                ", refId='" + refId + '\'' +
+                ", fOrgName='" + fOrgName + '\'' +
+                ", fWarehouseEntryDate=" + fWarehouseEntryDate +
+                ", fProjectName='" + fProjectName + '\'' +
+                ", fProjectCategory='" + fProjectCategory + '\'' +
+                ", fBusinessScenarios='" + fBusinessScenarios + '\'' +
+                ", fSmartHeating='" + fSmartHeating + '\'' +
+                ", fEnergyEfficiency='" + fEnergyEfficiency + '\'' +
+                ", fPhotovoltaic='" + fPhotovoltaic + '\'' +
+                ", fEnergyStorage='" + fEnergyStorage + '\'' +
+                ", fProjectNature='" + fProjectNature + '\'' +
+                ", fBusinessModel='" + fBusinessModel + '\'' +
+                ", fInvestmentScale='" + fInvestmentScale + '\'' +
+                ", fProjectRating='" + fProjectRating + '\'' +
+                ", fStaticPaybackPeriod='" + fStaticPaybackPeriod + '\'' +
+                ", fCalculateIrr='" + fCalculateIrr + '\'' +
+                ", fAnnualIncomeForecast='" + fAnnualIncomeForecast + '\'' +
+                ", fAnnualNetProfitForecast='" + fAnnualNetProfitForecast + '\'' +
+                ", fTeamLeader='" + fTeamLeader + '\'' +
+                ", fTeamLeaderId='" + fTeamLeaderId + '\'' +
+                ", fTeamCollaborationPer='" + fTeamCollaborationPer + '\'' +
+                ", fTeamCollaborationPerId='" + fTeamCollaborationPerId + '\'' +
+                ", fExpectedSigningDate=" + fExpectedSigningDate +
+                ", fExpectedScheduledDate=" + fExpectedScheduledDate +
+                ", fStrategicValue='" + fStrategicValue + '\'' +
+                ", fProjectSource='" + fProjectSource + '\'' +
+                ", fCustomerContact='" + fCustomerContact + '\'' +
+                ", fProjectOverview='" + fProjectOverview + '\'' +
+                ", fProjectDebriefing='" + fProjectDebriefing + '\'' +
+                ", fDeviationAnalysis='" + fDeviationAnalysis + '\'' +
+                ", fProjectState='" + fProjectState + '\'' +
+                ", fCreateBy='" + fCreateBy + '\'' +
+                ", fCreateById='" + fCreateById + '\'' +
+                ", fCreateTime=" + fCreateTime +
+                ", fUpdateBy='" + fUpdateBy + '\'' +
+                ", fUpdateById='" + fUpdateById + '\'' +
+                ", fUpdateTime=" + fUpdateTime +
+                ", fFormDataRev=" + fFormDataRev +
+                ", fProjectNo='" + fProjectNo + '\'' +
+                ", fOrgId='" + fOrgId + '\'' +
+                ", createTime='" + createTime + '\'' +
+                ", updateTime='" + updateTime + '\'' +
+                '}';
+    }
+
+    public void setfOrgName(String fOrgName) {
+        this.fOrgName = fOrgName;
+    }
+
     public void setFCreateBy(String fCreateBy) {
         this.fCreateBy = fCreateBy;
     }
@@ -583,50 +634,5 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory
         return this.id;
     }
 
-    @Override
-    public String toString() {
-        return "WProjectLibraryInventory{" +
-                "id=" + id +
-                ", refId=" + refId +
-                ", fProjectCompany=" + fProjectCompany +
-                ", fWarehouseEntryDate=" + fWarehouseEntryDate +
-                ", fProjectName=" + fProjectName +
-                ", fProjectCategory=" + fProjectCategory +
-                ", fBusinessScenarios=" + fBusinessScenarios +
-                ", fSmartHeating=" + fSmartHeating +
-                ", fEnergyEfficiency=" + fEnergyEfficiency +
-                ", fPhotovoltaic=" + fPhotovoltaic +
-                ", fEnergyStorage=" + fEnergyStorage +
-                ", fProjectNature=" + fProjectNature +
-                ", fBusinessModel=" + fBusinessModel +
-                ", fInvestmentScale=" + fInvestmentScale +
-                ", fProjectRating=" + fProjectRating +
-                ", fStaticPaybackPeriod=" + fStaticPaybackPeriod +
-                ", fCalculateIrr=" + fCalculateIrr +
-                ", fAnnualIncomeForecast=" + fAnnualIncomeForecast +
-                ", fAnnualNetProfitForecast=" + fAnnualNetProfitForecast +
-                ", fTeamLeader=" + fTeamLeader +
-                ", fTeamLeaderId=" + fTeamLeaderId +
-                ", fTeamCollaborationPer=" + fTeamCollaborationPer +
-                ", fTeamCollaborationPerId=" + fTeamCollaborationPerId +
-                ", fExpectedSigningDate=" + fExpectedSigningDate +
-                ", fExpectedScheduledDate=" + fExpectedScheduledDate +
-                ", fStrategicValue=" + fStrategicValue +
-                ", fProjectSource=" + fProjectSource +
-                ", fCustomerContact=" + fCustomerContact +
-                ", fProjectOverview=" + fProjectOverview +
-                ", fProjectDebriefing=" + fProjectDebriefing +
-                ", fDeviationAnalysis=" + fDeviationAnalysis +
-                ", fProjectState=" + fProjectState +
-                ", fCreateBy=" + fCreateBy +
-                ", fCreateById=" + fCreateById +
-                ", fCreateTime=" + fCreateTime +
-                ", fUpdateBy=" + fUpdateBy +
-                ", fUpdateById=" + fUpdateById +
-                ", fUpdateTime=" + fUpdateTime +
-                ", fFormDataRev=" + fFormDataRev +
-                ", fProjectNo=" + fProjectNo +
-                ", fOrgId=" + fOrgId +
-                "}";
-    }
+
 }
diff --git a/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml b/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
index 11974b5..fe879a6 100644
--- a/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
+++ b/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.hotent.chkpower.model.WProjectLibraryInventory">
         <id column="ID_" property="id"/>
         <result column="REF_ID_" property="refId"/>
-        <result column="F_project_company" property="fProjectCompany"/>
+        <result column="F_org_name" property="fOrgName"/>
         <result column="F_warehouse_entry_date" property="fWarehouseEntryDate"/>
         <result column="F_project_name" property="fProjectName"/>
         <result column="F_project_category" property="fProjectCategory"/>
@@ -49,7 +49,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID_, REF_ID_, F_project_company, F_warehouse_entry_date, F_project_name, F_project_category, F_business_scenarios, F_smart_heating, F_energy_efficiency, F_photovoltaic, F_energy_storage, F_project_nature, F_business_model, F_investment_scale, F_project_rating, F_static_payback_period, F_calculate_IRR, F_annual_income_forecast, F_annual_net_profit_forecast, F_team_leader, F_team_leader_id, F_team_collaboration_per, F_team_collaboration_per_id, F_expected_signing_date, F_expected_scheduled_date, F_strategic_value, F_project_source, F_customer_contact, F_project_overview, F_project_debriefing, F_deviation_analysis, F_project_state, F_create_by, F_create_by_id, F_create_time, F_update_by, F_update_by_id, F_update_time, F_form_data_rev_, F_project_no, F_org_id
+        ID_, REF_ID_, F_org_name, F_warehouse_entry_date, F_project_name, F_project_category, F_business_scenarios, F_smart_heating, F_energy_efficiency, F_photovoltaic, F_energy_storage, F_project_nature, F_business_model, F_investment_scale, F_project_rating, F_static_payback_period, F_calculate_IRR, F_annual_income_forecast, F_annual_net_profit_forecast, F_team_leader, F_team_leader_id, F_team_collaboration_per, F_team_collaboration_per_id, F_expected_signing_date, F_expected_scheduled_date, F_strategic_value, F_project_source, F_customer_contact, F_project_overview, F_project_debriefing, F_deviation_analysis, F_project_state, F_create_by, F_create_by_id, F_create_time, F_update_by, F_update_by_id, F_update_time, F_form_data_rev_, F_project_no, F_org_id
     </sql>
 
     <select id="selectPage" resultMap="BaseResultMap">
--
libgit2 0.21.2