diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index b6ac466..af65da6 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -98,6 +98,9 @@ public class ProjectService {
if(StrUtil.isNotEmpty(searchInfo.get("type")) && !"-1".equals(searchInfo.get("type"))){
queryHelper.addCondition("p.type=?", Integer.parseInt(searchInfo.get("type")));
}
+ if(StrUtil.isNotEmpty(searchInfo.get("cooperateType")) && !"-1".equals(searchInfo.get("cooperateType"))){
+ queryHelper.addCondition("p.cooperate_type=?", Integer.parseInt(searchInfo.get("cooperateType")));
+ }
if(StrUtil.isNotEmpty(searchInfo.get("underwrittenMode")) && !"-1".equals(searchInfo.get("underwrittenMode"))){
queryHelper.addCondition("p.underwritten_mode=?", Integer.parseInt(searchInfo.get("underwrittenMode")));
}
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index c21690a..6b5631e 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -243,7 +243,7 @@
#if>
- 垫资模式: |
+ 合作类型: |
colspan="1" <#else> colspan="5" #if> >
<#if project.cooperateType??>
<#if (project.cooperateType) =1>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index a44c2ae..ec6c609 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -165,7 +165,7 @@
#if>
|
- 垫资模式: |
+ 合作类型: |
colspan="1" <#else> colspan="5" #if> >
<#if project.cooperateType??>
<#if (project.cooperateType) =1>
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 0c25392..c79960a 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -217,6 +217,16 @@
+
+ 合作类型
+
+
+
+
+
+
+
-
-
项目负责人
@@ -293,33 +303,33 @@
-
- 行业场景
-
-
-
-
+
+ 行业场景
+
+
+
+
项目解决方案
@@ -331,7 +341,7 @@
-
+
-
+
-
+
预计合同签订时间
@@ -1222,6 +1232,8 @@
keywordsObj.deptId = $("#deptId").val();
if ($("#type").val())
keywordsObj.type = $("#type").val();
+ if ($("#cooperateType").val())
+ keywordsObj.cooperateType = $("#cooperateType").val();
if ($("#underwrittenMode").val())
keywordsObj.underwrittenMode = $("#underwrittenMode").val();
if ($("#certainty").val())
@@ -1360,6 +1372,8 @@
keywordsObj.deptId = $("#deptId").val();
if ($("#type").val())
keywordsObj.type = $("#type").val();
+ if ($("#cooperateType").val())
+ keywordsObj.cooperateType = $("#cooperateType").val();
if ($("#underwrittenMode").val())
keywordsObj.underwrittenMode = $("#underwrittenMode").val();
if ($("#certainty").val())
diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl
index 3be38f0..a90ad21 100644
--- a/src/main/resources/templates/admin/project_list_approve.ftl
+++ b/src/main/resources/templates/admin/project_list_approve.ftl
@@ -214,6 +214,16 @@
+
+ 合作类型
+
+
+
+
+
+
+
-
-
项目负责人
@@ -290,33 +300,33 @@
-
- 行业场景
-
-
-
-
+
+ 行业场景
+
+
+
+
项目解决方案
@@ -328,7 +338,7 @@
-
+
-
+
-
+
预计合同签订时间
@@ -644,6 +654,8 @@
keywordsObj.deptId = $("#deptId").val();
if ($("#type").val())
keywordsObj.type = $("#type").val();
+ if ($("#cooperateType").val())
+ keywordsObj.cooperateType = $("#cooperateType").val();
if ($("#underwrittenMode").val())
keywordsObj.underwrittenMode = $("#underwrittenMode").val();
if ($("#certainty").val())
|