From 7ee081c39c91ae364ad554c0947979529251bafa Mon Sep 17 00:00:00 2001 From: zt Date: Tue, 16 Sep 2025 15:52:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../controller/SubUserSalaryDetailController.java | 3 +-- .../SubConstructionUserSalaryVo.java | 13 ++++++++++++- .../impl/SubUserSalaryDetailServiceImpl.java | 2 +- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml index 39342b4e..ffa5eaca 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml @@ -26,7 +26,7 @@ snail-job: # 随主应用端口漂移 port: 2${server.port} # 客户端ip指定 - host: + host: 127.0.0.1 # RPC类型: netty, grpc rpc-type: grpc diff --git a/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml index ad9399f9..67961dc1 100644 --- a/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml +++ b/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml @@ -42,7 +42,7 @@ snail-job: --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: true + enabled: false url: http://192.168.110.119:9090/admin instance: service-host-type: IP diff --git a/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml index 2df4ca45..21489614 100644 --- a/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml +++ b/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml @@ -42,7 +42,7 @@ snail-job: --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: true + enabled: false url: http://192.168.110.2:19191/admin instance: service-host-type: IP diff --git a/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml b/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml index 98938a46..ba6df45f 100644 --- a/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 18833 + port: 8800 servlet: context-path: /snail-job diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubUserSalaryDetailController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubUserSalaryDetailController.java index 050ece26..5cba9f45 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubUserSalaryDetailController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubUserSalaryDetailController.java @@ -71,12 +71,11 @@ public class SubUserSalaryDetailController extends BaseController { return R.ok(subUserSalaryDetailService.queryById(id)); } - /** * 工资计算与导出 */ @GetMapping("/salaryPageList") - public TableDataInfo salaryPageList(@Validated SubConstructionUserSalaryDto dto, PageQuery pageQuery) { + public TableDataInfo salaryPageList( SubConstructionUserSalaryDto dto, PageQuery pageQuery) { return subUserSalaryDetailService.salaryPageList(dto, pageQuery); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/usersalaryperiod/SubConstructionUserSalaryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/usersalaryperiod/SubConstructionUserSalaryVo.java index 7231f0a5..72eb2bb6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/usersalaryperiod/SubConstructionUserSalaryVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/usersalaryperiod/SubConstructionUserSalaryVo.java @@ -62,7 +62,9 @@ public class SubConstructionUserSalaryVo implements Serializable { */ private String yhkOpeningBank; - + /** + * 总工资 + */ private BigDecimal totalSalary; /** @@ -70,10 +72,19 @@ public class SubConstructionUserSalaryVo implements Serializable { */ private Long sysUserId; + /** + * 工作天数 + */ private Double workDay; + /** + * 日薪 + */ private BigDecimal salary; + /** + * 时间 + */ private String time; private Integer order; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java index e4116ed4..70724318 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java @@ -297,7 +297,7 @@ public class SubUserSalaryDetailServiceImpl extends ServiceImpl