mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改合作类型相关的

master
OathK1per 2022-11-16 14:16:58 +08:00
parent 135785f211
commit ea6052040e
5 changed files with 87 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -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")));
}

2
src/main/resources/templates/admin/project_approve.ftl
View File

@ -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>

2
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -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>

70
src/main/resources/templates/admin/project_list.ftl
View File

@ -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())

68
src/main/resources/templates/admin/project_list_approve.ftl
View File

@ -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())