From fd05ffbbf4729b3429599a2c3b3fff26efe2a7ff Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 22 四月 2026 15:37:21 +0800
Subject: [PATCH] 新增获取序列号
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOnlyvalueServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 5 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java | 9 +++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOnlyvalueService.java | 8 ++++++++
4 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java
index 2b34a41..95ac50e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java
@@ -45,6 +45,15 @@
BaseOnlyvalue baseOnlyvalue = baseOnlyvalueService.getOnlyCode(businessType, datequery);
return AjaxResult.success(baseOnlyvalue);
}
+ /**
+ * 鑾峰彇鍞竴缂栧彿
+ */
+ @ApiOperation("鑾峰彇搴忓垪鍙�")
+ @GetMapping("/getSequence")
+ public AjaxResult getSequence( String businessType, String orgId) {
+
+ return AjaxResult.success(baseOnlyvalueService.getSequence(businessType, orgId));
+ }
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOnlyvalueService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOnlyvalueService.java
index 77e130e..1311c77 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOnlyvalueService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseOnlyvalueService.java
@@ -28,4 +28,12 @@
* @return
*/
public BaseOnlyvalue getOnlyCode(String businessType, Boolean datequery);
+
+ /**
+ * 鑾峰彇搴忓垪鍙�
+ *
+ * @param businessType
+ * @return
+ */
+ public String getSequence(String businessType, String orgId);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOnlyvalueServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOnlyvalueServiceImpl.java
index a87095f..771cf8e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOnlyvalueServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOnlyvalueServiceImpl.java
@@ -8,10 +8,12 @@
import com.ruoyi.project.domain.BaseOnlyvalue;
import com.ruoyi.project.mapper.BaseOnlyvalueMapper;
import com.ruoyi.project.service.IBaseOnlyvalueService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.List;
@@ -101,4 +103,39 @@
}
+ /**
+ * 鑾峰彇搴忓垪鍙�
+ *
+ * @param businessType
+ * @return
+ */
+ @Override
+ public String getSequence(String businessType, String orgId) {
+ LocalDate currentDate = LocalDate.now();
+ int year = currentDate.getYear();
+ String month = currentDate.getMonthValue()+"";
+ if(month.length()==1)
+ month="0"+month;
+ if(ObjectUtils.isEmpty(orgId)){
+ orgId="";
+ }
+ //閫氳繃骞存湀鏃ユ湡鍘绘煡璇㈣鏈堜唤鏄惁瀛樺湪
+ String data =year + month+orgId;
+ BaseOnlyvalue baseOnlyvalue = new BaseOnlyvalue();
+ baseOnlyvalue.setBusinesstype(businessType);
+
+ List<BaseOnlyvalue> baseOnlyvalues = queryList(baseOnlyvalue);
+ if(baseOnlyvalues.size()==0){
+ baseOnlyvalue.setAppentvalue(data);
+ baseOnlyvalue.setCurrentvalue(1L);
+ baseOnlyvalue.setBusinesstype(businessType);
+ save(baseOnlyvalue);
+ }else {
+ baseOnlyvalue= baseOnlyvalues.get(0);
+ baseOnlyvalue.setCurrentvalue(baseOnlyvalue.getCurrentvalue()+1);
+ updateById(baseOnlyvalue);
+ }
+ return baseOnlyvalue.getAppentvalue() + data + baseOnlyvalue.getCurrentvalue();
+ }
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
index c666474..4c2c8d1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.project.mapper.ServiceTransportMapper;
import com.ruoyi.project.service.IServiceTransportFileService;
import com.ruoyi.project.service.IServiceTransportService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +43,7 @@
LambdaQueryWrapper<ServiceTransport> wrappers = getWrappers(serviceTransport);
// 娣诲姞create_time涓嶄负绌虹殑鏉′欢
wrappers.isNotNull(ServiceTransport::getCreateTime);
+
// 鐒跺悗杩涜鍊掑簭鎺掑簭
wrappers.orderByDesc(ServiceTransport::getCreateTime);
// 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
@@ -88,6 +90,9 @@
private LambdaQueryWrapper<ServiceTransport> getWrappers(ServiceTransport serviceTransport) {
LambdaQueryWrapper<ServiceTransport> wrappers = Wrappers.lambdaQuery();
+ if (ObjectUtils.isNotEmpty(serviceTransport.getId() )) {
+ wrappers.eq(ServiceTransport::getId, serviceTransport.getId());
+ }
if (serviceTransport.getReportId() != null) {
wrappers.eq(ServiceTransport::getReportId, serviceTransport.getReportId());
}
--
Gitblit v1.9.3