From ea6052040e187aec31686dfecc8734af530d04ab Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 16 Nov 2022 14:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E4=BD=9C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9B=B8=E5=85=B3=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/service/ProjectService.java   |  3 +
 .../templates/admin/project_approve.ftl       |  2 +-
 .../templates/admin/project_budget_edit.ftl   |  2 +-
 .../templates/admin/project_list.ftl          | 70 +++++++++++--------
 .../templates/admin/project_list_approve.ftl  | 68 ++++++++++--------
 5 files changed, 87 insertions(+), 58 deletions(-)

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>
                             </tr>
                             <tr class="am-text-nowrap">
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">垫资模式:</span></th>
+                                <th class="table-title" colspan="1" ><span style="font-size: 15px">合作类型:</span></th>
                                 <td class="table-title" <#if project.cooperateType! == 1> 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>
                         </tr>
                         <tr class="am-text-nowrap">
-                            <th class="table-title" colspan="1" ><span style="font-size: 15px">垫资模式:</span></th>
+                            <th class="table-title" colspan="1" ><span style="font-size: 15px">合作类型:</span></th>
                             <td class="table-title" <#if project.cooperateType! == 1> 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 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="st-col">
+                                <div class="st-col-title">合作类型</div>
+                                <div class="st-col-field">
+                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="cooperateType" name="cooperateType">
+                                        <option value="-1">全部</option>
+                                        <option value="1" <#if cooperateType?? && cooperateType='1'>selected</#if>>战略合作类</option>
+                                        <option value="2" <#if cooperateType?? && cooperateType='2'>selected</#if>>非战略合作类</option>
+                                    </select>
+                                </div>
+                            </div>
                             <div class="st-col">
                                 <div class="st-col-title">垫资模式</div>
                                 <div class="st-col-field">
@@ -246,15 +256,15 @@
                                     <input type="text" id="customer" class="am-form-field am-input-sm" value="${customer!}"/>
                                 </div>
                             </div>
+                        </div>
+                        <!-- 第三行 -->
+                        <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">最终用户名称</div>
                                 <div class="st-col-field">
                                     <input type="text" id="terminalCustomer" class="am-form-field am-input-sm" value="${terminalCustomer!}"/>
                                 </div>
                             </div>
-                        </div>
-                        <!-- 第三行 -->
-                        <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">项目负责人</div>
                                 <div class="st-col-field">
@@ -293,33 +303,33 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
-                                <div class="st-col-title">行业场景</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="industryScene" name="industryScene">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if industryScene?? && industryScene='1'>selected</#if>>信息安全</option>
-                                        <option value="2" <#if industryScene?? && industryScene='2'>selected</#if>>政府</option>
-                                        <option value="3" <#if industryScene?? && industryScene='3'>selected</#if>>公安</option>
-                                        <option value="4" <#if industryScene?? && industryScene='4'>selected</#if>>企业</option>
-                                        <option value="5" <#if industryScene?? && industryScene='5'>selected</#if>>教育</option>
-                                        <option value="6" <#if industryScene?? && industryScene='6'>selected</#if>>交通</option>
-                                        <option value="7" <#if industryScene?? && industryScene='7'>selected</#if>>医疗</option>
-                                        <option value="8" <#if industryScene?? && industryScene='8'>selected</#if>>电力资源</option>
-                                        <option value="9" <#if industryScene?? && industryScene='9'>selected</#if>>运营商</option>
-                                        <option value="10" <#if industryScene?? && industryScene='10'>selected</#if>>金融</option>
-                                        <option value="11" <#if industryScene?? && industryScene='11'>selected</#if>>专网</option>
-                                        <option value="12" <#if industryScene?? && industryScene='12'>selected</#if>>其他</option>
-                                        <option value="13" <#if industryScene?? && industryScene='13'>selected</#if>>互联网</option>
-                                        <option value="14" <#if industryScene?? && industryScene='14'>selected</#if>>银行</option>
-                                    </select>
-                                </div>
-                            </div>
                         </div>
                         <!-- 扩展区域 -->
                         <div class="expand-section <#if extend='1'> fold</#if>">
                             <!-- 第四行 -->
                             <div class="flex-row st-row">
