Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zhuo

2025-04-17 f67aa8b146f0fa901ce4ae183be511d8615cde77

 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);
    }