Skip to content

H
Hgs
Commit a6259413 authored by 徐州's avatar 徐州
Browse files
Options

修改排班部分問題

parent c10892ef
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 85 deletions
house365-hgs-web/src/main/java/com/house365/web/controller/UserController.java
View file @ a6259413
......@@ -24,6 +24,7 @@ import net.sf.json.processors.DefaultValueProcessor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -652,6 +653,7 @@ public class UserController extends BaseController {
searchMap.put("managerId", userEntity.getId());
searchMap.put("isPrivate", 1);
searchMap.put("limit", 1);
searchMap.put("is_delete",0);
int count = customer.queryCount(searchMap);
if (count > 0) {
userVo.setHasCustomers(true);
......@@ -1192,12 +1194,70 @@ public class UserController extends BaseController {
return getAutoUrl("plform");
}
@RequestMapping(value = "/addDuty/{id_name}/{order}")
public void addDuty( @PathVariable("id_name") String id_name,
@PathVariable("order") Integer order) {
user.addDuty(id_name, order);
@RequestMapping(value = "/addDuty")
public String addDuty(Model model,HttpServletRequest request) {
String cityCode = (String) request.getSession().getAttribute(SessionConstants.SESSION_CITY_KEY);
List<UserEntity> userByCity = user.getUserByCity(cityCode);
model.addAttribute("userByCity", userByCity);
String action = request.getParameter("action");
if(TextUtils.isEmpty(action)) {
return getAutoUrl("pbform");
}
boolean edit = "edit".equals(action);
String order = request.getParameter("order");
String uid = request.getParameter(edit ? "eid" : "uid");
if(!edit && "0".equals(uid)) {
addErrorMessage(model, "请选择员工");
return getAutoUrl("pbform");
}
int i = 0;
try {
i = Integer.parseInt(order);
}catch (Exception e) {
addErrorMessage(model, "排序值必须是数字");
return getAutoUrl("pbform");
}
if(i < 1 || i > 100) {
addErrorMessage(model, "排序值需要在1-100之间");
return getAutoUrl("pbform");
}
if(!edit) {
List<DutyStaffEntity> ondutyById = user.getOndutyById(Integer.parseInt(uid));
if(ondutyById != null && ondutyById.size() > 0) {
addErrorMessage(model, "该员工已在排班表，不可重复添加");
return getAutoUrl("pbform");
}
}
List<UserEntity> dutyUserByCity = user.getDutyUserByCity(cityCode);
if(dutyUserByCity != null) {
List<UserEntity> collect = dutyUserByCity.stream().filter(ii -> order.trim().equals(ii.getStatus().toString())).collect(Collectors.toList());
if(collect.size() > 0) {
addErrorMessage(model, "排序值重复，无法"+(edit ? "修改":"添加"));
return getAutoUrl("pbform");
}
}
List<UserEntity> users = userByCity.stream().filter(ii -> uid.equals(ii.getId().toString())).collect(Collectors.toList());
if(users == null || users.size() == 0) {
addErrorMessage(model, "该员工不存在");
return getAutoUrl("pbform");
}
if(edit) {
user.updateDuty(i, Integer.parseInt(uid));
} else {
user.addDuty(users.get(0), i);
}
addSuccessMessage(model,(edit ? "修改":"添加") + "成功");
return getAutoUrl("pbform");
}
@RequestMapping(value = "/pbelist/{userId}")
public String pbelist(Model model, @PathVariable Integer userId) {
DutyStaffEntity entity = user.pbelist(userId);
......
house365-hgs-web/src/main/webapp/WEB-INF/decorators.xml
View file @ a6259413
......@@ -54,11 +54,16 @@
</decorator>
<decorator name="userSiteMesh" page="userSiteMesh.jsp">
<pattern>/user/*</pattern>
<pattern>/user/authorize*</pattern>
<pattern>/user/form*</pattern>
<pattern>/user/list*</pattern>
</decorator>
<decorator name="userDetailSiteMesh" page="default.jsp">
<pattern>/user/detail*</pattern>
<pattern>/user/pblist*</pattern>
<pattern>/user/pleform*</pattern>
<pattern>/user/pbform*</pattern>
</decorator>
<decorator name="deptSiteMesh" page="userSiteMesh.jsp">
......
house365-hgs-web/src/main/webapp/WEB-INF/views/user/pages/plform.jsp → house365-hgs-web/src/main/webapp/WEB-INF/views/user/pages/pbform.jsp
View file @ a6259413
......@@ -2,7 +2,7 @@
<%@ page language="java" pageEncoding="UTF-8" %>
<html>
<head>
<title>排班新增</title>
<title>排班新增/编辑</title>
</head>
<style type="text/css">
.img-show {
......@@ -18,62 +18,66 @@
}
</style>
<body>
<%@include file="/WEB-INF/common/layouts/topbar.jsp" %>
<form id="input_form" class="form-horizontal valid"
<%--action="${ctx}/user/pblist"
method="get"--%>>
<div class="container" style="width: 1200px;">
<form id="input_form" class="form-horizontal valid" action="${ctx}/user/addDuty"
method="get">
<!-- 面包屑 end -->
<house365:flushMessage/>
<div class="row${fluid}">
<div class="span12">
<!-- 面包屑 end -->
<house365:flushMessage/>
<div class="row${fluid}">
<div class="span12">
<div class="row-fluid">
<div class="span6 control-group">
<label class="control-label">选择员工<span style="color: red;">*</span>:</label>
<div class="controls">
<select name="name" id="select" style="width: 95%">
<option value="0">==请选择==</option>
<div class="row-fluid">
<div class="span6 control-group">
<label class="control-label">选择员工<span style="color: red;">*</span>:</label>
<div class="controls">
<c:if test="${not empty param.eid}">
<input type="text" style="display: none" name="eid" value="${param.eid}"/>
</c:if>
<input type="text" style="display: none" name="action" value="${empty param.eid ? 'add' : "edit"}"/>
<select name="uid" id="select" <c:if test="${not empty param.eid}">disabled</c:if> >
<option value="0">==请选择==</option>
<c:forEach items="${userByCity}" var="var" varStatus="vs">
<option value="${var.id}_${var.realName}"> ${var.realName} ${var.position}</option>
<c:forEach items="${userByCity}" var="var" varStatus="vs">
<option value="${var.id}" <c:if test="${var.id eq param.eid}">selected="selected"</c:if>> ${var.realName} ${var.position}</option>
</c:forEach>
</select>
</c:forEach>
</select>
</div>
</div>
</div>
</div>
<div class="row-fluid">
<div class="span6 control-group">
<label class="control-label">排序值<span style="color: #ff0000;">*</span>:</label>
<div class="controls">
<input type="text" id="order"
name="order" class="required" maxlength="64"
value="${order}"/>
<div class="row-fluid">
<div class="span6 control-group">
<label class="control-label">排序值<span style="color: #ff0000;">*</span>:</label>
<div class="controls">
<input type="text" id="order"
name="order" class="required" maxlength="64"
value="${param.order}"/>
</div>
</div>
</div>
</div>
<div class="portlet-header">
<div class="row-fluid">
<div class="operation-btn span18">
<div class="portlet-header">
<div class="row-fluid">
<div class="operation-btn span18">
<a href="${ctx}/user/pblist" class="btn gray"><i
class="icon-mail-reply"></i>&nbsp;返回</a>
<a href="${ctx}/user/pblist" class="btn gray"><i
class="icon-mail-reply"></i>&nbsp;返回</a>
<button class="btn blue btn col-lg-pull-12" onclick="save1()">
&nbsp;确认
</button>
<button class="btn blue btn col-lg-pull-12" type="submit">
&nbsp;确认
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</form>
<script language="javascript" type="text/javascript" src="${ctx}/resources/customize/js/layer.js"></script>
<script type="text/javascript">
function save1() {
......@@ -97,7 +101,7 @@
location.href = '${ctx}/user/pblist'
},
error:function(){
alert("增加成功！！！")
alert("操作失败！！！")
location.href = '${ctx}/user/pblist'
}
});
......
house365-hgs-web/src/main/webapp/WEB-INF/views/user/pages/pblist.jsp
View file @ a6259413
......@@ -155,20 +155,19 @@
</head>
<body>
<%@include file="/WEB-INF/common/layouts/topbar.jsp" %>
<!-- 面包屑 begin -->
<div class="container" style="width: 1200px;">
<div class="row${fluid}">
<div class="span12">
<form id="filterForm" class="form-inline filterForm" action="${ctx}/user/" method="get">
<div class="buttons pull-right" style="margin-left:15px;">
<a href="${ctx}/user/userByCity" class="btn blue pull-right" title="新增"><i
<a href="${ctx}/user/addDuty" class="btn blue pull-right" title="新增"><i
class="icon-plus"></i></a>
</div>
</form>
</div>
</div>
更新后的排班将于下次生效，按照当前排序值依次往下执行
<table class="table table-striped table-advance table-hover">
<thead>
<tr>
......@@ -217,7 +216,7 @@
<td nowrap="nowrap">
<a href="${ctx}/user/pbelist/${user.entity.id}" class="icon-edit pointer icon-large" title="编辑"></a>
<a href="${ctx}/user/addDuty?eid=${user.entity.id}&order=${user.entity.status}" class="icon-edit pointer icon-large" title="编辑"></a>
&nbsp; &nbsp;&nbsp;
<button class="icon-minus pointer icon-large"
onclick="deleteByIds(${user.entity.id}, ${user.entity.enabled})">删除
......@@ -229,28 +228,7 @@
</table>
</div>
<div id="choosemask" class="choosemask" style="display: none">
<div class="choosemask-wrap" style="width: 500px;height: 200px;">
<div class="choosemask-top">
<span id="choosemask_2" class="choosemask-close" onclick="hiddenChoosemask()" style="">×</span>
</div>
<div class="choosemask-bottom" style="width: 400px;">
<div class="choosemask-title">请选择身份：</div>
<ul class="choosemask-twobtn clearfix" id="fbs">
<li class="choosemask-fbs" onclick="saveIM(3)">新房房博士</li>
<li class="choosemask-fbs" onclick="saveIM(6)" style="margin-left: 10px;">二手房房博士</li>
<li class="choosemask-fbs" onclick="saveIM(10)" style="margin-left: 10px;">租房房博士</li>
<li class="choosemask-fbs" onclick="saveIM(14)" style="margin-left: 10px;">其他房博士</li>
</ul>
<ul class="choosemask-twobtn clearfix">
<li class="choosemask-fbs" onclick="saveIM(7)" id="kefu">客服</li>
<li class="choosemask-fbs" onclick="saveIM(1)" style="margin-left: 10px;">安家顾问</li>
<li class="choosemask-fbs" onclick="saveIM(20)" style="margin-left: 10px;">平台人员</li>
</ul>
</div>
</div>
</div>
<script language="javascript" type="text/javascript" src="${ctx}/resources/customize/js/layer.js"></script>
<script type="text/javascript">
......
house365-hgs-web/src/main/webapp/WEB-INF/views/user/pages/pleform.jsp
View file @ a6259413
......@@ -2,7 +2,7 @@
<%@ page language="java" pageEncoding="UTF-8" %>
<html>
<head>
<title>排班新增</title>
<title>排班编辑</title>
</head>
<style type="text/css">
.img-show {
......@@ -18,7 +18,7 @@
}
</style>
<body>
<%@include file="/WEB-INF/common/layouts/topbar.jsp" %>
<div class="container" style="width: 1200px;">
<form id="input_form" class="form-horizontal valid"
<%-- action="${ctx}/user/pblist"
method="get"--%>>
......@@ -64,7 +64,7 @@
<label class="control-label">排序值:</label>
<div class="controls">
<input type="text" id="entity_order"
name="entity.order" class="required" maxlength="24"
name="entity.order" class="required" maxlength="3"
value="${entity.order}"/>
......@@ -91,10 +91,12 @@
</div>
</form>
</div>
<script language="javascript" type="text/javascript" src="${ctx}/resources/customize/js/layer.js"></script>
<script type="text/javascript">
function save(userId,onduty) {
var order = document.getElementById("entity_order").value;
var orderInt = parseInt(order);
if(onduty==1){
alert("当天值日不可修改!!!")
return;
......@@ -120,7 +122,7 @@
location.href = '${ctx}/user/pblist'
},
error:function(){
alert("修改成功！！！")
alert("修改失败！！！")
location.href = '${ctx}/user/pblist'
}
});
......
house365-hgs-ws-interfaces/src/main/java/com/house365/ws/interfaces/server/IUser.java
View file @ a6259413
......@@ -202,7 +202,7 @@ public interface IUser extends IService {
void deleteDutyById(Integer userId);
void addDuty(String id_name ,Integer order);
void addDuty(UserEntity userEntity ,Integer order);
void updateDutyStaff(DutyStaffEntity entity);
......
house365-hgs-ws/src/main/java/com/house365/ws/interfaces/impl/UserImpl.java
View file @ a6259413
......@@ -1162,15 +1162,8 @@ public class UserImpl implements IUser {
}
@Override
public void addDuty(String id_name, Integer order) {
String[] split = id_name.split("_");
Integer userId = Integer.valueOf(split[0]);
String name = split[1];
DutyStaffEntity dutyStaffEntity = userMapper.selectBuyDutyId(userId);
if (dutyStaffEntity != null) {
return;
}
userMapper.addDuty(name, userId, new Date(), order);
public void addDuty(UserEntity userEntity, Integer order) {
userMapper.addDuty(userEntity.getRealName(), userEntity.getId(), new Date(), order);
}
......
house365-hgs-ws/src/main/resources/development/mybatis/UserMapper.xml
View file @ a6259413
......@@ -284,6 +284,7 @@
where userId = #{uid}#
</select>
<update id="authorizationById" parameterType="com.house365.beans.entity.RequestLoginEntity">
UPDATE request_login
SET status = #{status},
......
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