用户密码修改功能，签章对应文件以及图片信息上传

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -1551,4 +1551,38 @@ public class UserController extends BaseController {
         return ajaxJson;
     }
 
+
+    /**
+     * 修改个人用户密码
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "adminModifyPwdForm")
+    public String adminModifyPwdForm(String userId, Model model,HttpServletRequest request) {
+
+        model.addAttribute("userId", userId);
+        return "modules/sys/adminModifyPwdForm";
+    }
+
+
+    /**
+     * 修改用户密码
+     * @param newPassword
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "adminModifyPwd")
+    public String adminModifyPwd(String userId, String newPassword, Model model,HttpServletRequest request) {
+        User user = UserUtils.getByUserId(userId);
+        if (StringUtils.isNotBlank(newPassword)){
+            newPassword = SystemService.encrypeString(newPassword);
+
+            NewPassword psd = new NewPassword().newpassword(newPassword);
+            systemService.updatePasswordById(user.getId(), user.getLoginName(), newPassword);
+            model.addAttribute("message", "修改密码成功");
+            return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
+        };
+        return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
+    }
+
 }

src/main/webapp/WEB-INF/tags/table/importExcelSZSHImport.tag

@@ -0,0 +1,102 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="url" type="java.lang.String" required="true"%>
+
+<!-- 引入layer插件 -->
+<link href="${ctxStatic}/layer-v2.3/layui/css/layui.css" type="text/css" rel="stylesheet"/>
+<script src="${ctxStatic}/layer-v2.3/layer/layer.js"></script>
+<script src="${ctxStatic}/layer-v2.3/layer/laydate/laydate.js"></script>
+<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入controller的url --%>
+<button id="btnImport" class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" title="导入">
+	<%--	<i class="fa fa-folder-open-o"></i>--%>
+	导入
+</button>
+<div id="importBox" class="hide">
+	<form id="importForm2" action="${url}" method="post" enctype="multipart/form-data" onsubmit="loading('正在导入，请稍等...');">
+		<br/>
+		<div class="layui-form-item" style="text-align:center; line-height: 41px;">
+			<label class="layui-form-label" style="vertical-align:middle;display:inline-block;"><span class="require-item" style="color:red;font-size: 20px;">*</span>导入类型</label>
+			<select id="concealType" name="concealType">
+				<option value="">请选择</option>
+				<option value="js" selected="">江苏电力模板导入</option>
+				<option value="sh">上海电力模板导入</option>
+			</select>
+		</div>
+
+		<input id="uploadFile" name="file" type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
+	</form>
+</div>
+<script type="text/javascript">
+	$(document).ready(function() {
+		$("#btnImport").click(function(){
+			top.layer.open({
+				type: 1,
+				area: [500, 300],
+				title:"导入数据",
+				content:$("#importBox").html() ,
+				btn: ['下载模板','确定', '关闭'],
+				btn1: function(index, layero){
+					var type = top.$("#concealType").val();
+					if(null == type || "" == type) {
+						top.layer.open({
+							title: '提示'
+							, content: '请选择需要下载的数据类型'
+						});
+						return false;
+					}
+					window.location.href='${url}/template?type='+type;
+				},
+				btn2: function(index, layero){
+
+					var type = top.$("#concealType").val();
+					if(null == type || "" == type) {
+						top.layer.open({
+							title: '提示'
+							, content: '请选择导入的数据类型'
+						});
+						return false;
+					}
+
+					var inputForm =top.$("#importForm2");
+					var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					top.$("#importForm2").submit();
+					top.layer.close(index);
+
+
+					/*var formData = new FormData();
+					formData.append("file",top.$("#uploadFile")[0].files[0]);
+					formData.append("type",top.$("#concealType").val());
+					//alert(top.$("#concealType").val());
+					$.ajax({
+						type: 'post',
+						url: "${url}",
+						data: formData,
+						dataType: "json",
+						cache: false,
+						processData: false,
+						contentType: false,
+					}).success(function (result) {
+						if(result.code == 0){
+							if("sh" == result.data[0].type){
+								genRow(result.data);
+							}else if("js" == result.data[0].type){
+								genWorkSiteLevelRow(result.data);
+							}
+						}else {
+							top.layer.msg("导入文件异常："+result.message);
+						}
+					}).error(function () {
+						top.layer.msg("导入文件失败！");
+					});*/
+					top.layer.close(index);
+				},
+				btn3: function(index){
+					top.layer.close(index);
+				}
+			});
+		});
+
+	});
+
+</script>

