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

Merge remote-tracking branch 'origin/master'

master
OathK1per 2022-12-12 16:34:01 +08:00
parent 6c43043c2f dac623cb27
commit a1b17bafb9
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -166,10 +166,10 @@ public class ProjectController extends BaseController {
ExportExcelUtils exportExcelUtils = new ExportExcelUtils();
String[] headers0 = {"部门名称", "项目编号", "项目名称", "项目类型", "项目计划开始时间", "项目计划结束时间", "垫资模式", "合作对象", "垫资利息", "垫资峰值", "合同金额",
"项目毛利", "项目毛利率", "华智产品金额", "汇智产品金额", "华三产品金额", "其他产品金额", "项目把握度", "行业场景应用", "项目解决方案", "客户名称", "最终用户名称",
"价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"};
"价值及风险", "项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划","项目阶段"};
String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound",
"grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer",
"valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"};
"valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection","stageName"};
exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream);
// String[] headers1 = {"项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"};
// String[] columns1 = {"principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"};

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

@ -775,6 +775,12 @@ public class ProjectService {
", FORMAT(p.gross_profit,2) as grossProfitRound, FORMAT(p.gross_profit_margin,2) as grossProfitMarginRound, FORMAT(p.advance_interest_amount,2) as advanceInterestAmountRound, FORMAT(p.advance_peak_amount,2) as advancePeakAmountRound","project","p");
queryHelper.addCondition("p.id=?", id);
Project first = pagination.findFirst(queryHelper.getSql(), Project.class);
if(null == first.getStage()){
first.setStageName(getStageName(-1));
}else {
first.setStageName(getStageName(first.getStage()));
}
return first;
}

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

@ -562,8 +562,23 @@
<td>${Utils.format(list.contractAmount, "0.00")}</td>
<#--项目阶段-->
<td>
找后端要字段
<#--${Utils.format(list.contractAmount, "0.00")}-->
<#-- ${list.stage!}
项目阶段
0：S0-概算立项；
1：S1-项目调研；
2：S2-方案设计；
3：S3-预算评估；
4：S4-招标期；
5：S5-合同期；
6：S6-交付期；
7：S7-结算期；
8：S8-决算期；
9：L-项目丢失
-->
<#-- <#if list.tage==0>-->
<#-- ${}-->
<#-- </#if>-->
${handlerStage(list.stage)}
</td>
<#--项目毛利-->
<#--<td>${Utils.format(list.grossProfit, "0.00")}</td>-->
@ -667,7 +682,6 @@
<script src="../assets/js/amazeui.switch.js"></script>
<script type="text/javascript">
$(function () {
$("#extend").on("click", function () {
var extend = $("#extend").val();
if (extend === '0') {
@ -785,5 +799,9 @@
console.log("keywords: " + keywords);
location.href = '${base}/project/approve?listFrom=list&type=2&id=' + id + '&pageNumber=' + pageNumber + '&keywords=' + keywords;
};
function handlerStage(stage){
console.log('handlerStage:');
console.log('handlerStage:',stage);
}
</script>