项目重构，开发新需求20240123

smart-admin-api/sa-admin/pom.xml → smart-admin-api/kpt-admin/pom.xml

@@ -2,25 +2,25 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>net.1024lab</groupId>
-        <artifactId>sa-parent</artifactId>
+        <groupId>com.kpt</groupId>
+        <artifactId>kpt-parent</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>sa-admin</artifactId>
+    <artifactId>kpt-admin</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
 
-    <name>sa-admin</name>
-    <description>sa-admin project</description>
+    <name>kpt-admin</name>
+    <description>kpt-admin project</description>
 
     <dependencies>
 
         <dependency>
-            <groupId>net.1024lab</groupId>
-            <artifactId>sa-common</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.kpt</groupId>
+            <artifactId>kpt-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.jsqlparser</groupId>
@@ -36,7 +36,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>net.lab1024.sa.admin.SmartAdminApplication</mainClass>
+                    <mainClass>com.kpt.admin.SmartAdminApplication</mainClass>
                 </configuration>
                 <executions>
                     <execution>

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/SmartAdminApplication.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin;
+package com.kpt.admin;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.mybatis.spring.annotation.MapperScan;
@@ -13,17 +13,20 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 /**
  * SmartAdmin 项目启动类
  *
- * @Author 1024创新实验室-主任:卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-29 21:00:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @EnableCaching
 @EnableScheduling
 @EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
-@ComponentScan(basePackages = {"net.lab1024.sa"})
-@MapperScan(value = "net.lab1024.sa", annotationClass = Mapper.class)
+@ComponentScan(basePackages = {"com.kpt"})
+@MapperScan(value = "com.kpt", annotationClass = Mapper.class)
 @SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class })
 public class SmartAdminApplication {
 

smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/common/AdminBaseController.java

@@ -0,0 +1,16 @@
+package com.kpt.admin.common;
+
+/**
+ * admin 相关的父类
+ *
+ * @Author 科湃腾：白少杰
+ * @Date 2022-06-10 21:00:58
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
+ */
+public class AdminBaseController {
+}

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/common/PostRequestUtil.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/common/PostRequestUtil.java

@@ -1,12 +1,7 @@
-package net.lab1024.sa.admin.common;
+package com.kpt.admin.common;
 
 import lombok.extern.slf4j.Slf4j;
 
-import net.lab1024.sa.admin.module.gm.eq.domain.from.EquipmentTplnrFrom;
-import net.lab1024.sa.admin.module.gm.maintain.domain.vo.MaintainDetailsVo;
-import net.lab1024.sa.admin.module.gm.repair.service.RepairService;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,12 +12,8 @@ import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
 
 
 @RestController

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/HttpConverterConfig.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/config/HttpConverterConfig.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.config;
+package com.kpt.admin.config;
 
 
 import org.springframework.context.annotation.Configuration;

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/JweAspectConfig.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/config/JweAspectConfig.java

@@ -1,22 +1,23 @@
-package net.lab1024.sa.admin.config;
+package com.kpt.admin.config;
 
-import net.lab1024.sa.common.common.domain.RequestUser;
-import net.lab1024.sa.common.common.util.SmartRequestUtil;
-import net.lab1024.sa.common.module.support.jwe.JweAspect;
-import net.lab1024.sa.common.module.support.jwe.JweUserKey;
-import net.lab1024.sa.common.module.support.operatelog.core.OperateLogAspect;
-import net.lab1024.sa.common.module.support.operatelog.core.OperateLogConfig;
+import com.kpt.common.common.domain.RequestUser;
+import com.kpt.common.common.util.SmartRequestUtil;
+import com.kpt.common.module.support.jwe.JweAspect;
+import com.kpt.common.module.support.jwe.JweUserKey;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * 操作日志切面 配置
  *
