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

金额筛选

master
OathK1per 2022-11-14 16:48:58 +08:00
parent 64c7132d79
commit 2eac86bee7
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,28 +159,28 @@ public class ProjectService {
//金额，需判断是概算项目还是过了预算的项目，如过了预算则从project_extend表中取数
if (StrUtil.isNotEmpty(searchInfo.get("huizhiStart"))) {
queryHelper.addCondition("(pe.is_budget = 0 and p.huizhi_product_amount >= ?) or (pe.is_budget = 1 and pe.huizhi_product_amount >= ?)", searchInfo.get("huizhiStart"), searchInfo.get("huizhiStart"));
queryHelper.addCondition("((pe.is_budget = 0 and p.huizhi_product_amount >= ?) or (pe.is_budget = 1 and pe.huizhi_product_amount >= ?))", searchInfo.get("huizhiStart"), searchInfo.get("huizhiStart"));
}
if (StrUtil.isNotEmpty(searchInfo.get("huizhiEnd"))) {
queryHelper.addCondition("(pe.is_budget = 0 and p.huizhi_product_amount <= ?) or (pe.is_budget = 1 and pe.huizhi_product_amount <= ?)", searchInfo.get("huizhiEnd"), searchInfo.get("huizhiEnd"));
queryHelper.addCondition("((pe.is_budget = 0 and p.huizhi_product_amount <= ?) or (pe.is_budget = 1 and pe.huizhi_product_amount <= ?))", searchInfo.get("huizhiEnd"), searchInfo.get("huizhiEnd"));
}
if (StrUtil.isNotEmpty(searchInfo.get("huazhiStart"))) {
queryHelper.addCondition("(pe.is_budget = 0 and p.huazhi_product_amount >= ?) or (pe.is_budget = 1 and pe.huazhi_product_amount >= ?)", searchInfo.get("huazhiStart"), searchInfo.get("huazhiStart"));
queryHelper.addCondition("((pe.is_budget = 0 and p.huazhi_product_amount >= ?) or (pe.is_budget = 1 and pe.huazhi_product_amount >= ?))", searchInfo.get("huazhiStart"), searchInfo.get("huazhiStart"));
}
if (StrUtil.isNotEmpty(searchInfo.get("huazhiEnd"))) {
queryHelper.addCondition("(pe.is_budget = 0 and p.huazhi_product_amount <= ?) or (pe.is_budget = 1 and pe.huazhi_product_amount <= ?)", searchInfo.get("huazhiEnd"), searchInfo.get("huazhiEnd"));
queryHelper.addCondition("((pe.is_budget = 0 and p.huazhi_product_amount <= ?) or (pe.is_budget = 1 and pe.huazhi_product_amount <= ?))", searchInfo.get("huazhiEnd"), searchInfo.get("huazhiEnd"));
}
if (StrUtil.isNotEmpty(searchInfo.get("huasanStart"))) {
queryHelper.addCondition("(pe.is_budget = 0 and p.huasan_product_amount >= ?) or (pe.is_budget = 1 and pe.huasan_product_amount >= ?)", searchInfo.get("huasanStart"), searchInfo.get("huasanStart"));
queryHelper.addCondition("((pe.is_budget = 0 and p.huasan_product_amount >= ?) or (pe.is_budget = 1 and pe.huasan_product_amount >= ?))", searchInfo.get("huasanStart"), searchInfo.get("huasanStart"));
}
if (StrUtil.isNotEmpty(searchInfo.get("huasanEnd"))) {
queryHelper.addCondition("(pe.is_budget = 0 and p.huasan_product_amount <= ?) or (pe.is_budget = 1 and pe.huasan_product_amount <= ?)", searchInfo.get("huasanEnd"), searchInfo.get("huasanEnd"));
queryHelper.addCondition("((pe.is_budget = 0 and p.huasan_product_amount <= ?) or (pe.is_budget = 1 and pe.huasan_product_amount <= ?))", searchInfo.get("huasanEnd"), searchInfo.get("huasanEnd"));
}
if (StrUtil.isNotEmpty(searchInfo.get("otherStart"))) {
queryHelper.addCondition("(pe.is_budget = 0 and p.ziguang_other_amount >= ?) or (pe.is_budget = 1 and pe.ziguang_other_amount >= ?)", searchInfo.get("otherStart"), searchInfo.get("otherStart"));
queryHelper.addCondition("((pe.is_budget = 0 and p.ziguang_other_amount >= ?) or (pe.is_budget = 1 and pe.ziguang_other_amount >= ?))", searchInfo.get("otherStart"), searchInfo.get("otherStart"));
}
if (StrUtil.isNotEmpty(searchInfo.get("otherEnd"))) {
queryHelper.addCondition("(pe.is_budget = 0 and p.ziguang_other_amount <= ?) or (pe.is_budget = 1 and pe.ziguang_other_amount <= ?)", searchInfo.get("otherEnd"), searchInfo.get("otherEnd"));
queryHelper.addCondition("((pe.is_budget = 0 and p.ziguang_other_amount <= ?) or (pe.is_budget = 1 and pe.ziguang_other_amount <= ?))", searchInfo.get("otherEnd"), searchInfo.get("otherEnd"));
}
}

