Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/controller/UserInfoController.java

@@ -1,16 +1,17 @@
 package com.jeeplus.test.user.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.user.domain.SysUserInfo;
-import com.jeeplus.test.user.domain.dto.UserInfoDetailDto;
-import com.jeeplus.test.user.domain.dto.UserListDto;
+import com.jeeplus.test.user.service.dto.UserInfoDetailDto;
 import com.jeeplus.test.user.service.UserInfoService;
-import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
-import com.jeeplus.test.workClientInfo.domain.dto.PageInfoDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -28,9 +29,11 @@ public class UserInfoController {
      * 用户信息列表
      */
     @ApiOperation(value = "用户信息列表")
-    @PostMapping(value = "/list")
-    public Page<SysUserInfo> list(Page<SysUserInfo> page, @RequestBody UserListDto userListDto) {
-        return userInfoService.list(userListDto, page);
+    @GetMapping(value = "/list")
+    public ResponseEntity<IPage<SysUserInfo>> list(Page<SysUserInfo> page, SysUserInfo sysUserInfo) throws Exception{
+        QueryWrapper<SysUserInfo> sysUserInfoQueryWrapper = QueryWrapperGenerator.buildQueryCondition(sysUserInfo, SysUserInfo.class);
+        IPage<SysUserInfo> list = userInfoService.list(page, sysUserInfoQueryWrapper);
+        return ResponseEntity.ok (list);
     }
 
     @ApiOperation(value = "删除用户信息")
@@ -47,11 +50,11 @@ public class UserInfoController {
 
     @ApiOperation(value = "保存、更新数据")
     @PostMapping(value = "/save")
-    public String save(@RequestBody UserInfoDetailDto userInfoDetailDto) {
+    public ResponseEntity save(@RequestBody UserInfoDetailDto userInfoDetailDto) {
         if (StringUtils.isEmpty(userInfoDetailDto.getId())) {
-            return userInfoService.add(userInfoDetailDto);
+            return ResponseEntity.ok(userInfoService.add(userInfoDetailDto));
         }else {
-            return userInfoService.modify(userInfoDetailDto);
+            return ResponseEntity.ok(userInfoService.modify(userInfoDetailDto));
         }
     }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserAchievement.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_achievement")
-public class SysUserAchievement implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserAchievement extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -65,7 +40,7 @@ public class SysUserAchievement implements Serializable {
 
     // 担任职务
     @TableField("post")
-    private Short post;
+    private String post;
 
     // 参与内容
     @TableField("content")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserArchives.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_archives")
-public class SysUserArchives implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserArchives extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserCertificate.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_certificate")
-public class SysUserCertificate implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserCertificate extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -57,11 +32,11 @@ public class SysUserCertificate implements Serializable {
 
     // 注册日期
     @TableField("regine_date")
-    private Date regineDate;
+    private String regineDate;
 
     // 发证日期
     @TableField("issue_date")
-    private Date issueDate;
+    private String issueDate;
 
     // 发证机关
     @TableField("Issuing_authority")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserContract.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_contract")
-public class SysUserContract implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // 主键
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserContract extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -49,7 +24,7 @@ public class SysUserContract implements Serializable {
 
     // 合同类型
     @TableField("contract_type")
-    private Short contractType;
+    private String contractType;
 
     // 合同编号
     @TableField("contract_number")
@@ -61,19 +36,19 @@ public class SysUserContract implements Serializable {
 
     // 合同起始日期
     @TableField("contract_begin_date")
-    private Date contractBeginDate;
+    private String contractBeginDate;
 
     // 合同终止日期
     @TableField("contract_end_date")
-    private Date contractEndDate;
+    private String contractEndDate;
 
     // 试用期结束日期
     @TableField("probation_end_date")
-    private Date probationEndDate;
+    private String probationEndDate;
 
     // 办理日期
     @TableField("processing_date")
-    private Date processingDate;
+    private String processingDate;
 
     // 文件地址
     @TableField("file_url")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserDuties.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_duties")
-public class SysUserDuties implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserDuties extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -53,11 +28,11 @@ public class SysUserDuties implements Serializable {
 
     // 任职开始日期
     @TableField("post_begin_date")
-    private Date postBeginDate;
+    private String postBeginDate;
 
     // 任职结束日期
     @TableField("post_end_date")
-    private Date postEndDate;
+    private String postEndDate;
 
     // 任职机构
     @TableField("post_office")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserEducation.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_education")
-public class SysUserEducation implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // 主键
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserEducation extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -57,23 +32,23 @@ public class SysUserEducation implements Serializable {
 
     // 学历
     @TableField("education")
-    private Integer education;
+    private String education;
 
     // 学位
     @TableField("degree")
-    private Integer degree;
+    private String degree;
 
     // 学历性质
     @TableField("education_type")
-    private Integer educationType;
+    private String educationType;
 
     // 入学日期
     @TableField("entrance_date")
-    private Date entranceDate;
+    private String entranceDate;
 
     // 毕业日期
     @TableField("graduation_date")
-    private Date graduationDate;
+    private String graduationDate;
 
     // 学历证书地址
     @TableField("education_certificate_url")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserFamily.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_family")
-public class SysUserFamily implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserFamily extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -61,7 +36,7 @@ public class SysUserFamily implements Serializable {
 
     // 成员性别
     @TableField("sex")
-    private Short sex;
+    private String sex;
 
     // 成员联系方式
     @TableField("linkman_phone")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserInfo.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.query.Query;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,49 +17,24 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_info")
-public class SysUserInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // 主键
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserInfo extends BaseEntity {
 
     // 工号
     @TableField("jobNo")
     private String jobNo;
 
     // 姓名
+    @Query
     @TableField("name")
     private String name;
 
     // 性别
     @TableField("sex")
-    private Short sex;
+    private String sex;
 
     // 民族
     @TableField("nation")
-    private Short nation;
+    private String nation;
 
     // 身份证号码
     @TableField("id_card")
@@ -69,13 +46,14 @@ public class SysUserInfo implements Serializable {
 
     // 出生日期
     @TableField("birthday")
-    private Date birthday;
+    private String birthday;
 
     // 电子邮箱
     @TableField("e_mail")
     private String eMail;
 
     // 移动电话
+    @Query
     @TableField("mobile_phone")
     private String mobilePhone;
 
@@ -85,7 +63,7 @@ public class SysUserInfo implements Serializable {
 
     // 员工状态
     @TableField("user_type")
-    private Short userType;
+    private String userType;
 
     // 银行卡号
     @TableField("bank_number")
@@ -93,15 +71,15 @@ public class SysUserInfo implements Serializable {
 
     // 婚姻状态
     @TableField("marital_status")
-    private Short maritalStatus;
+    private String maritalStatus;
 
     // 政治面貌
     @TableField("political_outlook")
-    private Short politicalOutlook;
+    private String politicalOutlook;
 
     // 籍贯
     @TableField("native_place")
-    private Byte nativePlace;
+    private String nativePlace;
 
     // 户口所在地
     @TableField("registered_residence")
@@ -133,7 +111,7 @@ public class SysUserInfo implements Serializable {
 
     // 入职时间
     @TableField("entry_date")
-    private Date entryDate;
+    private String entryDate;
 
     // 试用岗位
     @TableField("probation_position")
@@ -145,7 +123,7 @@ public class SysUserInfo implements Serializable {
 
     // 试用期结束日期
     @TableField("probation_end_date")
-    private Date probationEndDate;
+    private String probationEndDate;
 
     // 所属部门
     @TableField("department")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserLanguages.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_languages")
-public class SysUserLanguages implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserLanguages extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -61,7 +36,7 @@ public class SysUserLanguages implements Serializable {
 
     // 获证日期
     @TableField("get_date")
-    private Date getDate;
+    private String getDate;
 
     // 文件url
     @TableField("file_url")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserRewards.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_rewards")
-public class SysUserRewards implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserRewards extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -49,7 +24,7 @@ public class SysUserRewards implements Serializable {
 
     // 奖惩类型
     @TableField("rewards_type")
-    private Short rewardsType;
+    private String rewardsType;
 
     // 奖惩名称
     @TableField("rewards_name")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserTitle.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_title")
-public class SysUserTitle implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserTitle extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -57,7 +32,7 @@ public class SysUserTitle implements Serializable {
 
     // 取得日期
     @TableField("get_date")
-    private Date getDate;
+    private String getDate;
 
     // 取得途径
     @TableField("get_access")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserTrain.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_train")
-public class SysUserTrain implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // id
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserTrain extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -61,15 +36,15 @@ public class SysUserTrain implements Serializable {
 
     // 培训起始日期
     @TableField("train_begin_date")
-    private Date trainBeginDate;
+    private String trainBeginDate;
 
     // 培训终止日期
     @TableField("train_end_date")
-    private Date trainEndDate;
+    private String trainEndDate;
 
     // 培训类型
     @TableField("train_level")
-    private Short trainLevel;
+    private String trainLevel;
 
     // 学时
     @TableField("time")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/SysUserWork.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -15,33 +16,7 @@ import java.util.Date;
  */
 @Data
 @TableName("sys_user_work")
-public class SysUserWork implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // 主键
-    @TableField("id")
-    private String id;
-
-    // 创建者
-    @TableField("create_by")
-    private String createBy;
-
-    // 创建时间
-    @TableField("create_date")
-    private Date createDate;
-
-    // 更新者
-    @TableField("update_by")
-    private String updateBy;
-
-    // 更新时间
-    @TableField("update_date")
-    private Date updateDate;
-
-    // 逻辑删除标记
-    @TableLogic
-    @TableField("del_flag")
-    private String delFlag;
+public class SysUserWork extends BaseEntity {
 
     // 用户信息id
     @TableField("user_info_id")
@@ -61,11 +36,11 @@ public class SysUserWork implements Serializable {
 
     // 起始日期
     @TableField("begin_date")
-    private Date beginDate;
+    private String beginDate;
 
     // 终止日期
     @TableField("end_date")
-    private Date endDate;
+    private String endDate;
 
     // 证明人
     @TableField("witness")

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/mapper/SysUserInfoMapper.java

@@ -1,15 +1,15 @@
 package com.jeeplus.test.user.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.test.user.domain.SysUserInfo;
 import org.apache.ibatis.annotations.Param;
 
 public interface SysUserInfoMapper extends BaseMapper<SysUserInfo> {
 
-    Page<SysUserInfo> findPageList(Page<SysUserInfo> page,
-                                   @Param("name") String name,
-                                   @Param("mobilePhone") String mobilePhone,
-                                   @Param("userStatus") String USER_STATUS);
+    IPage<SysUserInfo> findPageList(Page<SysUserInfo> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("userStatus") String userStatus);
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/mapper/xml/SysUserInfoMapper.xml

@@ -12,16 +12,11 @@
 			(SELECT NAME FROM sys_office b WHERE b.id = a.department) AS department,
 			(SELECT NAME FROM sys_role c WHERE c.id = a.position) AS position,
 			highest_education,
-			(SELECT e.label FROM sys_dict_type d LEFT JOIN sys_dict_value e ON d.id = e.dict_type_id WHERE d.type = #{userStatus} AND e.`value` = a.user_type) AS user_status
+			(SELECT e.label FROM sys_dict_type d LEFT JOIN sys_dict_value e ON d.id = e.dict_type_id WHERE d.type = #{userStatus} AND e.`value` = a.user_type) AS user_status,
+			entry_date
 		FROM
 			sys_user_info a
-		WHERE a.del_flag = 0
-		<if test="name != null and name != ''">
-			AND `name` LIKE CONCAT('%',#{name},'%')
-		</if>
-		<if test="mobilePhone != null and mobilePhone !=''">
-			AND mobile_phone LIKE CONCAT('%',#{mobilePhone},'%')
-		</if>
+		${ew.customSqlSegment}
 		ORDER BY update_date DESC
 	</select>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/service/UserInfoService.java

@@ -1,14 +1,17 @@
 package com.jeeplus.test.user.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.user.domain.*;
-import com.jeeplus.test.user.domain.dto.UserInfoDetailDto;
-import com.jeeplus.test.user.domain.dto.UserListDto;
+import com.jeeplus.test.user.service.dto.UserInfoDetailDto;
+import com.jeeplus.test.user.service.dto.UserListDto;
 import com.jeeplus.test.user.mapper.*;
+import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,12 +53,14 @@ public class UserInfoService {
 
     /**
      * 用户信息列表
-     * @param userListDto
      * @param page
+     * @param queryWrapper
      * @return
      */
-    public Page<SysUserInfo> list(UserListDto userListDto, Page<SysUserInfo> page) {
-        return sysUserInfoMapper.findPageList(page,userListDto.getName(),userListDto.getMobilePhone(),USER_STATUS);
+    public IPage<SysUserInfo> list(Page<SysUserInfo> page, QueryWrapper<SysUserInfo> queryWrapper) {
+        queryWrapper.eq("a.del_flag",0);
+        IPage<SysUserInfo> pageList = sysUserInfoMapper.findPageList(page, queryWrapper, USER_STATUS);
+        return pageList;
     }
 
     /**
@@ -186,7 +191,7 @@ public class UserInfoService {
         sysUserInfo.setCreateDate(new Date());
         sysUserInfo.setUpdateBy(dto.getId());
         sysUserInfo.setUpdateDate(new Date());
-        sysUserInfo.setDelFlag("0");
+        sysUserInfo.setDelFlag(0);
         sysUserInfoMapper.insert(sysUserInfo);
         //用户教育经历
         if (CollectionUtils.isNotEmpty(detailDto.getSysUserEducations())) {
@@ -197,7 +202,7 @@ public class UserInfoService {
                 education.setCreateDate(new Date());
                 education.setUpdateBy(dto.getId());
                 education.setUpdateDate(new Date());
-                education.setDelFlag("0");
+                education.setDelFlag(0);
                 sysUserEducationMapper.insert(education);
             }
          }
@@ -210,7 +215,7 @@ public class UserInfoService {
                 contract.setCreateDate(new Date());
                 contract.setUpdateBy(dto.getId());
                 contract.setUpdateDate(new Date());
-                contract.setDelFlag("0");
+                contract.setDelFlag(0);
                 sysUserContractMapper.insert(contract);
             }
         }
@@ -223,7 +228,7 @@ public class UserInfoService {
                 languages.setCreateDate(new Date());
                 languages.setUpdateBy(dto.getId());
                 languages.setUpdateDate(new Date());
-                languages.setDelFlag("0");
+                languages.setDelFlag(0);
                 sysUserLanguagesMapper.insert(languages);
             }
         }
@@ -236,7 +241,7 @@ public class UserInfoService {
                 work.setCreateDate(new Date());
                 work.setUpdateBy(dto.getId());
                 work.setUpdateDate(new Date());
-                work.setDelFlag("0");
+                work.setDelFlag(0);
                 sysUserWorkMapper.insert(work);
             }
         }
@@ -249,7 +254,7 @@ public class UserInfoService {
                 certificate.setCreateDate(new Date());
                 certificate.setUpdateBy(dto.getId());
                 certificate.setUpdateDate(new Date());
-                certificate.setDelFlag("0");
+                certificate.setDelFlag(0);
                 sysUserCertificateMapper.insert(certificate);
             }
         }
@@ -262,7 +267,7 @@ public class UserInfoService {
                 title.setCreateDate(new Date());
                 title.setUpdateBy(dto.getId());
                 title.setUpdateDate(new Date());
-                title.setDelFlag("0");
+                title.setDelFlag(0);
                 sysUserTitleMapper.insert(title);
             }
         }
@@ -275,7 +280,7 @@ public class UserInfoService {
                 family.setCreateDate(new Date());
                 family.setUpdateBy(dto.getId());
                 family.setUpdateDate(new Date());
-                family.setDelFlag("0");
+                family.setDelFlag(0);
                 sysUserFamilyMapper.insert(family);
             }
         }
@@ -288,7 +293,7 @@ public class UserInfoService {
                 train.setCreateDate(new Date());
                 train.setUpdateBy(dto.getId());
                 train.setUpdateDate(new Date());
-                train.setDelFlag("0");
+                train.setDelFlag(0);
                 sysUserTrainMapper.insert(train);
             }
         }
@@ -301,7 +306,7 @@ public class UserInfoService {
                 duties.setCreateDate(new Date());
                 duties.setUpdateBy(dto.getId());
                 duties.setUpdateDate(new Date());
-                duties.setDelFlag("0");
+                duties.setDelFlag(0);
                 sysUserDutiesMapper.insert(duties);
             }
         }
@@ -314,7 +319,7 @@ public class UserInfoService {
                 rewards.setCreateDate(new Date());
                 rewards.setUpdateBy(dto.getId());
                 rewards.setUpdateDate(new Date());
-                rewards.setDelFlag("0");
+                rewards.setDelFlag(0);
                 sysUserRewardsMapper.insert(rewards);
             }
         }
@@ -327,7 +332,7 @@ public class UserInfoService {
                 achievement.setCreateDate(new Date());
                 achievement.setUpdateBy(dto.getId());
                 achievement.setUpdateDate(new Date());
-                achievement.setDelFlag("0");
+                achievement.setDelFlag(0);
                 sysUserAchievementMapper.insert(achievement);
             }
         }
@@ -340,7 +345,7 @@ public class UserInfoService {
                 archives.setCreateDate(new Date());
                 archives.setUpdateBy(dto.getId());
                 archives.setUpdateDate(new Date());
-                archives.setDelFlag("0");
+                archives.setDelFlag(0);
                 sysUserArchivesMapper.insert(archives);
             }
         }
@@ -373,7 +378,7 @@ public class UserInfoService {
                 education.setCreateDate(new Date());
                 education.setUpdateBy(dto.getId());
                 education.setUpdateDate(new Date());
-                education.setDelFlag("0");
+                education.setDelFlag(0);
                 sysUserEducationMapper.insert(education);
             }
         }
@@ -389,7 +394,7 @@ public class UserInfoService {
                 contract.setCreateDate(new Date());
                 contract.setUpdateBy(dto.getId());
                 contract.setUpdateDate(new Date());
-                contract.setDelFlag("0");
+                contract.setDelFlag(0);
                 sysUserContractMapper.insert(contract);
             }
         }
@@ -405,7 +410,7 @@ public class UserInfoService {
                 languages.setCreateDate(new Date());
                 languages.setUpdateBy(dto.getId());
                 languages.setUpdateDate(new Date());
-                languages.setDelFlag("0");
+                languages.setDelFlag(0);
                 sysUserLanguagesMapper.insert(languages);
             }
         }
@@ -421,7 +426,7 @@ public class UserInfoService {
                 work.setCreateDate(new Date());
                 work.setUpdateBy(dto.getId());
                 work.setUpdateDate(new Date());
-                work.setDelFlag("0");
+                work.setDelFlag(0);
                 sysUserWorkMapper.insert(work);
             }
         }
@@ -437,7 +442,7 @@ public class UserInfoService {
                 certificate.setCreateDate(new Date());
                 certificate.setUpdateBy(dto.getId());
                 certificate.setUpdateDate(new Date());
-                certificate.setDelFlag("0");
+                certificate.setDelFlag(0);
                 sysUserCertificateMapper.insert(certificate);
             }
         }
@@ -453,7 +458,7 @@ public class UserInfoService {
                 title.setCreateDate(new Date());
                 title.setUpdateBy(dto.getId());
                 title.setUpdateDate(new Date());
-                title.setDelFlag("0");
+                title.setDelFlag(0);
                 sysUserTitleMapper.insert(title);
             }
         }
@@ -469,7 +474,7 @@ public class UserInfoService {
                 family.setCreateDate(new Date());
                 family.setUpdateBy(dto.getId());
                 family.setUpdateDate(new Date());
-                family.setDelFlag("0");
+                family.setDelFlag(0);
                 sysUserFamilyMapper.insert(family);
             }
         }
@@ -485,7 +490,7 @@ public class UserInfoService {
                 train.setCreateDate(new Date());
                 train.setUpdateBy(dto.getId());
                 train.setUpdateDate(new Date());
-                train.setDelFlag("0");
+                train.setDelFlag(0);
                 sysUserTrainMapper.insert(train);
             }
         }
@@ -501,7 +506,7 @@ public class UserInfoService {
                 duties.setCreateDate(new Date());
                 duties.setUpdateBy(dto.getId());
                 duties.setUpdateDate(new Date());
-                duties.setDelFlag("0");
+                duties.setDelFlag(0);
                 sysUserDutiesMapper.insert(duties);
             }
         }
@@ -517,7 +522,7 @@ public class UserInfoService {
                 rewards.setCreateDate(new Date());
                 rewards.setUpdateBy(dto.getId());
                 rewards.setUpdateDate(new Date());
-                rewards.setDelFlag("0");
+                rewards.setDelFlag(0);
                 sysUserRewardsMapper.insert(rewards);
             }
         }
@@ -533,7 +538,7 @@ public class UserInfoService {
                 achievement.setCreateDate(new Date());
                 achievement.setUpdateBy(dto.getId());
                 achievement.setUpdateDate(new Date());
-                achievement.setDelFlag("0");
+                achievement.setDelFlag(0);
                 sysUserAchievementMapper.insert(achievement);
             }
         }
@@ -549,7 +554,7 @@ public class UserInfoService {
                 archives.setCreateDate(new Date());
                 archives.setUpdateBy(dto.getId());
                 archives.setUpdateDate(new Date());
-                archives.setDelFlag("0");
+                archives.setDelFlag(0);
                 sysUserArchivesMapper.insert(archives);
             }
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/dto/UserInfoDetailDto.java

@@ -1,32 +1,16 @@
-package com.jeeplus.test.user.domain.dto;
+package com.jeeplus.test.user.service.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.test.user.domain.*;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 import java.util.List;
 
 @Data
-public class UserInfoDetailDto {
-
-    // 主键
-    private String id;
-
-    // 创建者
-    private String createBy;
-
-    // 创建时间
-    private Date createDate;
-
-    // 更新者
-    private String updateBy;
-
-    // 更新时间
-    private Date updateDate;
-
-    // 逻辑删除标记
-    private String delFlag;
+@EqualsAndHashCode(callSuper = false)
+public class UserInfoDetailDto extends BaseDTO {
 
     // 工号
     private String jobNo;
@@ -35,10 +19,10 @@ public class UserInfoDetailDto {
     private String name;
 
     // 性别
-    private Short sex;
+    private String sex;
 
     // 民族
-    private Short nation;
+    private String nation;
 
     // 身份证号码
     private String idCard;
@@ -47,7 +31,7 @@ public class UserInfoDetailDto {
     private Integer age;
 
     // 出生日期
-    private Date birthday;
+    private String birthday;
 
     // 电子邮箱
     private String eMail;
@@ -59,19 +43,19 @@ public class UserInfoDetailDto {
     private String phone;
 
     // 员工状态
-    private Short userType;
+    private String userType;
 
     // 银行卡号
     private String bankNumber;
 
     // 婚姻状态
-    private Short maritalStatus;
+    private String maritalStatus;
 
     // 政治面貌
-    private Short politicalOutlook;
+    private String politicalOutlook;
 
     // 籍贯
-    private Byte nativePlace;
+    private String nativePlace;
 
     // 户口所在地
     private String registeredResidence;
@@ -95,7 +79,7 @@ public class UserInfoDetailDto {
     private String qq;
 
     // 入职时间
-    private Date entryDate;
+    private String entryDate;
 
     // 试用岗位
     private String probationPosition;
@@ -104,7 +88,7 @@ public class UserInfoDetailDto {
     private String probationTime;
 
     // 试用期结束日期
-    private Date probationEndDate;
+    private String probationEndDate;
 
     // 所属部门
     private String department;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/domain/dto/UserListDto.java

@@ -1,4 +1,4 @@
-package com.jeeplus.test.user.domain.dto;
+package com.jeeplus.test.user.service.dto;
 
 import lombok.Data;