platform / platform-cms · Commits

Go to a project

Authored by mlge
Commit 3f356a14465d0cb5151426854e2af95075cb1eb9 2 parents a615ccb6 b74b05a4

Merge branch 'test6.8.7' of http://git.yoho.cn/platform/platform-cms into test6.8.7

Inline Side-by-side
Showing 5 changed files with 44 additions and 33 deletions
... ... @@ -561,6 +561,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService{
String authName = req.getPublisher();
String startTime = req.getStartTimeStr();
String endTime = req.getEndTimeStr();
Integer authorUid = req.getAuthorUid();
Long startTimeInt = null;
Long endTimeInt = null;
if(StringUtils.isNotEmpty(authName)){
... ... @@ -574,6 +575,11 @@ public class GrassArticleServiceImpl implements IGrassArticleService{
return rsp;
}
}
if(authorUid !=null){
if(CollectionUtils.isEmpty(authorUids)){
authorUids = Lists.newArrayList(authorUid);
}
}
if(StringUtils.isNotEmpty(startTime)){
startTimeInt = Long.valueOf(startTime);
}
... ...
<!DOCTYPE html>
<div id="tt" class="easyui-layout" fit="true" style="height: 80%;display:flex;justify-content:center;align-items:center;" >
<div id="tt" class="easyui-layout" fit="true" style="height: 90%;display:flex;justify-content:center;align-items:center;" >
<div ><input id="publishTimeStr" name="publishTimeStr" class="easyui-datetimebox" data-options="prompt:'选择时间'"/></div>
</div>
<div region="center" id="labelGroupList" style="margin-left: 20px">
... ...
... ... @@ -25,7 +25,7 @@
</style>
</head>
<body class="easyui-layout" fit="true" style="overflow-y: scroll" >
<div region="north" style="height: 20%;">
<div region="north" style="height: 25%;">
<script>
document.write(addHead('种草社区管理', '种草草稿箱'));
</script>
... ... @@ -38,11 +38,13 @@
</input>
<input class="easyui-textbox" id="articleId">
</input>
<input class="easyui-textbox" id="authorId">
</input>
<input id="startTimeStr" name="startTimeStr" class="easyui-datetimebox" data-options="prompt:'开始时间'"/>
<!--<input id="startTimeStr" name="startTimeStr" class="easyui-datetimebox" data-options="prompt:'开始时间'"/>-->
<input id="endTimeStr" name="endTimeStr" class="easyui-datetimebox" data-options="prompt:'结束时间'"/>
</input>
<!--<input id="endTimeStr" name="endTimeStr" class="easyui-datetimebox" data-options="prompt:'结束时间'"/>-->
<!--</input>-->
<a id="searchBtn1" class="btn-info">筛选</a>
<!--<a id="addActivityBtn" class="btn-success">新增</a>-->
<a id="allBtn" class="btn-info">全部 </a>
... ... @@ -73,8 +75,7 @@
$("#publisher").textbox("setValue","");
$("#articleId").textbox("setValue","");
$("#isPublished").combobox("setValue","");
$("#startTimeStr").datetimebox('setValue',"");
$("#endTimeStr").datetimebox('setValue',"");
$("#authorId").textbox("setValue","");
$("#activityListTable").datagrid("load", {
});
... ... @@ -92,6 +93,11 @@
prompt: "文章id"
});
$("#authorId").textbox({
required:false,
prompt: "用户uid"
});
$("#isPublished").combobox({
valueField : "value",
textField : "text",
... ... @@ -107,20 +113,19 @@
iconCls : "icon-search",
onClick : function() {
debugger;
var startTime="";
var endTime="";
if ($("#startTimeStr").datetimebox('getValue')!='') {
startTime = parseInt(new Date($("#startTimeStr").datetimebox('getValue')).getTime() );
}
if ($("#endTimeStr").datetimebox('getValue')!='') {
endTime = parseInt(new Date($("#endTimeStr").datetimebox('getValue')).getTime() );
}
// var startTime="";
// var endTime="";
// if ($("#startTimeStr").datetimebox('getValue')!='') {
// startTime = parseInt(new Date($("#startTimeStr").datetimebox('getValue')).getTime() );
// }
// if ($("#endTimeStr").datetimebox('getValue')!='') {
// endTime = parseInt(new Date($("#endTimeStr").datetimebox('getValue')).getTime() );
// }
$("#activityListTable").datagrid("load", {
publisher: $("#publisher").textbox("getValue"),
articleId: $("#articleId").textbox("getValue"),
isPublished: $("#isPublished").combobox("getValue"),
startTimeStr:startTime,
endTimeStr:endTime
authorUid: $("#authorId").textbox("getValue")
});
}
});
... ... @@ -332,7 +337,7 @@
var status = $(this).attr("status");
var dataId = $(this).attr("dataId");
index = $(this).attr("index");
getEditDialog(data,dataId,status );
timeDialog(data,dataId,status );
}
});
... ... @@ -407,7 +412,7 @@
}
// 定时 选择时间
function getEditDialog(data,id, status){
function timeDialog(data,id, status){
var timeChoose = $("<div id='timeChoose'>").appendTo($(document.body));
var title = "选择时间";
var textVar = "确认";
... ... @@ -416,7 +421,7 @@
$(timeChoose).myDialog({
title: title,
width: "20%",
height: "20%",
height: "30%",
resizable:false,
buttons:[{
id : "saveBtn",
... ... @@ -457,7 +462,7 @@
$(articleEditer).myDialog({
title: title,
width: "80%",
height: "90%",
height: "100%",
resizable:false,
// buttons:[{
// id : "saveBtn",
... ...
... ... @@ -48,10 +48,10 @@
<tr style="height: 60px">
<td >
<div style="float: left;width:800px;" >
<div style="float: left;width:600px;" >
<span style="color:red">*</span><label>选择用户</label> <br>
<input id="articleUid" name="authorUid" style="width:100% " class="easyui-textbox" /> <br>
<span style="color:red"> 必填项，选择某个马甲身份后，才能发布</span>
<span style="color:red"> 必填项，选择某个用户身份后，才能发布</span>
</div>
<div id="userInfo" style="float: left;margin-left: 30px;">
</div>
... ... @@ -61,7 +61,7 @@
<tr style="height: 60px">
<td>
<span style="color:red">*</span><label>文字内容</label> <br>
<div style="width:800px; word-wrap:break-word;float: left;position: relative" >
<div style="width:600px; word-wrap:break-word;float: left;position: relative" >
<textarea rows="5" id="content" style="width:60%; white-space: pre-wrap;" name = "content" class="form-control" placeholder="请在这里输入1-500字的笔记" required="" maxlength="500"></textarea>
<div style="position: absolute;bottom:0;right:-50px"> <span id="content-count">0</span>/500</div>
... ... @@ -73,7 +73,7 @@
<td>
<label>选择标签</label> <br>
<span style="color:red">至多添加5个标签，非必填项</span><label></label><br>
<input id="labelId" name="labelId" class="easyui-combobox" style="width:800px;"/>
<input id="labelId" name="labelId" class="easyui-combobox" style="width:600px;"/>
<input id="labelIds" name="labelIds" hidden="hidden"/>
<div id="labelList">
... ... @@ -168,7 +168,7 @@
$("#addSkn").linkbutton({
iconCls : "icon-search",
onClick : function() {
getEditDialog();
getGoodsDialog();
}
});
... ... @@ -580,7 +580,7 @@
$(timeChoose).myDialog({
title: title,
width: "20%",
height: "20%",
height: "30%",
resizable:false,
buttons:[{
id : "saveBtn",
... ... @@ -681,7 +681,7 @@
// 编辑分组
function getEditDialog(data){
function getGoodsDialog(data){
var labelGroupList = $("<div id='labelGroupList'>").appendTo($(document.body));
var title = "选择商品";
var textVar = "确认";
... ...
... ... @@ -61,10 +61,10 @@
<tr style="height: 60px">
<td style="width:100% ">
<div style="float: left;width:800px;" >
<div style="float: left;width:600px;" >
<span style="color:red">*</span><label>选择用户</label> <br>
<input id="articleUid" name="authorUid" style="width:100% " class="easyui-textbox" /> <br>
<span style="color:red"> 必填项，选择某个马甲身份后，才能发布</span>
<span style="color:red"> 必填项，选择某个用户身份后，才能发布</span>
</div>
<div id="userInfo" style="float: left;margin-left: 30px;">
</div>
... ... @@ -74,7 +74,7 @@
<tr style="height: 60px">
<td style="width:100%; word-wrap:break-word;" >
<span style="color:red">*</span><label>文字内容</label> <br>
<div style="width:800px; word-wrap:break-word;float: left;position: relative" >
<div style="width:600px; word-wrap:break-word;float: left;position: relative" >
<textarea rows="5" id="content" style="width:60%; white-space: pre-wrap;" name = "content" class="form-control" placeholder="请在这里输入1-500字的笔记" required="" maxlength="500"></textarea>
<div style="position: absolute;bottom:0;right:-50px"> <span id="content-count">0</span>/500</div>
... ... @@ -89,7 +89,7 @@
<td style="width:100%;">
<label>选择标签</label> <br>
<span style="color:red">至多添加5个标签，非必填项</span><label></label><br>
<input id="labelId" name="labelId" class="easyui-combobox" style="width:800px; "/>
<input id="labelId" name="labelId" class="easyui-combobox" style="width:600px; "/>
<input id="labelIds" name="labelIds" hidden="hidden"/>
<div id="labelList">
... ... @@ -579,7 +579,7 @@
$(timeChoose).myDialog({
title: title,
width: "20%",
height: "20%",
height: "30%",
resizable:false,
buttons:[{
id : "saveBtn",
... ...