dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system

Browse Source 
 Conflicts:
	dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/mapper/CompanyStaffMapper.java
	dl-module-company/src/main/resources/mapper/company/CompanyStaffMapper.xml
This commit is contained in:
xiao-fajia 2024-08-07 11:03:55 +08:00
commit 93af3ee12e
14 changed files with 64 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dl-module-company/src/main/java/cn/iocoder/yudao/module/company/mapper/CompanyStaffMapper.java
View File

@ -1,21 +0,0 @@
package cn.iocoder.yudao.module.company.mapper;
import cn.iocoder.yudao.module.company.entity.CompanyStaff;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 企业管理-员工信息表
* @author 小李
* @date 16:26 2024/8/6
**/
@Mapper
public interface CompanyStaffMapper extends BaseMapper<CompanyStaff> {
IPage<CompanyStaff> selectStaffListPage();
List<CompanyStaff> selectList();
}

10
dl-module-company/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyStaffController.java → dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/controller/admin/CompanyStaffController.java
View File

@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.company.controller.admin;
package cn.iocoder.yudao.module.staff.controller.admin;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.company.entity.CompanyStaff;
import cn.iocoder.yudao.module.company.service.CompanyStaffService;
import cn.iocoder.yudao.module.company.vo.CompanyStaffReqVO;
import cn.iocoder.yudao.module.company.vo.CompanyStaffRespVO;
import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
import cn.iocoder.yudao.module.staff.service.CompanyStaffService;
import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;

2
dl-module-company/src/main/java/cn/iocoder/yudao/module/company/entity/CompanyStaff.java → dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/entity/CompanyStaff.java
View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.company.entity;
package cn.iocoder.yudao.module.staff.entity;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;

22
dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/mapper/CompanyStaffMapper.java Normal file
View File

@ -0,0 +1,22 @@
package cn.iocoder.yudao.module.staff.mapper;
import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 企业管理-员工信息表
* @author 小李
* @date 16:26 2024/8/6
**/
@Mapper
public interface CompanyStaffMapper extends BaseMapper<CompanyStaff> {
IPage<CompanyStaff> selectListPage(@Param("map") CompanyStaffReqVO companyStaffReqVO, Page<CompanyStaff> page);
}

8
dl-module-company/src/main/java/cn/iocoder/yudao/module/company/service/CompanyStaffService.java → dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/CompanyStaffService.java
View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.company.service;
package cn.iocoder.yudao.module.staff.service;
import cn.iocoder.yudao.module.company.entity.CompanyStaff;
import cn.iocoder.yudao.module.company.vo.CompanyStaffReqVO;
import cn.iocoder.yudao.module.company.vo.CompanyStaffRespVO;
import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;

15
dl-module-company/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyStaffServiceImpl.java → dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/CompanyStaffServiceImpl.java
View File

@ -1,10 +1,10 @@
package cn.iocoder.yudao.module.company.service.impl;
package cn.iocoder.yudao.module.staff.service.impl;
import cn.iocoder.yudao.module.company.entity.CompanyStaff;
import cn.iocoder.yudao.module.company.mapper.CompanyStaffMapper;
import cn.iocoder.yudao.module.company.service.CompanyStaffService;
import cn.iocoder.yudao.module.company.vo.CompanyStaffReqVO;
import cn.iocoder.yudao.module.company.vo.CompanyStaffRespVO;
import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
import cn.iocoder.yudao.module.staff.mapper.CompanyStaffMapper;
import cn.iocoder.yudao.module.staff.service.CompanyStaffService;
import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -32,8 +32,7 @@ public class CompanyStaffServiceImpl extends ServiceImpl<CompanyStaffMapper, Com
**/
@Override
public IPage<CompanyStaff> queryListPage(CompanyStaffReqVO pageReqVO, Page<CompanyStaff> page) {
staffMapper.selectList();
return staffMapper.selectStaffListPage();
return staffMapper.selectListPage(pageReqVO, page);
}
@Override

4
dl-module-company/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyStaffReqVO.java → dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/vo/CompanyStaffReqVO.java
View File

