项目管理列表展示完善
xxssyyyyssxx
parent
90067b5e5b
commit
d63264dd98
|
|
@ -25,17 +25,17 @@ public class ProjectService {
|
|||
"CASE p.approve_status WHEN 0 THEN '待审核' WHEN 1 THEN '审核通过' WHEN 2 THEN '审核不通过' ELSE '未知' AS approveStatusDesc," +
|
||||
*/
|
||||
QueryHelper queryHelper = new QueryHelper("SELECT p.*","project","p");
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("status")) && "-1".equals(searchInfo.get("status"))){
|
||||
queryHelper.addCondition("p.status=?", searchInfo.get("status"));
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("status")) && !"-1".equals(searchInfo.get("status"))){
|
||||
queryHelper.addCondition("p.status=?", Integer.parseInt(searchInfo.get("status")));
|
||||
}
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("approveStatus")) && "-1".equals(searchInfo.get("approveStatus"))){
|
||||
queryHelper.addCondition("p.approve_status=?", searchInfo.get("approveStatus"));
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("approveStatus")) && !"-1".equals(searchInfo.get("approveStatus"))){
|
||||
queryHelper.addCondition("p.approve_status=?", Integer.parseInt(searchInfo.get("approveStatus")));
|
||||
}
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("deptId")) && "-1".equals(searchInfo.get("deptId"))){
|
||||
queryHelper.addCondition("p.dept_id=?", searchInfo.get("deptId"));
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("deptId")) && !"-1".equals(searchInfo.get("deptId"))){
|
||||
queryHelper.addCondition("p.dept_id=?", Integer.parseInt(searchInfo.get("deptId")));
|
||||
}
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("type")) && "-1".equals(searchInfo.get("type"))){
|
||||
queryHelper.addCondition("p.type=?", searchInfo.get("type"));
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("type")) && !"-1".equals(searchInfo.get("type"))){
|
||||
queryHelper.addCondition("p.type=?", Integer.parseInt(searchInfo.get("type")));
|
||||
}
|
||||
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")+"%");
|
||||
|
|
@ -44,16 +44,20 @@ public class ProjectService {
|
|||
* 只选择了一个时间的情况，就项目时间包括这个时间的
|
||||
*/
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("startTime")) && StrUtil.isEmpty(searchInfo.get("endTime"))){
|
||||
queryHelper.addCondition("p.start_date<=? AND p.end_date>?",searchInfo.get("startTime"), searchInfo.get("startTime"));
|
||||
String time = searchInfo.get("startTime") + " 00:00:00";
|
||||
queryHelper.addCondition("p.start_date<=? AND p.end_date>=?", time, time);
|
||||
}
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("endTime")) && StrUtil.isEmpty(searchInfo.get("startTime"))){
|
||||
queryHelper.addCondition("p.start_date<=? AND p.end_date>?",searchInfo.get("endTime"), searchInfo.get("endTime"));
|
||||
String time = searchInfo.get("endTime") + " 00:00:00";
|
||||
queryHelper.addCondition("p.start_date<=? AND p.end_date>=?", time, time);
|
||||
}
|
||||
/**
|
||||
* 两个时间都选了，则包含项目时间
|
||||
*/
|
||||
if(StrUtil.isNotEmpty(searchInfo.get("startTime")) && StrUtil.isNotEmpty(searchInfo.get("endTime"))){
|
||||
queryHelper.addCondition("p.start_date>=? AND p.end_date<?",searchInfo.get("endTime"), searchInfo.get("endTime"));
|
||||
String startTime = searchInfo.get("startTime") + " 00:00:00";
|
||||
String endTime = searchInfo.get("endTime") + " 23:59:59";
|
||||
queryHelper.addCondition("p.start_date>=? AND p.end_date<=?", startTime, endTime);
|
||||
}
|
||||
|
||||
return queryHelper;
|
||||
|
|
|
|||
|
|
@ -31,34 +31,19 @@
|
|||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="am-text-middle">项目状态</th>
|
||||
<th class="am-text-middle">项目类型</th>
|
||||
<td>
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected id="status" name="status">
|
||||
<select data-am-selected id="type" name="type">
|
||||
<option value="-1">全部</option>
|
||||
<option value="0">草稿</option>
|
||||
<option value="1">项目创建</option>
|
||||
<option value="5">概算完成</option>
|
||||
<option value="10">预算完成</option>
|
||||
<option value="15">结算中</option>
|
||||
<option value="20">决算完成</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="status" name="status">
|
||||
<option value="-1">全部</option>
|
||||
<option value="0">待审核</option>
|
||||
<option value="1">审核通过</option>
|
||||
<option value="2">审核不通过</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="am-text-middle">部门名称</th>
|
||||
<td>
|
||||
<div class="am-u-sm-10">
|
||||
|
|
@ -72,27 +57,68 @@
|
|||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle">项目类型</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<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">工程集成类</option>
|
||||
<option value="2">设备集成类</option>
|
||||
<option value="3">战略合作类</option>
|
||||
<option value="0" <#if status?? && status='0'>selected</#if>>草稿</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>
|
||||
<option value="20" <#if status?? && status='20'>selected</#if>>决算完成</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
<th class="am-text-middle">审核状态</th>
|
||||
<td>
|
||||
<div class="am-u-sm-10">
|
||||
<select data-am-selected id="approveStatus" name="approveStatus">
|
||||
<option value="-1">全部</option>
|
||||
<option value="0" <#if approveStatus?? && approveStatus='0'>selected</#if>>待审核</option>
|
||||
<option value="1" <#if approveStatus?? && approveStatus='1'>selected</#if>>审核通过</option>
|
||||
<option value="2" <#if approveStatus?? && approveStatus='2'>selected</#if>>审核不通过</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="am-text-middle">项目周期</th>
|
||||
<td colspan="3">
|
||||
<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="startTime"
|
||||
value="${startTime!}" placeholder="开始日期" 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="endTime"
|
||||
value="${endTime!}"
|
||||
placeholder="结束日期" data-am-datepicker>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div align='right'>
|
||||
<@shiro.hasPermission name="PROJECT_QUERY">
|
||||
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
|
||||
id="submit-btn">搜索
|
||||
</button>
|
||||
</@shiro.hasPermission>
|
||||
<@shiro.hasPermission name="PROJECT_EXPORT">
|
||||
<button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
|
||||
id="submit-btn-export">导出
|
||||
</button>
|
||||
</@shiro.hasPermission>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -135,6 +161,7 @@
|
|||
<tbody>
|
||||
<#list pager.list as list>
|
||||
<tr>
|
||||
<td>${list.id!}</td>
|
||||
<td>${list.name!}</td>
|
||||
<td>${list.typeDesc!}</td>
|
||||
<td>${list.statusDesc!}</td>
|
||||
|
|
@ -142,7 +169,7 @@
|
|||
<td>${list.approveName!}</td>
|
||||
<td>${list.creatorName!}</td>
|
||||
<td>${list.deptName!}</td>
|
||||
<td>${list.startDate?datetime}-${list.endDate?datetime}</td>
|
||||
<td>${list.startDate?string("yyyy-MM")} ~ ${list.endDate?string("yyyy-MM")}</td>
|
||||
<td>
|
||||
--
|
||||
</td>
|
||||
|
|
@ -193,10 +220,10 @@
|
|||
keywordsObj.deptId = $("#deptId").val();
|
||||
if ($("#type").val())
|
||||
keywordsObj.type = $("#type").val();
|
||||
if ($("#startDate").val())
|
||||
keywordsObj.startDate = $("#startDate").val();
|
||||
if ($("#endDate").val())
|
||||
keywordsObj.endDate = $("#endDate").val();
|
||||
if ($("#startTime").val())
|
||||
keywordsObj.startTime = $("#startTime").val();
|
||||
if ($("#endTime").val())
|
||||
keywordsObj.endTime = $("#endTime").val();
|
||||
var keywords = "";
|
||||
if (!$.isEmptyObject(keywordsObj)) {
|
||||
keywords = JSON.stringify(keywordsObj);
|
||||
|
|
|
|||
Loading…
Reference in New Issue