From 296d323f8e2032581b27ae4e3799c006e7c640aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwangzihua=E2=80=9D?= Date: Sun, 25 Jan 2026 21:27:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/form/ServiceDepartmentImportForm.java | 2 ++ .../domain/form/ServiceLawyerImportForm.java | 2 ++ .../service/service/ServiceApplicationsService.java | 13 ++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceDepartmentImportForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceDepartmentImportForm.java index e3bbc22..6e4e92c 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceDepartmentImportForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceDepartmentImportForm.java @@ -27,12 +27,14 @@ public class ServiceDepartmentImportForm { private Double quarterlyServiceDuration = 0.0; @ExcelProperty("季度累计服务成本") + @ExcelIgnore private BigDecimal quarterlyServiceCost = BigDecimal.ZERO; @ExcelProperty("年度累计服务时长") private Double annualServiceDuration = 0.0; @ExcelProperty("年度累计服务成本") + @ExcelIgnore private BigDecimal annualServiceCost = BigDecimal.ZERO; } \ No newline at end of file diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceLawyerImportForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceLawyerImportForm.java index 145e8a0..3766635 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceLawyerImportForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceLawyerImportForm.java @@ -30,11 +30,13 @@ public class ServiceLawyerImportForm { private Double quarterlyServiceDuration = 0.0; @ExcelProperty("季度累计服务成本") + @ExcelIgnore private BigDecimal quarterlyServiceCost = BigDecimal.ZERO; @ExcelProperty("年度累计服务时长") private Double annualServiceDuration = 0.0; @ExcelProperty("年度累计服务成本") + @ExcelIgnore private BigDecimal annualServiceCost = BigDecimal.ZERO; } \ No newline at end of file diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java index 5c8bd14..e6e2bfc 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java @@ -227,7 +227,11 @@ public class ServiceApplicationsService { */ public ResponseDTO add(ServiceApplicationsAddForm addForm) { ServiceApplicationsEntity serviceApplicationsEntity = SmartBeanUtil.copy(addForm, ServiceApplicationsEntity.class); - serviceApplicationsDao.insert(serviceApplicationsEntity); + if(addForm.getApplicationId() == null) { + serviceApplicationsDao.insert(serviceApplicationsEntity); + }else { + serviceApplicationsDao.updateById(serviceApplicationsEntity); + } return ResponseDTO.ok(); } @@ -1016,6 +1020,13 @@ public class ServiceApplicationsService { * @param queryForm */ public void exportLawyer(ServiceLawyerQueryForm queryForm, HttpServletResponse response) { + RequestEmployee requestUser = AdminRequestUtil.getRequestUser(); + RoleVO roleList = roleEmployeeService.getRoleIdList(requestUser.getEmployeeId()).get(0); + if (UserTypeEnum.USER.getDesc().equals(roleList.getRoleCode())){ + queryForm.setUserId(requestUser.getEmployeeId()); + }else if (UserTypeEnum.CTO.getDesc().equals(roleList.getRoleCode())){ + queryForm.setFirmId(requestUser.getDepartmentId()); + } DictEntity one = dictService.getOne("FILECOST"); // 如果没有指定季度，则使用年度范围，否则使用季度范围 if (queryForm.getQuarter() == null) {