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

四算概算修改垫资

master
OathK1per 2022-08-15 15:50:34 +08:00
parent 17bac51b42
commit f13ad7ac85
3 changed files with 90 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,9 +79,28 @@ 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("isSecond")) && !"-1".equals(searchInfo.get("isSecond"))){
queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond")));
}
if(StrUtil.isNotEmpty(searchInfo.get("signType")) && !"-1".equals(searchInfo.get("signType"))){
queryHelper.addCondition("p.sign_type=?", Integer.parseInt(searchInfo.get("signType")));
}
if(StrUtil.isNotEmpty(searchInfo.get("resolvePlan")) && !"-1".equals(searchInfo.get("resolvePlan"))){
queryHelper.addCondition("p.resolve_plan=?", Integer.parseInt(searchInfo.get("resolvePlan")));
}
if(StrUtil.isNotEmpty(searchInfo.get("underwrittenMode")) && !"-1".equals(searchInfo.get("underwrittenMode"))){
queryHelper.addCondition("p.underwritten_mode=?", Integer.parseInt(searchInfo.get("underwrittenMode")));
}
if(StrUtil.isNotEmpty(searchInfo.get("certainty")) && !"-1".equals(searchInfo.get("certainty"))){
queryHelper.addCondition("p.certainty=?", Integer.parseInt(searchInfo.get("certainty")));
}
queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("projectNo")),"p.project_no LIKE ?", "%"+searchInfo.get("projectNo")+"%");
queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("name")),"p.name LIKE ?", "%"+searchInfo.get("name")+"%");
queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("creatorName")),"p.creator_name LIKE ?", "%"+searchInfo.get("creatorName")+"%");
queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("industryScenario")),"p.industry_scenario LIKE ?", "%"+searchInfo.get("industryScenario")+"%");
queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("customer")),"p.customer LIKE ?", "%"+searchInfo.get("customer")+"%");
queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("terminalCustomer")),"p.terminal_customer LIKE ?", "%"+searchInfo.get("terminalCustomer")+"%");
queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("principal")),"p.principal LIKE ?", "%"+searchInfo.get("principal")+"%");
/**
* 只选择了一个时间的情况，就项目时间包括这个时间的
*/
@ -110,6 +129,14 @@ public class ProjectService {
String time = searchInfo.get("endUpdateDate") + " 00:00:00";
queryHelper.addCondition("p.last_update_time<=?", time);
}
if(StrUtil.isNotEmpty(searchInfo.get("contractStartTime"))){
String time = searchInfo.get("contractStartTime") + " 00:00:00";
queryHelper.addCondition("p.contract_time>=?", time);
}
if(StrUtil.isNotEmpty(searchInfo.get("contractEndTime"))){
String time = searchInfo.get("contractEndTime") + " 00:00:00";
queryHelper.addCondition("p.contract_time<=?", time);
}
//项目可见性，根据角色和人员id
Admin admin = InterfaceUtil.getAdmin();

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

@ -195,7 +195,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华智产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="华智产品金额"
<input type="text" class="number am-input" data-validation-message="华智产品金额" required
name="huazhiProductAmount" id="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@ -204,7 +204,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>汇智产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="汇智产品金额"
<input type="text" class="number am-input" data-validation-message="汇智产品金额" required
name="huizhiProductAmount" id="huizhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@ -213,7 +213,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华三产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="华三产品金额"
<input type="text" class="number am-input" data-validation-message="华三产品金额" required
name="huasanProductAmount" id="huasanProductAmount" placeholder="单位（元）" maxlength="16" value="" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@ -222,7 +222,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>其他产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
<input type="text" class="number am-input" data-validation-message="请输入其他产品金额" required
name="ziguangOtherAmount" id="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@ -318,8 +318,8 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">垫资利息</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资利息"
name="advanceInterestAmount" placeholder="单位（元）" maxlength="16"
<input type="text" class="number am-input" data-validate-async data-validation-message="请输入垫资利息"
name="advanceInterestAmount" id="advanceInterestAmount" placeholder="单位（元）" maxlength="16"
value="" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@ -327,8 +327,8 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">垫资峰值</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资峰值"
name="advancePeakAmount" placeholder="单位（元）" maxlength="16"
<input type="text" class="number am-input" data-validate-async data-validation-message="请输入垫资峰值"
name="advancePeakAmount" id="advancePeakAmount" placeholder="单位（元）" maxlength="16"
value="" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>

