Merge remote-tracking branch 'origin/master'

ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeConfig.java

@@ -1,64 +0,0 @@
-package com.ningdatech.generator.config;
-
-import com.baomidou.mybatisplus.generator.FastAutoGenerator;
-import com.baomidou.mybatisplus.generator.config.OutputFile;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-import java.util.Collections;
-
-/**
- * @description: 自动生成code代码
- * @author: liuxinxin
- * @date: 2023/01/03 09:20
- */
-public class GeneratorCodeConfig {
-
-    private static final String PATH_LXX = "/Users/liuxinxin/IdeaProjects/project-management/pmapi/src/main/java";
-    private static final String PATH_YYD = "";
-    private static final String PATH_LS = "";
-    private static final String PATH_ZPF = "";
-    private static final String PATH_CMM = "";
-
-    private static final String URL = "jdbc:mysql://47.98.125.47:3306/nd_project_management?" +
-            "useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&" +
-            "useSSL=false&serverTimezone=Asia/Shanghai";
-    private static final String USER_NAME = "root";
-    private static final String PASSWORD = "NingdaKeji123!";
-
-    private static void generate(String author, String packageName, String path, String... tableNames) {
-        FastAutoGenerator.create(URL, USER_NAME, PASSWORD)
-                .globalConfig(builder -> {
-                    // 设置作者
-                    builder.author(author)
-                            // 开启 swagger 模式
-                            .enableSwagger()
-                            // 覆盖已生成文件
-                            .fileOverride()
-                            // 指定输出目录
-                            .outputDir(path);
-                })
-                .packageConfig(builder -> {
-                    // 设置父包名
-                    builder.parent("com.ningdatech")
-                            // 设置父包模块名
-                            .moduleName("pmapi." + packageName)
-                            // 设置mapperXml生成路径
-                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml,
-                                    //设置自己的生成路径
-                                    path + "/com/ningdatech/pmapi/" + packageName + "/mapper"));
-                })
-                .strategyConfig(builder -> {
-                    builder.addTablePrefix("nd");
-                    // 设置需要生成的表名
-                    builder.addInclude(tableNames);
-                })
-                // 使用Freemarker引擎模板，默认的是Velocity引擎模板
-                .templateEngine(new FreemarkerTemplateEngine())
-                .execute();
-    }
-
-    public static void main(String[] args) {
-        generate("Liuxinxin", "user", PATH_LXX, "nd_role_info", "nd_user_role");
-    }
-
-}

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

