Commit 5554c00adc17a70854df1c7a5d55f43d7b2f5b40
1 parent
9fbe13ea
Exists in
master
修改字段名称
Showing
3 changed files
with
64 additions
and
58 deletions
Show diff stats
backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
| ... | ... | @@ -105,7 +105,7 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL |
| 105 | 105 | for (WProjectLibraryInventory projectLibraryInventory : list) { |
| 106 | 106 | HashMap<String, Object> mapSon = new HashMap<>(); |
| 107 | 107 | mapSon.put("projectNo", projectLibraryInventory.getFProjectNo()); |
| 108 | - mapSon.put("projectCompany", projectLibraryInventory.getFProjectCompany()); | |
| 108 | + mapSon.put("projectCompany", projectLibraryInventory.getfOrgName()); | |
| 109 | 109 | mapSon.put("warehouseEntryDate", ObjectUtils.isNotEmpty(projectLibraryInventory.getFWarehouseEntryDate()) ? projectLibraryInventory.getFWarehouseEntryDate().format(dateTimeFormatter) : ""); |
| 110 | 110 | mapSon.put("projectName", projectLibraryInventory.getFProjectName()); |
| 111 | 111 | mapSon.put("projectCategory", projectLibraryInventory.getFProjectCategory()); | ... | ... |
backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
| ... | ... | @@ -33,9 +33,9 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory |
| 33 | 33 | private String refId; |
| 34 | 34 | |
| 35 | 35 | @ApiModelProperty(value = "项目公司或代表处") |
| 36 | - @TableField("F_project_company") | |
| 37 | - @JsonProperty("fProjectCompany") | |
| 38 | - private String fProjectCompany; | |
| 36 | + @TableField("F_org_name") | |
| 37 | + @JsonProperty("fOrgName") | |
| 38 | + private String fOrgName; | |
| 39 | 39 | |
| 40 | 40 | @ApiModelProperty(value = "入库时间") |
| 41 | 41 | @TableField("F_warehouse_entry_date") |
| ... | ... | @@ -265,13 +265,7 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory |
| 265 | 265 | this.refId = refId; |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | - public String getFProjectCompany() { | |
| 269 | - return fProjectCompany; | |
| 270 | - } | |
| 271 | 268 | |
| 272 | - public void setFProjectCompany(String fProjectCompany) { | |
| 273 | - this.fProjectCompany = fProjectCompany; | |
| 274 | - } | |
| 275 | 269 | |
| 276 | 270 | public LocalDateTime getFWarehouseEntryDate() { |
| 277 | 271 | return fWarehouseEntryDate; |
| ... | ... | @@ -509,6 +503,63 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory |
| 509 | 503 | return fCreateBy; |
| 510 | 504 | } |
| 511 | 505 | |
| 506 | + public String getfOrgName() { | |
| 507 | + return fOrgName; | |
| 508 | + } | |
| 509 | + | |
| 510 | + @Override | |
| 511 | + public String toString() { | |
| 512 | + return "WProjectLibraryInventory{" + | |
| 513 | + "id='" + id + '\'' + | |
| 514 | + ", refId='" + refId + '\'' + | |
| 515 | + ", fOrgName='" + fOrgName + '\'' + | |
| 516 | + ", fWarehouseEntryDate=" + fWarehouseEntryDate + | |
| 517 | + ", fProjectName='" + fProjectName + '\'' + | |
| 518 | + ", fProjectCategory='" + fProjectCategory + '\'' + | |
| 519 | + ", fBusinessScenarios='" + fBusinessScenarios + '\'' + | |
| 520 | + ", fSmartHeating='" + fSmartHeating + '\'' + | |
| 521 | + ", fEnergyEfficiency='" + fEnergyEfficiency + '\'' + | |
| 522 | + ", fPhotovoltaic='" + fPhotovoltaic + '\'' + | |
| 523 | + ", fEnergyStorage='" + fEnergyStorage + '\'' + | |
| 524 | + ", fProjectNature='" + fProjectNature + '\'' + | |
| 525 | + ", fBusinessModel='" + fBusinessModel + '\'' + | |
| 526 | + ", fInvestmentScale='" + fInvestmentScale + '\'' + | |
| 527 | + ", fProjectRating='" + fProjectRating + '\'' + | |
| 528 | + ", fStaticPaybackPeriod='" + fStaticPaybackPeriod + '\'' + | |
| 529 | + ", fCalculateIrr='" + fCalculateIrr + '\'' + | |
| 530 | + ", fAnnualIncomeForecast='" + fAnnualIncomeForecast + '\'' + | |
| 531 | + ", fAnnualNetProfitForecast='" + fAnnualNetProfitForecast + '\'' + | |
| 532 | + ", fTeamLeader='" + fTeamLeader + '\'' + | |
| 533 | + ", fTeamLeaderId='" + fTeamLeaderId + '\'' + | |
| 534 | + ", fTeamCollaborationPer='" + fTeamCollaborationPer + '\'' + | |
| 535 | + ", fTeamCollaborationPerId='" + fTeamCollaborationPerId + '\'' + | |
| 536 | + ", fExpectedSigningDate=" + fExpectedSigningDate + | |
| 537 | + ", fExpectedScheduledDate=" + fExpectedScheduledDate + | |
| 538 | + ", fStrategicValue='" + fStrategicValue + '\'' + | |
| 539 | + ", fProjectSource='" + fProjectSource + '\'' + | |
| 540 | + ", fCustomerContact='" + fCustomerContact + '\'' + | |
| 541 | + ", fProjectOverview='" + fProjectOverview + '\'' + | |
| 542 | + ", fProjectDebriefing='" + fProjectDebriefing + '\'' + | |
| 543 | + ", fDeviationAnalysis='" + fDeviationAnalysis + '\'' + | |
| 544 | + ", fProjectState='" + fProjectState + '\'' + | |
| 545 | + ", fCreateBy='" + fCreateBy + '\'' + | |
| 546 | + ", fCreateById='" + fCreateById + '\'' + | |
| 547 | + ", fCreateTime=" + fCreateTime + | |
| 548 | + ", fUpdateBy='" + fUpdateBy + '\'' + | |
| 549 | + ", fUpdateById='" + fUpdateById + '\'' + | |
| 550 | + ", fUpdateTime=" + fUpdateTime + | |
| 551 | + ", fFormDataRev=" + fFormDataRev + | |
| 552 | + ", fProjectNo='" + fProjectNo + '\'' + | |
| 553 | + ", fOrgId='" + fOrgId + '\'' + | |
| 554 | + ", createTime='" + createTime + '\'' + | |
| 555 | + ", updateTime='" + updateTime + '\'' + | |
| 556 | + '}'; | |
| 557 | + } | |
| 558 | + | |
| 559 | + public void setfOrgName(String fOrgName) { | |
| 560 | + this.fOrgName = fOrgName; | |
| 561 | + } | |
| 562 | + | |
| 512 | 563 | public void setFCreateBy(String fCreateBy) { |
| 513 | 564 | this.fCreateBy = fCreateBy; |
| 514 | 565 | } |
| ... | ... | @@ -583,50 +634,5 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory |
| 583 | 634 | return this.id; |
| 584 | 635 | } |
| 585 | 636 | |
| 586 | - @Override | |
| 587 | - public String toString() { | |
| 588 | - return "WProjectLibraryInventory{" + | |
| 589 | - "id=" + id + | |
| 590 | - ", refId=" + refId + | |
| 591 | - ", fProjectCompany=" + fProjectCompany + | |
| 592 | - ", fWarehouseEntryDate=" + fWarehouseEntryDate + | |
| 593 | - ", fProjectName=" + fProjectName + | |
| 594 | - ", fProjectCategory=" + fProjectCategory + | |
| 595 | - ", fBusinessScenarios=" + fBusinessScenarios + | |
| 596 | - ", fSmartHeating=" + fSmartHeating + | |
| 597 | - ", fEnergyEfficiency=" + fEnergyEfficiency + | |
| 598 | - ", fPhotovoltaic=" + fPhotovoltaic + | |
| 599 | - ", fEnergyStorage=" + fEnergyStorage + | |
| 600 | - ", fProjectNature=" + fProjectNature + | |
| 601 | - ", fBusinessModel=" + fBusinessModel + | |
| 602 | - ", fInvestmentScale=" + fInvestmentScale + | |
| 603 | - ", fProjectRating=" + fProjectRating + | |
| 604 | - ", fStaticPaybackPeriod=" + fStaticPaybackPeriod + | |
| 605 | - ", fCalculateIrr=" + fCalculateIrr + | |
| 606 | - ", fAnnualIncomeForecast=" + fAnnualIncomeForecast + | |
| 607 | - ", fAnnualNetProfitForecast=" + fAnnualNetProfitForecast + | |
| 608 | - ", fTeamLeader=" + fTeamLeader + | |
| 609 | - ", fTeamLeaderId=" + fTeamLeaderId + | |
| 610 | - ", fTeamCollaborationPer=" + fTeamCollaborationPer + | |
| 611 | - ", fTeamCollaborationPerId=" + fTeamCollaborationPerId + | |
| 612 | - ", fExpectedSigningDate=" + fExpectedSigningDate + | |
| 613 | - ", fExpectedScheduledDate=" + fExpectedScheduledDate + | |
| 614 | - ", fStrategicValue=" + fStrategicValue + | |
| 615 | - ", fProjectSource=" + fProjectSource + | |
| 616 | - ", fCustomerContact=" + fCustomerContact + | |
| 617 | - ", fProjectOverview=" + fProjectOverview + | |
| 618 | - ", fProjectDebriefing=" + fProjectDebriefing + | |
| 619 | - ", fDeviationAnalysis=" + fDeviationAnalysis + | |
| 620 | - ", fProjectState=" + fProjectState + | |
| 621 | - ", fCreateBy=" + fCreateBy + | |
| 622 | - ", fCreateById=" + fCreateById + | |
| 623 | - ", fCreateTime=" + fCreateTime + | |
| 624 | - ", fUpdateBy=" + fUpdateBy + | |
| 625 | - ", fUpdateById=" + fUpdateById + | |
| 626 | - ", fUpdateTime=" + fUpdateTime + | |
| 627 | - ", fFormDataRev=" + fFormDataRev + | |
| 628 | - ", fProjectNo=" + fProjectNo + | |
| 629 | - ", fOrgId=" + fOrgId + | |
| 630 | - "}"; | |
| 631 | - } | |
| 637 | + | |
| 632 | 638 | } | ... | ... |
backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | <resultMap id="BaseResultMap" type="com.hotent.chkpower.model.WProjectLibraryInventory"> |
| 7 | 7 | <id column="ID_" property="id"/> |
| 8 | 8 | <result column="REF_ID_" property="refId"/> |
| 9 | - <result column="F_project_company" property="fProjectCompany"/> | |
| 9 | + <result column="F_org_name" property="fOrgName"/> | |
| 10 | 10 | <result column="F_warehouse_entry_date" property="fWarehouseEntryDate"/> |
| 11 | 11 | <result column="F_project_name" property="fProjectName"/> |
| 12 | 12 | <result column="F_project_category" property="fProjectCategory"/> |
| ... | ... | @@ -49,7 +49,7 @@ |
| 49 | 49 | |
| 50 | 50 | <!-- 通用查询结果列 --> |
| 51 | 51 | <sql id="Base_Column_List"> |
| 52 | - 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 | |
| 52 | + 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 | |
| 53 | 53 | </sql> |
| 54 | 54 | |
| 55 | 55 | <select id="selectPage" resultMap="BaseResultMap"> | ... | ... |