106
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -203,41 +203,41 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华智产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="华智产品金额"
name="huazhiProductAmount" placeholder="单位（元）" maxlength="20"
value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
value="${Utils.format(project.huazhiProductAmount, "0.00")}" required />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">汇智产品金额</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>汇智产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="请输入汇智产品金额"
name="huizhiProductAmount" placeholder="单位（元）" maxlength="20"
value="${Utils.format(project.huizhiProductAmount, "0.00")}" />
value="${Utils.format(project.huizhiProductAmount, "0.00")}" required />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">华三产品金额</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华三产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="华三产品金额"
name="huasanProductAmount" placeholder="单位（元）" maxlength="20"
value="${Utils.format(project.huasanProductAmount, "0.00")}" />
value="${Utils.format(project.huasanProductAmount, "0.00")}" required />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">其他产品金额</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>其他产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20"
value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
value="${Utils.format(project.ziguangOtherAmount, "0.00")}" required />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@ -261,44 +261,44 @@
<div class="am-tab-panel am-fade am-in" id="tab2">
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目负责人</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">项目负责人</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" id="principal" class="am-input" data-validate-async data-validation-message="请输入项目负责人"
name="principal" placeholder="请输入项目负责人" maxlength="20"
value="${project.principal!}" required />
value="${project.principal!}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>预计合同签订时间</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">预计合同签订时间</div>
<div class="am-u-sm-2 am-u-md-2">
<div class="am-form-group am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="contractTime"
name="contractTime" autocomplete="off"
value="${(project.contractTime?string("yyyy-MM-dd"))!}" placeholder="预计合同签订时间"
data-am-datepicker required>
data-am-datepicker>
</div>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划招标时间</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">项目计划招标时间</div>
<div class="am-u-sm-2 am-u-md-2">
<div class="am-form-group am-form-icon">
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="bidsTime"
name="bidsTime" autocomplete="off"
value="${(project.bidsTime?string("yyyy-MM-dd"))!}" placeholder="项目计划招标时间"
data-am-datepicker required>
data-am-datepicker>
</div>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>是否二次合作</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">是否二次合作</div>
<div class="am-u-sm-6 am-u-md-6">
<select data-am-selected id="isSecond" name="isSecond">
<option value="1" <#if project.isSecond=1>selected</#if>>是</option>
@ -309,7 +309,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>签单方式</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">签单方式</div>
<div class="am-u-sm-6 am-u-md-6">
<select data-am-selected id="signType" name="signType">
<option value="1" <#if project.signType=1>selected</#if>>紫光汇智直接投标</option>
@ -319,7 +319,7 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目解决方案</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">项目解决方案</div>
<div class="am-u-sm-6 am-u-md-6">
<select data-am-selected id="resolvePlan" name="resolvePlan">
<option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
@ -331,52 +331,52 @@
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">垫资利息</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资利息"
<input type="text" class="number am-input" data-validate-async data-validation-message="请输入垫资利息"
name="advanceInterestAmount" placeholder="单位（元）" maxlength="16"
value="${Utils.format(project.advanceInterestAmount)}" required />
value="${Utils.format(project.advanceInterestAmount)}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">垫资峰值</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资峰值"
<input type="text" class="number am-input" data-validate-async data-validation-message="请输入垫资峰值"
name="advancePeakAmount" placeholder="单位（元）" maxlength="16"
value="${Utils.format(project.advancePeakAmount)}" required />
value="${Utils.format(project.advancePeakAmount)}" />
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>主合同收款条款</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">主合同收款条款</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
class="am-input" data-validate-async data-validation-message="请输入收款条款"
placeholder="请输入收款条款" required
placeholder="请输入收款条款"
>${project.mainContractCollectionTerms!}</textarea>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>主合同具体解决方案</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">主合同具体解决方案</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"
class="am-input" data-validate-async data-validation-message="请输入具体解决方案"
placeholder="请输入具体解决方案" required
placeholder="请输入具体解决方案"
>${project.mainContractResolvePlan!}</textarea>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>计收计划</div>
<div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"
class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
placeholder="按照开票金额及时间罗列计收计划" required
placeholder="按照开票金额及时间罗列计收计划"
>${project.calculationCollection!}</textarea>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@ -681,27 +681,27 @@
var terminalCustomer = $("#terminalCustomer").val();
var contractAmount = $("#contractAmount").val();
var industryScenario = $("#industryScenario").val();
var mainContractCollectionTerms = $("#mainContractCollectionTerms").val();
// var mainContractCollectionTerms = $("#mainContractCollectionTerms").val();
var valueRisk = $("#valueRisk").val();
var incomeDeviceTaxInclude = $("#incomeDeviceTaxInclude").val();
var incomeDeviceTaxExclude = $("#incomeDeviceTaxExclude").val();
var incomeEngineerTaxInclude = $("#incomeEngineerTaxInclude").val();
var incomeEngineerTaxExclude = $("#incomeEngineerTaxExclude").val();
var incomeServiceTaxInclude = $("#incomeServiceTaxInclude").val();
var incomeServiceTaxExclude = $("#incomeServiceTaxExclude").val();
var costPurchaseDeviceTaxInclude = $("#costPurchaseDeviceTaxInclude").val();
var costPurchaseDeviceTaxExclude = $("#costPurchaseDeviceTaxExclude").val();
var costPurchaseBuildTaxInclude = $("#costPurchaseBuildTaxInclude").val();
var costPurchaseBuildTaxExclude = $("#costPurchaseBuildTaxExclude").val();
var costPurchaseServiceTaxInclude = $("#costPurchaseServiceTaxInclude").val();
var costPurchaseServiceTaxExclude = $("#costPurchaseServiceTaxExclude").val();
var costPurchaseOtherTaxInclude = $("#costPurchaseOtherTaxInclude").val();
var costPurchaseOtherTaxExclude = $("#costPurchaseOtherTaxExclude").val();
var costCompanyManageTaxExclude = $("#costCompanyManageTaxExclude ").val();
var costProjectManageTaxExclude = $("#costProjectManageTaxExclude ").val();
var costOtherOtherTaxInclude = $("#costOtherOtherTaxInclude").val();
var costOtherOtherTaxExclude = $("#costOtherOtherTaxExclude").val();
// var incomeDeviceTaxInclude = $("#incomeDeviceTaxInclude").val();
// var incomeDeviceTaxExclude = $("#incomeDeviceTaxExclude").val();
// var incomeEngineerTaxInclude = $("#incomeEngineerTaxInclude").val();
// var incomeEngineerTaxExclude = $("#incomeEngineerTaxExclude").val();
// var incomeServiceTaxInclude = $("#incomeServiceTaxInclude").val();
// var incomeServiceTaxExclude = $("#incomeServiceTaxExclude").val();
// var costPurchaseDeviceTaxInclude = $("#costPurchaseDeviceTaxInclude").val();
// var costPurchaseDeviceTaxExclude = $("#costPurchaseDeviceTaxExclude").val();
// var costPurchaseBuildTaxInclude = $("#costPurchaseBuildTaxInclude").val();
// var costPurchaseBuildTaxExclude = $("#costPurchaseBuildTaxExclude").val();
// var costPurchaseServiceTaxInclude = $("#costPurchaseServiceTaxInclude").val();
// var costPurchaseServiceTaxExclude = $("#costPurchaseServiceTaxExclude").val();
// var costPurchaseOtherTaxInclude = $("#costPurchaseOtherTaxInclude").val();
// var costPurchaseOtherTaxExclude = $("#costPurchaseOtherTaxExclude").val();
// var costCompanyManageTaxExclude = $("#costCompanyManageTaxExclude ").val();
// var costProjectManageTaxExclude = $("#costProjectManageTaxExclude ").val();
// var costOtherOtherTaxInclude = $("#costOtherOtherTaxInclude").val();
// var costOtherOtherTaxExclude = $("#costOtherOtherTaxExclude").val();
if (startTime.length <= 0) {
window.confirm('项目计划开始时间不能为空');
@ -771,11 +771,11 @@
return;
}
if (mainContractCollectionTerms == undefined || mainContractCollectionTerms.length <= 0) {
window.confirm('主合同收款条款不能为空');
check = 1;
return;
}
// if (mainContractCollectionTerms == undefined || mainContractCollectionTerms.length <= 0) {
// window.confirm('主合同收款条款不能为空');
// check = 1;
// return;
// }
if (valueRisk == undefined || valueRisk.length <= 0) {
window.confirm('价值及风险不能为空');