@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.company.vo;
package cn.iocoder.yudao.module.staff.vo;
import cn.iocoder.yudao.module.company.entity.CompanyStaff;
import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
import lombok.Data;
/**

4
dl-module-company/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyStaffRespVO.java → dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/vo/CompanyStaffRespVO.java
View File

@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.company.vo;
package cn.iocoder.yudao.module.staff.vo;
import cn.iocoder.yudao.module.company.entity.CompanyStaff;
import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
import lombok.Data;
import java.util.List;

53
dl-module-company/src/main/resources/mapper/company/CompanyStaffMapper.xml
View File

@ -1,53 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.company2.mapper.CompanyStaffMapper">
<resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.company.entity.CompanyStaff">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="corpId" column="corp_id" jdbcType="VARCHAR"/>
<result property="userId" column="user_id" jdbcType="BIGINT"/>
<result property="deptId" column="dept_id" jdbcType="BIGINT"/>
<result property="workNo" column="work_no" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="tel" column="tel" jdbcType="VARCHAR"/>
<result property="sex" column="sex" jdbcType="VARCHAR"/>
<result property="address" column="address" jdbcType="VARCHAR"/>
<result property="workDate" column="work_date" jdbcType="DATE"/>
<result property="workYear" column="work_year" jdbcType="DECIMAL"/>
<result property="joinedDate" column="joined_date" jdbcType="DATE"/>
<result property="joinedYear" column="joined_year" jdbcType="DECIMAL"/>
<result property="education" column="education" jdbcType="VARCHAR"/>
<result property="content" column="content" jdbcType="VARCHAR"/>
<result property="uniqueCode" column="unique_code" jdbcType="VARCHAR"/>
<result property="fileIds" column="file_ids" jdbcType="VARCHAR"/>
<result property="tenantId" column="tenant_id" jdbcType="VARCHAR"/>
<result property="deleted" column="deleted" jdbcType="BIT"/>
<result property="creator" column="creator" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updater" column="updater" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
select
id,corp_id,user_id,
dept_id,work_no,name,
tel,sex,address,
work_date,work_year,joined_date,
joined_year,education,content,
unique_code,file_ids,tenant_id,
deleted,creator,create_time,
updater,update_time
from company_staff
</sql>
<select id="selectStaffListPage" resultMap="BaseResultMap">
<include refid="Base_Column_List" />
</select>
<select id="selectList" resultType="cn.iocoder.yudao.module.company.entity.CompanyStaff">
<include refid="Base_Column_List" />
</select>
</mapper>

9
dl-module-company/src/main/resources/mapper/staff/CompanyStaffMapper.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.staff.mapper.CompanyStaffMapper">
<select id="selectListPage" resultType="cn.iocoder.yudao.module.staff.entity.CompanyStaff">
select * from company_staff
</select>
</mapper>

5
pom.xml
View File

@ -15,16 +15,17 @@
<module>yudao-module-infra</module>
<!-- <module>yudao-module-member</module>-->
<module>yudao-module-bpm</module>
<module>yudao-module-report</module>
<!-- <module>yudao-module-report</module>-->
<!-- <module>yudao-module-mp</module>-->
<!-- <module>yudao-module-pay</module>-->
<!-- <module>yudao-module-mall</module>-->
<module>yudao-module-crm</module>
<module>yudao-module-erp</module>
<module>dl-module-base</module>
<module>dl-module-company</module>
<!-- Server 主项目 -->
<module>yudao-server</module>
<module>dl-module-company</module>
<!-- <module>yudao-module-ai</module>-->
</modules>

2
yudao-dependencies/pom.xml
View File

@ -502,7 +502,7 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
<!-- <version>${guice.version}</version>-->
</dependency>
<dependency>

10
yudao-server/pom.xml
View File

@ -51,11 +51,11 @@
<!-- </dependency>-->
<!-- 数据报表。默认注释，保证编译速度 -->
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-module-report-biz</artifactId>
<version>${revision}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>cn.iocoder.boot</groupId>-->
<!-- <artifactId>yudao-module-report-biz</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<!-- 工作流。默认注释，保证编译速度 -->
<dependency>
<groupId>cn.iocoder.boot</groupId>

4
yudao-server/src/main/resources/application.yaml
View File

@ -80,7 +80,9 @@ mybatis-plus:
type-aliases-package:
- ${yudao.info.base-package}.module.*.dal.dataobject
- ${yudao.info.base-package}.module.*.entity
mapper-locations: classpath:/mapper/*/*.xml
mapper-locations:
- classpath*:mapper/*/*.xml # 扫描子模块下的 mapper.xml文件
- classpath:mapper/*/*.xml # 扫描当前模块下的 mapper.xml 文件
encryptor:
password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成