微信绑定用户重构

src/main/java/com/xjrsoft/module/organization/service/impl/UserServiceImpl.java

@@ -321,10 +321,10 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
                             .eq(User::getOpenId, dto.getOpenid()), false);
 
             if (ObjectUtil.isNotEmpty(openId2user)) {
-                result.setUserId(user.getId().toString());
-                result.setName(user.getName());
-                result.setUserName(user.getUserName());
-                result.setMobile(user.getMobile());
+                result.setUserId(openId2user.getId().toString());
+                result.setName(openId2user.getName());
+                result.setUserName(openId2user.getUserName());
+                result.setMobile(openId2user.getMobile());
                 result.setStatus(3);
                 return result;
             }

src/main/java/com/xjrsoft/module/organization/vo/BindOpenidVo.java

@@ -16,7 +16,6 @@ public class BindOpenidVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-
     private String userId;
 
     @ApiModelProperty("用户名")

src/main/java/com/xjrsoft/module/teacher/controller/TeacherbaseManagerController.java

@@ -23,7 +23,6 @@ import com.xjrsoft.module.organization.entity.UserPostRelation;
 import com.xjrsoft.module.organization.service.IUserDeptRelationService;
 import com.xjrsoft.module.organization.service.IUserPostRelationService;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
-import com.xjrsoft.module.system.service.IDictionarydetailService;
 import com.xjrsoft.module.teacher.dto.AddXjrUserDto;
 import com.xjrsoft.module.teacher.dto.UpdateXjrUserDto;
 import com.xjrsoft.module.teacher.dto.XjrUserPageDto;
@@ -59,7 +58,6 @@ public class TeacherbaseManagerController {
 
 
     private final ITeacherbaseManagerService teacherbaseManagerService;
-    private final IDictionarydetailService dictionarydetailService;
     private final IUserDeptRelationService userDeptRelationService;
     private final IUserPostRelationService userPostRelationService;
 
@@ -68,7 +66,6 @@ public class TeacherbaseManagerController {
     @SaCheckPermission("teacherbasemanager:detail")
     @XjrLog(value = "XjrUser列表(分页)")
     public R page(@Valid XjrUserPageDto dto) {
-
         MPJLambdaWrapper<XjrUser> queryWrapper = MPJWrappers.<XjrUser>lambdaJoin()
                 .disableSubLogicDel()
                 .like(StrUtil.isNotBlank(dto.getUserName()), XjrUser::getUserName, dto.getUserName())
@@ -77,12 +74,27 @@ public class TeacherbaseManagerController {
                 .like(StrUtil.isNotBlank(dto.getEmail()), XjrUser::getEmail, dto.getEmail())
 
                 .orderByDesc(XjrUser::getId)
+
                 .select(XjrUser::getId)
                 .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUserPageVo.class).contains(x.getProperty()))
-                .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, XjrUser::getId)
-                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getJobState, ext -> ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getJobState))
-                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, XjrUser::getCredentialType, ext -> ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getCredentialType))
-                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getEmployWay, ext -> ext.selectAs(DictionaryDetail::getName, XjrUserPageVo::getEmployWay))
+
+                .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, XjrUser::getId,
+                        wra -> wra
+                                .selectAs(BaseTeacher::getJoinTime, XjrUserPageVo::getJoinTime)
+                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getJobState,
+                                        ext -> ext
+                                                .selectAs(DictionaryDetail::getName, XjrUserPageVo::getJobState)
+                                )
+                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getEmployType,
+                                        ext -> ext
+                                                .selectAs(DictionaryDetail::getName, XjrUserPageVo::getEmployWay)
+                                )
+                        )
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, XjrUser::getCredentialType,
+                        ext -> ext
+                                .selectAs(DictionaryDetail::getName, XjrUserPageVo::getCredentialType)
+                )
+
 
                 .selectAsClass(BaseTeacher.class, XjrUserPageVo.class);
 

src/main/java/com/xjrsoft/module/teacher/vo/XjrUserPageVo.java

@@ -1,8 +1,11 @@
 package com.xjrsoft.module.teacher.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @title: 分页列表出参
  * @Author 管理员
@@ -79,9 +82,9 @@ public class XjrUserPageVo {
     @ApiModelProperty("在职状态")
     private String jobState;
     /**
-     * 聘用方式
+     * 聘用方式(xjr_dictionary_item[employ_type])上级聘用类型
      */
-    @ApiModelProperty("聘用方式")
+    @ApiModelProperty("聘用方式(xjr_dictionary_item[employ_type])上级聘用类型")
     private String employWay;
     /**
      * 手机号
@@ -89,4 +92,9 @@ public class XjrUserPageVo {
     @ApiModelProperty("手机号")
     private String mobile;
 
+    /**
+     * 来校年月
+     */
+    @ApiModelProperty("来校年月")
+    private Date joinTime;
 }