diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index 7de65ee..3702164 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -139,6 +139,11 @@ public class Project {
*/
@Column(name = "value_risk")
private String valueRisk;
+ /**
+ * 其他中的小类名称
+ */
+ @Column(name = "other_name")
+ private String otherName;
/**
* 项目创建时的配置的阀值
*/
@@ -379,6 +384,14 @@ public class Project {
this.valueRisk = valueRisk;
}
+ public String getOtherName() {
+ return otherName;
+ }
+
+ public void setOtherName(String otherName) {
+ this.otherName = otherName;
+ }
+
public BigDecimal getProjectContributionProfitRateThreshold() {
return projectContributionProfitRateThreshold;
}
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 7b09e07..b10e395 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -190,6 +190,7 @@ public class ProjectService {
projectInDb.setZiguangOtherAmount(project.getZiguangOtherAmount());
projectInDb.setMainContractCollectionTerms(project.getMainContractCollectionTerms());
projectInDb.setValueRisk(project.getValueRisk());
+ projectInDb.setOtherName(project.getOtherName());
/// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 4e24fc4..151041b 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -244,7 +244,7 @@
@@ -354,7 +354,7 @@
成本 |
其他 |
- 其他 |
+ ${project.otherName!} |
|
|
@@ -514,7 +514,7 @@
成本 |
其他 |
- 其他 |
+ ${project.otherName!} |
|
|
@@ -782,7 +782,7 @@
成本 |
其他 |
- 其他 |
+ ${project.otherName!} |
|
|
|
@@ -1134,7 +1134,7 @@
成本 |
其他 |
- 其他 |
+ ${project.otherName!} |
|
|
|
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index e4944ce..2eaf40e 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -95,23 +95,19 @@
@@ -191,10 +187,10 @@
@@ -300,7 +296,8 @@
成本 |
其他 |
- 其他 |
+ |
|
|
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 83dbc13..0e28f44 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -269,7 +269,8 @@
成本 |
其他 |
- 其他 |
+ |
|
|
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 93e9a2e..4d6c866 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -174,7 +174,7 @@
+ >${project.mainContractCollectionTerms!}
@@ -276,7 +276,8 @@
成本 |
其他 |
- 其他 |
+ |
|
|
diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl
index 9e919b2..1e058c9 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -139,7 +139,8 @@
成本 |
其他 |
- 其他 |
+ |
|
|
|
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index d760d91..c75dcd4 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -139,7 +139,8 @@
成本 |
其他 |
- 其他 |
+ |
|
|
|
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index df8b916..a5a05de 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -163,7 +163,8 @@
成本 |
其他 |
- 其他 |
+ |
|
|
|
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 3edd9f6..180da1e 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -161,7 +161,8 @@
成本 |
其他 |
- 其他 |
+ |
|
|
|