+                                <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                    <div class="st-col-title">行业场景</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="industryScene" name="industryScene">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if industryScene?? && industryScene='1'>selected</#if>>信息安全</option>
+                                            <option value="2" <#if industryScene?? && industryScene='2'>selected</#if>>政府</option>
+                                            <option value="3" <#if industryScene?? && industryScene='3'>selected</#if>>公安</option>
+                                            <option value="4" <#if industryScene?? && industryScene='4'>selected</#if>>企业</option>
+                                            <option value="5" <#if industryScene?? && industryScene='5'>selected</#if>>教育</option>
+                                            <option value="6" <#if industryScene?? && industryScene='6'>selected</#if>>交通</option>
+                                            <option value="7" <#if industryScene?? && industryScene='7'>selected</#if>>医疗</option>
+                                            <option value="8" <#if industryScene?? && industryScene='8'>selected</#if>>电力资源</option>
+                                            <option value="9" <#if industryScene?? && industryScene='9'>selected</#if>>运营商</option>
+                                            <option value="10" <#if industryScene?? && industryScene='10'>selected</#if>>金融</option>
+                                            <option value="11" <#if industryScene?? && industryScene='11'>selected</#if>>专网</option>
+                                            <option value="12" <#if industryScene?? && industryScene='12'>selected</#if>>其他</option>
+                                            <option value="13" <#if industryScene?? && industryScene='13'>selected</#if>>互联网</option>
+                                            <option value="14" <#if industryScene?? && industryScene='14'>selected</#if>>银行</option>
+                                        </select>
+                                    </div>
+                                </div>
                                 <div class="st-col">
                                     <div class="st-col-title">项目解决方案</div>
                                     <div class="st-col-field">
@@ -331,7 +341,7 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="st-col st-col-4">
+                                <div class="st-col">
                                     <div class="st-col-title">最后更新时间</div>
                                     <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
@@ -347,7 +357,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="st-col st-col-4">
+                                <div class="st-col">
                                     <div class="st-col-title">项目周期</div>
                                     <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
@@ -363,7 +373,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="st-col st-col-4">
+                                <div class="st-col">
                                     <div class="st-col-title">预计合同签订时间</div>
                                     <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
@@ -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 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="st-col">
+                                <div class="st-col-title">合作类型</div>
+                                <div class="st-col-field">
+                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="cooperateType" name="cooperateType">
+                                        <option value="-1">全部</option>
+                                        <option value="1" <#if cooperateType?? && cooperateType='1'>selected</#if>>战略合作类</option>
+                                        <option value="2" <#if cooperateType?? && cooperateType='2'>selected</#if>>非战略合作类</option>
+                                    </select>
+                                </div>
+                            </div>
                             <div class="st-col">
                                 <div class="st-col-title">垫资模式</div>
                                 <div class="st-col-field">
@@ -243,15 +253,15 @@
                                     <input type="text" id="customer" class="am-form-field am-input-sm" value="${customer!}"/>
                                 </div>
                             </div>
+                        </div>
+                        <!-- 第三行 -->
+                        <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">最终用户名称</div>
                                 <div class="st-col-field">
                                     <input type="text" id="terminalCustomer" class="am-form-field am-input-sm" value="${terminalCustomer!}"/>
                                 </div>
                             </div>
-                        </div>
-                        <!-- 第三行 -->
-                        <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">项目负责人</div>
                                 <div class="st-col-field">
