diff --git a/build.gradle b/build.gradle index b53ab3b..5fd884b 100644 --- a/build.gradle +++ b/build.gradle @@ -24,10 +24,10 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 repositories { - maven { url "http://maven.aliyun.com/nexus/content/groups/public/"} mavenLocal() mavenCentral() jcenter() + maven { url "http://maven.aliyun.com/nexus/content/groups/public/"} maven { url 'https://jitpack.io' } } diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 1dbdc4c..c6d20c7 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -1,7 +1,6 @@ package cn.palmte.work.model; import cn.palmte.work.bean.ApproveStatusEnum; -import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import top.jfunc.common.datetime.DatetimeUtils; @@ -99,6 +98,16 @@ public class Project { */ @Column(name = "underwritten_mode") private int underwrittenMode; + /** + * 合作对象 + */ + @Column(name = "collaborator") + private String collaborator; + /** + * 合作对象url + */ + @Column(name = "collaborator_url") + private String collaboratorUrl; /** * 客户名称 */ @@ -189,6 +198,9 @@ public class Project { @Column(name = "certainty") private String certainty; + @Transient + private String certaintyStr; + @Column(name = "gross_profit") private BigDecimal grossProfit; @@ -232,7 +244,7 @@ public class Project { private String mainContractResolvePlan; @Column(name = "calculation_collection") - private String CalculationCollection; + private String calculationCollection; @Transient private String contractRound; @@ -396,6 +408,22 @@ public class Project { this.underwrittenMode = underwrittenMode; } + public String getCollaborator() { + return collaborator; + } + + public void setCollaborator(String collaborator) { + this.collaborator = collaborator; + } + + public String getCollaboratorUrl() { + return collaboratorUrl; + } + + public void setCollaboratorUrl(String collaboratorUrl) { + this.collaboratorUrl = collaboratorUrl; + } + public String getCustomer() { return customer; } @@ -579,6 +607,14 @@ public class Project { this.certainty = certainty; } + public String getCertaintyStr() { + return certaintyStr; + } + + public void setCertaintyStr(String certaintyStr) { + this.certaintyStr = certaintyStr; + } + public BigDecimal getGrossProfit() { return grossProfit; } @@ -668,11 +704,11 @@ public class Project { } public String getCalculationCollection() { - return CalculationCollection; + return calculationCollection; } public void setCalculationCollection(String calculationCollection) { - CalculationCollection = calculationCollection; + this.calculationCollection = calculationCollection; } public String getContractRound() { diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 850b8d4..f85bf67 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -24,6 +24,13 @@ + + + + - + - + - - - + @@ -93,24 +104,85 @@ - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + @@ -202,8 +325,25 @@ + + + + + + + + + + + + + + + + + @@ -440,18 +580,38 @@ function setKeywords() { var keywordsObj = {}; + if ($("#projectNo").val()) + keywordsObj.projectNo = $("#projectNo").val(); if ($("#name").val()) keywordsObj.name = $("#name").val(); if ($("#creatorName").val()) keywordsObj.creatorName = $("#creatorName").val(); if ($("#status").val()) keywordsObj.status = $("#status").val(); + if ($("#isSecond").val()) + keywordsObj.isSecond = $("#isSecond").val(); + if ($("#signType").val()) + keywordsObj.signType = $("#signType").val(); + if ($("#resolvePlan").val()) + keywordsObj.resolvePlan = $("#resolvePlan").val(); if ($("#approveStatus").val()) keywordsObj.approveStatus = $("#approveStatus").val(); if ($("#deptId").val()) keywordsObj.deptId = $("#deptId").val(); if ($("#type").val()) keywordsObj.type = $("#type").val(); + if ($("#underwrittenMode").val()) + keywordsObj.underwrittenMode = $("#underwrittenMode").val(); + if ($("#certainty").val()) + keywordsObj.certainty = $("#certainty").val(); + if ($("#industryScenario").val()) + keywordsObj.industryScenario = $("#industryScenario").val(); + if ($("#customer").val()) + keywordsObj.customer = $("#customer").val(); + if ($("#terminalCustomer").val()) + keywordsObj.terminalCustomer = $("#terminalCustomer").val(); + if ($("#principal").val()) + keywordsObj.principal = $("#principal").val(); if ($("#startDate").val()) keywordsObj.startDate = $("#startDate").val(); if ($("#endDate").val()) @@ -460,6 +620,10 @@ keywordsObj.startUpdateDate = $("#startUpdateDate").val(); if ($("#endUpdateDate").val()) keywordsObj.endUpdateDate = $("#endUpdateDate").val(); + if ($("#contractStartTime").val()) + keywordsObj.contractStartTime = $("#contractStartTime").val(); + if ($("#contractEndTime").val()) + keywordsObj.contractEndTime = $("#contractEndTime").val(); var keywords = ""; if (!$.isEmptyObject(keywordsObj)) { keywords = JSON.stringify(keywordsObj);
项目编号 +
+ +
+ 		项目名称
@@ -31,6 +38,18 @@ value="${name!}"/>
项目状态 +
+ +
+ 		项目创建者
@@ -41,41 +60,33 @@
项目类型是否二次合作
- - - - + +
部门名称签单方式
- - <#list deptList as dept> - - +
项目状态项目解决方案
- - - - - + + +
项目周期部门名称
-
-
- - -
-
至
-
- - -
-
+
项目类型 +
+ +
+ 		垫资模式 +
+ +
+ 		项目把握度 +
+ +
+
行业场景应用 +
+ +
+ 		客户名称 +
+ +
+ 		终端客户名称 +
+ +
+ 		项目负责人 +
+ +
+
最后更新时间
@@ -129,9 +201,43 @@
+ 项目周期 +
+
+
+ + +
+
至
+
+ + +
+
+
+ 		预计合同签订时间 +
+
+
+ + +
+
至
+
+ + +
+
+
+
<@shiro.hasPermission name="PROJECT_QUERY">
项目合同金额 华智产品金额汇智产品金额华三产品金额 其他产品金额 项目状态垫资模式合作对象项目把握度行业场景应用客户名称终端客户名称项目毛利项目毛利率项目负责人预计合同签订时间项目计划招标时间是否二次合作签单方式垫资利息垫资峰值 审核状态 当前审核人 项目创建者${list.typeDesc!} ${Utils.format(list.contractAmount, "0.00")} ${Utils.format(list.huazhiProductAmount, "0.00")}${Utils.format(list.huizhiProductAmount, "0.00")}${Utils.format(list.huasanProductAmount, "0.00")} ${Utils.format(list.ziguangOtherAmount, "0.00")} ${list.statusDesc!}${list.underwrittenModeDesc!}${list.collaborator!}${list.certaintyStr!}${list.industryScenario!}${list.customer!}${list.terminalCustomer!}${Utils.format(list.grossProfit, "0.00")}${Utils.format(list.grossProfitMargin, "0.00")}${list.principal!}${list.contractTime?string("yyyy-MM-dd HH:mm:ss")}${list.bidsTime?string("yyyy-MM-dd HH:mm:ss")}${list.isSecondStr!}${list.signTypeStr!}${Utils.format(list.advanceInterestAmount, "0.00")}${Utils.format(list.advancePeakAmount, "0.00")} ${list.approveStatusDesc!} ${list.approveName!} ${list.creatorName!}