@@ -56,7 +56,7 @@ public class GeneratorCodeKingbaseConfig {
     }
 
     public static void main(String[] args) {
-        generate("WendyYang", "sys", PATH_YYD, "nd_role_menu_datascope");
+        generate("WendyYang", "projectlib", PATH_YYD, "nd_project");
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/common/utils/BizUtils.java

@@ -7,6 +7,7 @@ import org.springframework.util.NumberUtils;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -36,4 +37,17 @@ public class BizUtils {
         return splitToNum(str, Long.class);
     }
 
+
+    public static <T> void notNull(T obj, Consumer<T> consumer) {
+        if (obj != null) {
+            consumer.accept(obj);
+        }
+    }
+
+    public static void notBlank(String str,Consumer<String> consumer) {
+        if (StrUtil.isNotBlank(str)) {
+            consumer.accept(str);
+        }
+    }
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java

@@ -0,0 +1,36 @@
+package com.ningdatech.pmapi.projectlib.controller;
+
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectLibListReq;
+import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * ProjectLibController
+ * </p>
+ *
+ * @author WendyYang
+ * @since 17:30 2023/2/1
+ */
+@RestController
+@RequestMapping("/api/v1/project/lib")
+@AllArgsConstructor
+@Api(tags = "项目库")
+public class ProjectLibController {
+
+    private final ProjectLibManage projectLibManage;
+
+    @GetMapping("/list")
+    @ApiOperation("项目库列表")
+    public PageVo<ProjectLibListItemVO> projectLibList(ProjectLibListReq req) {
+        return projectLibManage.projectLibList(req);
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

@@ -0,0 +1,83 @@
+package com.ningdatech.pmapi.projectlib.manage;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.pmapi.projectlib.model.entity.Project;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectLibListReq;
+import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
+import com.ningdatech.pmapi.projectlib.service.INdProjectService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+import static com.ningdatech.pmapi.common.utils.BizUtils.notBlank;
+import static com.ningdatech.pmapi.common.utils.BizUtils.notNull;
+
+/**
+ * <p>
+ * ProjectLibManage
+ * </p>
+ *
+ * @author WendyYang
+ * @since 14:19 2023/2/1
+ */
+@Component
+@RequiredArgsConstructor
+public class ProjectLibManage {
+
+    private final INdProjectService projectService;
+
+    private LambdaQueryWrapper<Project> projectLibQuery(ProjectLibListReq req) {
+        LambdaQueryWrapper<Project> query = Wrappers.lambdaQuery(Project.class);
+        notBlank(req.getProjectName(), w -> query.like(Project::getProjectName, w));
+        notNull(req.getProjectType(), w -> query.eq(Project::getProjectType, w));
+        notNull(req.getProjectYear(), w -> query.eq(Project::getProjectYear, w));
+        // 申报金额 批复金额
+        notNull(req.getApproveAmountMin(), w -> query.ge(Project::getApprovalAmount, w));
+        notNull(req.getApproveAmountMax(), w -> query.le(Project::getApprovalAmount, w));
+
+        notNull(req.getDeclareAmountMax(), w -> query.le(Project::getDeclareAmount, w));
+        notNull(req.getDeclareAmountMin(), w -> query.ge(Project::getDeclareAmount, w));
+        // 状态查询
+        notNull(req.getStatus1st(), w -> query.ge(Project::getStage, w));
+        notNull(req.getStatus2nd(), w -> query.ge(Project::getStatus, w));
+
+        notNull(req.getCreateOnMin(), w -> query.ge(Project::getCreateOn, w));
+        notNull(req.getCreateOnMax(), w -> query.le(Project::getCreateOn, w));
+
+        notBlank(req.getBuildUnit(), w -> query.like(Project::getBuildUnitName, w));
+
+        query.orderByDesc(Project::getUpdateOn, Project::getCreateOn);
+        // TODO 区域编码处理
+        return query;
+    }
+
+    public PageVo<ProjectLibListItemVO> projectLibList(ProjectLibListReq req) {
+        LambdaQueryWrapper<Project> query = projectLibQuery(req);
+        Page<Project> page = projectService.page(req.page(), query);
+        long total;
+        if ((total = page.getTotal()) == 0) {
+            return PageVo.empty();
+        }
+        List<ProjectLibListItemVO> records = CollUtils.convert(page.getRecords(), w -> {
+            ProjectLibListItemVO item = new ProjectLibListItemVO();
+            item.setId(w.getId());
+            item.setProjectName(w.getProjectName());
+            item.setCreateOn(w.getCreateOn());
+            item.setDeclaredAmount(w.getDeclareAmount());
+            item.setStatus1st(w.getStage());
+            item.setStatus2nd(w.getStatus());
+            item.setProjectType(w.getProjectType());
+            item.setProjectYear(w.getProjectYear());
+            item.setBuildUnit(w.getBuildUnitName());
+            item.setBizDomain(w.getBizDomain());
+            return item;
+        });
+        return PageVo.of(records, total);
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/NdProjectMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.projectlib.mapper;
+
+import com.ningdatech.pmapi.projectlib.model.entity.Project;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2023-02-03
+ */
+public interface NdProjectMapper extends BaseMapper<Project> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/NdProjectMapper.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.projectlib.mapper.NdProjectMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -0,0 +1,282 @@
+package com.ningdatech.pmapi.projectlib.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2023-02-03
+ */
+@Data
+@TableName("nd_project")
+@ApiModel(value = "NdProject对象", description = "")
+public class Project implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("所属地区编号")
+    private String areaCode;
+
+    @ApiModelProperty("所属地区名称")
+    private String area;
+
+    @ApiModelProperty("项目阶段")
+    private Integer stage;
+
+    @ApiModelProperty("项目状态")
+    private Integer status;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("是否临时增补 0:否 1:是")
+    private Integer isTemporaryAugment;
+
+    @ApiModelProperty("项目负责人")
+    private String responsibleMan;
+
+    @ApiModelProperty("负责人手机号码")
+    private String responsibleManMobile;
+
+    @ApiModelProperty("项目联系人")
+    private String contactName;
+
+    @ApiModelProperty("项目联系人手机号码")
+    private String contactPhone;
+
+    @ApiModelProperty("建设单位名称")
+    private String buildUnitName;
+
+    @ApiModelProperty("建设单位统一社会信用代码")
+    private String buildUnitCode;
+
+    @ApiModelProperty("建设单位浙政钉ID")
+    private String buildUnitZheJiangGovernmentDingId;
+
+    @ApiModelProperty("项目类型 1:建设 2:运维")
+    private Integer projectType;
+
+    @ApiModelProperty("是否首次新建 0:否 1:是")
+    private Integer isFirst;
+
+    @ApiModelProperty("项目预算年度")
+    private Integer projectYear;
+
+    @ApiModelProperty("项目建设起始时间")
+    private String beginTime;
+
+    @ApiModelProperty("项目建设终止时间")
+    private String endTime;
+
+    @ApiModelProperty("四大体系 1:业务应用 2:应用支撑 3:数据资源 4:基础设施")
+    private Integer fourSystems;
+
+    @ApiModelProperty("是否数字化改革项目 0:否 1:是")
+    private Integer isDigitalReform;
+
+    @ApiModelProperty("综合业务领域")
+    private String bizDomain;
+
+    @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
+    private Integer buildLevel;
+
+    @ApiModelProperty("立项依据")
+    private String buildBasis;
+
+    @ApiModelProperty("发改编码")
+    private String developCode;
+
+    @ApiModelProperty("财政编码")
+    private String financialCode;
+
+    @ApiModelProperty("是否上云 0:否 1:是")
+    private Integer isCloud;
+
+    private String cloudType;
+
+    @ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级")
+    private Integer protectionLevel;
+
+    @ApiModelProperty("是否密评 0:否 1:是")
+    private Integer isSecretComments;
+
+    @ApiModelProperty("项目简介")
+    private String projectIntroduction;
+
+    @ApiModelProperty("资金申报情况-申报金额(万元)")
+    private BigDecimal declareAmount;
+
+    @ApiModelProperty("资金申报情况-自有金额(万元)")
+    private BigDecimal declareHaveAmount;
+
+    @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
+    private BigDecimal declareGovernmentOwnFinanceAmount;
+
+    @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
+    private BigDecimal declareGovernmentSuperiorFinanceAmount;
+
+    @ApiModelProperty("银行贷款(万元)")
+    private BigDecimal declareBankLendingAmount;
+
+    @ApiModelProperty("其它资金(万元)")
+    private BigDecimal declareOtherAmount;
+
+    @ApiModelProperty("资金分配情况-软件开发(万元)")
+    private BigDecimal softwareDevelopmentAmount;
+
+    @ApiModelProperty("资金分配情况-云资源、硬件购置(万元)")
+    private BigDecimal cloudHardwarePurchaseAmount;
+
+    @ApiModelProperty("资金分配情况-第三方服务(万元)")
+    private BigDecimal thirdPartyAmount;
+
+    @ApiModelProperty("年度支付计划-年度支付计划(万元)")
+    private BigDecimal annualPlanAmount;
+
+    @ApiModelProperty("年度支付计划-自有金额(万元)")
+    private BigDecimal annualPlanHaveAmount;
+
+    @ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)")
+    private BigDecimal annualPlanGovernmentOwnFinanceAmount;
+
+    @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
+    private BigDecimal annualPlanGovernmentSuperiorFinanceAmount;
+
+    @ApiModelProperty("年度支付计划-银行贷款(万元)")
+    private BigDecimal annualPlanBankLendingAmount;
+
+    @ApiModelProperty("年度支付计划-其它资金(万元)")
+    private BigDecimal annualPlanOtherAmount;
+
+    @ApiModelProperty("立项批复资金(万元)")
+    private BigDecimal approvalAmount;
+
+    private LocalDateTime annualPlanAddTime;
+
+    @ApiModelProperty("核心业务-核心业务模块")
+    private String coreBusiness;
+
+    @ApiModelProperty("安全投入-投入项")
+    private String safetyInputTitle;
+
+    @ApiModelProperty("安全投入-内容描述")
+    private String safetyInputDescribe;
+
+    @ApiModelProperty("安全投入-金额(万元)")
+    private BigDecimal safetyInputAmount;
+
+    @ApiModelProperty("附件-初步方案")
+    private String preliminaryPlanFile;
+
+    @ApiModelProperty("附件-佐证材料")
+    private String supportingMaterialsFile;
+
+    @ApiModelProperty("附件-项目总投资测算明细")
+    private String calculationTotalInvestmentFile;
+
+    @ApiModelProperty("附件-申报单位主要职责（单位三定方案）")
+    private String mainResponsibilitiesApplicantFile;
+
+    @ApiModelProperty("备注")
+    private String projectRemarks;
+
+    @ApiModelProperty("是否包含应用 0:否 1:是")
+    private Integer includeApplication;
+
+    @ApiModelProperty("工程形象进度-第一季度")
+    private String engineeringSpeedOne;
+
+    @ApiModelProperty("工程形象进度-第二季度")
+    private String engineeringSpeedTwo;
+
+    @ApiModelProperty("工程形象进度-第三季度")
+    private String engineeringSpeedThree;
+
+    @ApiModelProperty("工程形象进度-第四季度")
+    private String engineeringSpeedFour;
+
+    @ApiModelProperty("核心业务-是否开启核心业务模块 false:关闭 true:开启")
+    private Boolean isOpenCoreBusiness;
+
+    @ApiModelProperty("安全投入-是否开启安全投入模块 false:关闭 true:开启")
+    private Boolean isOpenSafetyInput;
+
+    @ApiModelProperty("工程形象进度-是否开启 false:关闭 true:开启")
+    private Boolean isEngineeringSpeed;
+
+    @ApiModelProperty("附件-是否开启 false:关闭 true:开启")
+    private Boolean isAccessories;
+
+    @ApiModelProperty("备注-是否开启 false:关闭 true:开启")
+    private Boolean isRemarks;
+
+    @ApiModelProperty("年度支付计划-是否开启 false:关闭 true:开启")
+    private Boolean isAnnualPlanAmount;
+
+    @ApiModelProperty("一地创新全省共享项目-是否开启 false:关闭 true:开启")
+    private Boolean isInnovateWholeProvinceShare;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    @ApiModelProperty("流程实例编号")
+    private String instCode;
+
+    @ApiModelProperty("安全投入-模块信息")
+    private String safetyInputModular;
+
+    @ApiModelProperty("项目申报pdf")
+    private String projectPdf;
+
+    @ApiModelProperty("立项申报pdf")
+    private String declarationPdf;
+
+    @ApiModelProperty("建设周期（月）")
+    private String buildCycle;
+
+    @ApiModelProperty("建设方案文件")
+    private String constructionPlanFile;
+
+    @ApiModelProperty("立项批复文件")
+    private String approvedFile;
+
+    @ApiModelProperty("批复金额")
+    private BigDecimal approvedTotalInvestmentIncrease;
+
+    @ApiModelProperty("上级主管部门")
+    private String higherSuperUnit;
+
+    @ApiModelProperty("上级主管部门Code")
+    private String higherSuperUnitCode;
+
+    @ApiModelProperty("主管部门名称")
+    private String superUnit;
+
+    @ApiModelProperty("主管部门Code")
+    private String superUnitCode;
+
+    @ApiModelProperty("前端所需验证字段")
+    private Integer allApplicationsDone;
+
+    private Long createBy;
+
+    private Long updateBy;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectLibListReq.java

@@ -0,0 +1,64 @@
+package com.ningdatech.pmapi.projectlib.model.req;
+
+import com.ningdatech.basic.model.PagePo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * ProjectLibListReq
+ * </p>
+ *
+ * @author WendyYang
+ * @since 14:35 2023/2/1
+ */
+@Data
+@ApiModel("项目库列表查询")
+@EqualsAndHashCode(callSuper = true)
+public class ProjectLibListReq extends PagePo {
+
+    @ApiModelProperty("区域编码")
+    private String regionCode;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("申报单位")
+    private String buildUnit;
+
+    @ApiModelProperty("项目类型")
+    private Integer projectType;
+
+    @ApiModelProperty("预算年度")
+    private Integer projectYear;
+
+    @ApiModelProperty("项目状态")
+    private Integer status1st;
+
+    @ApiModelProperty("项目状态")
+    private Integer status2nd;
+
+    @ApiModelProperty("申报金额")
+    private BigDecimal declareAmountMin;
+
+    @ApiModelProperty("申报金额")
+    private BigDecimal declareAmountMax;
+
+    @ApiModelProperty("批复金额")
+    private BigDecimal approveAmountMin;
+
+    @ApiModelProperty("批复金额")
+    private BigDecimal approveAmountMax;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createOnMin;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createOnMax;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectLibListItemVO.java

@@ -0,0 +1,58 @@
+package com.ningdatech.pmapi.projectlib.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * ProjectLibListItemVO
+ * </p>
+ *
+ * @author WendyYang
+ * @since 15:13 2023/2/1
+ */
+@Data
+@ApiModel("项目库列表视图")
+public class ProjectLibListItemVO {
+
+    @ApiModelProperty("项目ID")
+    private Long id;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("申报金额")
+    private BigDecimal declaredAmount;
+
+    @ApiModelProperty("批复金额")
+    private BigDecimal approvedAmount;
+
+    @ApiModelProperty("项目类型")
+    private Integer projectType;
+
+    @ApiModelProperty("项目状态")
+    private Integer status1st;
+
+    @ApiModelProperty("项目状态")
+    private Integer status2nd;
+
+    @ApiModelProperty("申报年度")
+    private Integer projectYear;
+
+    @ApiModelProperty("申报单位")
+    private String buildUnit;
+
+    @ApiModelProperty("业务领域")
+    private String bizDomain;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createOn;
+
+    @ApiModelProperty("修改时间")
+    private LocalDateTime updateOn;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/INdProjectService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.projectlib.service;
+
+import com.ningdatech.pmapi.projectlib.model.entity.Project;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2023-02-03
+ */
+public interface INdProjectService extends IService<Project> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/NdProjectServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.projectlib.service.impl;
+
+import com.ningdatech.pmapi.projectlib.model.entity.Project;
+import com.ningdatech.pmapi.projectlib.mapper.NdProjectMapper;
+import com.ningdatech.pmapi.projectlib.service.INdProjectService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2023-02-03
+ */
+@Service
+public class NdProjectServiceImpl extends ServiceImpl<NdProjectMapper, Project> implements INdProjectService {
+
+}

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 {
+
+}