Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -1,4 +1,5 @@
 package com.ningdatech.pmapi.todocenter.manage;
+
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -6,6 +7,7 @@ import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.exception.BizException;
+import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.pmapi.common.constant.ProjectDeclareConstants;
 import com.ningdatech.pmapi.common.util.ExcelDownUtil;
@@ -16,6 +18,8 @@ import com.ningdatech.pmapi.todocenter.constant.HisProInsEndActId;
 import com.ningdatech.pmapi.todocenter.enums.ProcessStatusEnum;
 import com.ningdatech.pmapi.todocenter.extension.cmd.BackToHisApprovalNodeCmd;
 import com.ningdatech.pmapi.todocenter.model.dto.req.ReqProcessHandlerDTO;
+import com.ningdatech.pmapi.todocenter.model.dto.req.ReqToBeProcessedDTO;
+import com.ningdatech.pmapi.todocenter.model.dto.res.ResToBeProcessedDTO;
 import com.ningdatech.pmapi.todocenter.model.dto.res.ResToBeProjectListExportDTO;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import com.wflow.bean.do_.UserDo;
@@ -34,8 +38,9 @@ import com.wflow.workflow.bean.process.props.ApprovalProps;
 import com.wflow.workflow.bean.vo.ProcessProgressVo;
 import com.wflow.workflow.bean.vo.ProcessTaskVo;
 import com.wflow.workflow.config.WflowGlobalVarDef;
-import com.wflow.workflow.service.*;
 import com.wflow.workflow.service.FormService;
+import com.wflow.workflow.service.*;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.util.Maps;
 import org.flowable.engine.*;
@@ -46,15 +51,8 @@ import org.flowable.engine.runtime.Execution;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.flowable.task.api.TaskQuery;
-
 import org.flowable.variable.api.history.HistoricVariableInstance;
 import org.springframework.stereotype.Component;
-import com.ningdatech.basic.model.PageVo;
-
-import com.ningdatech.pmapi.todocenter.model.dto.req.ReqToBeProcessedDTO;
-import com.ningdatech.pmapi.todocenter.model.dto.res.ResToBeProcessedDTO;
-import lombok.RequiredArgsConstructor;
-
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserAuthController.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.user.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+@Controller
+@RequestMapping("/pmapi.user/nd-user-auth")
+public class NdUserAuthController {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/controller/NdUserInfoController.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.user.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+@Controller
+@RequestMapping("/pmapi.user/nd-user-info")
+public class NdUserInfoController {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserAuth.java

@@ -0,0 +1,99 @@
+package com.ningdatech.pmapi.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+@TableName("nd_user_auth")
+@ApiModel(value = "NdUserAuth对象", description = "")
+public class NdUserAuth implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private Long userId;
+
+    private String authType;
+
+    private String identifier;
+
+    private String credential;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public LocalDateTime getCreateOn() {
+        return createOn;
+    }
+
+    public void setCreateOn(LocalDateTime createOn) {
+        this.createOn = createOn;
+    }
+    public LocalDateTime getUpdateOn() {
+        return updateOn;
+    }
+
+    public void setUpdateOn(LocalDateTime updateOn) {
+        this.updateOn = updateOn;
+    }
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+    public String getAuthType() {
+        return authType;
+    }
+
+    public void setAuthType(String authType) {
+        this.authType = authType;
+    }
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+    public String getCredential() {
+        return credential;
+    }
+
+    public void setCredential(String credential) {
+        this.credential = credential;
+    }
+
+    @Override
+    public String toString() {
+        return "NdUserAuth{" +
+            "id=" + id +
+            ", createOn=" + createOn +
+            ", updateOn=" + updateOn +
+            ", userId=" + userId +
+            ", authType=" + authType +
+            ", identifier=" + identifier +
+            ", credential=" + credential +
+        "}";
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/entity/NdUserInfo.java

@@ -0,0 +1,109 @@
+package com.ningdatech.pmapi.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+@TableName("nd_user_info")
+@ApiModel(value = "NdUserInfo对象", description = "")
+public class NdUserInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private Long createBy;
+
+    private Long updateBy;
+
+    private String username;
+
+    private String mobile;
+
+    private String realName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public LocalDateTime getCreateOn() {
+        return createOn;
+    }
+
+    public void setCreateOn(LocalDateTime createOn) {
+        this.createOn = createOn;
+    }
+    public LocalDateTime getUpdateOn() {
+        return updateOn;
+    }
+
+    public void setUpdateOn(LocalDateTime updateOn) {
+        this.updateOn = updateOn;
+    }
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    @Override
+    public String toString() {
+        return "NdUserInfo{" +
+            "id=" + id +
+            ", createOn=" + createOn +
+            ", updateOn=" + updateOn +
+            ", createBy=" + createBy +
+            ", updateBy=" + updateBy +
+            ", username=" + username +
+            ", mobile=" + mobile +
+            ", realName=" + realName +
+        "}";
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.user.mapper;
+
+import com.ningdatech.pmapi.user.entity.NdUserAuth;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+public interface NdUserAuthMapper extends BaseMapper<NdUserAuth> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserAuthMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.pmapi.user.mapper.NdUserAuthMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.user.mapper;
+
+import com.ningdatech.pmapi.user.entity.NdUserInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+public interface NdUserInfoMapper extends BaseMapper<NdUserInfo> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/NdUserInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.pmapi.user.mapper.NdUserInfoMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/user/mapper/UserAuthMapper.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.user.mapper;
 
-import com.ningdatech.pmapi.user.entity.UserAuth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.user.entity.UserAuth;
 
 /**
  * <p>

pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserAuthService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.user.service;
+
+import com.ningdatech.pmapi.user.entity.NdUserAuth;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+public interface INdUserAuthService extends IService<NdUserAuth> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/service/INdUserInfoService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.user.service;
+
+import com.ningdatech.pmapi.user.entity.NdUserInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+public interface INdUserInfoService extends IService<NdUserInfo> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserAuthServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.user.service.impl;
+
+import com.ningdatech.pmapi.user.entity.NdUserAuth;
+import com.ningdatech.pmapi.user.mapper.NdUserAuthMapper;
+import com.ningdatech.pmapi.user.service.INdUserAuthService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+@Service
+public class NdUserAuthServiceImpl extends ServiceImpl<NdUserAuthMapper, NdUserAuth> implements INdUserAuthService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/NdUserInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.user.service.impl;
+
+import com.ningdatech.pmapi.user.entity.NdUserInfo;
+import com.ningdatech.pmapi.user.mapper.NdUserInfoMapper;
+import com.ningdatech.pmapi.user.service.INdUserInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Lierbao
+ * @since 2023-02-01
+ */
+@Service
+public class NdUserInfoServiceImpl extends ServiceImpl<NdUserInfoMapper, NdUserInfo> implements INdUserInfoService {
+
+}