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

积木报表打包问题

Browse Source
This commit is contained in:
Vinjor 2024-08-07 11:37:48 +08:00
parent 3f1cb77842
commit f6b29d08e8
5 changed files with 96 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
pom.xml
View File

@ -15,7 +15,7 @@
<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>-->
@ -136,36 +136,51 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>aliyun</id>
<name>aliyun Repository</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!-- 积木报表部分依赖需要从jeecg仓库中下载 -->
<repository>
<id>jeecg</id>
<name>jeecg Repository</name>
<url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!-- 使用 huawei / aliyun 的 Maven 源，提升下载速度 -->
<repository>
<id>huaweicloud</id>
<name>huawei</name>
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
</repository>
<repository>
<id>aliyunmaven</id>
<name>aliyun</name>
<url>https://maven.aliyun.com/repository/public</url>
</repository>
<!-- 使用 huawei / aliyun 的 Maven 源，提升下载速度 -->
<!-- <repositories>-->
<!-- <repository>-->
<!-- <id>huaweicloud</id>-->
<!-- <name>huawei</name>-->
<!-- <url>https://mirrors.huaweicloud.com/repository/maven/</url>-->
<!-- </repository>-->
<!-- <repository>-->
<!-- <id>aliyunmaven</id>-->
<!-- <name>aliyun</name>-->
<!-- <url>https://maven.aliyun.com/repository/public</url>-->
<!-- </repository>-->
<!-- <repository>-->
<!-- <id>spring-milestones</id>-->
<!-- <name>Spring Milestones</name>-->
<!-- <url>https://repo.spring.io/milestone</url>-->
<!-- <snapshots>-->
<!-- <enabled>false</enabled>-->
<!-- </snapshots>-->
<!-- </repository>-->
<!-- <repository>-->
<!-- <id>spring-snapshots</id>-->
<!-- <name>Spring Snapshots</name>-->
<!-- <url>https://repo.spring.io/snapshot</url>-->
<!-- <releases>-->
<!-- <enabled>false</enabled>-->
<!-- </releases>-->
<!-- </repository>-->
<!-- </repositories>-->
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
</project>

1
yudao-module-report/yudao-module-report-biz/pom.xml
View File

@ -63,6 +63,7 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
<!-- <version>1.4.0</version>-->
</dependency>
<!-- 单独依赖升级版本，解决低版本validator失败问题 -->
<dependency>

27
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/DeptEnum.java Normal file
View File

@ -0,0 +1,27 @@
package cn.iocoder.yudao.module.system.enums.common;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 性别的枚举值
*
* @author 芋道源码
*/
@Getter
@AllArgsConstructor
public enum DeptEnum {
/** 私人客户 */
PRIVATE_CUS("私人客户"),
/** 代办客户 */
AGENT_CUS("代办客户"),
/** 政企客户 */
GOV_CUS("政企客户");
/**
* 名称
*/
private final String name;
}

20
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
View File

@ -51,6 +51,7 @@ import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.system.enums.common.DeptEnum.*;
import static java.util.Collections.singleton;
/**
@ -131,7 +132,11 @@ public class TenantServiceImpl implements TenantService {
// 修改租户的管理员
tenantMapper.updateById(new TenantDO().setId(tenant.getId()).setContactUserId(userId));
//创建租户顶级部门
Long deptId = createDept(userId,createReqVO.getName(),createReqVO.getContactMobile());
Long deptId = createDept(userId,createReqVO.getName(),createReqVO.getContactMobile(),null);
//创建三个客户部门：私人客户、代办客户、政企客户
createDept(null,PRIVATE_CUS.getName(),null,deptId);
createDept(null,AGENT_CUS.getName(),null,deptId);
createDept(null,GOV_CUS.getName(),null,deptId);
//拉取本租户配置的服务套餐对应的角色和权限，存入本租户对应信息
createServiceRole(createReqVO.getPackageId());
});
@ -158,13 +163,20 @@ public class TenantServiceImpl implements TenantService {
}
}
private Long createDept(Long userId,String deptName,String phone){
private Long createDept(Long userId,String deptName,String phone,Long parentId){
DeptSaveReqVO deptSaveReqVO = new DeptSaveReqVO();
deptSaveReqVO.setName(deptName);
deptSaveReqVO.setSort(0);
deptSaveReqVO.setPhone(phone);
deptSaveReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
deptSaveReqVO.setLeaderUserId(userId);
if(null!=phone){
deptSaveReqVO.setPhone(phone);
}
if(null!=userId){
deptSaveReqVO.setLeaderUserId(userId);
}
if(null!=parentId){
deptSaveReqVO.setParentId(parentId);
}
return deptService.createDept(deptSaveReqVO);
}

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>