From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展

---
 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java |  328 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 220 insertions(+), 108 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 1ae24e9..3e157ed 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.quality.service.impl;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -8,15 +9,14 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
-import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.procurementrecord.dto.Details;
-import com.ruoyi.procurementrecord.dto.ProcurementAddDto;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
+import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.procurementrecord.utils.StockUtils;
 import com.ruoyi.quality.dto.QualityInspectDto;
 import com.ruoyi.quality.mapper.QualityInspectMapper;
 import com.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -24,22 +24,26 @@
 import com.ruoyi.quality.pojo.QualityInspect;
 import com.ruoyi.quality.pojo.QualityInspectParam;
 import com.ruoyi.quality.pojo.QualityUnqualified;
+import com.ruoyi.stock.pojo.StockInRecord;
+import com.ruoyi.stock.service.StockInRecordService;
 import com.ruoyi.quality.service.IQualityInspectParamService;
 import com.ruoyi.quality.service.IQualityInspectService;
 import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.stock.dto.StockInventoryDto;
+import com.ruoyi.stock.service.StockInventoryService;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -47,8 +51,11 @@
 @AllArgsConstructor
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class QualityInspectServiceImpl extends ServiceImpl<QualityInspectMapper, QualityInspect>  implements IQualityInspectService {
+public class QualityInspectServiceImpl extends ServiceImpl<QualityInspectMapper, QualityInspect> implements IQualityInspectService {
 
+    private final StockUtils stockUtils;
+    private final StockInventoryService stockInventoryService;
+    private final StockInRecordService stockInRecordService;
     private QualityInspectMapper qualityInspectMapper;
 
     private IQualityInspectParamService qualityInspectParamService;
@@ -64,7 +71,7 @@
     @Override
     public int add(QualityInspectDto qualityInspectDto) {
         QualityInspect qualityInspect = new QualityInspect();
-        BeanUtils.copyProperties(qualityInspectDto,qualityInspect);
+        BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
         qualityInspect.setInspectState(0);//榛樿鏈彁浜�
         qualityInspectMapper.insert(qualityInspect);
         for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
@@ -79,7 +86,7 @@
         QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
         List<QualityInspectParam> qualityInspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
         QualityInspectDto qualityInspectDto = new QualityInspectDto();
-        BeanUtils.copyProperties(qualityInspect,qualityInspectDto);
+        BeanUtils.copyProperties(qualityInspect, qualityInspectDto);
         qualityInspectDto.setQualityInspectParams(qualityInspectParams);
         return qualityInspectDto;
     }
@@ -88,116 +95,148 @@
     @Override
     public int submit(QualityInspect inspect) {
         QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
-        /*鍒ゆ柇涓嶅悎鏍�*/
-        if (ObjectUtils.isNotNull(qualityInspect.getCheckResult()) && qualityInspect.getCheckResult().equals("涓嶅悎鏍�")){
+
+        //鎻愪氦鍓嶅繀椤诲垽鏂槸鍚﹀悎鏍�
+        if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
+            throw new ServiceException("璇峰厛鍒ゆ柇鏄惁鍚堟牸");
+        }
+
+        if (ObjectUtils.isNull(qualityInspect.getQualifiedQuantity())) {
+            throw new ServiceException("鍚堟牸鏁伴噺涓嶈兘涓虹┖");
+        }
+
+        if (ObjectUtils.isNull(qualityInspect.getUnqualifiedQuantity())) {
+            throw new ServiceException("涓嶅悎鏍兼暟閲忎笉鑳戒负绌�");
+        }
+
+        // 濡傛灉鍚堟牸鏁伴噺涓虹┖锛岃涓�0
+        if (qualityInspect.getQualifiedQuantity() == null) {
+            qualityInspect.setQualifiedQuantity(BigDecimal.ZERO);
+        }
+
+        // 濡傛灉涓嶅悎鏍兼暟閲忎负绌猴紝璁句负0
+        if (qualityInspect.getUnqualifiedQuantity() == null) {
+            qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
+        }
+
+        // 鍚堟牸鐩存帴鍏ュ簱
+        if(qualityInspect.getQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0){
+            //浠呮坊鍔犲叆搴撹褰�
+            StockInventoryDto stockInventoryDto = new StockInventoryDto();
+            //濡傛灉鏄噰璐川妫�鍚堟牸鍏ュ簱閫夌敤CUSTOMIZATION_UNSTOCK_OUT,鍏朵綑鍚堟牸鍏ュ簱閫夌敤QUALITYINSPECT_STOCK_IN
+            stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode()));
+            if (ObjectUtils.isNotEmpty(qualityInspect.getPurchaseLedgerId())){
+                stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
+            }
+            stockInventoryDto.setRecordId(qualityInspect.getId());
+            stockInventoryDto.setProductModelId(qualityInspect.getProductModelId());
+            stockInventoryDto.setQualitity(qualityInspect.getQualifiedQuantity());
+            if (qualityInspect.getCheckTime() != null) {
+                LocalDate stockCreateDate = DateUtils.toLocalDate(qualityInspect.getCheckTime()).plusDays(1);
+                stockInventoryDto.setCreateTime(LocalDateTime.of(stockCreateDate, java.time.LocalTime.MIDNIGHT));
+            }
+            stockInventoryDto.setBatchNo(resolveProductionBatchNo(
+                    qualityInspect.getProductMainId(),
+                    qualityInspect.getId(),
+                    qualityInspect.getProductModelId()));
+            stockInventoryService.addStockInRecordOnly(stockInventoryDto);
+        }
+        // 涓嶅悎鏍煎鐞�
+        if(qualityInspect.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) > 0){
             QualityUnqualified qualityUnqualified = new QualityUnqualified();
-            BeanUtils.copyProperties(qualityInspect,qualityUnqualified);
+            BeanUtils.copyProperties(qualityInspect, qualityUnqualified);
             qualityUnqualified.setInspectState(0);//寰呭鐞�
+            qualityUnqualified.setQuantity(qualityInspect.getUnqualifiedQuantity());
+            qualityUnqualified.setProductModelId(qualityInspect.getProductModelId());
             List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
             String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
-            qualityUnqualified.setDefectivePhenomena(text+"杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
+            qualityUnqualified.setDefectivePhenomena(text + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
             qualityUnqualified.setInspectId(qualityInspect.getId());
             qualityUnqualifiedMapper.insert(qualityUnqualified);
         }
 
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (qualityInspect.getInspectType() == 0) {
-            if ("鍚堟牸".equals(qualityInspect.getCheckResult())) {
-                ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
-                procurementRecordOutAdd.setType(1);
-                procurementRecordOutAdd.setTypeName("閲囪喘鍘熸潗鏂欐楠屽悎鏍煎叆搴�");
-                procurementRecordOutAdd.setNickName(loginUser.getNickName());
-                procurementRecordOutAdd.setPurchaseLedgerId(Math.toIntExact(qualityInspect.getPurchaseLedgerId()));
-                if (qualityInspect.getPurchaseLedgerId() == null) {
-                    throw new BaseException("璇烽�夋嫨閲囪喘鍗�");
-                }
-                SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(qualityInspect.getProductId());
-
-                ArrayList<Details> detailss = new ArrayList<>();
-                Details details = new Details();
-                details.setId(Math.toIntExact(salesLedgerProduct.getId()));
-                details.setInboundQuantity(qualityInspect.getQuantity());
-                details.setWarnNum(salesLedgerProduct.getWarnNum());
-                details.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
-                details.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
-                details.setProductModelId(qualityInspect.getProductModelId());
-                detailss.add( details);
-                procurementRecordOutAdd.setDetails(detailss);
-                procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
-                procurementRecordService.add(procurementRecordOutAdd);
-            }
-        }else if (qualityInspect.getInspectType() == 1) {
-            //鏌ヨUnitPrice/TotalPrice
-            ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
-            procurementRecordOutAdd.setType(2);
-            procurementRecordOutAdd.setTypeName("鐢熶骇杩囩▼妫�楠屽悎鏍煎叆搴�");
-            procurementRecordOutAdd.setNickName(loginUser.getNickName());
-            List<Details> details = new ArrayList<>();
-            Details details1 = new Details();
-            details1.setInboundQuantity(qualityInspect.getQuantity());
-            details1.setProductModelId(qualityInspect.getProductModelId());
-            procurementRecordOutAdd.setDetails(details);
-
-            ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
-                    .salesLedgerProductId(0)
-                    .inboundBatches( "鐢熶骇鍗婃垚鍝佸叆搴�")
-                    .inboundNum(details1.getInboundQuantity())
-                    .type(2)
-                    .warnNum(new BigDecimal(0))
-                    .unitPrice(new BigDecimal(0))
-                    .totalPrice(new BigDecimal(0))
-                    .createTime(LocalDateTime.now())
-                    .createUser(loginUser.getUserId())
-                    .updateTime(LocalDateTime.now())
-                    .updateUser(loginUser.getUserId())
-                    .createBy(procurementRecordOutAdd.getNickName())
-                    .productModelId(details1.getProductModelId())
-                    .qualityInspectId(qualityInspect.getId());
-            procurementRecordService.save(procurementRecordBuilder.build());
-
-
-
-        }else if (qualityInspect.getInspectType() == 2) {
-            //鏌ヨUnitPrice/TotalPrice
-            if (ObjectUtils.isNull(qualityInspect.getProductMainId())){
-                //濡傛灉鏄墜鍔ㄦ柊澧炵殑鍑哄巶妫�
-            }else {
-                SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectSalesLedgerProductByMainId(qualityInspect.getProductMainId());
-                ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
-                procurementRecordOutAdd.setType(2);
-                procurementRecordOutAdd.setTypeName("鐢熶骇鍑哄巶妫�楠屽悎鏍煎叆搴�");
-                procurementRecordOutAdd.setNickName(loginUser.getNickName());
-                List<Details> details = new ArrayList<>();
-                Details details1 = new Details();
-                details1.setInboundQuantity(qualityInspect.getQuantity());
-                details1.setId(Math.toIntExact(salesLedgerProduct.getId()));
-                details1.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
-                details1.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
-                details1.setProductModelId(salesLedgerProduct.getProductModelId());
-                details.add(details1);
-                procurementRecordOutAdd.setDetails(details);
-                procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
-                procurementRecordService.add(procurementRecordOutAdd);
-            }
-        }
         qualityInspect.setInspectState(1);//宸叉彁浜�
         return qualityInspectMapper.updateById(qualityInspect);
+    }
+
+    @Override
+    public R autoSubmit(Long id) {
+        if (id == null) {
+            return R.fail("妫�楠屽崟ID涓嶈兘涓虹┖");
+        }
+        QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
+        if (qualityInspect == null) {
+            return R.fail("妫�楠屽崟涓嶅瓨鍦�");
+        }
+        if (Integer.valueOf(1).equals(qualityInspect.getInspectState())) {
+            return R.ok("妫�楠屽崟宸叉彁浜�");
+        }
+
+        if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
+            qualityInspect.setCheckResult("鍚堟牸");
+        }
+        if (ObjectUtils.isNull(qualityInspect.getQualifiedQuantity())) {
+            qualityInspect.setQualifiedQuantity(qualityInspect.getQuantity() == null ? BigDecimal.ZERO : qualityInspect.getQuantity());
+        }
+        if (ObjectUtils.isNull(qualityInspect.getUnqualifiedQuantity())) {
+            qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
+        }
+        qualityInspectMapper.updateById(qualityInspect);
+        int rows = submit(qualityInspect);
+        return rows > 0 ? R.ok("妫�楠屽崟鎻愪氦鎴愬姛") : R.fail("妫�楠屽崟鎻愪氦澶辫触");
+    }
+
+    private String resolveProductionBatchNo(Long productionProductMainId,
+                                            Long qualityInspectId,
+                                            Long productModelId) {
+        if (productModelId == null) {
+            return null;
+        }
+        if (productionProductMainId != null) {
+            StockInRecord productionRecord = stockInRecordService.getOne(
+                    Wrappers.<StockInRecord>lambdaQuery()
+                            .eq(StockInRecord::getRecordId, productionProductMainId)
+                            .eq(StockInRecord::getProductModelId, productModelId)
+                            .in(StockInRecord::getRecordType, Arrays.asList(
+                                    StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode(),
+                                    StockInQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode()))
+                            .isNotNull(StockInRecord::getBatchNo)
+                            .orderByDesc(StockInRecord::getId)
+                            .last("limit 1"),
+                    false);
+            if (productionRecord != null) {
+                return productionRecord.getBatchNo();
+            }
+        }
+        if (qualityInspectId == null) {
+            return null;
+        }
+        StockInRecord inspectRecord = stockInRecordService.getOne(
+                Wrappers.<StockInRecord>lambdaQuery()
+                        .eq(StockInRecord::getRecordId, qualityInspectId)
+                        .eq(StockInRecord::getProductModelId, productModelId)
+                        .eq(StockInRecord::getRecordType, StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode())
+                        .isNotNull(StockInRecord::getBatchNo)
+                        .orderByDesc(StockInRecord::getId)
+                        .last("limit 1"),
+                false);
+        return inspectRecord == null ? null : inspectRecord.getBatchNo();
     }
 
     /*鐢熸垚妫�楠屾姤鍛�*/
     @Override
     public void down(HttpServletResponse response, QualityInspect qualityInspect) {
         QualityInspect inspect = qualityInspectMapper.selectById(qualityInspect.getId());
-        String inspectType="";
-        switch (inspect.getInspectType()){
+        String inspectType = "";
+        switch (inspect.getInspectType()) {
             case 0:
-                inspectType="鍘熸潗鏂欐楠�";
+                inspectType = "鍘熸潗鏂欐楠�";
                 break;
             case 1:
-                inspectType="杩囩▼妫�楠�";
+                inspectType = "杩囩▼妫�楠�";
                 break;
             case 2:
-                inspectType="鍑哄巶妫�楠�";
+                inspectType = "鍑哄巶妫�楠�";
                 break;
         }
         List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
@@ -205,6 +244,12 @@
         for (QualityInspectParam detail : paramList) {
             detail.setIndex(index);
             index++;
+            
+            if (detail.getParameterType() != null && detail.getParameterType() == 1) {
+                String min = detail.getMinValue() != null ? detail.getMinValue().stripTrailingZeros().toPlainString() : "";
+                String max = detail.getMaxValue() != null ? detail.getMaxValue().stripTrailingZeros().toPlainString() : "";
+                detail.setStandardValue(min + "~" + max);
+            }
         }
         InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
         Configure configure = Configure.builder()
@@ -237,33 +282,100 @@
     }
 
     @Override
+    public void downPdf(HttpServletResponse response, QualityInspect qualityInspect) {
+        QualityInspect inspect = qualityInspectMapper.selectById(qualityInspect.getId());
+        String inspectType = "";
+        switch (inspect.getInspectType()) {
+            case 0:
+                inspectType = "鍘熸潗鏂欐楠�";
+                break;
+            case 1:
+                inspectType = "杩囩▼妫�楠�";
+                break;
+            case 2:
+                inspectType = "鍑哄巶妫�楠�";
+                break;
+        }
+        List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
+        int index = 1;
+        for (QualityInspectParam detail : paramList) {
+            detail.setIndex(index);
+            index++;
+            
+            if (detail.getParameterType() != null && detail.getParameterType() == 1) {
+                String min = detail.getMinValue() != null ? detail.getMinValue().stripTrailingZeros().toPlainString() : "";
+                String max = detail.getMaxValue() != null ? detail.getMaxValue().stripTrailingZeros().toPlainString() : "";
+                detail.setStandardValue(min + "~" + max);
+            }
+        }
+        InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
+        Configure configure = Configure.builder()
+                .bind("paramList", new HackLoopTableRenderPolicy())
+                .build();
+        String finalInspectType = inspectType;
+        XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
+                new HashMap<String, Object>() {{
+                    put("inspect", inspect);
+                    put("inspectType", finalInspectType);
+                    put("paramList", paramList);
+                }});
+
+        try {
+            // 鍏堝皢妯℃澘鍐欏叆鍒� ByteArrayOutputStream 涓�
+            java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
+            template.write(bos);
+            bos.flush();
+            bos.close();
+            inputStream.close();
+            
+            // 浣跨敤 Spire.Doc 璇诲彇 docx 鏁版嵁娴佸苟杞负 PDF
+            java.io.ByteArrayInputStream bis = new java.io.ByteArrayInputStream(bos.toByteArray());
+            com.spire.doc.Document document = new com.spire.doc.Document(bis);
+
+            response.setContentType("application/pdf");
+            String fileName = URLEncoder.encode("妫�楠屾姤鍛�", "UTF-8");
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".pdf");
+            
+            java.io.OutputStream os = response.getOutputStream();
+            document.saveToStream(os, com.spire.doc.FileFormat.PDF);
+            os.flush();
+            os.close();
+            bis.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("瀵煎嚭澶辫触");
+        }
+    }
+
+    @Override
     public int updateQualityInspect(QualityInspectDto qualityInspectDto) {
         if (ObjectUtils.isNotNull(qualityInspectDto.getQualityInspectParams())) {
-            qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId,qualityInspectDto.getId()));
+            qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, qualityInspectDto.getId()));
             for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
                 qualityInspectParam.setInspectId(qualityInspectDto.getId());
             }
             qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
         }
         QualityInspect qualityInspect = new QualityInspect();
-        BeanUtils.copyProperties(qualityInspectDto,qualityInspect);
+        BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
         return qualityInspectMapper.updateById(qualityInspect);
     }
 
     @Override
-    public IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect) {
-        return qualityInspectMapper.qualityInspectListPage(page,qualityInspect);
+    public IPage<QualityInspectDto> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
+        return qualityInspectMapper.qualityInspectListPage(page, qualityInspect);
     }
 
     @Override
     public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
-        List<QualityInspect> qualityInspects =qualityInspectMapper.qualityInspectExport(qualityInspect);
+        List<QualityInspect> qualityInspects = qualityInspectMapper.qualityInspectExport(qualityInspect);
         ExcelUtil<QualityInspect> util = new ExcelUtil<QualityInspect>(QualityInspect.class);
-        switch (qualityInspect.getInspectType()){
+        switch (qualityInspect.getInspectType()) {
             case 0:
                 util.exportExcel(response, qualityInspects, "鍘熸潗鏂欐楠屽鍑�");
                 break;
-            case  1:
+            case 1:
                 util.exportExcel(response, qualityInspects, "杩囩▼妫�楠屽鍑�");
                 break;
             case 2:

--
Gitblit v1.9.3