- * @Author 1024创新实验室: 罗伊
+ * @Author 科湃腾：白少杰
  * @Date 2022-05-30 21:22:12
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+
  */
 @Configuration
 public class JweAspectConfig {

smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/config/OperateLogAspectConfig.java

@@ -0,0 +1,33 @@
+package com.kpt.admin.config;
+
+import com.kpt.common.module.support.operatelog.core.OperateLogAspect;
+import com.kpt.common.module.support.operatelog.core.OperateLogConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 操作日志切面 配置
+ *
+ * @Author 科湃腾：白少杰
+ * @Date 2022-05-30 21:22:12
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+
+ */
+@Configuration
+public class OperateLogAspectConfig extends OperateLogAspect{
+
+    /**
+     * 配置信息
+     * @return
+     */
+    @Override
+    public OperateLogConfig getOperateLogConfig() {
+        OperateLogConfig config = OperateLogConfig.builder().corePoolSize(4).queueCapacity(1000).build();
+        return config;
+    }
+
+
+}

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityConfig.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/config/SecurityConfig.java

@@ -1,7 +1,7 @@
-package net.lab1024.sa.admin.config;
+package com.kpt.admin.config;
 
-import net.lab1024.sa.admin.module.system.login.service.LoginService;
-import net.lab1024.sa.common.common.security.AbstractSecurityConfig;
+import com.kpt.admin.module.system.login.service.LoginService;
+import com.kpt.common.common.security.AbstractSecurityConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -12,11 +12,14 @@ import java.util.function.BiFunction;
 /**
  * 权限配置
  *
- * @Author 1024创新实验室: 罗伊
+ * @Author 科湃腾：白少杰
  * @Date 2022-05-30 21:22:12
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+
  */
 @Configuration
 public class SecurityConfig extends AbstractSecurityConfig {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityMethodConfig.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/config/SecurityMethodConfig.java

@@ -1,9 +1,9 @@
-package net.lab1024.sa.admin.config;
+package com.kpt.admin.config;
 
-import net.lab1024.sa.admin.module.system.login.domain.LoginEmployeeDetail;
-import net.lab1024.sa.common.common.annoation.SaAuth;
-import net.lab1024.sa.common.common.security.SecurityMethodSource;
-import net.lab1024.sa.common.common.security.SecurityPermissionCheckService;
+import com.kpt.admin.module.system.login.domain.LoginEmployeeDetail;
+import com.kpt.common.common.annoation.SaAuth;
+import com.kpt.common.common.security.SecurityMethodSource;
+import com.kpt.common.common.security.SecurityPermissionCheckService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory;
 import org.springframework.security.access.method.MethodSecurityMetadataSource;
@@ -19,11 +19,14 @@ import org.springframework.security.core.Authentication;
  * 5、采用此配置原@PreAuthorize依然有效 <br>
  * 6、如若无需此配置，需将@EnableGlobalMethodSecurity注解添加至SecurityConfig类上
  *
- * @Author 1024创新实验室: 罗伊
+ * @Author 科湃腾：白少杰
  * @Date 2021-08-31 0:01
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+
  */
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class SecurityMethodConfig extends GlobalMethodSecurityConfiguration {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminCacheConst.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/constant/AdminCacheConst.java

@@ -1,15 +1,18 @@
-package net.lab1024.sa.admin.constant;
+package com.kpt.admin.constant;
 
-import net.lab1024.sa.common.constant.CacheKeyConst;
+import com.kpt.common.constant.CacheKeyConst;
 
 /**
  * 缓存 key
  *
- * @Author 1024创新实验室-主任:卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-01-07 18:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 public class AdminCacheConst extends CacheKeyConst {
 

smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/constant/AdminRedisKeyConst.java

@@ -0,0 +1,20 @@
+package com.kpt.admin.constant;
+
+import com.kpt.common.constant.RedisKeyConst;
+
+/**
+ * redis key 常量类
+ *
+ * @Author 科湃腾：白少杰
+ * @Date 2022-01-07 18:59:22
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
+ */
+public class AdminRedisKeyConst extends RedisKeyConst {
+
+
+}

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/constant/AdminSwaggerTagConst.java

@@ -1,15 +1,18 @@
-package net.lab1024.sa.admin.constant;
+package com.kpt.admin.constant;
 
-import net.lab1024.sa.common.constant.SwaggerTagConst;
+import com.kpt.common.constant.SwaggerTagConst;
 
 /**
  * swagger
  *
- * @Author 1024创新实验室:罗伊
+ * @Author 科湃腾：白少杰
  * @Date 2022-01-07 18:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 public class AdminSwaggerTagConst extends SwaggerTagConst {
 

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/listener/AdminStartupRunner.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/listener/AdminStartupRunner.java

@@ -1,8 +1,8 @@
-package net.lab1024.sa.admin.listener;
+package com.kpt.admin.listener;
 
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.common.common.code.ErrorCodeRegister;
-import net.lab1024.sa.common.config.ScheduleConfig;
+import com.kpt.common.common.code.ErrorCodeRegister;
+import com.kpt.common.config.ScheduleConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
@@ -10,11 +10,14 @@ import org.springframework.stereotype.Component;
 /**
  * admin 应用启动加载
  *
- * @Author 1024创新实验室-主任:卓大
+ * @Author 科湃腾：白少杰
  * @Date 2021-08-26 18:46:32
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Slf4j
 @Component
@@ -29,12 +32,12 @@ public class AdminStartupRunner implements CommandLineRunner {
         // 初始化状态码
         int codeCount = ErrorCodeRegister.initialize();
 
-        //TODO <卓大> ：根据实际情况来决定是否开启定时任务
+        //TODO <科湃腾> ：根据实际情况来决定是否开启定时任务
         String destroySchedules = "Spring 定时任务 @Schedule 已启动";
 //        destroySchedules = scheduleConfig.destroy();
 
-        log.info("\n ---------------【1024创新实验室 温馨提示：】 ErrorCode 共计完成初始化： {}个！---------------" +
-                 "\n ---------------【1024创新实验室 温馨提示：】 {}---------------\n", codeCount, destroySchedules);
+        log.info("\n ---------------【科湃腾 温馨提示：】 ErrorCode 共计完成初始化： {}个！---------------" +
+                 "\n ---------------【科湃腾 温馨提示：】 {}---------------\n", codeCount, destroySchedules);
 
     }
 }

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/constant/CategoryTypeEnum.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/constant/CategoryTypeEnum.java

@@ -1,18 +1,21 @@
-package net.lab1024.sa.admin.module.business.category.constant;
+package com.kpt.admin.module.business.category.constant;
 
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.lab1024.sa.common.common.enumeration.BaseEnum;
+import com.kpt.common.common.enumeration.BaseEnum;
 
 /**
  * 分类类型 枚举
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @AllArgsConstructor
 @Getter

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/controller/CategoryController.java

@@ -1,17 +1,17 @@
-package net.lab1024.sa.admin.module.business.category.controller;
+package com.kpt.admin.module.business.category.controller;
 
+import com.kpt.admin.module.business.category.domain.form.CategoryAddForm;
+import com.kpt.admin.module.business.category.domain.form.CategoryTreeQueryForm;
+import com.kpt.admin.module.business.category.domain.vo.CategoryTreeVO;
+import com.kpt.admin.module.business.category.domain.vo.CategoryVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.sa.admin.common.AdminBaseController;
-import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
-import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
-import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;
-import net.lab1024.sa.admin.module.business.category.domain.form.CategoryUpdateForm;
-import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
-import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryVO;
-import net.lab1024.sa.admin.module.business.category.service.CategoryService;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import com.kpt.admin.common.AdminBaseController;
+import com.kpt.admin.constant.AdminSwaggerTagConst;
+import com.kpt.admin.module.business.category.domain.form.CategoryUpdateForm;
+import com.kpt.admin.module.business.category.service.CategoryService;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.module.support.operatelog.annoation.OperateLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,11 +21,14 @@ import java.util.List;
 /**
  * 类目
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @OperateLog
 @RestController
@@ -35,31 +38,31 @@ public class CategoryController extends AdminBaseController {
     @Autowired
     private CategoryService categoryService;
 
-    @ApiOperation("添加类目 @author 胡克")
+    @ApiOperation("添加类目 @Author 科湃腾：白少杰")
     @PostMapping("/category/add")
     public ResponseDTO<String> add(@RequestBody @Valid CategoryAddForm addForm) {
         return categoryService.add(addForm);
     }
 
-    @ApiOperation("更新类目 @author 胡克")
+    @ApiOperation("更新类目 @Author 科湃腾：白少杰")
     @PostMapping("/category/update")
     public ResponseDTO<String> update(@RequestBody @Valid CategoryUpdateForm updateForm) {
         return categoryService.update(updateForm);
     }
 
-    @ApiOperation("查询类目详情 @author 胡克")
+    @ApiOperation("查询类目详情 @Author 科湃腾：白少杰")
     @GetMapping("/category/{categoryId}")
     public ResponseDTO<CategoryVO> queryDetail(@PathVariable Long categoryId) {
         return categoryService.queryDetail(categoryId);
     }
 
-    @ApiOperation("查询类目层级树 @author 胡克")
+    @ApiOperation("查询类目层级树 @Author 科湃腾：白少杰")
     @PostMapping("/category/tree")
     public ResponseDTO<List<CategoryTreeVO>> queryTree(@RequestBody @Valid CategoryTreeQueryForm queryForm) {
         return categoryService.queryTree(queryForm);
     }
 
-    @ApiOperation("删除类目 @author 胡克")
+    @ApiOperation("删除类目 @Author 科湃腾：白少杰")
     @GetMapping("/category/delete/{categoryId}")
     public ResponseDTO<String> delete(@PathVariable Long categoryId) {
         return categoryService.delete(categoryId);

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/dao/CategoryDao.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/dao/CategoryDao.java

@@ -1,8 +1,8 @@
-package net.lab1024.sa.admin.module.business.category.dao;
+package com.kpt.admin.module.business.category.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
-import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
+import com.kpt.admin.module.business.category.constant.CategoryTypeEnum;
+import com.kpt.admin.module.business.category.domain.entity.CategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -12,11 +12,14 @@ import java.util.List;
 /**
  * 类目 dao
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Component
 @Mapper

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/domain/dto/CategoryBaseDTO.java

@@ -1,10 +1,10 @@
-package net.lab1024.sa.admin.module.business.category.domain.dto;
+package com.kpt.admin.module.business.category.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
-import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import com.kpt.admin.module.business.category.constant.CategoryTypeEnum;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.common.common.validator.enumeration.CheckEnum;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 /**
  * 类目 基础属性 DTO 类
  *
- * @author 胡克
+ * @Author 科湃腾：白少杰
  * @date 2021/1/20 16:17
  */
 @Data

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategorySimpleDTO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/domain/dto/CategorySimpleDTO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.category.domain.dto;
+package com.kpt.admin.module.business.category.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -6,7 +6,7 @@ import lombok.Data;
 /**
  * 类目 基础属性 DTO 类
  *
- * @author 胡克
+ * @Author 科湃腾：白少杰
  * @date 2021/1/20 16:17
  */
 @Data

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/entity/CategoryEntity.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/domain/entity/CategoryEntity.java

@@ -1,21 +1,24 @@
-package net.lab1024.sa.admin.module.business.category.domain.entity;
+package com.kpt.admin.module.business.category.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kpt.admin.module.business.category.constant.CategoryTypeEnum;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
 
 import java.time.LocalDateTime;
 
 /**
  * 类目 实体类
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @TableName("t_category")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/domain/form/CategoryAddForm.java

@@ -1,11 +1,10 @@
-package net.lab1024.sa.admin.module.business.category.domain.form;
+package com.kpt.admin.module.business.category.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
-import net.lab1024.sa.admin.module.business.category.domain.dto.CategoryBaseDTO;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
-import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import com.kpt.admin.module.business.category.constant.CategoryTypeEnum;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.common.common.validator.enumeration.CheckEnum;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -14,11 +13,14 @@ import javax.validation.constraints.NotNull;
 /**
  * 类目 添加
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class CategoryAddForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryTreeQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/domain/form/CategoryTreeQueryForm.java

@@ -1,18 +1,21 @@
-package net.lab1024.sa.admin.module.business.category.domain.form;
+package com.kpt.admin.module.business.category.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.admin.module.business.category.constant.CategoryTypeEnum;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
 
 /**
  * 类目 层级树查询
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class CategoryTreeQueryForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/domain/form/CategoryUpdateForm.java

@@ -1,19 +1,21 @@
-package net.lab1024.sa.admin.module.business.category.domain.form;
+package com.kpt.admin.module.business.category.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.category.domain.dto.CategoryBaseDTO;
 
 import javax.validation.constraints.NotNull;
 
 /**
  * 类目 更新
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class CategoryUpdateForm extends CategoryAddForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryTreeVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/domain/vo/CategoryTreeVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.category.domain.vo;
+package com.kpt.admin.module.business.category.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import java.util.List;
 /**
  * 类目 层级树 vo
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class CategoryTreeVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/domain/vo/CategoryVO.java

@@ -1,25 +1,23 @@
-package net.lab1024.sa.admin.module.business.category.domain.vo;
+package com.kpt.admin.module.business.category.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
-import net.lab1024.sa.admin.module.business.category.domain.dto.CategoryBaseDTO;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
-import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import com.kpt.admin.module.business.category.constant.CategoryTypeEnum;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
+
 import java.time.LocalDateTime;
 
 /**
  * 类目
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class CategoryVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/manager/CategoryCacheManager.java

@@ -1,13 +1,13 @@
-package net.lab1024.sa.admin.module.business.category.manager;
+package com.kpt.admin.module.business.category.manager;
 
 import com.google.common.collect.Lists;
+import com.kpt.admin.constant.AdminCacheConst;
+import com.kpt.admin.module.business.category.dao.CategoryDao;
+import com.kpt.admin.module.business.category.domain.entity.CategoryEntity;
+import com.kpt.admin.module.business.category.domain.vo.CategoryTreeVO;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.constant.AdminCacheConst;
-import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
-import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
-import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
-import net.lab1024.sa.common.common.constant.StringConst;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import com.kpt.common.common.constant.StringConst;
+import com.kpt.common.common.util.SmartBeanUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
@@ -21,11 +21,14 @@ import java.util.stream.Collectors;
 /**
  * 类目 查询 缓存
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 @Slf4j

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/service/CategoryQueryService.java

@@ -1,14 +1,14 @@
-package net.lab1024.sa.admin.module.business.category.service;
+package com.kpt.admin.module.business.category.service;
 
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.kpt.admin.module.business.category.dao.CategoryDao;
+import com.kpt.admin.module.business.category.domain.dto.CategorySimpleDTO;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
-import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
-import net.lab1024.sa.admin.module.business.category.domain.dto.CategorySimpleDTO;
-import net.lab1024.sa.admin.module.business.category.manager.CategoryCacheManager;
-import net.lab1024.sa.common.common.constant.StringConst;
+import com.kpt.admin.module.business.category.domain.entity.CategoryEntity;
+import com.kpt.admin.module.business.category.manager.CategoryCacheManager;
+import com.kpt.common.common.constant.StringConst;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,11 +20,14 @@ import java.util.stream.Collectors;
 /**
  * 类目 查询 业务类
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 @Slf4j

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/category/service/CategoryService.java

@@ -1,17 +1,17 @@
-package net.lab1024.sa.admin.module.business.category.service;
+package com.kpt.admin.module.business.category.service;
 
 import com.google.common.collect.Lists;
-import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
-import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
-import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
-import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;
-import net.lab1024.sa.admin.module.business.category.domain.form.CategoryUpdateForm;
-import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
-import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryVO;
-import net.lab1024.sa.admin.module.business.category.manager.CategoryCacheManager;
-import net.lab1024.sa.common.common.code.UserErrorCode;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import com.kpt.admin.module.business.category.dao.CategoryDao;
+import com.kpt.admin.module.business.category.domain.entity.CategoryEntity;
+import com.kpt.admin.module.business.category.domain.form.CategoryAddForm;
+import com.kpt.admin.module.business.category.domain.form.CategoryTreeQueryForm;
+import com.kpt.admin.module.business.category.domain.form.CategoryUpdateForm;
+import com.kpt.admin.module.business.category.domain.vo.CategoryTreeVO;
+import com.kpt.admin.module.business.category.domain.vo.CategoryVO;
+import com.kpt.admin.module.business.category.manager.CategoryCacheManager;
+import com.kpt.common.common.code.UserErrorCode;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartBeanUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,11 +24,14 @@ import java.util.Optional;
 /**
  * 类目
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021/08/05 21:26:58
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 public class CategoryService {
@@ -45,7 +48,7 @@ public class CategoryService {
     /**
      * 添加类目
      *
-     * @author 胡克
+     * @Author 科湃腾：白少杰
      * @date 2021/1/20 17:17
      */
     public ResponseDTO<String> add(CategoryAddForm addForm) {
@@ -73,7 +76,7 @@ public class CategoryService {
      * 更新类目
      * 不能更新父级类目
      *
-     * @author 胡克
+     * @Author 科湃腾：白少杰
      * @date 2021/1/20 17:17
      */
     public ResponseDTO<String> update(CategoryUpdateForm updateForm) {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/constant/GoodsStatusEnum.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/constant/GoodsStatusEnum.java

@@ -1,18 +1,21 @@
-package net.lab1024.sa.admin.module.business.goods.constant;
+package com.kpt.admin.module.business.goods.constant;
 
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.lab1024.sa.common.common.enumeration.BaseEnum;
+import com.kpt.common.common.enumeration.BaseEnum;
 
 /**
  * 商品状态
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @AllArgsConstructor
 @Getter

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/controller/GoodsController.java

@@ -1,18 +1,18 @@
-package net.lab1024.sa.admin.module.business.goods.controller;
+package com.kpt.admin.module.business.goods.controller;
 
+import com.kpt.admin.module.business.goods.domain.form.GoodsUpdateForm;
+import com.kpt.admin.module.business.goods.domain.vo.GoodsVO;
+import com.kpt.admin.module.business.goods.service.GoodsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.sa.admin.common.AdminBaseController;
-import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
-import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
-import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
-import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsUpdateForm;
-import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
-import net.lab1024.sa.admin.module.business.goods.service.GoodsService;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.domain.ValidateList;
-import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import com.kpt.admin.common.AdminBaseController;
+import com.kpt.admin.constant.AdminSwaggerTagConst;
+import com.kpt.admin.module.business.goods.domain.form.GoodsAddForm;
+import com.kpt.admin.module.business.goods.domain.form.GoodsQueryForm;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.domain.ValidateList;
+import com.kpt.common.module.support.operatelog.annoation.OperateLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -22,11 +22,12 @@ import javax.validation.Valid;
 /**
  * 商品业务
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+ * @Email
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+ * ，2012-2022
  */
 @OperateLog
 @RestController
@@ -36,35 +37,35 @@ public class GoodsController extends AdminBaseController {
     @Autowired
     private GoodsService goodsService;
 
-    @ApiOperation("分页查询 @author 胡克")
+    @ApiOperation("分页查询 @Author 科湃腾：白少杰")
     @PostMapping("/goods/query")
     @PreAuthorize("@saAuth.checkPermission('goods:query ')")
     public ResponseDTO<PageResult<GoodsVO>> query(@RequestBody @Valid GoodsQueryForm queryForm) {
         return goodsService.query(queryForm);
     }
 
-    @ApiOperation("添加商品 @author 胡克")
+    @ApiOperation("添加商品 @Author 科湃腾：白少杰")
     @PostMapping("/goods/add")
     @PreAuthorize("@saAuth.checkPermission('goods:add')")
     public ResponseDTO<String> add(@RequestBody @Valid GoodsAddForm addForm) {
         return goodsService.add(addForm);
     }
 
-    @ApiOperation("更新商品 @author 胡克")
+    @ApiOperation("更新商品 @Author 科湃腾：白少杰")
     @PostMapping("/goods/update")
     @PreAuthorize("@saAuth.checkPermission('goods:update')")
     public ResponseDTO<String> update(@RequestBody @Valid GoodsUpdateForm updateForm) {
         return goodsService.update(updateForm);
     }
 
-    @ApiOperation("删除 @author 卓大")
+    @ApiOperation("删除 @Author 科湃腾：白少杰")
     @GetMapping("/goods/delete/{goodsId}")
     @PreAuthorize("@saAuth.checkPermission('goods:delete')")
     public ResponseDTO<String> delete(@PathVariable Long goodsId) {
         return goodsService.delete(goodsId);
     }
 
-    @ApiOperation("批量 @author 卓大")
+    @ApiOperation("批量 @Author 科湃腾：白少杰")
     @PostMapping("/goods/batchDelete")
     @PreAuthorize("@saAuth.checkPermission('goods:batchDelete')")
     public ResponseDTO<String> batchDelete(@RequestBody @Valid ValidateList<Long> idList) {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/dao/GoodsDao.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/dao/GoodsDao.java

@@ -1,10 +1,10 @@
-package net.lab1024.sa.admin.module.business.goods.dao;
+package com.kpt.admin.module.business.goods.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.business.goods.domain.entity.GoodsEntity;
-import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
-import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
+import com.kpt.admin.module.business.goods.domain.vo.GoodsVO;
+import com.kpt.admin.module.business.goods.domain.entity.GoodsEntity;
+import com.kpt.admin.module.business.goods.domain.form.GoodsQueryForm;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -14,11 +14,14 @@ import java.util.List;
 /**
  * 商品
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Mapper
 @Component

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/domain/entity/GoodsEntity.java

@@ -1,13 +1,9 @@
-package net.lab1024.sa.admin.module.business.goods.domain.entity;
+package com.kpt.admin.module.business.goods.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
-import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldBigDecimal;
-import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldLabel;
-import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldSql;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -15,11 +11,14 @@ import java.time.LocalDateTime;
 /**
  * 商品 实体类
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @TableName("t_goods")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/domain/form/GoodsAddForm.java

@@ -1,13 +1,12 @@
-package net.lab1024.sa.admin.module.business.goods.domain.form;
+package com.kpt.admin.module.business.goods.domain.form;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.kpt.admin.module.business.goods.constant.GoodsStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
-import net.lab1024.sa.common.common.json.deserializer.DictValueVoDeserializer;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
-import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
-import org.hibernate.validator.constraints.Length;
+import com.kpt.common.common.json.deserializer.DictValueVoDeserializer;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.common.common.validator.enumeration.CheckEnum;
 
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotBlank;
@@ -17,11 +16,14 @@ import java.math.BigDecimal;
 /**
  * 商品 添加表单
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class GoodsAddForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/domain/form/GoodsQueryForm.java

@@ -1,25 +1,24 @@
-package net.lab1024.sa.admin.module.business.goods.domain.form;
+package com.kpt.admin.module.business.goods.domain.form;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.kpt.admin.module.business.goods.constant.GoodsStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
-import net.lab1024.sa.common.common.domain.PageParam;
-import net.lab1024.sa.common.common.json.deserializer.DictValueVoDeserializer;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
-import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import com.kpt.common.common.domain.PageParam;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.common.common.validator.enumeration.CheckEnum;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * 商品 分页查询
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class GoodsQueryForm extends PageParam {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/domain/form/GoodsUpdateForm.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.goods.domain.form;
+package com.kpt.admin.module.business.goods.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import javax.validation.constraints.NotNull;
 /**
  * 商品 更新表单
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class GoodsUpdateForm extends GoodsAddForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/domain/vo/GoodsVO.java

@@ -1,11 +1,11 @@
-package net.lab1024.sa.admin.module.business.goods.domain.vo;
+package com.kpt.admin.module.business.goods.domain.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
-import net.lab1024.sa.common.common.json.serializer.DictValueVoSerializer;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.admin.module.business.goods.constant.GoodsStatusEnum;
+import com.kpt.common.common.json.serializer.DictValueVoSerializer;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -13,11 +13,14 @@ import java.time.LocalDateTime;
 /**
  * 商品
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class GoodsVO  {

smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/manager/GoodsManager.java

@@ -0,0 +1,23 @@
+package com.kpt.admin.module.business.goods.manager;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kpt.admin.module.business.goods.dao.GoodsDao;
+import com.kpt.admin.module.business.goods.domain.entity.GoodsEntity;
+import org.springframework.stereotype.Service;
+
+/**
+ * 商品 manager
+ *
+ * @Author 科湃腾：白少杰
+ * @Date 2021-10-25 20:26:54
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
+ */
+@Service
+public class GoodsManager extends ServiceImpl<GoodsDao, GoodsEntity> {
+
+}

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/goods/service/GoodsService.java

@@ -1,24 +1,23 @@
-package net.lab1024.sa.admin.module.business.goods.service;
+package com.kpt.admin.module.business.goods.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
-import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
-import net.lab1024.sa.admin.module.business.category.service.CategoryQueryService;
-import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
-import net.lab1024.sa.admin.module.business.goods.dao.GoodsDao;
-import net.lab1024.sa.admin.module.business.goods.domain.entity.GoodsEntity;
-import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
-import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
-import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsUpdateForm;
-import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
-import net.lab1024.sa.admin.module.business.goods.manager.GoodsManager;
-import net.lab1024.sa.common.common.code.UserErrorCode;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
-import net.lab1024.sa.common.common.util.SmartPageUtil;
-import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
-import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import com.kpt.admin.module.business.goods.constant.GoodsStatusEnum;
+import com.kpt.admin.module.business.goods.dao.GoodsDao;
+import com.kpt.admin.module.business.goods.domain.form.GoodsUpdateForm;
+import com.kpt.admin.module.business.goods.domain.vo.GoodsVO;
+import com.kpt.admin.module.business.category.constant.CategoryTypeEnum;
+import com.kpt.admin.module.business.category.domain.entity.CategoryEntity;
+import com.kpt.admin.module.business.category.service.CategoryQueryService;
+import com.kpt.admin.module.business.goods.domain.entity.GoodsEntity;
+import com.kpt.admin.module.business.goods.domain.form.GoodsAddForm;
+import com.kpt.admin.module.business.goods.domain.form.GoodsQueryForm;
+import com.kpt.common.common.code.UserErrorCode;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartBeanUtil;
+import com.kpt.common.common.util.SmartPageUtil;
+import com.kpt.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import com.kpt.common.module.support.datatracer.service.DataTracerService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,11 +32,14 @@ import java.util.stream.Collectors;
 /**
  * 商品
  *
- * @Author 1024创新实验室: 胡克
+ * @Author 科湃腾：白少杰
  * @Date 2021-10-25 20:26:54
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 public class GoodsService {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/bank/BankController.java

@@ -1,16 +1,16 @@
-package net.lab1024.sa.admin.module.business.oa.bank;
+package com.kpt.admin.module.business.oa.bank;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
-import net.lab1024.sa.admin.module.business.oa.bank.domain.BankCreateForm;
-import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;
-import net.lab1024.sa.admin.module.business.oa.bank.domain.BankUpdateForm;
-import net.lab1024.sa.admin.module.business.oa.bank.domain.BankVO;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.RequestUser;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartRequestUtil;
+import com.kpt.admin.constant.AdminSwaggerTagConst;
+import com.kpt.admin.module.business.oa.bank.domain.BankCreateForm;
+import com.kpt.admin.module.business.oa.bank.domain.BankQueryForm;
+import com.kpt.admin.module.business.oa.bank.domain.BankUpdateForm;
+import com.kpt.admin.module.business.oa.bank.domain.BankVO;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.RequestUser;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartRequestUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,11 +20,14 @@ import java.util.List;
 /**
  * OA办公-OA银行信息
  *
- * @Author 1024创新实验室:善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022/6/23 21:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @RestController
 @Api(tags = {AdminSwaggerTagConst.Business.OA_BANK})
@@ -33,25 +36,25 @@ public class BankController {
     @Autowired
     private BankService bankService;
 
-    @ApiOperation(value = "分页查询银行信息 @author 善逸")
+    @ApiOperation(value = "分页查询银行信息 @Author 科湃腾：白少杰")
     @PostMapping("/oa/bank/page/query")
     public ResponseDTO<PageResult<BankVO>> queryByPage(@RequestBody @Valid BankQueryForm queryDTO) {
         return bankService.queryByPage(queryDTO);
     }
 
-    @ApiOperation(value = "根据企业ID查询银行信息列表 @author 善逸")
+    @ApiOperation(value = "根据企业ID查询银行信息列表 @Author 科湃腾：白少杰")
     @GetMapping("/oa/bank/query/list/{enterpriseId}")
     public ResponseDTO<List<BankVO>> queryList(@PathVariable Long enterpriseId) {
         return bankService.queryList(enterpriseId);
     }
 
-    @ApiOperation(value = "查询银行信息详情 @author 善逸")
+    @ApiOperation(value = "查询银行信息详情 @Author 科湃腾：白少杰")
     @GetMapping("/oa/bank/get/{bankId}")
     public ResponseDTO<BankVO> getDetail(@PathVariable Long bankId) {
         return bankService.getDetail(bankId);
     }
 
-    @ApiOperation(value = "新建银行信息 @author 善逸")
+    @ApiOperation(value = "新建银行信息 @Author 科湃腾：白少杰")
     @PostMapping("/oa/bank/create")
     public ResponseDTO<String> createBank(@RequestBody @Valid BankCreateForm createVO) {
         RequestUser requestUser = SmartRequestUtil.getRequestUser();
@@ -60,13 +63,13 @@ public class BankController {
         return bankService.createBank(createVO);
     }
 
-    @ApiOperation(value = "编辑银行信息 @author 善逸")
+    @ApiOperation(value = "编辑银行信息 @Author 科湃腾：白少杰")
     @PostMapping("/oa/bank/update")
     public ResponseDTO<String> updateBank(@RequestBody @Valid BankUpdateForm updateVO) {
         return bankService.updateBank(updateVO);
     }
 
-    @ApiOperation(value = "删除银行信息 @author 善逸")
+    @ApiOperation(value = "删除银行信息 @Author 科湃腾：白少杰")
     @GetMapping("/oa/bank/delete/{bankId}")
     public ResponseDTO<String> deleteBank(@PathVariable Long bankId) {
         return bankService.deleteBank(bankId);

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/bank/BankDao.java

@@ -1,10 +1,10 @@
-package net.lab1024.sa.admin.module.business.oa.bank;
+package com.kpt.admin.module.business.oa.bank;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.business.oa.bank.domain.BankEntity;
-import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;
-import net.lab1024.sa.admin.module.business.oa.bank.domain.BankVO;
+import com.kpt.admin.module.business.oa.bank.domain.BankEntity;
+import com.kpt.admin.module.business.oa.bank.domain.BankQueryForm;
+import com.kpt.admin.module.business.oa.bank.domain.BankVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -14,11 +14,14 @@ import java.util.List;
 /**
  * OA办公-OA银行信息
  *
- * @Author 1024创新实验室:善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022/6/23 21:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Mapper
 @Component

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/bank/BankService.java

@@ -1,17 +1,18 @@
-package net.lab1024.sa.admin.module.business.oa.bank;
+package com.kpt.admin.module.business.oa.bank;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kpt.admin.module.business.oa.bank.domain.*;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.module.business.oa.bank.domain.*;
-import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
-import net.lab1024.sa.common.common.util.SmartPageUtil;
-import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerConst;
-import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
-import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import com.kpt.admin.module.business.oa.bank.domain.*;
+import com.kpt.admin.module.business.oa.enterprise.dao.EnterpriseDao;
+import com.kpt.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartBeanUtil;
+import com.kpt.common.common.util.SmartPageUtil;
+import com.kpt.common.module.support.datatracer.constant.DataTracerConst;
+import com.kpt.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import com.kpt.common.module.support.datatracer.service.DataTracerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,11 +23,14 @@ import java.util.Objects;
 /**
  * OA办公-OA银行信息
  *
- * @Author 1024创新实验室:善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022/6/23 21:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 @Slf4j

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/bank/domain/BankCreateForm.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.bank.domain;
+package com.kpt.admin.module.business.oa.bank.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,11 +10,14 @@ import javax.validation.constraints.NotNull;
 /**
  * OA办公-银行信息新建
  *
- * @Author 1024创新实验室:善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022/6/23 21:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class BankCreateForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankEntity.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/bank/domain/BankEntity.java

@@ -1,21 +1,24 @@
-package net.lab1024.sa.admin.module.business.oa.bank.domain;
+package com.kpt.admin.module.business.oa.bank.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldLabel;
+import com.kpt.common.module.support.datatracer.annoation.DataTracerFieldLabel;
 
 import java.time.LocalDateTime;
 
 /**
  * OA办公-OA银行信息
  *
- * @Author 1024创新实验室:善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022/6/23 21:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @TableName("t_oa_bank")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/bank/domain/BankQueryForm.java

@@ -1,8 +1,8 @@
-package net.lab1024.sa.admin.module.business.oa.bank.domain;
+package com.kpt.admin.module.business.oa.bank.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.domain.PageParam;
+import com.kpt.common.common.domain.PageParam;
 import org.hibernate.validator.constraints.Length;
 
 import java.time.LocalDate;
@@ -10,11 +10,14 @@ import java.time.LocalDate;
 /**
  * OA办公-OA银行信息查询
  *
- * @Author 1024创新实验室:善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022/6/23 21:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class BankQueryForm extends PageParam {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/bank/domain/BankUpdateForm.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.bank.domain;
+package com.kpt.admin.module.business.oa.bank.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import javax.validation.constraints.NotNull;
 /**
  * OA办公-银行信息更新
  *
- * @Author 1024创新实验室:善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022/6/23 21:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class BankUpdateForm extends BankCreateForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/bank/domain/BankVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.bank.domain;
+package com.kpt.admin.module.business.oa.bank.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import java.time.LocalDateTime;
 /**
  * OA办公-OA银行信息
  *
- * @Author 1024创新实验室:善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022/6/23 21:59:22
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class BankVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/EnterpriseController.java

@@ -1,19 +1,20 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise;
+package com.kpt.admin.module.business.oa.enterprise;
 
+import com.kpt.admin.module.business.oa.enterprise.domain.form.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
-import net.lab1024.sa.common.common.annoation.SaAuth;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.RequestUser;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartRequestUtil;
-import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import com.kpt.admin.constant.AdminSwaggerTagConst;
+import com.kpt.admin.module.business.oa.enterprise.domain.form.*;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import com.kpt.common.common.annoation.SaAuth;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.RequestUser;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartRequestUtil;
+import com.kpt.common.module.support.operatelog.annoation.OperateLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,11 +24,14 @@ import java.util.List;
 /**
  * 企业
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Slf4j
 @RestController
@@ -38,21 +42,21 @@ public class EnterpriseController {
     @Autowired
     private EnterpriseService enterpriseService;
 
-    @ApiOperation(value = "分页查询企业模块 @author 开云")
+    @ApiOperation(value = "分页查询企业模块 @Author 科湃腾：白少杰")
     @PostMapping("/oa/enterprise/page/query")
     @SaAuth
     public ResponseDTO<PageResult<EnterpriseVO>> queryByPage(@RequestBody @Valid EnterpriseQueryForm queryDTO) {
         return enterpriseService.queryByPage(queryDTO);
     }
 
-    @ApiOperation(value = "查询企业详情 @author 开云")
+    @ApiOperation(value = "查询企业详情 @Author 科湃腾：白少杰")
     @GetMapping("/oa/enterprise/get/{enterpriseId}")
     @SaAuth
     public ResponseDTO<EnterpriseVO> getDetail(@PathVariable Long enterpriseId) {
         return ResponseDTO.ok(enterpriseService.getDetail(enterpriseId));
     }
 
-    @ApiOperation(value = "新建企业 @author 开云")
+    @ApiOperation(value = "新建企业 @Author 科湃腾：白少杰")
     @PostMapping("/oa/enterprise/create")
     @SaAuth
     public ResponseDTO<String> createEnterprise(@RequestBody @Valid EnterpriseCreateForm createVO) {
@@ -62,21 +66,21 @@ public class EnterpriseController {
         return enterpriseService.createEnterprise(createVO);
     }
 
-    @ApiOperation(value = "编辑企业 @author 开云")
+    @ApiOperation(value = "编辑企业 @Author 科湃腾：白少杰")
     @PostMapping("/oa/enterprise/update")
     @SaAuth
     public ResponseDTO<String> updateEnterprise(@RequestBody @Valid EnterpriseUpdateForm updateVO) {
         return enterpriseService.updateEnterprise(updateVO);
     }
 
-    @ApiOperation(value = "删除企业 @author 开云")
+    @ApiOperation(value = "删除企业 @Author 科湃腾：白少杰")
     @GetMapping("/oa/enterprise/delete/{enterpriseId}")
     @SaAuth
     public ResponseDTO<String> deleteEnterprise(@PathVariable Long enterpriseId) {
         return enterpriseService.deleteEnterprise(enterpriseId);
     }
 
-    @ApiOperation(value = "企业列表查询 @author 开云")
+    @ApiOperation(value = "企业列表查询 @Author 科湃腾：白少杰")
     @GetMapping("/oa/enterprise/query/list")
     @SaAuth
     public ResponseDTO<List<EnterpriseListVO>> queryList(@RequestParam(value = "type", required = false) Integer type) {
@@ -84,21 +88,21 @@ public class EnterpriseController {
     }
 
 
-    @ApiOperation(value = "企业添加员工 @author 罗伊")
+    @ApiOperation(value = "企业添加员工 @Author 科湃腾：白少杰")
     @PostMapping("/oa/enterprise/employee/add")
     @SaAuth
     public ResponseDTO<String> addEmployee(@RequestBody @Valid EnterpriseEmployeeForm enterpriseEmployeeForm) {
         return enterpriseService.addEmployee(enterpriseEmployeeForm);
     }
 
-    @ApiOperation(value = "查询企业全部员工 @author 罗伊")
+    @ApiOperation(value = "查询企业全部员工 @Author 科湃腾：白少杰")
     @PostMapping("/oa/enterprise/employee/list")
     @SaAuth
     public ResponseDTO<List<EnterpriseEmployeeVO>> employeeList(@RequestBody @Valid List<Long> enterpriseIdList) {
         return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList));
     }
 
-    @ApiOperation(value = "分页查询企业员工 @author 卓大")
+    @ApiOperation(value = "分页查询企业员工 @Author 科湃腾：白少杰")
     @PostMapping("/oa/enterprise/employee/queryPage")
     @SaAuth
     public ResponseDTO<PageResult<EnterpriseEmployeeVO>> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) {
@@ -106,7 +110,7 @@ public class EnterpriseController {
     }
 
 
-    @ApiOperation(value = "企业删除员工 @author 罗伊")
+    @ApiOperation(value = "企业删除员工 @Author 科湃腾：白少杰")
     @PostMapping("/oa/enterprise/employee/delete")
     @SaAuth
     public ResponseDTO<String> deleteEmployee(@RequestBody @Valid EnterpriseEmployeeForm enterpriseEmployeeForm) {

smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java

@@ -0,0 +1,22 @@
+package com.kpt.admin.module.business.oa.enterprise;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kpt.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;
+import com.kpt.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
+import org.springframework.stereotype.Service;
+
+/**
+ * 企业员工关系 manager
+ *
+ * @Author 科湃腾：白少杰
+ * @Date 2022/7/28 20:37:15
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
+ */
+@Service
+public class EnterpriseEmployeeManager extends ServiceImpl<EnterpriseEmployeeDao, EnterpriseEmployeeEntity> {
+}

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/EnterpriseService.java

@@ -1,26 +1,26 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise;
+package com.kpt.admin.module.business.oa.enterprise;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.kpt.admin.module.business.oa.enterprise.dao.EnterpriseDao;
+import com.kpt.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;
+import com.kpt.admin.module.business.oa.enterprise.domain.form.*;
+import com.kpt.admin.module.system.department.service.DepartmentService;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
-import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
-import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
-import net.lab1024.sa.common.common.code.UserErrorCode;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
-import net.lab1024.sa.common.common.util.SmartPageUtil;
-import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
-import net.lab1024.sa.common.module.support.datatracer.domain.form.DataTracerForm;
-import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import com.kpt.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
+import com.kpt.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
+import com.kpt.admin.module.business.oa.enterprise.domain.form.*;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import com.kpt.common.common.code.UserErrorCode;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartBeanUtil;
+import com.kpt.common.common.util.SmartPageUtil;
+import com.kpt.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import com.kpt.common.module.support.datatracer.domain.form.DataTracerForm;
+import com.kpt.common.module.support.datatracer.service.DataTracerService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,11 +33,14 @@ import java.util.stream.Collectors;
 /**
  * 企业
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 @Slf4j

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/constant/EnterpriseTypeEnum.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/constant/EnterpriseTypeEnum.java

@@ -1,16 +1,19 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.constant;
+package com.kpt.admin.module.business.oa.enterprise.constant;
 
 
-import net.lab1024.sa.common.common.enumeration.BaseEnum;
+import com.kpt.common.common.enumeration.BaseEnum;
 
 /**
  * 企业类型
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 public enum EnterpriseTypeEnum implements BaseEnum {
 

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseDao.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/dao/EnterpriseDao.java

@@ -1,11 +1,11 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.dao;
+package com.kpt.admin.module.business.oa.enterprise.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.EnterpriseQueryForm;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import com.kpt.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
+import com.kpt.admin.module.business.oa.enterprise.domain.form.EnterpriseQueryForm;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -15,11 +15,14 @@ import java.util.List;
 /**
  * 企业
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Mapper
 @Component

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseEmployeeDao.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/dao/EnterpriseEmployeeDao.java

@@ -1,10 +1,10 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.dao;
+package com.kpt.admin.module.business.oa.enterprise.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.EnterpriseEmployeeQueryForm;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
+import com.kpt.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
+import com.kpt.admin.module.business.oa.enterprise.domain.form.EnterpriseEmployeeQueryForm;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -15,11 +15,14 @@ import java.util.List;
 /**
  * 企业员工
  *
- * @Author 1024创新实验室: 罗伊
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Mapper
 @Component

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEmployeeEntity.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/entity/EnterpriseEmployeeEntity.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity;
+package com.kpt.admin.module.business.oa.enterprise.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,11 +11,14 @@ import java.time.LocalDateTime;
 /**
  * 企业员工
  *
- * @Author 1024创新实验室: 罗伊
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @TableName("t_oa_enterprise_employee")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEntity.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/entity/EnterpriseEntity.java

@@ -1,23 +1,26 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity;
+package com.kpt.admin.module.business.oa.enterprise.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
-import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldEnum;
-import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldLabel;
+import com.kpt.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
+import com.kpt.common.module.support.datatracer.annoation.DataTracerFieldEnum;
+import com.kpt.common.module.support.datatracer.annoation.DataTracerFieldLabel;
 
 import java.time.LocalDateTime;
 
 /**
  * 企业
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @TableName("t_oa_enterprise")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java

@@ -1,15 +1,15 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+package com.kpt.admin.module.business.oa.enterprise.domain.form;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
-import net.lab1024.sa.common.common.json.deserializer.FileKeyVoDeserializer;
-import net.lab1024.sa.common.common.json.serializer.FileKeyVoSerializer;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
-import net.lab1024.sa.common.common.util.SmartVerificationUtil;
-import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import com.kpt.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
+import com.kpt.common.common.json.deserializer.FileKeyVoDeserializer;
+import com.kpt.common.common.json.serializer.FileKeyVoSerializer;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.common.common.util.SmartVerificationUtil;
+import com.kpt.common.common.validator.enumeration.CheckEnum;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -19,11 +19,14 @@ import javax.validation.constraints.Pattern;
 /**
  * OA企业模块创建
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class EnterpriseCreateForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+package com.kpt.admin.module.business.oa.enterprise.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,11 +10,14 @@ import java.util.List;
 /**
  * 企业员工
  *
- * @Author 1024创新实验室: 罗伊
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class EnterpriseEmployeeForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java

@@ -1,22 +1,23 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+package com.kpt.admin.module.business.oa.enterprise.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.domain.PageParam;
+import com.kpt.common.common.domain.PageParam;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.List;
 
 /**
  * 查询企业员工
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2021-12-20 21:06:49
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+
  */
 @Data
 public class EnterpriseEmployeeQueryForm extends PageParam {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/form/EnterpriseQueryForm.java

@@ -1,8 +1,8 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+package com.kpt.admin.module.business.oa.enterprise.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.domain.PageParam;
+import com.kpt.common.common.domain.PageParam;
 import org.hibernate.validator.constraints.Length;
 
 import java.time.LocalDate;
@@ -10,11 +10,14 @@ import java.time.LocalDate;
 /**
  * OA企业模块分页查询
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class EnterpriseQueryForm extends PageParam {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+package com.kpt.admin.module.business.oa.enterprise.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import javax.validation.constraints.NotNull;
 /**
  * OA企业模块编辑
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class EnterpriseUpdateForm extends EnterpriseCreateForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseEmployeeVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/vo/EnterpriseEmployeeVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo;
+package com.kpt.admin.module.business.oa.enterprise.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -6,11 +6,14 @@ import lombok.Data;
 /**
  * 企业员工信息
  *
- * @Author 1024创新实验室: 罗伊
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class EnterpriseEmployeeVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseListVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/vo/EnterpriseListVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo;
+package com.kpt.admin.module.business.oa.enterprise.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -6,7 +6,7 @@ import lombok.Data;
 /**
  * OA企业模块列表
  *
- * @author lihaifan
+ * @Author 科湃腾：白少杰
  * @date 2022/6/23 14:31
  */
 @Data

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/enterprise/domain/vo/EnterpriseVO.java

@@ -1,22 +1,25 @@
-package net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo;
+package com.kpt.admin.module.business.oa.enterprise.domain.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
-import net.lab1024.sa.common.common.json.serializer.FileKeyVoSerializer;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
+import com.kpt.common.common.json.serializer.FileKeyVoSerializer;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
 
 import java.time.LocalDateTime;
 
 /**
  * 企业信息
  *
- * @Author 1024创新实验室: 开云
+ * @Author 科湃腾：白少杰
  * @Date 2022/7/28 20:37:15
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class EnterpriseVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/invoice/InvoiceController.java

@@ -1,18 +1,18 @@
-package net.lab1024.sa.admin.module.business.oa.invoice;
+package com.kpt.admin.module.business.oa.invoice;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
-import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceAddForm;
-import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
-import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceUpdateForm;
-import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.RequestUser;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartRequestUtil;
-import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import com.kpt.admin.constant.AdminSwaggerTagConst;
+import com.kpt.admin.module.business.oa.invoice.domain.InvoiceAddForm;
+import com.kpt.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
+import com.kpt.admin.module.business.oa.invoice.domain.InvoiceUpdateForm;
+import com.kpt.admin.module.business.oa.invoice.domain.InvoiceVO;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.RequestUser;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartRequestUtil;
+import com.kpt.common.module.support.operatelog.annoation.OperateLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,11 +22,14 @@ import java.util.List;
 /**
  * OA发票信息
  *
- * @Author 1024创新实验室: 善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022-06-23 19:32:59
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Slf4j
 @RestController
@@ -37,19 +40,19 @@ public class InvoiceController {
     @Autowired
     private InvoiceService invoiceService;
 
-    @ApiOperation(value = "分页查询发票信息 @author 善逸")
+    @ApiOperation(value = "分页查询发票信息 @Author 科湃腾：白少杰")
     @PostMapping("/oa/invoice/page/query")
     public ResponseDTO<PageResult<InvoiceVO>> queryByPage(@RequestBody @Valid InvoiceQueryForm queryDTO) {
         return invoiceService.queryByPage(queryDTO);
     }
 
-    @ApiOperation(value = "查询发票信息详情 @author 善逸")
+    @ApiOperation(value = "查询发票信息详情 @Author 科湃腾：白少杰")
     @GetMapping("/oa/invoice/get/{invoiceId}")
     public ResponseDTO<InvoiceVO> getDetail(@PathVariable Long invoiceId) {
         return invoiceService.getDetail(invoiceId);
     }
 
-    @ApiOperation(value = "新建发票信息 @author 善逸")
+    @ApiOperation(value = "新建发票信息 @Author 科湃腾：白少杰")
     @PostMapping("/oa/invoice/create")
     public ResponseDTO<String> createInvoice(@RequestBody @Valid InvoiceAddForm createVO) {
         RequestUser requestUser = SmartRequestUtil.getRequestUser();
@@ -58,19 +61,19 @@ public class InvoiceController {
         return invoiceService.createInvoice(createVO);
     }
 
-    @ApiOperation(value = "编辑发票信息 @author 善逸")
+    @ApiOperation(value = "编辑发票信息 @Author 科湃腾：白少杰")
     @PostMapping("/oa/invoice/update")
     public ResponseDTO<String> updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) {
         return invoiceService.updateInvoice(updateVO);
     }
 
-    @ApiOperation(value = "删除发票信息 @author 善逸")
+    @ApiOperation(value = "删除发票信息 @Author 科湃腾：白少杰")
     @GetMapping("/invoice/delete/{invoiceId}")
     public ResponseDTO<String> deleteInvoice(@PathVariable Long invoiceId) {
         return invoiceService.deleteInvoice(invoiceId);
     }
 
-    @ApiOperation(value = "查询列表 @author lidoudou")
+    @ApiOperation(value = "查询列表 @Author 科湃腾：白少杰")
     @GetMapping("/oa/invoice/query/list/{enterpriseId}")
     public ResponseDTO<List<InvoiceVO>> queryList(@PathVariable Long enterpriseId) {
         return invoiceService.queryList(enterpriseId);

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/invoice/InvoiceDao.java

@@ -1,10 +1,10 @@
-package net.lab1024.sa.admin.module.business.oa.invoice;
+package com.kpt.admin.module.business.oa.invoice;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceEntity;
-import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
-import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO;
+import com.kpt.admin.module.business.oa.invoice.domain.InvoiceEntity;
+import com.kpt.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
+import com.kpt.admin.module.business.oa.invoice.domain.InvoiceVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -14,11 +14,14 @@ import java.util.List;
 /**
  * OA发票信息
  *
- * @Author 1024创新实验室: 善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022-06-23 19:32:59
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Mapper
 @Component

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/invoice/InvoiceService.java

@@ -1,17 +1,18 @@
-package net.lab1024.sa.admin.module.business.oa.invoice;
+package com.kpt.admin.module.business.oa.invoice;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kpt.admin.module.business.oa.invoice.domain.*;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.module.business.oa.enterprise.EnterpriseService;
-import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
-import net.lab1024.sa.admin.module.business.oa.invoice.domain.*;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
-import net.lab1024.sa.common.common.util.SmartPageUtil;
-import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerConst;
-import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
-import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import com.kpt.admin.module.business.oa.enterprise.EnterpriseService;
+import com.kpt.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import com.kpt.admin.module.business.oa.invoice.domain.*;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartBeanUtil;
+import com.kpt.common.common.util.SmartPageUtil;
+import com.kpt.common.module.support.datatracer.constant.DataTracerConst;
+import com.kpt.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import com.kpt.common.module.support.datatracer.service.DataTracerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,11 +23,14 @@ import java.util.Objects;
 /**
  * OA发票信息
  *
- * @Author 1024创新实验室: 善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022-06-23 19:32:59
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 @Slf4j

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/invoice/domain/InvoiceAddForm.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+package com.kpt.admin.module.business.oa.invoice.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,11 +10,14 @@ import javax.validation.constraints.NotNull;
 /**
  * OA发票信息新建
  *
- * @Author 1024创新实验室: 善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022-06-23 19:32:59
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class InvoiceAddForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceEntity.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/invoice/domain/InvoiceEntity.java

@@ -1,21 +1,24 @@
-package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+package com.kpt.admin.module.business.oa.invoice.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldLabel;
+import com.kpt.common.module.support.datatracer.annoation.DataTracerFieldLabel;
 
 import java.time.LocalDateTime;
 
 /**
  * OA发票信息
  *
- * @Author 1024创新实验室: 善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022-06-23 19:32:59
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @TableName("t_oa_invoice")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/invoice/domain/InvoiceQueryForm.java

@@ -1,8 +1,8 @@
-package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+package com.kpt.admin.module.business.oa.invoice.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.domain.PageParam;
+import com.kpt.common.common.domain.PageParam;
 import org.hibernate.validator.constraints.Length;
 
 import java.time.LocalDate;
@@ -10,11 +10,14 @@ import java.time.LocalDate;
 /**
  * OA发票信息查询
  *
- * @Author 1024创新实验室: 善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022-06-23 19:32:59
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class InvoiceQueryForm extends PageParam {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+package com.kpt.admin.module.business.oa.invoice.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import javax.validation.constraints.NotNull;
 /**
  * OA发票信息编辑
  *
- * @Author 1024创新实验室: 善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022-06-23 19:32:59
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class InvoiceUpdateForm extends InvoiceAddForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/invoice/domain/InvoiceVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+package com.kpt.admin.module.business.oa.invoice.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import java.time.LocalDateTime;
 /**
  * OA发票信息
  *
- * @Author 1024创新实验室: 善逸
+ * @Author 科湃腾：白少杰
  * @Date 2022-06-23 19:32:59
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class InvoiceVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/constant/NoticeVisibleRangeDataTypeEnum.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/constant/NoticeVisibleRangeDataTypeEnum.java

@@ -1,18 +1,21 @@
-package net.lab1024.sa.admin.module.business.oa.notice.constant;
+package com.kpt.admin.module.business.oa.notice.constant;
 
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.lab1024.sa.common.common.enumeration.BaseEnum;
+import com.kpt.common.common.enumeration.BaseEnum;
 
 /**
  * 公告、通知 可见范围类型
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Getter
 @AllArgsConstructor

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/controller/NoticeController.java

@@ -1,19 +1,21 @@
-package net.lab1024.sa.admin.module.business.oa.notice.controller;
+package com.kpt.admin.module.business.oa.notice.controller;
 
 import cn.hutool.extra.servlet.ServletUtil;
+import com.kpt.admin.module.business.oa.notice.domain.form.*;
+import com.kpt.admin.module.business.oa.notice.domain.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.*;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*;
-import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeEmployeeService;
-import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeService;
-import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeTypeService;
-import net.lab1024.sa.common.common.annoation.SaAuth;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartRequestUtil;
-import net.lab1024.sa.common.module.support.repeatsubmit.annoation.RepeatSubmit;
+import com.kpt.admin.constant.AdminSwaggerTagConst;
+import com.kpt.admin.module.business.oa.notice.domain.form.*;
+import com.kpt.admin.module.business.oa.notice.domain.vo.*;
+import com.kpt.admin.module.business.oa.notice.service.NoticeEmployeeService;
+import com.kpt.admin.module.business.oa.notice.service.NoticeService;
+import com.kpt.admin.module.business.oa.notice.service.NoticeTypeService;
+import com.kpt.common.common.annoation.SaAuth;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartRequestUtil;
+import com.kpt.common.module.support.repeatsubmit.annoation.RepeatSubmit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,11 +26,14 @@ import java.util.List;
 /**
  * 公告、通知、新闻等等
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat 卓大1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Api(tags = AdminSwaggerTagConst.Business.OA_NOTICE)
 @RestController
@@ -45,25 +50,25 @@ public class NoticeController {
 
     // --------------------- 通知公告类型 -------------------------
 
-    @ApiOperation("通知公告类型-获取全部 @author 卓大")
+    @ApiOperation("通知公告类型-获取全部 @Author 科湃腾：白少杰")
     @GetMapping("/oa/noticeType/getAll")
     public ResponseDTO<List<NoticeTypeVO>> getAll() {
         return ResponseDTO.ok(noticeTypeService.getAll());
     }
 
-    @ApiOperation("通知公告类型-添加 @author 卓大")
+    @ApiOperation("通知公告类型-添加 @Author 科湃腾：白少杰")
     @GetMapping("/oa/noticeType/add/{name}")
     public ResponseDTO<String> add(@PathVariable String name) {
         return noticeTypeService.add(name);
     }
 
-    @ApiOperation("通知公告类型-修改 @author 卓大")
+    @ApiOperation("通知公告类型-修改 @Author 科湃腾：白少杰")
     @GetMapping("/oa/noticeType/update/{noticeTypeId}/{name}")
     public ResponseDTO<String> update(@PathVariable Long noticeTypeId, @PathVariable String name) {
         return noticeTypeService.update(noticeTypeId, name);
     }
 
-    @ApiOperation("通知公告类型-删除 @author 卓大")
+    @ApiOperation("通知公告类型-删除 @Author 科湃腾：白少杰")
     @GetMapping("/oa/noticeType/delete/{noticeTypeId}")
     public ResponseDTO<String> deleteNoticeType(@PathVariable Long noticeTypeId) {
         return noticeTypeService.delete(noticeTypeId);
@@ -71,14 +76,14 @@ public class NoticeController {
 
     // --------------------- 【管理】通知公告-------------------------
 
-    @ApiOperation("【管理】通知公告-分页查询 @author 卓大")
+    @ApiOperation("【管理】通知公告-分页查询 @Author 科湃腾：白少杰")
     @PostMapping("/oa/notice/query")
     @SaAuth
     public ResponseDTO<PageResult<NoticeVO>> query(@RequestBody @Valid NoticeQueryForm queryForm) {
         return ResponseDTO.ok(noticeService.query(queryForm));
     }
 
-    @ApiOperation("【管理】通知公告-添加 @author 卓大")
+    @ApiOperation("【管理】通知公告-添加 @Author 科湃腾：白少杰")
     @PostMapping("/oa/notice/add")
     @RepeatSubmit
     @SaAuth
@@ -87,7 +92,7 @@ public class NoticeController {
         return noticeService.add(addForm);
     }
 
-    @ApiOperation("【管理】通知公告-更新 @author 卓大")
+    @ApiOperation("【管理】通知公告-更新 @Author 科湃腾：白少杰")
     @PostMapping("/oa/notice/update")
     @RepeatSubmit
     @SaAuth
@@ -95,14 +100,14 @@ public class NoticeController {
         return noticeService.update(updateForm);
     }
 
-    @ApiOperation("【管理】通知公告-更新详情 @author 卓大")
+    @ApiOperation("【管理】通知公告-更新详情 @Author 科湃腾：白少杰")
     @GetMapping("/oa/notice/getUpdateVO/{noticeId}")
     @SaAuth
     public ResponseDTO<NoticeUpdateFormVO> getUpdateFormVO(@PathVariable Long noticeId) {
         return ResponseDTO.ok(noticeService.getUpdateFormVO(noticeId));
     }
 
-    @ApiOperation("【管理】通知公告-删除 @author 卓大")
+    @ApiOperation("【管理】通知公告-删除 @Author 科湃腾：白少杰")
     @GetMapping("/oa/notice/delete/{noticeId}")
     @SaAuth
     public ResponseDTO<String> delete(@PathVariable Long noticeId) {
@@ -110,7 +115,7 @@ public class NoticeController {
     }
 
     // --------------------- 【员工】查看 通知公告 -------------------------
-    @ApiOperation("【员工】通知公告-查看详情 @author 卓大")
+    @ApiOperation("【员工】通知公告-查看详情 @Author 科湃腾：白少杰")
     @GetMapping("/oa/notice/employee/view/{noticeId}")
     public ResponseDTO<NoticeDetailVO> view(@PathVariable Long noticeId, HttpServletRequest request) {
         return noticeEmployeeService.view(
@@ -121,13 +126,13 @@ public class NoticeController {
         );
     }
 
-    @ApiOperation("【员工】通知公告-查询全部 @author 卓大")
+    @ApiOperation("【员工】通知公告-查询全部 @Author 科湃腾：白少杰")
     @PostMapping("/oa/notice/employee/query")
     public ResponseDTO<PageResult<NoticeEmployeeVO>> queryEmployeeNotice(@RequestBody @Valid NoticeEmployeeQueryForm noticeEmployeeQueryForm) {
         return noticeEmployeeService.queryList(SmartRequestUtil.getRequestUserId(), noticeEmployeeQueryForm);
     }
 
-    @ApiOperation("【员工】通知公告-查询 查看记录 @author 卓大")
+    @ApiOperation("【员工】通知公告-查询 查看记录 @Author 科湃腾：白少杰")
     @PostMapping("/oa/notice/employee/queryViewRecord")
     public ResponseDTO<PageResult<NoticeViewRecordVO>> queryViewRecord(@RequestBody @Valid NoticeViewRecordQueryForm noticeViewRecordQueryForm) {
         return ResponseDTO.ok(noticeEmployeeService.queryViewRecord(noticeViewRecordQueryForm));

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/dao/NoticeDao.java

@@ -1,16 +1,16 @@
-package net.lab1024.sa.admin.module.business.oa.notice.dao;
+package com.kpt.admin.module.business.oa.notice.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeQueryForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeViewRecordQueryForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
+import com.kpt.admin.module.business.oa.notice.domain.entity.NoticeEntity;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeQueryForm;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeViewRecordQueryForm;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeVO;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -20,11 +20,14 @@ import java.util.List;
 /**
  * 公告、通知、新闻等等
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Mapper
 @Component

smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/dao/NoticeTypeDao.java

@@ -0,0 +1,24 @@
+package com.kpt.admin.module.business.oa.notice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kpt.admin.module.business.oa.notice.domain.entity.NoticeTypeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 通知公告类型
+ *
+ * @Author 科湃腾：白少杰
+ * @Date 2022-08-12 21:40:39
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
+ */
+@Mapper
+@Component
+public interface NoticeTypeDao extends BaseMapper<NoticeTypeEntity> {
+
+}

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeEntity.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/entity/NoticeEntity.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.entity;
+package com.kpt.admin.module.business.oa.notice.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,11 +10,14 @@ import java.time.LocalDateTime;
 /**
  * 通知公告
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @TableName("t_notice")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeTypeEntity.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/entity/NoticeTypeEntity.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.entity;
+package com.kpt.admin.module.business.oa.notice.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,11 +13,14 @@ import java.time.LocalDateTime;
 /**
  * 通知公告类型
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @TableName("t_notice_type")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/form/NoticeAddForm.java

@@ -1,9 +1,9 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+package com.kpt.admin.module.business.oa.notice.domain.form;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.json.deserializer.FileKeyVoDeserializer;
+import com.kpt.common.common.json.deserializer.FileKeyVoDeserializer;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.Valid;
@@ -15,11 +15,14 @@ import java.util.List;
 /**
  * 通知公告 添加表单
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeAddForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeEmployeeQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/form/NoticeEmployeeQueryForm.java

@@ -1,19 +1,22 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+package com.kpt.admin.module.business.oa.notice.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.domain.PageParam;
+import com.kpt.common.common.domain.PageParam;
 
 import java.time.LocalDate;
 
 /**
  * 通知公告 员工查询表单
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeEmployeeQueryForm extends PageParam {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java

@@ -1,19 +1,22 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+package com.kpt.admin.module.business.oa.notice.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.domain.PageParam;
+import com.kpt.common.common.domain.PageParam;
 
 import java.time.LocalDate;
 
 /**
  * 通知公告 管理查询表单
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeQueryForm extends PageParam {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+package com.kpt.admin.module.business.oa.notice.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import javax.validation.constraints.NotNull;
 /**
  * 通知公告 更新表单
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeUpdateForm extends NoticeAddForm {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java

@@ -1,19 +1,22 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+package com.kpt.admin.module.business.oa.notice.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.domain.PageParam;
+import com.kpt.common.common.domain.PageParam;
 
 import javax.validation.constraints.NotNull;
 
 /**
  * 通知公告 阅读记录查询
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeViewRecordQueryForm extends PageParam {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java

@@ -1,23 +1,26 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+package com.kpt.admin.module.business.oa.notice.domain.form;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
-import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import com.kpt.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.common.common.validator.enumeration.CheckEnum;
 
 import javax.validation.constraints.NotNull;
 
 /**
  * 通知公告 可见范围数据
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 @NoArgsConstructor

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java

@@ -1,9 +1,9 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+package com.kpt.admin.module.business.oa.notice.domain.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.json.serializer.FileKeyVoSerializer;
+import com.kpt.common.common.json.serializer.FileKeyVoSerializer;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -12,11 +12,14 @@ import java.time.LocalDateTime;
 /**
  * 通知公告 详情
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeDetailVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeEmployeeVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/vo/NoticeEmployeeVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+package com.kpt.admin.module.business.oa.notice.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import java.time.LocalDate;
 /**
  * 通知公告 员工查看
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeEmployeeVO extends NoticeVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeTypeVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/vo/NoticeTypeVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+package com.kpt.admin.module.business.oa.notice.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -6,11 +6,14 @@ import lombok.Data;
 /**
  * 通知公告 类型
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeTypeVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeUpdateFormVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/vo/NoticeUpdateFormVO.java

@@ -1,20 +1,23 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+package com.kpt.admin.module.business.oa.notice.domain.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.common.common.json.serializer.FileKeyVoSerializer;
+import com.kpt.common.common.json.serializer.FileKeyVoSerializer;
 
 import java.util.List;
 
 /**
  * 用于更新 【通知、公告】 的 VO 对象
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeUpdateFormVO extends NoticeVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/vo/NoticeVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+package com.kpt.admin.module.business.oa.notice.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,11 +10,14 @@ import java.time.LocalDateTime;
 /**
  * 新闻、公告  VO
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeViewRecordVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/vo/NoticeViewRecordVO.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+package com.kpt.admin.module.business.oa.notice.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,11 +8,14 @@ import java.time.LocalDateTime;
 /**
  * 浏览记录 VO
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email 
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeViewRecordVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVisibleRangeVO.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/domain/vo/NoticeVisibleRangeVO.java

@@ -1,18 +1,21 @@
-package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+package com.kpt.admin.module.business.oa.notice.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
-import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import com.kpt.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
+import com.kpt.common.common.swagger.ApiModelPropertyEnum;
 
 /**
  * 新闻、公告 可见范围数据 VO
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Data
 public class NoticeVisibleRangeVO {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/manager/NoticeManager.java

@@ -1,10 +1,10 @@
-package net.lab1024.sa.admin.module.business.oa.notice.manager;
+package com.kpt.admin.module.business.oa.notice.manager;
 
-import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
-import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
-import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import com.kpt.admin.module.business.oa.notice.dao.NoticeDao;
+import com.kpt.admin.module.business.oa.notice.domain.entity.NoticeEntity;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
+import com.kpt.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import com.kpt.common.module.support.datatracer.service.DataTracerService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,11 +15,14 @@ import java.util.List;
 /**
  * 通知、公告 manager
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 public class NoticeManager {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/service/NoticeEmployeeService.java

@@ -1,19 +1,20 @@
-package net.lab1024.sa.admin.module.business.oa.notice.service;
+package com.kpt.admin.module.business.oa.notice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
-import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
-import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeViewRecordQueryForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*;
-import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
-import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
-import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
-import net.lab1024.sa.common.common.util.SmartPageUtil;
+import com.kpt.admin.module.business.oa.notice.dao.NoticeDao;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeViewRecordQueryForm;
+import com.kpt.admin.module.business.oa.notice.domain.vo.*;
+import com.kpt.admin.module.system.department.service.DepartmentService;
+import com.kpt.admin.module.system.employee.domain.entity.EmployeeEntity;
+import com.kpt.admin.module.system.employee.service.EmployeeService;
+import com.kpt.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
+import com.kpt.admin.module.business.oa.notice.domain.vo.*;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartBeanUtil;
+import com.kpt.common.common.util.SmartPageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,11 +26,14 @@ import java.util.stream.Collectors;
 /**
  * 员工查看 通知。公告
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 public class NoticeEmployeeService {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/service/NoticeService.java

@@ -1,31 +1,31 @@
-package net.lab1024.sa.admin.module.business.oa.notice.service;
+package com.kpt.admin.module.business.oa.notice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
-import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeAddForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeQueryForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeUpdateForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeUpdateFormVO;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
-import net.lab1024.sa.admin.module.business.oa.notice.manager.NoticeManager;
-import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
-import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
-import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
-import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
-import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao;
-import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
-import net.lab1024.sa.common.common.constant.StringConst;
-import net.lab1024.sa.common.common.domain.PageResult;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
-import net.lab1024.sa.common.common.util.SmartPageUtil;
-import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
-import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import com.kpt.admin.module.business.oa.notice.dao.NoticeDao;
+import com.kpt.admin.module.business.oa.notice.domain.entity.NoticeEntity;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeAddForm;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeQueryForm;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeUpdateForm;
+import com.kpt.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeUpdateFormVO;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeVO;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
+import com.kpt.admin.module.business.oa.notice.manager.NoticeManager;
+import com.kpt.admin.module.system.department.dao.DepartmentDao;
+import com.kpt.admin.module.system.department.domain.entity.DepartmentEntity;
+import com.kpt.admin.module.system.department.domain.vo.DepartmentVO;
+import com.kpt.admin.module.system.department.service.DepartmentService;
+import com.kpt.admin.module.system.employee.dao.EmployeeDao;
+import com.kpt.admin.module.system.employee.domain.entity.EmployeeEntity;
+import com.kpt.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
+import com.kpt.common.common.constant.StringConst;
+import com.kpt.common.common.domain.PageResult;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartBeanUtil;
+import com.kpt.common.common.util.SmartPageUtil;
+import com.kpt.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import com.kpt.common.module.support.datatracer.service.DataTracerService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,11 +41,14 @@ import java.util.stream.Collectors;
 /**
  * 通知。公告 后台管理业务
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 public class NoticeService {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/business/oa/notice/service/NoticeTypeService.java

@@ -1,11 +1,11 @@
-package net.lab1024.sa.admin.module.business.oa.notice.service;
+package com.kpt.admin.module.business.oa.notice.service;
 
 import cn.hutool.core.util.StrUtil;
-import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeTypeDao;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeTypeEntity;
-import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import com.kpt.admin.module.business.oa.notice.dao.NoticeTypeDao;
+import com.kpt.admin.module.business.oa.notice.domain.entity.NoticeTypeEntity;
+import com.kpt.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartBeanUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,11 +17,14 @@ import java.util.stream.Collectors;
 /**
  * 通知。公告 类型
  *
- * @Author 1024创新实验室-主任: 卓大
+ * @Author 科湃腾：白少杰
  * @Date 2022-08-12 21:40:39
- * @Wechat zhuoda1024
- * @Email lab1024@163.com
- * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Wechat Copartner
+
+ * @Email
+
+ * @Copyright 上海科湃腾信息科技有限公司（www.dairyinfo.com.cn）
+，2012-2022
  */
 @Service
 public class NoticeTypeService {

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/gm/audit/controller/AuditController.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/gm/audit/controller/AuditController.java

@@ -1,34 +1,29 @@
-package net.lab1024.sa.admin.module.gm.audit.controller;
+package com.kpt.admin.module.gm.audit.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kpt.admin.module.gm.audit.domain.from.editAuditCancelFrom;
+import com.kpt.admin.module.gm.audit.domain.vo.AuditVo;
+import com.kpt.admin.module.gm.eq.domain.from.AuditStatisticsForm;
+import com.kpt.admin.module.gm.eq.domain.from.EquipmentQueryFrom;
+import com.kpt.admin.module.system.menu.service.MenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.admin.module.gm.audit.domain.from.EditAuditRepairFrom;
-import net.lab1024.sa.admin.module.gm.audit.domain.from.editAuditCancelFrom;
-import net.lab1024.sa.admin.module.gm.audit.domain.from.editAuditFlowCompeletedFrom;
-import net.lab1024.sa.admin.module.gm.audit.domain.vo.AuditVo;
-import net.lab1024.sa.admin.module.gm.audit.domain.vo.ManHourVo;
-import net.lab1024.sa.admin.module.gm.audit.service.AuditService;
-import net.lab1024.sa.admin.module.gm.common.service.CommonService;
-import net.lab1024.sa.admin.module.gm.eq.domain.from.EquipmentQueryFrom;
-import net.lab1024.sa.admin.module.gm.eq.domain.vo.EquipmentBindDetailsVo;
-import net.lab1024.sa.admin.module.gm.inspection.service.InspectionService;
-import net.lab1024.sa.admin.module.gm.maintain.domain.vo.MaintainDetailsVo;
-import net.lab1024.sa.admin.module.gm.partapply.domain.vo.BigPartapplyVo;
-import net.lab1024.sa.admin.module.gm.partapply.service.PartapplyService;
-import net.lab1024.sa.admin.module.gm.repair.service.RepairService;
-import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
-import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
-import net.lab1024.sa.admin.module.system.menu.domain.vo.MenuVO;
-import net.lab1024.sa.admin.module.system.menu.service.MenuService;
-import net.lab1024.sa.common.common.annoation.NoNeedLogin;
-import net.lab1024.sa.common.common.domain.EquipmentAddResponse;
-import net.lab1024.sa.common.common.domain.ResponseDTO;
-import net.lab1024.sa.common.common.util.SmartPageUtil;
+import com.kpt.admin.module.gm.audit.domain.from.EditAuditRepairFrom;
+import com.kpt.admin.module.gm.audit.domain.from.editAuditFlowCompeletedFrom;
+import com.kpt.admin.module.gm.audit.domain.vo.ManHourVo;
+import com.kpt.admin.module.gm.audit.service.AuditService;
+import com.kpt.admin.module.gm.common.service.CommonService;
+import com.kpt.admin.module.gm.inspection.service.InspectionService;
+import com.kpt.admin.module.gm.maintain.domain.vo.MaintainDetailsVo;
+import com.kpt.admin.module.gm.partapply.domain.vo.BigPartapplyVo;
+import com.kpt.admin.module.gm.partapply.service.PartapplyService;
+import com.kpt.admin.module.gm.repair.service.RepairService;
+import com.kpt.admin.module.system.menu.domain.vo.MenuVO;
+import com.kpt.common.common.domain.EquipmentAddResponse;
+import com.kpt.common.common.domain.ResponseDTO;
+import com.kpt.common.common.util.SmartPageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -90,9 +85,9 @@ public class AuditController {
         page.setPageSize(pageSize);
         Page pageParam = SmartPageUtil.convert2PageQuery(page);
         List<AuditVo> auditList = auditService.GetAuditList(pageParam, "", "", "2", status, eqCodeOrName,
-                auditType, pastureId, pick, code, sapCode, startDate, endDate, authAuditType, "", empId,"");
+                auditType, pastureId, pick, code, sapCode, startDate, endDate, authAuditType, "", empId, "");
         int count = auditService.GetAuditListCount("", "", "2", status, eqCodeOrName, auditType, pastureId,
-                pick, code, sapCode, startDate, endDate, authAuditType, "", empId,"");
+                pick, code, sapCode, startDate, endDate, authAuditType, "", empId, "");
 
 
         String[] roleNameList = roleName.split(",");
@@ -324,6 +319,34 @@ public class AuditController {
         return t;
     }
 
+    /**
+     *
+     * @param auditStatisticsForm
+     * @return ResponseDTO
+     *
+     */
+    @GetMapping("/audit/manhour/statistics/list")
+    public ResponseDTO<List<ManHourVo>> getAuditStatisticsList(@ModelAttribute AuditStatisticsForm auditStatisticsForm) {
+        EquipmentQueryFrom page = new EquipmentQueryFrom();
+        page.setPageNum(auditStatisticsForm.getPageNum());
+        page.setPageSize(auditStatisticsForm.getPageSize());
+        Page pageParam = SmartPageUtil.convert2PageQuery(page);
+
+        List<ManHourVo> manHourVoList = auditService.getManHourStatistics(pageParam,auditStatisticsForm);
+        int count = auditService.getManHourStatisticsCount(auditStatisticsForm);
+        int i = 0;
+        for (ManHourVo manHourVo : manHourVoList) {
+            i++;
+            manHourVo.setNumber((auditStatisticsForm.getPageNum() - 1) * auditStatisticsForm.getPageSize() + i);
+        }
+        ResponseDTO t = ResponseDTO.ok(manHourVoList);
+        t.setCount(count);
+        t.setCode(200);
+        t.setPageSize(auditStatisticsForm.getPageSize());
+        t.setPageNum(auditStatisticsForm.getPageNum());
+        return t;
+    }
+
 
     @PostMapping("/audit/edit/cancel")
     //@NoNeedLogin

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/gm/audit/dao/AuditDao.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/gm/audit/dao/AuditDao.java

@@ -1,11 +1,12 @@
-package net.lab1024.sa.admin.module.gm.audit.dao;
+package com.kpt.admin.module.gm.audit.dao;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.lab1024.sa.admin.module.gm.audit.domain.from.AddAuditFrom;
-import net.lab1024.sa.admin.module.gm.audit.domain.from.EditAuditFrom;
-import net.lab1024.sa.admin.module.gm.audit.domain.from.editAuditFlowCompeletedFrom;
-import net.lab1024.sa.admin.module.gm.audit.domain.vo.AuditVo;
-import net.lab1024.sa.admin.module.gm.audit.domain.vo.ManHourVo;
+import com.kpt.admin.module.gm.audit.domain.from.AddAuditFrom;
+import com.kpt.admin.module.gm.audit.domain.from.EditAuditFrom;
+import com.kpt.admin.module.gm.audit.domain.from.editAuditFlowCompeletedFrom;
+import com.kpt.admin.module.gm.audit.domain.vo.AuditVo;
+import com.kpt.admin.module.gm.audit.domain.vo.ManHourVo;
+import com.kpt.admin.module.gm.eq.domain.from.AuditStatisticsForm;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -23,25 +24,25 @@ public interface AuditDao {
                                @Param("fromAuditType") String auditType, @Param("fromPastureId") int pastureId,
                                @Param("pick") String pick,
                                @Param("code") String code,
-                               @Param("sapCode") String sapCode,@Param("startDate")String startDate,@Param("endDate")String endDate,
-                               @Param("authAuditType")String  authAuditType,@Param("priok")String  priok,
-                               @Param("empId") String  empId,
-                               @Param("roleId") String  roleId);
+                               @Param("sapCode") String sapCode, @Param("startDate") String startDate, @Param("endDate") String endDate,
+                               @Param("authAuditType") String authAuditType, @Param("priok") String priok,
+                               @Param("empId") String empId,
+                               @Param("roleId") String roleId);
 
     int getAuditListCount(@Param("personnel") String personnel, @Param("createUserId") String createUserId,
                           @Param("processed") String processed, @Param("status") String status,
                           @Param("eqCodeOrName") String eqCodeOrName, @Param("fromAuditType") String auditType,
                           @Param("fromPastureId") int pastureId, @Param("pick") String pick,
                           @Param("code") String code,
-                          @Param("sapCode") String sapCode,@Param("startDate")String startDate,@Param("endDate")String endDate,
-                          @Param("authAuditType")String authAuditType,@Param("priok")String  priok,
-                          @Param("empId") String  empId,
-                          @Param("roleId") String  roleId);
+                          @Param("sapCode") String sapCode, @Param("startDate") String startDate, @Param("endDate") String endDate,
+                          @Param("authAuditType") String authAuditType, @Param("priok") String priok,
+                          @Param("empId") String empId,
+                          @Param("roleId") String roleId);
 
     void editAuditPersonnel(@Param("audit") EditAuditFrom audit);
 
 
-    void editAuditDate(@Param("code") String  code );
+    void editAuditDate(@Param("code") String code);
 
     String getAuditSapCode(@Param("code") String code);
 
@@ -65,11 +66,14 @@ public interface AuditDao {
     List<ManHourVo> getManHour(@Param("page") Page page, @Param("pastureId") String pastureId, @Param("eqName") String eqName, @Param("startTime") String startTime,
                                @Param("endTime") String endTime, @Param("startPick") String startPick, @Param("endPick") String endPick,
                                @Param("startCompletion") String startCompletion, @Param("endCompletion") String endCompletion,
-                               @Param("startAudit") String startAudit, @Param("endAudit") String endAudit,@Param("repairPerson") String repairPerson);
+                               @Param("startAudit") String startAudit, @Param("endAudit") String endAudit, @Param("repairPerson") String repairPerson);
 
-    int getManHourCount( @Param("pastureId") String pastureId, @Param("eqName") String eqName, @Param("startTime") String startTime,
-                               @Param("endTime") String endTime, @Param("startPick") String startPick, @Param("endPick") String endPick,
-                               @Param("startCompletion") String startCompletion, @Param("endCompletion") String endCompletion,
-                         @Param("startAudit") String startAudit, @Param("endAudit") String endAudit,@Param("repairPerson") String repairPerson);
+    int getManHourCount(@Param("pastureId") String pastureId, @Param("eqName") String eqName, @Param("startTime") String startTime,
+                        @Param("endTime") String endTime, @Param("startPick") String startPick, @Param("endPick") String endPick,
+                        @Param("startCompletion") String startCompletion, @Param("endCompletion") String endCompletion,
+                        @Param("startAudit") String startAudit, @Param("endAudit") String endAudit, @Param("repairPerson") String repairPerson);
+
+    List<ManHourVo> getManHourStatistics(@Param("pageParam") Page pageParam, @Param("audit") AuditStatisticsForm auditStatisticsForm);
 
+    int getManHourStatisticsCount(AuditStatisticsForm auditStatisticsForm);
 }

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/gm/audit/domain/from/AddAuditFrom.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/gm/audit/domain/from/AddAuditFrom.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.gm.audit.domain.from;
+package com.kpt.admin.module.gm.audit.domain.from;
 
 import lombok.Data;
 

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/gm/audit/domain/from/EditAuditFrom.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/gm/audit/domain/from/EditAuditFrom.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.gm.audit.domain.from;
+package com.kpt.admin.module.gm.audit.domain.from;
 
 import lombok.Data;
 

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/gm/audit/domain/from/EditAuditRepairFrom.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/gm/audit/domain/from/EditAuditRepairFrom.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.gm.audit.domain.from;
+package com.kpt.admin.module.gm.audit.domain.from;
 
 
 import lombok.Data;

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/gm/audit/domain/from/editAuditCancelFrom.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/gm/audit/domain/from/editAuditCancelFrom.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.gm.audit.domain.from;
+package com.kpt.admin.module.gm.audit.domain.from;
 
 
 import lombok.Data;

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/gm/audit/domain/from/editAuditFlowCompeletedFrom.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/gm/audit/domain/from/editAuditFlowCompeletedFrom.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.gm.audit.domain.from;
+package com.kpt.admin.module.gm.audit.domain.from;
 
 
 import lombok.Data;

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/gm/audit/domain/vo/AuditVo.java → smart-admin-api/kpt-admin/src/main/java/com/kpt/admin/module/gm/audit/domain/vo/AuditVo.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.admin.module.gm.audit.domain.vo;
+package com.kpt.admin.module.gm.audit.domain.vo;
 
 import lombok.Data;