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

项目列表页改动

master
OathK1per 2022-08-12 15:55:28 +08:00
parent 5f034da78a
commit e0497dcf1a
3 changed files with 242 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -24,10 +24,10 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
repositories { repositories {
maven { url "http://maven.aliyun.com/nexus/content/groups/public/"}
mavenLocal() mavenLocal()
mavenCentral() mavenCentral()
jcenter() jcenter()
maven { url "http://maven.aliyun.com/nexus/content/groups/public/"}
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
} }

44
src/main/java/cn/palmte/work/model/Project.java
View File

@ -1,7 +1,6 @@
package cn.palmte.work.model; package cn.palmte.work.model;
import cn.palmte.work.bean.ApproveStatusEnum; import cn.palmte.work.bean.ApproveStatusEnum;
import org.hibernate.annotations.CollectionId;
import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.GenericGenerator;
import top.jfunc.common.datetime.DatetimeUtils; import top.jfunc.common.datetime.DatetimeUtils;
@ -99,6 +98,16 @@ public class Project {
*/ */
@Column(name = "underwritten_mode") @Column(name = "underwritten_mode")
private int underwrittenMode; private int underwrittenMode;
/**
* 合作对象
*/
@Column(name = "collaborator")
private String collaborator;
/**
* 合作对象url
*/
@Column(name = "collaborator_url")
private String collaboratorUrl;
/** /**
* 客户名称 * 客户名称
*/ */
@ -189,6 +198,9 @@ public class Project {
@Column(name = "certainty") @Column(name = "certainty")
private String certainty; private String certainty;
@Transient
private String certaintyStr;
@Column(name = "gross_profit") @Column(name = "gross_profit")
private BigDecimal grossProfit; private BigDecimal grossProfit;
@ -232,7 +244,7 @@ public class Project {
private String mainContractResolvePlan; private String mainContractResolvePlan;
@Column(name = "calculation_collection") @Column(name = "calculation_collection")
private String CalculationCollection; private String calculationCollection;
@Transient @Transient
private String contractRound; private String contractRound;
@ -396,6 +408,22 @@ public class Project {
this.underwrittenMode = underwrittenMode; this.underwrittenMode = underwrittenMode;
} }
public String getCollaborator() {
return collaborator;
}
public void setCollaborator(String collaborator) {
this.collaborator = collaborator;
}
public String getCollaboratorUrl() {
return collaboratorUrl;
}
public void setCollaboratorUrl(String collaboratorUrl) {
this.collaboratorUrl = collaboratorUrl;
}
public String getCustomer() { public String getCustomer() {
return customer; return customer;
} }
@ -579,6 +607,14 @@ public class Project {
this.certainty = certainty; this.certainty = certainty;
} }
public String getCertaintyStr() {
return certaintyStr;
}
public void setCertaintyStr(String certaintyStr) {
this.certaintyStr = certaintyStr;
}
public BigDecimal getGrossProfit() { public BigDecimal getGrossProfit() {
return grossProfit; return grossProfit;
} }
@ -668,11 +704,11 @@ public class Project {
} }
public String getCalculationCollection() { public String getCalculationCollection() {
return CalculationCollection; return calculationCollection;
} }
public void setCalculationCollection(String calculationCollection) { public void setCalculationCollection(String calculationCollection) {
CalculationCollection = calculationCollection; this.calculationCollection = calculationCollection;
} }
public String getContractRound() { public String getContractRound() {

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

@ -24,6 +24,13 @@
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"> <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody> <tbody>
<tr> <tr>
<th class="am-text-middle">项目编号</th>
<td>
<div class="am-u-sm-10">
<input type="text" id="projectNo" class="am-form-field am-input-sm"
value="${projectNo!}"/>
</div>
</td>
<th class="am-text-middle">项目名称</th> <th class="am-text-middle">项目名称</th>
<td> <td>
<div class="am-u-sm-10"> <div class="am-u-sm-10">
@ -31,6 +38,18 @@
value="${name!}"/> value="${name!}"/>
</div> </div>
</td> </td>
<th class="am-text-middle">项目状态</th>
<td>
<div class="am-u-sm-10">
<select data-am-selected id="status" name="status">
<option value="-1">全部</option>
<option value="1" <#if status?? && status='1'>selected</#if>>项目创建(概算)</option>
<option value="5" <#if status?? && status='5'>selected</#if>>预算</option>
<option value="10" <#if status?? && status='10'>selected</#if>>结算</option>
<option value="15" <#if status?? && status='15'>selected</#if>>决算</option>
</select>
</div>
</td>
<th class="am-text-middle">项目创建者</th> <th class="am-text-middle">项目创建者</th>
<td> <td>
<div class="am-u-sm-10"> <div class="am-u-sm-10">
@ -41,41 +60,33 @@
</tr> </tr>
<tr> <tr>
<th class="am-text-middle">项目类型</th> <th class="am-text-middle">是否二次合作</th>
<td> <td>
<div class="am-u-sm-10"> <div class="am-u-sm-10">
<select data-am-selected id="type" name="type"> <select data-am-selected id="isSecond" name="isSecond">
<option value="-1">全部</option> <option value="-1">全部</option>
<option value="1" <#if type?? && type='1'>selected</#if>>工程集成类</option> <option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
<option value="2" <#if type?? && type='2'>selected</#if>>设备集成类</option> <option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
<option value="3" <#if type?? && type='3'>selected</#if>>战略合作类</option>
</select> </select>
</div> </div>
</td> </td>
<th class="am-text-middle">部门名称</th> <th class="am-text-middle">签单方式</th>
<td> <td>
<div class="am-u-sm-10"> <div class="am-u-sm-10">
<select data-am-selected id="deptId" name="deptId"> <select data-am-selected id="signType" name="signType">
<option value="-1">全部</option> <option value="-1">全部</option>
<#list deptList as dept> <option value="1" <#if signType?? && signType='1'>selected</#if>>紫光汇智直接投标</option>
<option value=${dept.id!} <#if deptId! =="${dept.id}" >
selected
</#if>>${dept.name!}</option>
</#list>
</select> </select>
</div> </div>
</td> </td>
</tr> <th class="am-text-middle">项目解决方案</th>
<tr>
<th class="am-text-middle">项目状态</th>
<td> <td>
<div class="am-u-sm-10"> <div class="am-u-sm-10">
<select data-am-selected id="status" name="status"> <select data-am-selected id="resolvePlan" name="resolvePlan">
<option value="-1">全部</option> <option value="-1">全部</option>
<option value="1" <#if status?? && status='1'>selected</#if>>项目创建(概算)</option> <option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
<option value="5" <#if status?? && status='5'>selected</#if>>预算</option> <option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>
<option value="10" <#if status?? && status='10'>selected</#if>>结算</option> <option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option>
<option value="15" <#if status?? && status='15'>selected</#if>>决算</option>
</select> </select>
</div> </div>
</td> </td>
@ -93,24 +104,85 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th class="am-text-middle">项目周期</th> <th class="am-text-middle">部门名称</th>
<td> <td>
<div class="am-u-sm-10"> <div class="am-u-sm-10">
<div class="am-form am-form-inline"> <select data-am-selected id="deptId" name="deptId">
<div class="am-form-group am-form-icon"> <option value="-1">全部</option>
<i class="am-icon-calendar"></i> <#list deptList as dept>
<input type="text" class="am-form-field am-input-sm" id="startDate" <option value=${dept.id!} <#if deptId! =="${dept.id}" >
value="${startDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker> selected
</div> </#if>>${dept.name!}</option>
<div class="am-form-group">至</div> </#list>
<div class="am-form-group am-form-icon"> </select>
<i class="am-icon-calendar"></i>
<input type="text" class="am-form-field am-input-sm" id="endDate"
value="${endDate!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
</div>
</div>
</div> </div>
</td> </td>
<th class="am-text-middle">项目类型</th>
<td>
<div class="am-u-sm-10">
<select data-am-selected id="type" name="type">
<option value="-1">全部</option>
<option value="1" <#if type?? && type='1'>selected</#if>>工程集成类</option>
<option value="2" <#if type?? && type='2'>selected</#if>>设备集成类</option>
<option value="3" <#if type?? && type='3'>selected</#if>>战略合作类</option>
</select>
</div>
</td>
<th class="am-text-middle">垫资模式</th>
<td>
<div class="am-u-sm-10">
<select data-am-selected id="underwrittenMode" name="underwrittenMode">
<option value="-1">全部</option>
<option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资（战略合作）</option>
<option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资（背靠背）</option>
<option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>C类-垫资（账期覆盖）</option>
<option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>D类-垫资（账期不覆盖）</option>
</select>
</div>
</td>
<th class="am-text-middle">项目把握度</th>
<td>
<div class="am-u-sm-10">
<select data-am-selected id="certainty" name="certainty">
<option value="-1">全部</option>
<option value="1" <#if certainty?? && certainty='1'>selected</#if>>A：基本确定中标，待签合同，合同签订中</option>
<option value="2" <#if certainty?? && certainty='2'>selected</#if>>B：客户产品参数、商务评分、商务资质引导成功</option>
<option value="3" <#if certainty?? && certainty='3'>selected</#if>>C：项目初期引导阶段</option>
</select>
</div>
</td>
</tr>
<tr>
<th class="am-text-middle">行业场景应用</th>
<td>
<div class="am-u-sm-10">
<input type="text" id="industryScenario" class="am-form-field am-input-sm"
value="${industryScenario!}"/>
</div>
</td>
<th class="am-text-middle">客户名称</th>
<td>
<div class="am-u-sm-10">
<input type="text" id="customer" class="am-form-field am-input-sm"
value="${customer!}"/>
</div>
</td>
<th class="am-text-middle">终端客户名称</th>
<td>
<div class="am-u-sm-10">
<input type="text" id="terminalCustomer" class="am-form-field am-input-sm"
value="${terminalCustomer!}"/>
</div>
</td>
<th class="am-text-middle">项目负责人</th>
<td>
<div class="am-u-sm-10">
<input type="text" id="principal" class="am-form-field am-input-sm"
value="${principal!}"/>
</div>
</td>
</tr>
<tr>
<th class="am-text-middle">最后更新时间</th> <th class="am-text-middle">最后更新时间</th>
<td> <td>
<div class="am-u-sm-10"> <div class="am-u-sm-10">
@ -129,9 +201,43 @@
</div> </div>
</div> </div>
</td> </td>
</tr> <th class="am-text-middle">项目周期</th>
<tr> <td>
<td colspan="4"> <div class="am-u-sm-10">
<div class="am-form am-form-inline">
<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="startDate"
value="${startDate!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
</div>
<div class="am-form-group">至</div>
<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="endDate"
value="${endDate!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
</div>
</div>
</div>
</td>
<th class="am-text-middle">预计合同签订时间</th>
<td>
<div class="am-u-sm-10">
<div class="am-form am-form-inline">
<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="contractStartTime"
value="${contractStartTime!}" placeholder="开始日期" autocomplete="off" data-am-datepicker>
</div>
<div class="am-form-group">至</div>
<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="contractEndTime"
value="${contractEndTime!}" placeholder="结束日期" autocomplete="off" data-am-datepicker>
</div>
</div>
</div>
</td>
<td colspan="2">
<div align='right'> <div align='right'>
<@shiro.hasPermission name="PROJECT_QUERY"> <@shiro.hasPermission name="PROJECT_QUERY">
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary" <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
@ -182,8 +288,25 @@
<th class="table-title">项目类型</th> <th class="table-title">项目类型</th>
<th class="table-title">项目合同金额</th> <th class="table-title">项目合同金额</th>
<th class="table-title">华智产品金额</th> <th class="table-title">华智产品金额</th>
<th class="table-title">汇智产品金额</th>
<th class="table-title">华三产品金额</th>
<th class="table-title">其他产品金额</th> <th class="table-title">其他产品金额</th>
<th class="table-title">项目状态</th> <th class="table-title">项目状态</th>
<th class="table-title">垫资模式</th>
<th class="table-title">合作对象</th>
<th class="table-title">项目把握度</th>
<th class="table-title">行业场景应用</th>
<th class="table-title">客户名称</th>
<th class="table-title">终端客户名称</th>
<th class="table-title">项目毛利</th>
<th class="table-title">项目毛利率</th>
<th class="table-title">项目负责人</th>
<th class="table-title">预计合同签订时间</th>
<th class="table-title">项目计划招标时间</th>
<th class="table-title">是否二次合作</th>
<th class="table-title">签单方式</th>
<th class="table-title">垫资利息</th>
<th class="table-title">垫资峰值</th>
<th class="table-title">审核状态</th> <th class="table-title">审核状态</th>
<th class="table-title">当前审核人</th> <th class="table-title">当前审核人</th>
<th class="table-title">项目创建者</th> <th class="table-title">项目创建者</th>
@ -202,8 +325,25 @@
<td>${list.typeDesc!}</td> <td>${list.typeDesc!}</td>
<td>${Utils.format(list.contractAmount, "0.00")}</td> <td>${Utils.format(list.contractAmount, "0.00")}</td>
<td>${Utils.format(list.huazhiProductAmount, "0.00")}</td> <td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>
<td>${Utils.format(list.huizhiProductAmount, "0.00")}</td>
<td>${Utils.format(list.huasanProductAmount, "0.00")}</td>
<td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td> <td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>
<td>${list.statusDesc!}</td> <td>${list.statusDesc!}</td>
<td>${list.underwrittenModeDesc!}</td>
<td>${list.collaborator!}</td>
<td>${list.certaintyStr!}</td>
<td>${list.industryScenario!}</td>
<td>${list.customer!}</td>
<td>${list.terminalCustomer!}</td>
<td>${Utils.format(list.grossProfit, "0.00")}</td>
<td>${Utils.format(list.grossProfitMargin, "0.00")}</td>
<td>${list.principal!}</td>
<td>${list.contractTime?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${list.bidsTime?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${list.isSecondStr!}</td>
<td>${list.signTypeStr!}</td>
<td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>
<td>${Utils.format(list.advancePeakAmount, "0.00")}</td>
<td>${list.approveStatusDesc!}</td> <td>${list.approveStatusDesc!}</td>
<td>${list.approveName!}</td> <td>${list.approveName!}</td>
<td>${list.creatorName!}</td> <td>${list.creatorName!}</td>
@ -440,18 +580,38 @@
function setKeywords() { function setKeywords() {
var keywordsObj = {}; var keywordsObj = {};
if ($("#projectNo").val())
keywordsObj.projectNo = $("#projectNo").val();
if ($("#name").val()) if ($("#name").val())
keywordsObj.name = $("#name").val(); keywordsObj.name = $("#name").val();
if ($("#creatorName").val()) if ($("#creatorName").val())
keywordsObj.creatorName = $("#creatorName").val(); keywordsObj.creatorName = $("#creatorName").val();
if ($("#status").val()) if ($("#status").val())
keywordsObj.status = $("#status").val(); keywordsObj.status = $("#status").val();
if ($("#isSecond").val())
keywordsObj.isSecond = $("#isSecond").val();
if ($("#signType").val())
keywordsObj.signType = $("#signType").val();
if ($("#resolvePlan").val())
keywordsObj.resolvePlan = $("#resolvePlan").val();
if ($("#approveStatus").val()) if ($("#approveStatus").val())
keywordsObj.approveStatus = $("#approveStatus").val(); keywordsObj.approveStatus = $("#approveStatus").val();
if ($("#deptId").val()) if ($("#deptId").val())
keywordsObj.deptId = $("#deptId").val(); keywordsObj.deptId = $("#deptId").val();
if ($("#type").val()) if ($("#type").val())
keywordsObj.type = $("#type").val(); keywordsObj.type = $("#type").val();
if ($("#underwrittenMode").val())
keywordsObj.underwrittenMode = $("#underwrittenMode").val();
if ($("#certainty").val())
keywordsObj.certainty = $("#certainty").val();
if ($("#industryScenario").val())
keywordsObj.industryScenario = $("#industryScenario").val();
if ($("#customer").val())
keywordsObj.customer = $("#customer").val();
if ($("#terminalCustomer").val())
keywordsObj.terminalCustomer = $("#terminalCustomer").val();
if ($("#principal").val())
keywordsObj.principal = $("#principal").val();
if ($("#startDate").val()) if ($("#startDate").val())
keywordsObj.startDate = $("#startDate").val(); keywordsObj.startDate = $("#startDate").val();
if ($("#endDate").val()) if ($("#endDate").val())
@ -460,6 +620,10 @@
keywordsObj.startUpdateDate = $("#startUpdateDate").val(); keywordsObj.startUpdateDate = $("#startUpdateDate").val();
if ($("#endUpdateDate").val()) if ($("#endUpdateDate").val())
keywordsObj.endUpdateDate = $("#endUpdateDate").val(); keywordsObj.endUpdateDate = $("#endUpdateDate").val();
if ($("#contractStartTime").val())
keywordsObj.contractStartTime = $("#contractStartTime").val();
if ($("#contractEndTime").val())
keywordsObj.contractEndTime = $("#contractEndTime").val();
var keywords = ""; var keywords = "";
if (!$.isEmptyObject(keywordsObj)) { if (!$.isEmptyObject(keywordsObj)) {
keywords = JSON.stringify(keywordsObj); keywords = JSON.stringify(keywordsObj);