src/main/webapp/webpage/modules/sys/adminModifyPwdForm.jsp

@@ -0,0 +1,64 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>修改密码</title>
+	<meta name="decorator" content="default"/>
+    <script src="${ctxStatic}/jquery/md5.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function() {
+
+            $.validator.addMethod("checkPassword",function(value,element,params){
+                var regExp = /^[0-9A-Za-z]{6,12}$/;
+                return this.optional(element)||(regExp.test(value));
+            },"密码必须为6-12位数字或大小写字母!");
+            $("#inputForm").validate({
+                rules : {
+                    newPassword: {
+                        checkPassword: true,
+                    },
+                    confirmNewPassword:{
+                        checkPassword:true
+                    }
+                }
+            });
+		});
+	</script>
+	<style>
+		.form-top{
+			padding-top: 40px;
+			margin-left: 15px;
+			margin-right: 15px;
+		}
+        .help-inline{
+            color: red;
+            font-size: 12px;
+        }
+	</style>
+</head>
+<body>
+	<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/adminModifyPwd"  method="post" class="form-horizontal form-group">
+		<form:hidden path="id"/>
+		<form:hidden path="home"/>
+		<sys:message hideType="1" content="${message}"/>
+		<input type="hidden" id="userId" name="userId" value="${userId}">
+		<div class="container1">
+			<div class="form-top">
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label"><span class="require-item">*</span>新密码：</label>
+					<div class="layui-input-block">
+						<input id="newPassword" placeholder="请输入新密码"  name="newPassword" type="password" value="" maxlength="12" class="form-control layui-input required"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label"><span class="require-item">*</span>确认密码：</label>
+					<div class="layui-input-block">
+						<input id="confirmNewPassword" placeholder="请输入确认密码"  name="confirmNewPassword" type="password" value="" maxlength="12" class="form-control layui-input required" equalTo="#newPassword"/>
+					</div>
+				</div>
+
+			</div>
+		</div>
+	</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -75,6 +75,8 @@
                         setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
                     }
                     return false;
+
+
                 },
                 btn2: function (index) {
 
@@ -82,6 +84,55 @@
             });
         }
 
+        function adminModifuPwd(title,url,width,height,target) {
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: "修改密码",
+                content: url,
+                skin: "two-btns",
+                btn: ['确定', '关闭'],
+                yes: function (index, layero) {
+                    var body = top.layer.getChildFrame('body', index);
+                    var inputForm = $(body).find('#inputForm');
+                    var btn = body.find('#btnSubmit');
+                    var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    inputForm.validate({
+                        rules: {},
+                        messages: {
+                            confirmNewPassword: {equalTo: "输入与上面相同的密码"}
+                        },
+                        submitHandler: function (form) {
+                            loading('正在提交，请稍等...');
+                            form.submit();
+
+                        },
+                        errorContainer: "#messageBox",
+                        errorPlacement: function (error, element) {
+                            $("#messageBox").text("输入有误，请先更正。");
+                            if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                                error.appendTo(element.parent().parent());
+                            } else {
+                                error.insertAfter(element);
+                            }
+                        }
+                    });
+                    if (inputForm.valid()) {
+                        loading("正在提交，请稍等...");
+                        inputForm.submit();
+                        top.layer.close(index);//关闭对话框。
+                    } else {
+                        return;
+                    }
+
+
+                },
+                cancel: function (index) {
+                }
+            });
+        }
+
         function setParentInfo(ids,names,nos,salarys){
             return;
         }
@@ -281,7 +332,7 @@
                     }}*/
                 ,{field:'status',align:'center', title: '员工状态', minWidth:80}
                 ,{field:'entryDate', align:'center',sort:true,title: '入职日期',width:100}
-                ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",width:200,templet:function(d){
                         ////对操作进行初始化
                         var xml = "<div class=\"layui-btn-group\">";
 
@@ -289,6 +340,10 @@
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
 
+                        if(d.canedit != undefined && d.canedit == "1"){
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"adminModifuPwd('修改密码', '${ctx}/sys/user/adminModifyPwdForm?userId="+ d.userId + "','500px','350px')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改密码</a>";
+                        }
+
 
                         if(d.freeze != undefined && d.freeze == "1"){
                             if(d.userLoginFlag == 1){