lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

考勤

Browse Source
This commit is contained in:
zt
2025-09-16 15:52:30 +08:00
parent d66d44460b
commit 7ee081c39c
7 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -26,7 +26,7 @@ snail-job:
# 随主应用端口漂移 # 随主应用端口漂移
port: 2${server.port} port: 2${server.port}
# 客户端ip指定 # 客户端ip指定
host: host: 127.0.0.1
# RPC类型: netty, grpc # RPC类型: netty, grpc
rpc-type: grpc rpc-type: grpc

2
xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
View File

@ -42,7 +42,7 @@ snail-job:
--- # 监控中心配置 --- # 监控中心配置
spring.boot.admin.client: spring.boot.admin.client:
# 增加客户端开关 # 增加客户端开关
enabled: true enabled: false
url: http://192.168.110.119:9090/admin url: http://192.168.110.119:9090/admin
instance: instance:
service-host-type: IP service-host-type: IP

2
xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
View File

@ -42,7 +42,7 @@ snail-job:
--- # 监控中心配置 --- # 监控中心配置
spring.boot.admin.client: spring.boot.admin.client:
# 增加客户端开关 # 增加客户端开关
enabled: true enabled: false
url: http://192.168.110.2:19191/admin url: http://192.168.110.2:19191/admin
instance: instance:
service-host-type: IP service-host-type: IP

2
xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml
View File

@ -1,5 +1,5 @@
server: server:
port: 18833 port: 8800
servlet: servlet:
context-path: /snail-job context-path: /snail-job

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubUserSalaryDetailController.java
View File

@ -71,12 +71,11 @@ public class SubUserSalaryDetailController extends BaseController {
return R.ok(subUserSalaryDetailService.queryById(id)); return R.ok(subUserSalaryDetailService.queryById(id));
} }
/** /**
* 工资计算与导出 * 工资计算与导出
*/ */
@GetMapping("/salaryPageList") @GetMapping("/salaryPageList")
public TableDataInfo<SubConstructionUserSalaryVo> salaryPageList(@Validated SubConstructionUserSalaryDto dto, PageQuery pageQuery) { public TableDataInfo<SubConstructionUserSalaryVo> salaryPageList( SubConstructionUserSalaryDto dto, PageQuery pageQuery) {
return subUserSalaryDetailService.salaryPageList(dto, pageQuery); return subUserSalaryDetailService.salaryPageList(dto, pageQuery);
} }

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/usersalaryperiod/SubConstructionUserSalaryVo.java
View File

@ -62,7 +62,9 @@ public class SubConstructionUserSalaryVo implements Serializable {
*/ */
private String yhkOpeningBank; private String yhkOpeningBank;
/**
* 总工资
*/
private BigDecimal totalSalary; private BigDecimal totalSalary;
/** /**
@ -70,10 +72,19 @@ public class SubConstructionUserSalaryVo implements Serializable {
*/ */
private Long sysUserId; private Long sysUserId;
/**
* 工作天数
*/
private Double workDay; private Double workDay;
/**
* 日薪
*/
private BigDecimal salary; private BigDecimal salary;
/**
* 时间
*/
private String time; private String time;
private Integer order; private Integer order;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java
View File

@ -297,7 +297,7 @@ public class SubUserSalaryDetailServiceImpl extends ServiceImpl<SubUserSalaryDet
for (SubConstructionUserVo row : rows) { for (SubConstructionUserVo row : rows) {
SubConstructionUserSalaryVo vo = new SubConstructionUserSalaryVo(); SubConstructionUserSalaryVo vo = new SubConstructionUserSalaryVo();
BeanUtil.copyProperties(row,vo); BeanUtil.copyProperties(row,vo);
vo.setSfzNumber(idCardEncryptorUtil.decrypt(vo.getSfzNumber())); // vo.setSfzNumber(idCardEncryptorUtil.decrypt(vo.getSfzNumber()));
vo.setTime(dto.getTime()); vo.setTime(dto.getTime());
// 获取工资 // 获取工资
BigDecimal salary = row.getSalary(); BigDecimal salary = row.getSalary();