From 68590eabef1d27d9d9c4c5ede4a71831536621e3 Mon Sep 17 00:00:00 2001 From: "Crystal.Sea" Date: Sat, 26 Dec 2020 18:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E4=BB=BB=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit USERINFO_ADJUNCT --- .../org/maxkey/domain/UserInfoAdjoint.java | 288 ++++++++++++++++++ .../mapper/UserInfoAdjointMapper.java | 31 ++ .../service/UserInfoAdjointService.java | 46 +++ .../xml/mysql/UserInfoAdjointMapper.xml | 49 +++ .../web/contorller/UserAdjointController.java | 145 +++++++++ .../resources/messages/message.properties | 1 + .../resources/messages/message_en.properties | 2 +- .../messages/message_zh_CN.properties | 1 + .../src/main/resources/static/css/base.css | 8 +- .../static/jquery/platform.common.js | 11 +- .../views/userinfo/userInfoAdjointAdd.ftl | 167 ++++++++++ .../views/userinfo/userInfoAdjointUpdate.ftl | 165 ++++++++++ .../views/userinfo/userinfoAdjointList.ftl | 75 +++++ .../templates/views/userinfo/usersList.ftl | 46 ++- 14 files changed, 1019 insertions(+), 16 deletions(-) create mode 100644 maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java create mode 100644 maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java create mode 100644 maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java create mode 100644 maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml create mode 100644 maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserAdjointController.java create mode 100644 maxkey-web-manage/src/main/resources/templates/views/userinfo/userInfoAdjointAdd.ftl create mode 100644 maxkey-web-manage/src/main/resources/templates/views/userinfo/userInfoAdjointUpdate.ftl create mode 100644 maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoAdjointList.ftl diff --git a/maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java b/maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java new file mode 100644 index 000000000..3e743e155 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java @@ -0,0 +1,288 @@ +package org.maxkey.domain; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.apache.mybatis.jpa.persistence.JpaBaseDomain; + +@Entity +@Table(name = "MXK_USERINFO_ADJUNCT") +public class UserInfoAdjoint extends JpaBaseDomain { + + /** + * + */ + private static final long serialVersionUID = -8634054312223379561L; + + @Id + @Column + @GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid") + String id; + + protected String displayName; + @Column + protected String userId; + + // for work + @Column + protected String workCountry; + @Column + protected String workRegion;// province; + @Column + protected String workLocality;// city; + @Column + protected String workStreetAddress; + @Column + protected String workAddressFormatted; + @Column + protected String workEmail; + @Column + protected String workPhoneNumber; + @Column + protected String workPostalCode; + @Column + protected String workFax; + + @Column + protected String costCenter; + @Column + protected String organization; + @Column + protected String division; + @Column + protected String departmentId; + @Column + protected String department; + @Column + protected String jobTitle; + @Column + protected String jobLevel; + @Column + protected String managerId; + @Column + protected String manager; + @Column + protected String assistantId; + @Column + protected String assistant; + @Column + protected String entryDate; + @Column + protected String quitDate; + public UserInfoAdjoint() { + super(); + // TODO Auto-generated constructor stub + } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getDisplayName() { + return displayName; + } + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + public String getWorkCountry() { + return workCountry; + } + public void setWorkCountry(String workCountry) { + this.workCountry = workCountry; + } + public String getWorkRegion() { + return workRegion; + } + public void setWorkRegion(String workRegion) { + this.workRegion = workRegion; + } + public String getWorkLocality() { + return workLocality; + } + public void setWorkLocality(String workLocality) { + this.workLocality = workLocality; + } + public String getWorkStreetAddress() { + return workStreetAddress; + } + public void setWorkStreetAddress(String workStreetAddress) { + this.workStreetAddress = workStreetAddress; + } + public String getWorkAddressFormatted() { + return workAddressFormatted; + } + public void setWorkAddressFormatted(String workAddressFormatted) { + this.workAddressFormatted = workAddressFormatted; + } + public String getWorkEmail() { + return workEmail; + } + public void setWorkEmail(String workEmail) { + this.workEmail = workEmail; + } + public String getWorkPhoneNumber() { + return workPhoneNumber; + } + public void setWorkPhoneNumber(String workPhoneNumber) { + this.workPhoneNumber = workPhoneNumber; + } + public String getWorkPostalCode() { + return workPostalCode; + } + public void setWorkPostalCode(String workPostalCode) { + this.workPostalCode = workPostalCode; + } + public String getWorkFax() { + return workFax; + } + public void setWorkFax(String workFax) { + this.workFax = workFax; + } + public String getCostCenter() { + return costCenter; + } + public void setCostCenter(String costCenter) { + this.costCenter = costCenter; + } + public String getOrganization() { + return organization; + } + public void setOrganization(String organization) { + this.organization = organization; + } + public String getDivision() { + return division; + } + public void setDivision(String division) { + this.division = division; + } + public String getDepartmentId() { + return departmentId; + } + public void setDepartmentId(String departmentId) { + this.departmentId = departmentId; + } + public String getDepartment() { + return department; + } + public void setDepartment(String department) { + this.department = department; + } + public String getJobTitle() { + return jobTitle; + } + public void setJobTitle(String jobTitle) { + this.jobTitle = jobTitle; + } + public String getJobLevel() { + return jobLevel; + } + public void setJobLevel(String jobLevel) { + this.jobLevel = jobLevel; + } + public String getManagerId() { + return managerId; + } + public void setManagerId(String managerId) { + this.managerId = managerId; + } + public String getManager() { + return manager; + } + public void setManager(String manager) { + this.manager = manager; + } + public String getAssistantId() { + return assistantId; + } + public void setAssistantId(String assistantId) { + this.assistantId = assistantId; + } + public String getAssistant() { + return assistant; + } + public void setAssistant(String assistant) { + this.assistant = assistant; + } + public String getEntryDate() { + return entryDate; + } + public void setEntryDate(String entryDate) { + this.entryDate = entryDate; + } + public String getQuitDate() { + return quitDate; + } + public void setQuitDate(String quitDate) { + this.quitDate = quitDate; + } + + + public String getUserId() { + return userId; + } + public void setUserId(String userId) { + this.userId = userId; + } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("UserInfoAdjoint [id="); + builder.append(id); + builder.append(", displayName="); + builder.append(displayName); + builder.append(", workCountry="); + builder.append(workCountry); + builder.append(", workRegion="); + builder.append(workRegion); + builder.append(", workLocality="); + builder.append(workLocality); + builder.append(", workStreetAddress="); + builder.append(workStreetAddress); + builder.append(", workAddressFormatted="); + builder.append(workAddressFormatted); + builder.append(", workEmail="); + builder.append(workEmail); + builder.append(", workPhoneNumber="); + builder.append(workPhoneNumber); + builder.append(", workPostalCode="); + builder.append(workPostalCode); + builder.append(", workFax="); + builder.append(workFax); + builder.append(", costCenter="); + builder.append(costCenter); + builder.append(", organization="); + builder.append(organization); + builder.append(", division="); + builder.append(division); + builder.append(", departmentId="); + builder.append(departmentId); + builder.append(", department="); + builder.append(department); + builder.append(", jobTitle="); + builder.append(jobTitle); + builder.append(", jobLevel="); + builder.append(jobLevel); + builder.append(", managerId="); + builder.append(managerId); + builder.append(", manager="); + builder.append(manager); + builder.append(", assistantId="); + builder.append(assistantId); + builder.append(", assistant="); + builder.append(assistant); + builder.append(", entryDate="); + builder.append(entryDate); + builder.append(", quitDate="); + builder.append(quitDate); + builder.append("]"); + return builder.toString(); + } + + +} diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java new file mode 100644 index 000000000..edfe6ed8e --- /dev/null +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java @@ -0,0 +1,31 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.persistence.mapper; + +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.domain.UserInfoAdjoint; + + +/** + * @author Crystal.Sea + * + */ +public interface UserInfoAdjointMapper extends IJpaBaseMapper{ + + +} diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java new file mode 100644 index 000000000..3abd187f0 --- /dev/null +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoAdjointService.java @@ -0,0 +1,46 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.persistence.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.domain.UserInfoAdjoint; +import org.maxkey.persistence.mapper.RolesMapper; +import org.maxkey.persistence.mapper.UserInfoAdjointMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +@Service +public class UserInfoAdjointService extends JpaBaseService{ + final static Logger _logger = LoggerFactory.getLogger(UserInfoAdjointService.class); + + + public UserInfoAdjointService() { + super(UserInfoAdjointMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public UserInfoAdjointMapper getMapper() { + return (UserInfoAdjointMapper)super.getMapper(); + } + + +} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml new file mode 100644 index 000000000..cc03ce866 --- /dev/null +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoAdjointMapper.xml @@ -0,0 +1,49 @@ + + + + + + + AND ID = #{id} + + + AND USERID = #{userId} + + + + + + + + + + UPDATE MXK_USERINFO_ADJUNCT SET + STATUS = '2' + WHERE 1 = 1 + + AND ID = #{id} + + + ADN NAME = #{name} + + + + + + UPDATE MXK_USERINFO_ADJUNCT SET STATUS='2' WHERE ID IN + + #{item} + + + + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserAdjointController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserAdjointController.java new file mode 100644 index 000000000..5c895374a --- /dev/null +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserAdjointController.java @@ -0,0 +1,145 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.web.contorller; + +import org.apache.mybatis.jpa.persistence.JpaPageResults; +import org.maxkey.constants.ConstantsOperateMessage; +import org.maxkey.domain.UserInfoAdjoint; +import org.maxkey.persistence.service.UserInfoAdjointService; +import org.maxkey.web.WebContext; +import org.maxkey.web.message.Message; +import org.maxkey.web.message.MessageType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + + +@Controller +@RequestMapping(value={"/useradjoint"}) +public class UserAdjointController { + final static Logger _logger = LoggerFactory.getLogger(UserAdjointController.class); + + @Autowired + @Qualifier("userInfoAdjointService") + UserInfoAdjointService userInfoAdjointService; + + + @RequestMapping(value={"/list/{userId}"}) + public ModelAndView userinfoAdjointList(@PathVariable("userId") String userId){ + ModelAndView modelAndView=new ModelAndView("userinfo/userinfoAdjointList"); + modelAndView.addObject("userId", userId); + return modelAndView; + } + + + @RequestMapping(value = { "/grid" }) + @ResponseBody + public JpaPageResults queryDataGrid(@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint) { + _logger.debug(""+userInfoAdjoint); + return userInfoAdjointService.queryPageResults(userInfoAdjoint); + } + + + @RequestMapping(value = { "/forwardAdd/{userId}" }) + public ModelAndView forwardAdd(@PathVariable("userId") String userId) { + ModelAndView modelAndView=new ModelAndView("userinfo/userinfoAdjointAdd"); + modelAndView.addObject("userId", userId); + return modelAndView; + } + + @RequestMapping(value = { "/forwardUpdate/{id}" }) + public ModelAndView forwardUpdate(@PathVariable("id") String id) { + ModelAndView modelAndView=new ModelAndView("userinfo/userinfoAdjointUpdate"); + UserInfoAdjoint userInfoAdjoint=userInfoAdjointService.get(id); + modelAndView.addObject("model",userInfoAdjoint); + return modelAndView; + } + + @ResponseBody + @RequestMapping(value={"/add"}) + public Message insert(@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint) { + _logger.debug("-Add :" + userInfoAdjoint); + + if (userInfoAdjointService.insert(userInfoAdjoint)) { + return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.success); + + } else { + return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.error); + } + + } + + /** + * 查询 + * @param group + * @return + */ + @ResponseBody + @RequestMapping(value={"/query"}) + public Message query(@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint) { + _logger.debug("-query :" + userInfoAdjoint); + if (userInfoAdjointService.load(userInfoAdjoint)!=null) { + return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.success); + + } else { + return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_ERROR),MessageType.error); + } + + } + + /** + * 修改 + * @param group + * @return + */ + @ResponseBody + @RequestMapping(value={"/update"}) + public Message update(@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint) { + _logger.debug("-update userInfoAdjoint :" + userInfoAdjoint); + + if (userInfoAdjointService.update(userInfoAdjoint)) { + return new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_SUCCESS),MessageType.success); + + } else { + return new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_ERROR),MessageType.error); + } + + } + + + @ResponseBody + @RequestMapping(value={"/delete"}) + public Message delete(@ModelAttribute("userInfoAdjoint") UserInfoAdjoint userInfoAdjoint) { + _logger.debug("-delete group :" + userInfoAdjoint); + + if (userInfoAdjointService.remove(userInfoAdjoint.getId())) { + return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success); + + } else { + return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.error); + } + + } +} diff --git a/maxkey-web-manage/src/main/resources/messages/message.properties b/maxkey-web-manage/src/main/resources/messages/message.properties index cde2b688b..3858e6282 100644 --- a/maxkey-web-manage/src/main/resources/messages/message.properties +++ b/maxkey-web-manage/src/main/resources/messages/message.properties @@ -467,6 +467,7 @@ button.text.generate=\u751f\u6210 button.text.view=\u67e5\u770b button.text.hidden=\u9690\u85cf button.text.import=\u5bfc\u5165 +button.text.adjunct=\u517c\u4efb\u673a\u6784 log.loginhistory.id=\u7f16\u53f7 log.loginhistory.sessionId=\u4f1a\u8bdd diff --git a/maxkey-web-manage/src/main/resources/messages/message_en.properties b/maxkey-web-manage/src/main/resources/messages/message_en.properties index 65d54ef7e..643ee2331 100644 --- a/maxkey-web-manage/src/main/resources/messages/message_en.properties +++ b/maxkey-web-manage/src/main/resources/messages/message_en.properties @@ -466,7 +466,7 @@ button.text.generate=Generate button.text.view=View button.text.hidden=Hidden button.text.import=Import - +button.text.adjunct=Adjoint Depts log.loginhistory.id=id log.loginhistory.sessionId=sessionId diff --git a/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties b/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties index fb3fd6aca..d6eee9c65 100644 --- a/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties +++ b/maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties @@ -468,6 +468,7 @@ button.text.generate=\u751f\u6210 button.text.view=\u67e5\u770b button.text.hidden=\u9690\u85cf button.text.import=\u5bfc\u5165 +button.text.adjunct=\u517c\u4efb\u673a\u6784 log.loginhistory.id=\u7f16\u53f7 log.loginhistory.sessionId=\u4f1a\u8bdd diff --git a/maxkey-web-manage/src/main/resources/static/css/base.css b/maxkey-web-manage/src/main/resources/static/css/base.css index 1e16b2d36..c5b16a267 100644 --- a/maxkey-web-manage/src/main/resources/static/css/base.css +++ b/maxkey-web-manage/src/main/resources/static/css/base.css @@ -309,7 +309,13 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li { } #tool_box_right { - height:32px; + height:46px; + text-align: right; + padding-right: 10px; + width:484px; +} +#tool_box_right_more{ + height:46px; text-align: right; padding-right: 10px; width:484px; diff --git a/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js b/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js index 3ad05a9ed..263116d38 100644 --- a/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js +++ b/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js @@ -311,7 +311,12 @@ $(function(){ var url=$(this).attr("wurl"); + if($(this).attr("ref")){ + if($("#"+$(this).attr("ref")).val()==""){ + $.alert({content:$.platform.messages.select.alertText}); + return; + } url=url+"/"+$("#"+$(this).attr("ref")).val(); } @@ -375,7 +380,8 @@ $(function(){ if($(this).attr("target")&&$(this).attr("target")=="forward"){ if($(this).attr("ref")){ if($("#"+$(this).attr("ref")+"").val()==""){ - $.forward($(this).attr("wurl")); + $.alert({content:$.platform.messages.select.alertText}); + return; }else{ $.forward($(this).attr("wurl")+"/"+$("#"+$(this).attr("ref")+"").val()); } @@ -392,7 +398,8 @@ $(function(){ }; if($(this).attr("ref")){ if($("#"+$(this).attr("ref")+"").val()==""){ - settings.url=$(this).attr("wurl"); + $.alert({content:$.platform.messages.select.alertText}); + return; }else{ settings.url=$(this).attr("wurl")+"/"+$("#"+$(this).attr("ref")+"").val(); } diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userInfoAdjointAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userInfoAdjointAdd.ftl new file mode 100644 index 000000000..b35889dbe --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userInfoAdjointAdd.ftl @@ -0,0 +1,167 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<@locale code="userinfo.organization" />： + + <@locale code="userinfo.division" />： + +
<@locale code="userinfo.department" />： + + + + <@locale code="userinfo.costCenter" />： + +
<@locale code="userinfo.jobTitle" />： + + <@locale code="userinfo.jobLevel" />： + +
<@locale code="userinfo.manager" />： + + + <@locale code="userinfo.assistant" />： + + +
<@locale code="userinfo.entryDate" />： + + <@locale code="userinfo.quitDate" />： + +
  +
<@locale code="userinfo.workCountry" />： + + <@locale code="userinfo.workRegion" />： + +
<@locale code="userinfo.workLocality" />： + + <@locale code="userinfo.workStreetAddress" />： + +
<@locale code="userinfo.workPostalCode" />： + + <@locale code="userinfo.workFax" />： + +
<@locale code="userinfo.workPhoneNumber" />： + + <@locale code="userinfo.workEmail" />： + +
  +
+ +
+
+
+
+
+ + + "/> +
+
+
+
+ + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userInfoAdjointUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userInfoAdjointUpdate.ftl new file mode 100644 index 000000000..6e90703fd --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userInfoAdjointUpdate.ftl @@ -0,0 +1,165 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<@locale code="userinfo.organization" />： + + <@locale code="userinfo.division" />： + +
<@locale code="userinfo.department" />： + + + + <@locale code="userinfo.costCenter" />： + +
<@locale code="userinfo.jobTitle" />： + + <@locale code="userinfo.jobLevel" />： + +
<@locale code="userinfo.manager" />： + + + <@locale code="userinfo.assistant" />： + + +
<@locale code="userinfo.entryDate" />： + + <@locale code="userinfo.quitDate" />： + +
  +
<@locale code="userinfo.workCountry" />： + + <@locale code="userinfo.workRegion" />： + +
<@locale code="userinfo.workLocality" />： + + <@locale code="userinfo.workStreetAddress" />： + +
<@locale code="userinfo.workPostalCode" />： + + <@locale code="userinfo.workFax" />： + +
<@locale code="userinfo.workPhoneNumber" />： + + <@locale code="userinfo.workEmail" />： + +
  +
+ +
+
+
+
+
+ + + + "/> +
+
+
+
+ + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoAdjointList.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoAdjointList.ftl new file mode 100644 index 000000000..6591402af --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userinfoAdjointList.ftl @@ -0,0 +1,75 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + +
+ " + wurl="<@base/>/useradjoint/forwardAdd/${userId!}" + target="forward"> + + " + wurl="<@base/>/useradjoint/forwardUpdate" + target="forward"> + " + wurl="<@base/>/useradjoint/delete" /> + + " > +
+ + + + + +
+ + + + + + + + + + + + +
<@locale code="userinfo.id"/><@locale code="userinfo.organization"/><@locale code="userinfo.department"/><@locale code="userinfo.jobTitle"/><@locale code="userinfo.jobLevel"/>
+
+ + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl index 8992d01e2..3e7f11a34 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl @@ -19,6 +19,14 @@ function onClick (event, treeId, treeNode) { $("#searchBtn").click(); } + +//adjunctUserIdRef +function beforeWindow( ){ + if($('#datagrid').bootstrapTable('getSelections')){ + $("#adjunctUserIdRef").val($('#datagrid').bootstrapTable('getSelections')[0].id); + } +} + $(function () { @@ -145,6 +153,16 @@ $(function () { $("#changepwdBtnHidden").click(); }); + + $("#moreBtn").on("click",function(){ + var node=$("#tool_box_right_more"); + if(node.is(':hidden')){　　 + 　　node.show();　 + }else{ + 　　node.hide(); + } + }); + }); @@ -199,17 +217,7 @@ $(function () { -
- " /> - " - wurl="<@base/>/userinfo/forwardChangePassword" wwidth="600px" wheight="250px" /> - - " - wurl="<@base/>/userinfo/import" wwidth="400px" wheight="250px" /> - - +
" wurl="<@base/>/userinfo/forwardAdd" wwidth="960" @@ -221,9 +229,23 @@ $(function () { wwidth="960" wheight="600" target="window"> - " wurl="<@base/>/userinfo/delete" /> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
+