From 002f67c246db00b29fdce791c1e441221830434c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 11:13:16 +0800
Subject: [PATCH] bug修改
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 10 ++++++++++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java | 4 +++-
ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml | 1 +
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index 9681509..b275980 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -53,6 +54,8 @@
TInvoiceToBillService invoiceToBillService;
@Autowired
TokenService tokenService;
+ @Autowired
+ TTenantService tenantService;
@ApiOperation(value = "缴费账单查询分页列表")
@PostMapping("list")
@@ -111,6 +114,13 @@
@ApiOperation(value = "缴费账单开票")
@PostMapping(value = "/invoice")
public R<String> invoice(@RequestBody TInvoiceDTO dto) {
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ dto.setApplyName(tenantService.getById(userId).getResidentName());
+ String code;
+ do {
+ code = CodeGenerateUtils.generateVolumeSn();
+ } while (invoiceService.count(Wrappers.lambdaQuery(TInvoice.class).eq(TInvoice::getInvoiceNumber, code)) > 0);
+ dto.setInvoiceNumber(CodeGenerateUtils.generateVolumeSn());
// 添加开票信息
invoiceService.save(dto);
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
index cc86304..e295fd3 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
@@ -63,7 +63,7 @@
List<TItemTypeVO> itemTypes = itemTypeService.getItemList(itemName);
List<TItem> items = itemService.list();
itemTypes.forEach(itemType -> {
- itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId())).collect(Collectors.toList()));
+ itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId()) && item.getItemName().contains(itemName)).collect(Collectors.toList()));
});
return R.ok(itemTypes);
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java
index eb27892..76492bc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java
@@ -3,6 +3,8 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @Description
@@ -67,7 +69,7 @@
dateTime = dateTime.substring(2);
String timestampPart = "" + (Math.random() * 10000) * (System.currentTimeMillis() / 10000);
timestampPart = timestampPart.replace(".", "").replace("E", "");
- timestampPart = timestampPart.substring(0, 5);
+ timestampPart = timestampPart.substring(0, 0);
return dateTime + timestampPart;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
index bbc2d5c..858a121 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
@@ -103,6 +103,7 @@
t.create_by,
t.update_by,
t.disabled,
+ t.code,
i.item_name AS itemName,
it.type_name AS itemTypeName,
tnt.resident_name AS residentName
--
Gitblit v1.7.1