From 377b8cdb560f05b8016f2fd7d6de3dfcebb65c59 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Tue, 18 Jun 2024 18:32:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=B7=A5=E8=B5=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/mysql/user/AdminUserMapper.java | 5 +- .../src/views/biz/Statement/wage.vue | 48 +++++++++---------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java index e405a949..39c584b0 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java @@ -63,16 +63,17 @@ public interface AdminUserMapper extends BaseMapperX { String span = "0"; if(reqVO.getYearMonth()!=null){ - LocalDate date1 = LocalDate.of(new Integer(reqVO.getYearMonth().substring(0,3)), new Integer(reqVO.getYearMonth().substring(4,5)), 1); + LocalDate date1 = LocalDate.of(new Integer(reqVO.getYearMonth().substring(0,4)), new Integer(reqVO.getYearMonth().substring(4,6)), 1); LocalDate date2 = LocalDate.of(LocalDate.now().getYear(), LocalDate.now().getMonth(), 1); long monthsBetween = ChronoUnit.MONTHS.between( date1.withDayOfMonth(1), date2.withDayOfMonth(1) ); + span = monthsBetween+""; } query.selectAll(AdminUserDO.class) - .select("a.year_mont,b.projectCode,b.external_code,sd.name as deptName") + .select("a.year_mont as yearMonth,b.projectCode,b.external_code,sd.name as deptName") .select("ifnull(sum(" + "case when exists(select id from base_process_setting where user_id=b.owner and procedure_id=b.procedure_id and salary_type='HourWage') " + "then (select price from base_process_setting where user_id=b.owner and procedure_id=b.procedure_id and salary_type='HourWage' limit 1)*b.workTime " + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue index f28ee94c..c5a13f9c 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/wage.vue @@ -12,9 +12,9 @@ :inline="true" label-width="100px" > - + - + - + - - - - - - - + + + + + + + { loading.value = true try { - const data = await ProcessDesignApi.getProcessDesignPage(queryParams) + const data = await UserApi.getUsersalaryPage(queryParams) list.value = data.list + console.log(list.value); + total.value = data.total } finally { loading.value = false