@@ -290,33 +300,33 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
-                                <div class="st-col-title">行业场景</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="industryScene" name="industryScene">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if industryScene?? && industryScene='1'>selected</#if>>信息安全</option>
-                                        <option value="2" <#if industryScene?? && industryScene='2'>selected</#if>>政府</option>
-                                        <option value="3" <#if industryScene?? && industryScene='3'>selected</#if>>公安</option>
-                                        <option value="4" <#if industryScene?? && industryScene='4'>selected</#if>>企业</option>
-                                        <option value="5" <#if industryScene?? && industryScene='5'>selected</#if>>教育</option>
-                                        <option value="6" <#if industryScene?? && industryScene='6'>selected</#if>>交通</option>
-                                        <option value="7" <#if industryScene?? && industryScene='7'>selected</#if>>医疗</option>
-                                        <option value="8" <#if industryScene?? && industryScene='8'>selected</#if>>电力资源</option>
-                                        <option value="9" <#if industryScene?? && industryScene='9'>selected</#if>>运营商</option>
-                                        <option value="10" <#if industryScene?? && industryScene='10'>selected</#if>>金融</option>
-                                        <option value="11" <#if industryScene?? && industryScene='11'>selected</#if>>专网</option>
-                                        <option value="12" <#if industryScene?? && industryScene='12'>selected</#if>>其他</option>
-                                        <option value="13" <#if industryScene?? && industryScene='13'>selected</#if>>互联网</option>
-                                        <option value="14" <#if industryScene?? && industryScene='14'>selected</#if>>银行</option>
-                                    </select>
-                                </div>
-                            </div>
                         </div>
                         <!-- 扩展区域 -->
                         <div class="expand-section <#if extend='1'> fold</#if>">
                             <!-- 第四行 -->
                             <div class="flex-row st-row">
+                                <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                    <div class="st-col-title">行业场景</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="industryScene" name="industryScene">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if industryScene?? && industryScene='1'>selected</#if>>信息安全</option>
+                                            <option value="2" <#if industryScene?? && industryScene='2'>selected</#if>>政府</option>
+                                            <option value="3" <#if industryScene?? && industryScene='3'>selected</#if>>公安</option>
+                                            <option value="4" <#if industryScene?? && industryScene='4'>selected</#if>>企业</option>
+                                            <option value="5" <#if industryScene?? && industryScene='5'>selected</#if>>教育</option>
+                                            <option value="6" <#if industryScene?? && industryScene='6'>selected</#if>>交通</option>
+                                            <option value="7" <#if industryScene?? && industryScene='7'>selected</#if>>医疗</option>
+                                            <option value="8" <#if industryScene?? && industryScene='8'>selected</#if>>电力资源</option>
+                                            <option value="9" <#if industryScene?? && industryScene='9'>selected</#if>>运营商</option>
+                                            <option value="10" <#if industryScene?? && industryScene='10'>selected</#if>>金融</option>
+                                            <option value="11" <#if industryScene?? && industryScene='11'>selected</#if>>专网</option>
+                                            <option value="12" <#if industryScene?? && industryScene='12'>selected</#if>>其他</option>
+                                            <option value="13" <#if industryScene?? && industryScene='13'>selected</#if>>互联网</option>
+                                            <option value="14" <#if industryScene?? && industryScene='14'>selected</#if>>银行</option>
+                                        </select>
+                                    </div>
+                                </div>
                                 <div class="st-col">
                                     <div class="st-col-title">项目解决方案</div>
                                     <div class="st-col-field">
@@ -328,7 +338,7 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="st-col st-col-4">
+                                <div class="st-col">
                                     <div class="st-col-title">最后更新时间</div>
                                     <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
@@ -344,7 +354,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="st-col st-col-4">
+                                <div class="st-col">
                                     <div class="st-col-title">项目周期</div>
                                     <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
@@ -360,7 +370,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="st-col st-col-4">
+                                <div class="st-col">
                                     <div class="st-col-title">预计合同签订时间</div>
                                     <div class="flex-row st-col-field">
                                         <div class="am-form-icon">
@@ -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())