Skip to content

李洋 / 消息系统

Go to a project
Commit f47fe21e by gongyang
Options

提交代码

parent 84981e41
Inline Side-by-side
Showing with 63 additions and 18 deletions
app/Logic/SystemNoticeLogic.php
...@@ -342,8 +342,9 @@ class SystemNoticeLogic ...@@ -342,8 +342,9 @@ class SystemNoticeLogic
//查找出今日的所有更新 //查找出今日的所有更新
$date = $requestData['date']; $date = $requestData['date'];
$where['begin_time'] = $date; // $where['begin_time'] = $date;
$where['end_time'] = date('Y-m-d H:i:s',strtotime($date)+86400); // $where['end_time'] = date('Y-m-d H:i:s',strtotime($date)+86400);
$where['smue_id_str'] = $requestData['smue_id_str'];
$systemUpdateModel = new SystemUpdateModel(); $systemUpdateModel = new SystemUpdateModel();
...@@ -351,17 +352,25 @@ class SystemNoticeLogic ...@@ -351,17 +352,25 @@ class SystemNoticeLogic
//韦伯系统是所有的,通知所有人 //韦伯系统是所有的,通知所有人
$allUpdate = $systemUpdateModel->getWhereObj($where)->get()->toArray(); $allUpdate = $systemUpdateModel->getWhereObj($where)->get()->toArray();
if (!empty($allUpdate)){ if (!empty($allUpdate)){
// 查找所有通知用户邮箱和ID // 查找所有通知用户邮箱和ID
$sendUser = DB::table('t_user_perm')->where('begDate','<=',$date) $sendUser = DB::table('t_user_perm')->where('begDate','<=',$date)
->where('endDate','>=',$date) ->where('endDate','>=',$date)
->select('username','userId')->get(); ->select('username','userId')->get();
$createNotice->createNoticeSaveData($allUpdate,$date,'韦伯系统',json_encode($sendUser)); if (!empty($sendUser)){
$createNotice->createNoticeSaveData($allUpdate,$date,'韦伯系统',json_encode($sendUser));
}
} }
//查找所有需要更新的子系统，通知对应系统的人 //查找所有需要更新的子系统，通知对应系统的人
$allGroup = $systemUpdateModel->getWhereObj($where)->groupBy('system_id')->get()->toArray(); $allGroup = $systemUpdateModel->getWhereObj($where)->groupBy('system_id')->get()->toArray();
foreach ($allGroup as $value){ foreach ($allGroup as $value){
// 查找所有通知ID // 查找所有通知ID
...@@ -372,7 +381,11 @@ class SystemNoticeLogic ...@@ -372,7 +381,11 @@ class SystemNoticeLogic
$allUpdate = $systemUpdateModel->getWhereObj($where)->where('system_id',$value['system_id'])->get()->toArray(); $allUpdate = $systemUpdateModel->getWhereObj($where)->where('system_id',$value['system_id'])->get()->toArray();
$createNotice->createNoticeSaveData($allUpdate,$date,$value['system_name'],json_encode($sendUser)); if (!empty($sendUser)){
$createNotice->createNoticeSaveData($allUpdate,$date,$value['system_name'],json_encode($sendUser));
}
} }
} }
......
app/Model/SystemUpdateModel.php
...@@ -30,6 +30,9 @@ class SystemUpdateModel extends Model ...@@ -30,6 +30,9 @@ class SystemUpdateModel extends Model
case 'version_num': case 'version_num':
case 'weonlt_id': case 'weonlt_id':
$obj = $obj->where($key,$val);break; $obj = $obj->where($key,$val);break;
case 'smue_id_str':
$obj = $obj->whereIn('smue_id',explode(',',$val));break;
case 'update_title': case 'update_title':
case 'update_content': case 'update_content':
$obj = $obj->where($key,'like','%'.$val.'%');break; $obj = $obj->where($key,'like','%'.$val.'%');break;
......
public/js/Message/systemUpdate.js
...@@ -70,11 +70,8 @@ layui.use(['jquery','element', 'layer', 'form','table','laypage','laydate','laye ...@@ -70,11 +70,8 @@ layui.use(['jquery','element', 'layer', 'form','table','laypage','laydate','laye
// 获取选中数据 // 获取选中数据
var checkStatus = table.checkStatus('systemUpdateList'); var checkStatus = table.checkStatus('systemUpdateList');
console.log('选中的数据：', checkStatus.data.length); if(checkStatus.data.length == 0){
alert(1); alert('请先选择数据');
if(checkStatus.data.length === 0){
layer.msg('请先选择数据');
return false; return false;
} }
...@@ -83,10 +80,29 @@ layui.use(['jquery','element', 'layer', 'form','table','laypage','laydate','laye ...@@ -83,10 +80,29 @@ layui.use(['jquery','element', 'layer', 'form','table','laypage','laydate','laye
// 提取选中的ID（实际应用中常用） // 提取选中的ID（实际应用中常用）
var ids = checkStatus.data.map(function(item){ var ids = checkStatus.data.map(function(item){
return item.id; return item.smue_id;
});
$.ajax({
url: '/msgapi/createNotice',
type: 'post',
data: {'smue_id_str':ids.join(',')},
dataType:'json',
success: function (resp) {
if (resp.errcode == 0) {
layer.msg(resp.errmsg);
window.location.reload();
return false;
}
layer.msg(resp.errmsg);
},
error: function (err) {
console.log(err)
}
}); });
layer.msg('选中的ID：' + ids.join(','));
}); });
......
resources/views/message/systemBulletin.blade.php
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
<input type="text" class="layui-input" id="notice_date" name="notice_date" > <input type="text" class="layui-input" id="notice_date" name="notice_date" >
</div> </div>
</div> </div>
<div class="layui-inline "> {{-- <div class="layui-inline ">--}}
<label class="layui-form-label"></label> {{-- <label class="layui-form-label"></label>--}}
<div class="layui-input-inline"> {{-- <div class="layui-input-inline">--}}
<button class="layui-btn-sm layui-btn-warm" id="createNotice">生成公告</button> {{-- <button class="layui-btn-sm layui-btn-warm" id="createNotice">生成公告</button>--}}
</div> {{-- </div>--}}
</div> {{-- </div>--}}
</div> </div>
<form class="layui-form layui-box" method="post"> <form class="layui-form layui-box" method="post">
......
resources/views/message/systemUpdate.blade.php
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</style> </style>
@if($have_perm) @if(!$have_perm)
<form class="layui-form layui-box" > <form class="layui-form layui-box" >
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -73,6 +73,19 @@ ...@@ -73,6 +73,19 @@
</div> </div>
</div> </div>
<div class="layui-inline">
<label class="layui-form-label">产品负责人</label>
<div class="layui-input-inline">
<select name="product_user" lay-search lay-verify="required">
<option value=""></option>
@foreach($user as $key=>$value)
<option value="{{$key}}">{{$value}}</option>
@endforeach
</select>
</div>
</div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment