From 943d8d74ccde975602fbd8630c71e5dad1aaf0e1 Mon Sep 17 00:00:00 2001 From: tamguo Date: Thu, 26 Jul 2018 16:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tamguo/modules/sys/dao/SysUserMapper.java | 2 +- .../tamguo/modules/sys/model/SysUserEntity.java | 5 +++++ .../sys/model/condition/SysUserCondition.java | 7 +++++++ .../modules/sys/service/ISysPostService.java | 8 ++++++++ .../sys/service/impl/SysPostServiceImpl.java | 13 +++++++++++++ .../sys/service/impl/SysUserServiceImpl.java | 1 - ...PostController.java => SysPostController.java} | 2 +- .../tamguo/modules/sys/web/SysUserController.java | 15 +++++++++++++++ .../main/resources/mappers/sys/SysUserMapper.xml | 6 +++++- .../templates/modules/sys/user/list.html | 6 ++---- 10 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java create mode 100644 tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java rename tamguo-oms/src/main/java/com/tamguo/modules/sys/web/{PostController.java => SysPostController.java} (95%) diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java index b3abef3..55e7d64 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java @@ -16,5 +16,5 @@ public interface SysUserMapper extends SuperMapper{ List queryPage(@Param(value="userName")String userName , Page page); List listData(SysUserCondition condition, Pagination page); - + } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java index 00a44d3..93cbc54 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.modules.sys.model.enums.SysUserStatusEnum; @@ -39,10 +40,14 @@ public class SysUserEntity implements Serializable { private String phone; private Date pwdQuestUpdateDate; private String pwdQuestion; + @TableField(value="pwd_question_2") private String pwdQuestion2; + @TableField(value="pwd_question_3") private String pwdQuestion3; private String pwdQuestionAnswer; + @TableField(value="pwd_question_answer_2") private String pwdQuestionAnswer2; + @TableField(value="pwd_question_answer_3") private String pwdQuestionAnswer3; private BigDecimal pwdSecurityLevel; private Date pwdUpdateDate; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java index a31ada6..d57bf7e 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java @@ -17,6 +17,7 @@ public class SysUserCondition { private String companyName; private String postCode; private String status; + private String userType; public Integer getPageNo() { return pageNo; @@ -102,5 +103,11 @@ public class SysUserCondition { public void setStatus(String status) { this.status = status; } + public String getUserType() { + return userType; + } + public void setUserType(String userType) { + this.userType = userType; + } } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java new file mode 100644 index 0000000..d855b96 --- /dev/null +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysPostService.java @@ -0,0 +1,8 @@ +package com.tamguo.modules.sys.service; + +import com.baomidou.mybatisplus.service.IService; +import com.tamguo.modules.sys.model.SysPostEntity; + +public interface ISysPostService extends IService{ + +} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java new file mode 100644 index 0000000..1b52cb6 --- /dev/null +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysPostServiceImpl.java @@ -0,0 +1,13 @@ +package com.tamguo.modules.sys.service.impl; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.tamguo.modules.sys.dao.SysPostMapper; +import com.tamguo.modules.sys.model.SysPostEntity; +import com.tamguo.modules.sys.service.ISysPostService; + +@Service +public class SysPostServiceImpl extends ServiceImpl implements ISysPostService{ + +} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java index 55837b6..475afe1 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java @@ -22,7 +22,6 @@ public class SysUserServiceImpl implements ISysUserService{ return sysUserMapper.queryByLoginCode(loginCode); } - @Transactional(readOnly=false) @Override public Page listData(SysUserCondition condition) { diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/PostController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysPostController.java similarity index 95% rename from tamguo-oms/src/main/java/com/tamguo/modules/sys/web/PostController.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysPostController.java index 7f40513..f4b21e0 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/PostController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysPostController.java @@ -18,7 +18,7 @@ import com.tamguo.modules.sys.utils.Result; @Controller @RequestMapping(path="sys/post") -public class PostController { +public class SysPostController { private final String POST_INDEX_PAGE = "modules/sys/post/index"; private final String POST_UPDATE_PAGE = "modules/sys/post/update"; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java index 03331d1..8c03576 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java @@ -6,10 +6,13 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; +import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; import com.tamguo.modules.sys.model.SysUserEntity; import com.tamguo.modules.sys.model.condition.SysUserCondition; +import com.tamguo.modules.sys.service.IPostService; import com.tamguo.modules.sys.service.ISysUserService; import com.tamguo.modules.sys.utils.Result; @@ -17,8 +20,20 @@ import com.tamguo.modules.sys.utils.Result; @RequestMapping(path="sys/user") public class SysUserController { + private final String USER_LIST_PAGE = "modules/sys/user/list"; + @Autowired private ISysUserService iSysUserService; + @Autowired + private IPostService iPostService; + + @SuppressWarnings("unchecked") + @RequestMapping(path="list") + public ModelAndView list(ModelAndView model) { + model.setViewName(USER_LIST_PAGE); + model.addObject("postList", iPostService.selectList(Condition.create().eq("status", "0"))); + return model; + } @RequestMapping(path="listData",method=RequestMethod.POST) @ResponseBody diff --git a/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml index 4128d52..f22caa6 100644 --- a/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml +++ b/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml @@ -28,6 +28,7 @@ u.`status` FROM sys_user u + LEFT JOIN sys_user_post up ON u.user_code = up.user_code WHERE 1 = 1 @@ -61,11 +62,14 @@ and u.company_name = #{companyName} - and u.post_code = #{postCode} + and up.post_code = #{postCode} and u.status = #{status} + + and u.user_type = #{userType} + \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html b/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html index 9da011e..ee7c1ef 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html @@ -42,6 +42,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
+
@@ -253,10 +254,7 @@ $("#companyButton,#companyName").click(function(){