From a0b5291eb64b13555d4390aba7782eb76dced376 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 二月 2025 11:18:55 +0800
Subject: [PATCH] Merge branch 'dev' into dev_cr
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
index 5dd627c..6b91a0a 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.process.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
@@ -9,6 +10,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.mapper.InsReportMapper;
@@ -26,6 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.util.Date;
import java.util.List;
/**
@@ -49,6 +53,9 @@
@Resource
private InsSampleMapper insSampleMapper;
+ @Resource
+ private NumberGenerator<ProcessComplain> numberGenerator;
+
@Override
public IPage<ProcessComplain> pageProcessComplain(Page page, ProcessComplain processComplain) {
@@ -68,9 +75,10 @@
throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
}
//鎶曡瘔缂栧彿鐢熸垚
- //todo giveCode
-// String giveCode = this.giveCode.giveCode("JCZX-", "cnas_process_complain", "", "yyMMdd");
-// processComplain.setComplainNo(giveCode);
+ String giveCode = numberGenerator.generateNumberWithPrefix(3,
+ "JCZX-" + DateUtil.format(new Date(), "yyMMdd"),
+ ProcessComplain::getComplainNo);
+ processComplain.setComplainNo(giveCode);
return processComplainMapper.insert(processComplain);
}
--
Gitblit v1.9.3