Merge branch 'master' into pjfk

# Conflicts:
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/constant/UserTransactionEnum.java

@@ -0,0 +1,29 @@
+package com.bsd.pjcloud.admin.api.constant;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 用户调岗类型
+ */
+@AllArgsConstructor
+@Getter
+public enum UserTransactionEnum {
+
+    LEAVE("10", "离职"),
+    RETIRE("20", "退休"),
+    INNER_TRANSFER("30", "调岗(内部)"),
+    ;
+    private final String type;
+    private final String description;
+
+    public static UserTransactionEnum valueOfByType(String type) {
+        if (ObjectUtil.isEmpty(type)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
+    }
+
+}

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java

@@ -29,4 +29,11 @@ public class SysUserFaceDto extends SysUserFaceEntity implements BaseIsIncludeTr
     private Boolean isInclude;
 
     private Boolean isFindCheckUser = false;
+
+    /**
+     * 用户相关
+     */
+    private String username;
+
+    private String phone;
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUserTransactionEntity.java

@@ -3,14 +3,17 @@ package com.bsd.pjcloud.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
+
 import java.time.LocalDateTime;
 
 /**
  * 人员调动表
  */
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 @TenantTable
 @TableName("sys_user_transaction")
@@ -19,112 +22,124 @@ import java.time.LocalDateTime;
 public class SysUserTransactionEntity extends Model<SysUserTransactionEntity> {
 
 
-	/**
-	* 编号
-	*/
+    /**
+     * 编号
+     */
     @TableId(type = IdType.ASSIGN_ID)
-    @Schema(description="编号")
+    @Schema(description = "编号")
     private Long id;
 
-	/**
-	* 用户id
-	*/
-    @Schema(description="用户id")
+    /**
+     * 申请部门用户id
+     */
+    @Schema(description = "申请部门用户id")
+    private Long applyUserId;
+
+    /**
+     * 用户id
+     */
+    @Schema(description = "用户id")
     private Long userId;
 
-	/**
-	* 业务id
-	*/
-    @Schema(description="业务id")
+    /**
+     * 业务id
+     */
+    @Schema(description = "业务id")
     private Long bizId;
 
-	/**
-	* 业务类型
-	*/
-    @Schema(description="业务类型")
+    /**
+     * 业务类型
+     */
+    @Schema(description = "业务类型")
     private String bizType;
 
-	/**
-	* 源部门id
-	*/
-    @Schema(description="源部门id")
+    /**
+     * 源部门id
+     */
+    @Schema(description = "源部门id")
     private Long sourceDeptId;
 
-	/**
-	* 目标部门id
-	*/
-    @Schema(description="目标部门id")
+    /**
+     * 目标部门id
+     */
+    @Schema(description = "目标部门id")
     private Long targetDeptId;
 
-	/**
-	* 是否离职自动转账
-	*/
-    @Schema(description="是否离职自动转账")
+    /**
+     * 是否离职自动转账
+     */
+    @Schema(description = "是否离职自动转账")
     private String isWalletTransaction;
 
-	/**
-	* 离职自动转账时间
-	*/
-    @Schema(description="离职自动转账时间")
+    /**
+     * 离职自动转账时间
+     */
+    @Schema(description = "离职自动转账时间")
     private LocalDateTime walletTransactionTime;
 
-	/**
-	* 流程id
-	*/
-    @Schema(description="流程id")
+    /**
+     * 流程id
+     */
+    @Schema(description = "流程id")
     private String processId;
 
-	/**
-	* 审核状体
-	*/
-    @Schema(description="审核状体")
+    /**
+     * 审核状体
+     */
+    @Schema(description = "审核状体")
     private String processStatus;
 
-	/**
-	* 审核时间
-	*/
-    @Schema(description="审核时间")
+    /**
+     * 审核时间
+     */
+    @Schema(description = "审核时间")
     private LocalDateTime processTime;
 
-	/**
-	* 创建人
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建人")
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
     private String createBy;
 
-	/**
-	* 创建时间
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建时间")
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
-	/**
-	* 修改人
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改人")
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改人")
     private String updateBy;
 
-	/**
-	* 修改时间
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改时间")
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改时间")
     private LocalDateTime updateTime;
 
-	/**
-	* 删除标记
-	*/
+    /**
+     * 删除标记
+     */
     @TableLogic
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记")
     private String delFlag;
 
-	/**
-	* 租户ID
-	*/
-    @Schema(description="租户ID")
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
     private Long tenantId;
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java

@@ -40,6 +40,7 @@ import java.util.Set;
 @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.UPMS_SERVICE)
 public interface RemoteUserService {
 
+
     @NoToken
     @PostMapping("/user/inner-page")
     R<List<UserVO>> getRemoteUserPage(@RequestParam Long current, @RequestParam Long size, @RequestBody UserDTO userDTO);
@@ -54,6 +55,13 @@ public interface RemoteUserService {
     @GetMapping("/user/info/{username}")
     R<UserInfo> info(@PathVariable("username") String username);
 
+    /**
+     * 根据手机号查询用户
+     */
+    @NoToken
+    @GetMapping("/user/inner/phone")
+    R<UserInfo> getInnerByPhone(@RequestParam String phone);
+
     /**
      * 通过用户id查询用户、角色信息
      */
@@ -76,6 +84,10 @@ public interface RemoteUserService {
     @PostMapping("/user/list")
     R<List<SysUser>> getUserById(@RequestBody List<Long> userIds);
 
+    @NoToken
+    @PostMapping("/user/inner/list")
+    R<List<SysUser>> getInnerUserById(@RequestBody List<Long> userIds);
+
     @PostMapping("/user/user-dept")
     R<List<UserVO>> getUserDeptByIds(@RequestBody List<Long> userIds);
 

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserTransaction.java

@@ -0,0 +1,17 @@
+package com.bsd.pjcloud.admin.api.feign;
+
+import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.feign.annotation.NoToken;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+@FeignClient(contextId = "remoteUserTransaction", value = ServiceNameConstants.UPMS_SERVICE)
+public interface RemoteUserTransaction {
+
+    @NoToken
+    @PostMapping("/sys-user-transaction/wallet-transaction-callback")
+    void walletTransationCallback(@RequestParam(required = false) String params);
+
+}

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SysUserTransactionVo.java

@@ -26,4 +26,6 @@ public class SysUserTransactionVo extends SysUserTransactionEntity implements Ba
 
     private String userAvatar;
 
+    private String applyUsername;
+
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java

@@ -237,4 +237,8 @@ public class UserVO implements BaseFacesInterface, Serializable {
      */
     private Boolean isCheckUser = false;
 
+    /**
+     * 商户相关
+     */
+    private String merchantName;
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/base/BaseUserDeptInterface.java

@@ -41,5 +41,5 @@ public interface BaseUserDeptInterface {
      */
     String getUserDeptName();
 
-    void setUserDeptName(String deptName);
+    void setUserDeptName(String userDeptName);
 }

pjcloud-upms/pjcloud-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports

@@ -12,4 +12,5 @@ com.bsd.pjcloud.admin.api.feign.RemoteDictService
 com.bsd.pjcloud.admin.api.feign.RemoteAuditLogService
 com.bsd.pjcloud.admin.api.feign.RemoteMenuService
 com.bsd.pjcloud.admin.api.feign.RemoteRouteConfService
+com.bsd.pjcloud.admin.api.feign.RemoteUserTransaction
 com.bsd.pjcloud.admin.api.feign.RemoteMessageService