From 72fe6f7da4a4cdcd4e086f5ca1a1e82b93551513 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 30 七月 2026 09:19:22 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 10fe981..b83d5ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -105,8 +105,9 @@
@GetMapping("/list")
public TableDataInfo list(ServiceReimbursement serviceReimbursement) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- serviceReimbursement.setCreateBy(user.getUserName());
- serviceReimbursement.setUsername(user.getNickName());
+
+// serviceReimbursement.setCreateBy(user.getUserName());
+// serviceReimbursement.setUsername(user.getNickName());
startPage();
List<ServiceReimbursement> list = serviceReimbursementService.queryList(serviceReimbursement);
return getDataTable(list);
@@ -769,7 +770,7 @@
}
public static String convert(Double money) {
- String smoney = money.toString();
+ String smoney = BigDecimal.valueOf(money).toString();
try {
if (smoney.indexOf(".") != -1) { //鎶婃暟鍊煎垎涓烘暣鏁板瀷鍜屽甫灏忔暟鐨勬暟鍊煎垎寮�澶勭悊銆�
String left = smoney.substring(0, smoney.indexOf("."));
--
Gitblit v1.9.3