diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index ece9aa9..6e31d94 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -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")); } } diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 3d4a549..2219081 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -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('垫资利息不能为空'); diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index c2a1cf2..46a8e78 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -389,15 +389,13 @@
汇智产品金额
- + value="${huizhiStart!}" placeholder="汇智产品金额" autocomplete="off">
- + value="${huizhiEnd!}" placeholder="汇智产品金额" autocomplete="off">
@@ -405,15 +403,13 @@
华智产品金额
- + value="${huazhiStart!}" placeholder="华智产品金额" autocomplete="off">
- + value="${huazhiEnd!}" placeholder="华智产品金额" autocomplete="off">
@@ -421,15 +417,13 @@
华三产品金额
- + value="${huasanStart!}" placeholder="华三产品金额" autocomplete="off">
- + value="${huasanEnd!}" placeholder="华三产品金额" autocomplete="off">
@@ -437,15 +431,13 @@
其他产品金额
- + value="${otherStart!}" placeholder="其他产品金额" autocomplete="off">
- + value="${otherEnd!}" placeholder="其他产品金额" autocomplete="off">