ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into frx

Browse Source
This commit is contained in:
furongxin 2024-09-30 12:28:31 +08:00
commit 9ff735fdf7
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml
View File

@ -56,7 +56,7 @@ spring:
host: 127.0.0.1 # 地址 host: 127.0.0.1 # 地址
port: 6379 # 端口 port: 6379 # 端口
database: 1 # 数据库索引 database: 1 # 数据库索引
password: yhtkj@2024! # 密码，建议生产环境开启 # password: yhtkj@2024! # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 #################### --- #################### MQ 消息队列相关配置 ####################

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/vo/AttendanceRulesVO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.system.controller.admin.attendance.vo; package cn.iocoder.yudao.module.system.controller.admin.attendance.vo;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.group.AttendanceGroupDO;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -15,6 +16,8 @@ public class AttendanceRulesVO {
private String officeLocation; private String officeLocation;
@Schema(description = "是否允许外勤打卡 0否 1是") @Schema(description = "是否允许外勤打卡 0否 1是")
private Integer fieldworkFlag; private Integer fieldworkFlag;
@Schema(description = "考勤组信息")
private AttendanceGroupDO attendanceGroupDO;
@Data @Data
public static class WorkRules { public static class WorkRules {

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
View File

@ -954,6 +954,7 @@ public class AttendanceServiceImpl implements AttendanceService {
vo.setFieldworkFlag(group.getFieldworkFlag()); vo.setFieldworkFlag(group.getFieldworkFlag());
vo.setWorkRules(workRules); vo.setWorkRules(workRules);
vo.setOfficeLocation(group.getAddress()); vo.setOfficeLocation(group.getAddress());
vo.setAttendanceGroupDO(group);
return vo; return vo;
} }

2
yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml
View File

@ -56,7 +56,7 @@ spring:
host: 127.0.0.1 # 地址 host: 127.0.0.1 # 地址
port: 6379 # 端口 port: 6379 # 端口
database: 1 # 数据库索引 database: 1 # 数据库索引
password: yhtkj@2024! # 密码，建议生产环境开启 # password: yhtkj@2024! # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 #################### --- #################### MQ 消息队列相关配置 ####################

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-dev.yaml
View File

@ -56,7 +56,7 @@ spring:
host: 127.0.0.1 # 地址 host: 127.0.0.1 # 地址
port: 6379 # 端口 port: 6379 # 端口
database: 1 # 数据库索引 database: 1 # 数据库索引
password: yhtkj@2024! # 密码，建议生产环境开启 # password: yhtkj@2024! # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 #################### --- #################### MQ 消息队列相关配置 ####################