7
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -663,6 +663,7 @@
var underwrittenMode = $("#underwrittenMode").val();
var cooperateType = $("#cooperateType").val();
var collaborator = $("#collaborator").val();
var collaboratorUrl = $("#collaboratorUrl").val();
var advanceInterestAmount = $("#advanceInterestAmount").val();
var advancePeakAmount = $("#advancePeakAmount").val();
var contractAmount = $("#contractAmount").val();
@ -754,6 +755,12 @@
return;
}
if (cooperateType == 1 && (collaboratorUrl == undefined || collaboratorUrl.length <= 0 )) {
window.confirm('合作对象附件不能为空');
check = 1;
return;
}
if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {
window.confirm('垫资利息不能为空');

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

@ -389,15 +389,13 @@
<div class="st-col-title">汇智产品金额</div>
<div class="flex-row st-col-field">
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="huizhiStart"
value="${huizhiStart!}" placeholder="汇智产品金额" autocomplete="off" data-am-datepicker>
value="${huizhiStart!}" placeholder="汇智产品金额" autocomplete="off">
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="huizhiEnd"
value="${huizhiEnd!}" placeholder="汇智产品金额" autocomplete="off" data-am-datepicker>
value="${huizhiEnd!}" placeholder="汇智产品金额" autocomplete="off">
</div>
</div>
</div>
@ -405,15 +403,13 @@
<div class="st-col-title">华智产品金额</div>
<div class="flex-row st-col-field">
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="huazhiStart"
value="${huazhiStart!}" placeholder="华智产品金额" autocomplete="off" data-am-datepicker>
value="${huazhiStart!}" placeholder="华智产品金额" autocomplete="off">
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="huazhiEnd"
value="${huazhiEnd!}" placeholder="华智产品金额" autocomplete="off" data-am-datepicker>
value="${huazhiEnd!}" placeholder="华智产品金额" autocomplete="off">
</div>
</div>
</div>
@ -421,15 +417,13 @@
<div class="st-col-title">华三产品金额</div>
<div class="flex-row st-col-field">
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="huasanStart"
value="${huasanStart!}" placeholder="华三产品金额" autocomplete="off" data-am-datepicker>
value="${huasanStart!}" placeholder="华三产品金额" autocomplete="off">
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="huasanEnd"
value="${huasanEnd!}" placeholder="华三产品金额" autocomplete="off" data-am-datepicker>
value="${huasanEnd!}" placeholder="华三产品金额" autocomplete="off">
</div>
</div>
</div>
@ -437,15 +431,13 @@
<div class="st-col-title">其他产品金额</div>
<div class="flex-row st-col-field">
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="otherStart"
value="${otherStart!}" placeholder="其他产品金额" autocomplete="off" data-am-datepicker>
value="${otherStart!}" placeholder="其他产品金额" autocomplete="off">
</div>
<div class="mid-connect">至</div>
<div class="am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="otherEnd"
value="${otherEnd!}" placeholder="其他产品金额" autocomplete="off" data-am-datepicker>
value="${otherEnd!}" placeholder="其他产品金额" autocomplete="off">
</div>
</div>
</div>