CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.1.1

Browse Source
This commit is contained in:
DB 2024-04-26 17:43:46 +08:00
parent dec1629100
commit de05445ab2
17 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cpop-Api/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>Cpop-Api</artifactId> <artifactId>Cpop-Api</artifactId>

2
Cpop-ClockIn-Demo/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
</parent> </parent>
<artifactId>Cpop-ClockIn-Demo</artifactId> <artifactId>Cpop-ClockIn-Demo</artifactId>

2
Cpop-Core/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>Cpop-Core</artifactId> <artifactId>Cpop-Core</artifactId>

2
Cpop-Generator/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>Cpop-Generator</artifactId> <artifactId>Cpop-Generator</artifactId>

2
Cpop-Oam/Cpop-Oam-Web/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>Cpop-Oam-Web</artifactId> <artifactId>Cpop-Oam-Web</artifactId>

2
Cpop-Oam/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>Cpop-Oam</artifactId> <artifactId>Cpop-Oam</artifactId>

2
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java
View File

@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
import static com.cpop.system.business.entity.table.DictTypeTableDef.DICT_TYPE; import static com.cpop.oam.business.entity.table.DictTypeTableDef.DICT_TYPE;
/** /**
* 系统-字典类型表 控制层。 * 系统-字典类型表 控制层。

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java
View File

@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.cpop.system.business.entity.table.DictDataTableDef.DICT_DATA; import static com.cpop.oam.business.entity.table.DictDataTableDef.DICT_DATA;
/** /**
* 系统-字典数据表 服务层实现。 * 系统-字典数据表 服务层实现。

4
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java
View File

@ -24,8 +24,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.cpop.system.business.entity.table.DictDataTableDef.DICT_DATA; import static com.cpop.oam.business.entity.table.DictDataTableDef.DICT_DATA;
import static com.cpop.system.business.entity.table.DictTypeTableDef.DICT_TYPE; import static com.cpop.oam.business.entity.table.DictTypeTableDef.DICT_TYPE;
/** /**
* 系统-字典表 服务层实现。 * 系统-字典表 服务层实现。

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DutyServiceImpl.java
View File

@ -149,7 +149,7 @@ public class DutyServiceImpl extends ServiceImpl<DutyMapper, Duty> implements Du
Duty one = this.queryChain().where(DUTY.DUTY_DATE.eq(now)).one(); Duty one = this.queryChain().where(DUTY.DUTY_DATE.eq(now)).one();
if (one != null) { if (one != null) {
//获取当天技术值班人员 //获取当天技术值班人员
StaffDto staff = DbChain.table(USER).select(USER.PHONE_NUMBER, STAFF.NAME).from(USER) StaffDto staff = DbChain.table(USER).select(USER.PHONE, STAFF.NAME).from(USER)
.leftJoin(STAFF).on(STAFF.USER_ID.eq(USER.ID)) .leftJoin(STAFF).on(STAFF.USER_ID.eq(USER.ID))
.where(STAFF.ID.eq(one.getTechnologyStaffId())).oneAs(StaffDto.class); .where(STAFF.ID.eq(one.getTechnologyStaffId())).oneAs(StaffDto.class);
//技术售后群提醒 //技术售后群提醒

6
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java
View File

@ -31,9 +31,9 @@ import java.util.stream.Collectors;
import static com.cpop.core.base.table.table.UserTableDef.USER; import static com.cpop.core.base.table.table.UserTableDef.USER;
import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF; import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF;
import static com.cpop.system.business.entity.table.MenuTableDef.MENU; import static com.cpop.oam.business.entity.table.MenuTableDef.MENU;
import static com.cpop.system.business.entity.table.RoleMenuTableDef.ROLE_MENU; import static com.cpop.oam.business.entity.table.RoleMenuTableDef.ROLE_MENU;
import static com.cpop.system.business.entity.table.RoleTableDef.ROLE; import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE;
/** /**
* @author DB * @author DB

6
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java
View File

@ -23,9 +23,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.cpop.system.business.entity.table.MenuTableDef.MENU; import static com.cpop.oam.business.entity.table.MenuTableDef.MENU;
import static com.cpop.system.business.entity.table.RoleMenuTableDef.ROLE_MENU; import static com.cpop.oam.business.entity.table.RoleMenuTableDef.ROLE_MENU;
import static com.cpop.system.business.entity.table.RoleTableDef.ROLE; import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE;
/** /**
* 系统菜单表 服务层实现。 * 系统菜单表 服务层实现。

4
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java
View File

@ -27,8 +27,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.cpop.system.business.entity.table.RoleMenuTableDef.ROLE_MENU; import static com.cpop.oam.business.entity.table.RoleMenuTableDef.ROLE_MENU;
import static com.cpop.system.business.entity.table.RoleTableDef.ROLE; import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE;
/** /**
* 系统角色表 服务层实现。 * 系统角色表 服务层实现。

6
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskWorkOrderServiceImpl.java
View File

@ -753,7 +753,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
staffIds.add(task.getRecordStaffId()); staffIds.add(task.getRecordStaffId());
Map<String, StaffInfoVo> staffMap = staffService.listAs(QueryWrapper.create() Map<String, StaffInfoVo> staffMap = staffService.listAs(QueryWrapper.create()
.select(STAFF.ID, STAFF.NAME) .select(STAFF.ID, STAFF.NAME)
.select(USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) .select(USER.PHONE.as(StaffInfoVo::getPhoneNumber))
.from(STAFF) .from(STAFF)
.leftJoin(USER) .leftJoin(USER)
.on(USER.ID.eq(STAFF.USER_ID)) .on(USER.ID.eq(STAFF.USER_ID))
@ -1003,7 +1003,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
staffIds.add(task.getRecordStaffId()); staffIds.add(task.getRecordStaffId());
Map<String, StaffInfoVo> staffMap = staffService.listAs(QueryWrapper.create() Map<String, StaffInfoVo> staffMap = staffService.listAs(QueryWrapper.create()
.select(STAFF.ID, STAFF.NAME) .select(STAFF.ID, STAFF.NAME)
.select(USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) .select(USER.PHONE.as(StaffInfoVo::getPhoneNumber))
.from(STAFF) .from(STAFF)
.leftJoin(USER) .leftJoin(USER)
.on(USER.ID.eq(STAFF.USER_ID)) .on(USER.ID.eq(STAFF.USER_ID))
@ -1079,7 +1079,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl<TaskWorkOrderMapper, T
staffIds.add(task.getRecordStaffId()); staffIds.add(task.getRecordStaffId());
Map<String, StaffInfoVo> staffMap = staffService.listAs(QueryWrapper.create() Map<String, StaffInfoVo> staffMap = staffService.listAs(QueryWrapper.create()
.select(STAFF.ID, STAFF.NAME) .select(STAFF.ID, STAFF.NAME)
.select(USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) .select(USER.PHONE.as(StaffInfoVo::getPhoneNumber))
.from(STAFF) .from(STAFF)
.leftJoin(USER) .leftJoin(USER)
.on(USER.ID.eq(STAFF.USER_ID)) .on(USER.ID.eq(STAFF.USER_ID))

2
Cpop-Pay/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>Cpop-Pay</artifactId> <artifactId>Cpop-Pay</artifactId>

2
Cpop-System/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>Cpop-System</artifactId> <artifactId>Cpop-System</artifactId>

4
pom.xml
View File

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>com.cpop</groupId> <groupId>com.cpop</groupId>
<artifactId>Cpop-Union</artifactId> <artifactId>Cpop-Union</artifactId>
<version>1.1.0</version> <version>1.1.1</version>
<name>Cpop-Union</name> <name>Cpop-Union</name>
<description>深圳普普数字产业有限公司内部开发框架</description> <description>深圳普普数字产业有限公司内部开发框架</description>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -33,7 +33,7 @@
<properties> <properties>
<java.version>17</java.version> <java.version>17</java.version>
<cpop.version>1.1.0</cpop.version> <cpop.version>1.1.1</cpop.version>
<mybatis-flex.version>1.8.7</mybatis-flex.version> <mybatis-flex.version>1.8.7</mybatis-flex.version>
<common-text.version>1.10.0</common-text.version> <common-text.version>1.10.0</common-text.version>
<fastjson.version>2.0.46</fastjson.version> <fastjson.version>2.0.46</fastjson.version>