Skip to content

T
tjmdp
Commit d83ed006 authored by liuchao's avatar liuchao
Browse files
Options

no message

parent 8f8fa6a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 74 deletions
src/main/java/com/qiankun/controller/rainbowplan/RainbowPlanWebController.java
View file @ d83ed006
...@@ -51,7 +51,7 @@ public class RainbowPlanWebController extends BaseController<Object>{ ...@@ -51,7 +51,7 @@ public class RainbowPlanWebController extends BaseController<Object>{
return view; return view;
} }
@RequestMapping("/rainbow/wish/list") @RequestMapping("/rainbow/wish/list")
...@@ -71,16 +71,23 @@ public class RainbowPlanWebController extends BaseController<Object>{ ...@@ -71,16 +71,23 @@ public class RainbowPlanWebController extends BaseController<Object>{
return view; return view;
} }
@RequestMapping("/rainbow/wish/view")
public ModelAndView wishview(String id,HttpServletResponse response, HttpServletRequest request) throws Exception {
ModelAndView view = new ModelAndView();
Wish wish = wishDao.find(id);
view.getModelMap().addAttribute("wish", wish);
view.setViewName("rainbow/wishview");
return view;
}
@RequestMapping("/rainbow/wish/status/update") @RequestMapping("/rainbow/wish/status/update")
public ModelAndView wishStatusUpdate(@RequestParam(value = "id[]") String[] id, String status, HttpServletResponse response, HttpServletRequest request) throws Exception { public ModelAndView wishStatusUpdate(@RequestParam(value = "id[]") String[] id, String status, HttpServletResponse response, HttpServletRequest request) throws Exception {
ModelAndView view = new ModelAndView(); ModelAndView view = new ModelAndView();
wishDao.batchUpdateStatus(id, status);
return view; return view;
} }
......
src/main/java/com/qiankun/dao/WishDaoImpl.java
View file @ d83ed006
...@@ -98,6 +98,16 @@ public class WishDaoImpl extends AbsDao<Wish,String> implements WishDao { ...@@ -98,6 +98,16 @@ public class WishDaoImpl extends AbsDao<Wish,String> implements WishDao {
@Transactional @Transactional
@Override @Override
public void batchUpdateStatus(String[] id, String status) { public void batchUpdateStatus(String[] ids, String status) {
String sql = "";
for (String id : ids) {
if (StringUtils.isBlank(sql)) {
sql += " id='"+id+"'";
}else {
sql += " or id='"+id+"'";
}
}
super.excuteBySql(UPDATE_STATUS_BY_IDS + sql, status);
} }
} }
src/main/java/com/qiankun/dao/core/AbsDao.java
View file @ d83ed006
...@@ -182,8 +182,12 @@ public class AbsDao<E, K extends Serializable> implements IDao<E, K> { ...@@ -182,8 +182,12 @@ public class AbsDao<E, K extends Serializable> implements IDao<E, K> {
return hql.toString(); return hql.toString();
} }
public void excuteBySql(String sql) { public void excuteBySql(String sql, final Object... values) {
SQLQuery query = this.getSession().createSQLQuery(sql); SQLQuery query = this.getSession().createSQLQuery(sql);
if (values != null) {
for (int i = 0; i < values.length; i++)
query.setParameter(i, values[i]);
}
query.executeUpdate(); query.executeUpdate();
} }
......
src/main/webapp/WEB-INF/pages/rainbow/wishlist.jsp
View file @ d83ed006
...@@ -63,18 +63,17 @@ ...@@ -63,18 +63,17 @@
<span class="lbl"></span> <span class="lbl"></span>
</label> </label>
</th> </th>
<th width="5%">图片</th> <th width="">图片</th>
<th width="">小朋友</th> <th width="">小朋友</th>
<th width="">愿望</th> <th width="10%">愿望</th>
<th width="">内容</th> <th width="20%">内容</th>
<th width="">爱心人士</th> <th width="">爱心人士</th>
<th width="">寄送方式</th> <th width="">寄送方式</th>
<th width="">快递公司</th>
<th width="">快递单号</th>
<th width="">所属活动</th> <th width="">所属活动</th>
<th width="">状态</th> <th width="">状态</th>
<th width="">发布时间</th> <th width="5%">发布时间</th>
<th width="5%">操作</th> <!-- <th width="5%">操作</th> -->
</tr> </tr>
</thead> </thead>
...@@ -88,16 +87,21 @@ ...@@ -88,16 +87,21 @@
</label> </label>
</td> </td>
<td title="" valign="middle"></td> <td title="" valign="middle"></td>
<td title="">${wish.children.name}<br/> <td title="">姓名：${wish.children.name}&nbsp; 楼层床号：${wish.children.bedNum}<br/>
手机：${wish.children.phone} 联系方式：${wish.children.phone}<br/>
收件地址：${wish.children.receiveAddress};
</td> </td>
<td title="" valign="middle">${wish.title}</td> <td title="" valign="middle">${wish.title}</td>
<td title="" valign="middle">${wish.content}</td> <td title="" valign="middle"><div class="slim-scroll" style="overflow: hidden; width: auto; height: 65px;">${wish.content}</div></td>
<td title="" valign="middle">${wish.volunteer.name}<br/> <td title="" valign="middle">姓名：${wish.volunteer.name}<br/>
手机：${wish.volunteer.phone}</td> 手机：${wish.volunteer.phone}<br/>
<td title="" valign="middle"><c:if test="${wish.helpType == 1}">自送</c:if><c:if test="${wish.helpType == 1}">快递</c:if></td> 回寄地址：${wish.volunteer.receiveAddress};
<td title="" valign="middle">${wish.expressCompany}</td> </td>
<td title="" valign="middle">${wish.expressCode}</td> <td title="" valign="middle"><c:if test="${wish.helpType == 1}">自送</c:if>
<c:if test="${wish.helpType == 2}">快递：${wish.expressCompany}<br>
单号：${wish.expressCode}</c:if></td>
<td title="" valign="middle">${wish.activity.name}</td> <td title="" valign="middle">${wish.activity.name}</td>
<td title="" valign="middle"> <td title="" valign="middle">
<c:if test="${wish.status == 0}"><span class="label label-warning">发布</span></c:if> <c:if test="${wish.status == 0}"><span class="label label-warning">发布</span></c:if>
...@@ -109,23 +113,23 @@ ...@@ -109,23 +113,23 @@
<td title="" valign="middle"><fmt:formatDate value='${wish.createTime}' pattern='yyyy-MM-dd HH:mm' /></td> <td title="" valign="middle"><fmt:formatDate value='${wish.createTime}' pattern='yyyy-MM-dd HH:mm' /></td>
<td> <%-- <td>
<div class="visible-md visible-lg hidden-sm hidden-xs btn-group"> <div class="visible-md visible-lg hidden-sm hidden-xs btn-group">
<%-- <button class="btn btn-xs btn-info" onclick="window.location.href='<webpath:path/>/rainbow/user/add?id=${user.id}'"> <button class="btn btn-xs btn-info" onclick="window.location.href='<webpath:path/>/rainbow/user/add?id=${user.id}'">
<i class="icon-credit-card bigger-120"></i> <i class="icon-credit-card bigger-120"></i>
</button> </button>
&nbsp; --%> &nbsp;
<!-- <button class="btn btn-xs btn-danger"> <a class="btn btn-xs btn-link" title="详细信息" href="<webpath:path/>/rainbow/wish/view?id=${wish.id}">
<i class="icon-trash bigger-120"></i> <i class="icon-list-alt bigger-120"></i>
</button> --> </a>
</div> </div>
</td> </td> --%>
</tr> </tr>
</c:forEach> </c:forEach>
</tbody> </tbody>
......
src/main/webapp/WEB-INF/pages/rainbow/saveuser.jsp → src/main/webapp/WEB-INF/pages/rainbow/wishview.jsp
View file @ d83ed006
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<a href="#">首页</a> <a href="#">首页</a>
</li> </li>
<li class="active">彩虹计划</li> <li class="active">彩虹计划</li>
<li class="active">用户</li> <li class="active">愿望管理</li>
<li class="active">保存</li> <li class="active">${wish.children.name}</li>
</ul><!-- .breadcrumb --> </ul><!-- .breadcrumb -->
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
<div class="col-xs-12"> <div class="col-xs-12">
<form action="#" id="userForm" name="userForm" method="post" onsubmit="return false" class="form-horizontal" role="form"> <form action="#" id="" name="" method="post" onsubmit="return false" class="form-horizontal" role="form">
<input type="hidden" id="id" name="id" value="${user.id}"/>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<h3 class="header smaller lighter blue">用户信息</h3></div> <h3 class="header smaller lighter blue">${wish.children.name}</h3></div>
</div> </div>
...@@ -45,64 +45,40 @@ ...@@ -45,64 +45,40 @@
<div class="col-xs-4"> <div class="col-xs-4">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 用户类型 </label> <label class="col-sm-3 control-label no-padding-right" for="form-field-1">愿望</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select class="col-xs-10 col-sm-10" id="type" name="type"> ${wish.title}
<option value="0" <c:if test="${user.type==0}">selected</c:if>>小朋友</option>
<option value="1" <c:if test="${user.type==1}">selected</c:if>>爱心人士</option>
</select>
</div> </div>
</div> </div>
<div class="form-group children"> <div class="form-group children">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 状态 </label> <label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 内容 </label>
<div class="col-sm-9"> <div class="col-sm-9">
<select class="col-xs-10 col-sm-10" id="status" name="status"> <textarea rows="4" class="col-xs-10 col-sm-10" >${wish.content}</textarea>
<option value="0" <c:if test="${user.status==0}">selected</c:if>>未审核</option>
<option value="1" <c:if test="${user.status==1}">selected</c:if>>已审核</option>
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> <font color="red">*</font> 姓名 </label> <label class="col-sm-3 control-label no-padding-right" for="form-field-1"> <font color="red">*</font> 图片 </label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" id="name" name="name" value="${user.name}" class="col-xs-10 col-sm-10" /> <img src="<webpath:path/>/loadResource?imageName=${wish.uploadImage}" />
</div> </div>
</div> </div>
<div class="form-group children"> <div class="form-group children">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 昵称 </label> <label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 状态 </label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" id="nickName" name="nickName" value="${user.nickName}" class="col-xs-10 col-sm-10" /> ${wish.status}
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-2"> 性别 </label>
<div class="col-sm-9">
<label>
<input name="gender" type="radio" class="ace" value="男" <c:if test="${user.gender=='男'}">checked</c:if>>
<span class="lbl"> 男</span>
</label>
<label>
<input name="gender" type="radio" class="ace" value="女" <c:if test="${user.gender=='女'}">checked</c:if>>
<span class="lbl"> 女</span>
</label>
</div>
</div>
...@@ -343,12 +319,7 @@ ...@@ -343,12 +319,7 @@
<div class="col-md-offset-3 col-md-9"> <div class="col-md-offset-3 col-md-9">
<button class="btn btn-sm btn-success" type="submit">
<i class="icon-save bigger-110"></i>
保存
</button>
&nbsp; &nbsp; &nbsp;
<a class="btn btn-sm btn-success" href="javascript:history.go(-1)"> <a class="btn btn-sm btn-success" href="javascript:history.go(-1)">
<i class="icon-reply bigger-110"></i> <i class="icon-reply bigger-110"></i>
返回 返回
......
src/main/webapp/demo/buttons.html
View file @ d83ed006
This diff is collapsed.
src/main/webapp/resources/js/rainbow/wish.js
View file @ d83ed006
...@@ -4,6 +4,13 @@ $(document).ready(function(){ ...@@ -4,6 +4,13 @@ $(document).ready(function(){
allowClear : true allowClear : true
}); });
$('.slim-scroll').each(function () {
var $this = $(this);
$this.slimScroll({
height: $this.data('height') || 65,
railVisible:true
});
});
}) })
...@@ -102,6 +109,23 @@ var wish = { ...@@ -102,6 +109,23 @@ var wish = {
status: $("#changeStatus").val(), status: $("#changeStatus").val(),
id:ids id:ids
},
success: function(data){
$(".layui-layer-close").click();
bootbox.dialog({
message:"修改状态成功",
buttons:{
"success":{
"label":"确定",
"className":"btn-sm btn-primary",
"callback": function () {
window.location.reload();
}
}
}
});
} }
}) })
} }
......
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 to comment