lims项目框架修改优化--后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zouyu
2026-01-30 5bd1e846de7587f39d3edacfed58bfa8325c8758 
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java


@@ -1,7 +1,6 @@


package com.ruoyi.inspect.service.impl;




import cn.hutool.core.bean.BeanUtil;


import cn.hutool.core.io.IoUtil;


import com.alibaba.excel.EasyExcel;


import com.alibaba.excel.support.ExcelTypeEnum;


import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;


@@ -34,23 +33,17 @@


import com.ruoyi.inspect.service.InsUnqualifiedHandlerFileService;


import com.ruoyi.inspect.service.InsUnqualifiedHandlerService;


import com.ruoyi.inspect.vo.UnqualifiedHandlerVO;


import com.ruoyi.system.mapper.UserMapper;


import com.ruoyi.system.service.ISysDictDataService;


import com.ruoyi.system.service.ISysDictTypeService;


import com.ruoyi.system.service.UserService;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Isolation;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletResponse;


import java.io.InputStream;


import java.net.URLEncoder;


import java.nio.charset.StandardCharsets;


import java.time.LocalDate;


import java.time.format.DateTimeFormatter;


import java.util.ArrayList;


import java.util.HashMap;


@@ -94,23 +87,17 @@


        response.reset();


        try{


            //查询字典


            List<SysDictData> materialPropType = sysDictTypeService.selectDictDataByType("material_prop_type");


            List<SysDictData> materialPropType = sysDictTypeService.selectDictDataByType("material_prop_type");//物料属性


            List<SysDictData> categoriesNoConformities = sysDictTypeService.selectDictDataByType("categories_no_conformities");//不合格分类


            List<SysDictData> attributionNoConformities = sysDictTypeService.selectDictDataByType("attribution_no_conformities");// 不合格归属


            //查询不合格处理记录


            IPage<UnqualifiedHandlerVO> pageList = pageList(new Page<>(-1, -1), unqualifiedHandlerDto);


            List<InsUnqualifiedHandlerExcelData> records = pageList.getRecords().stream().map(m->{


                InsUnqualifiedHandlerExcelData handlerExcelData = new InsUnqualifiedHandlerExcelData();


                BeanUtil.copyProperties(m,handlerExcelData);


                handlerExcelData.setMaterialProp(materialPropType.stream().filter(f-> StringUtils.equals(f.getDictValue(),handlerExcelData.getMaterialProp())).findFirst().orElse(new SysDictData()).getDictLabel());


                if(StringUtils.equals(handlerExcelData.getClassification(),"0")){


                    handlerExcelData.setClassification("一类不合格");


                }else if(StringUtils.equals(handlerExcelData.getClassification(),"1")){


                    handlerExcelData.setClassification("二类不合格");


                }


                if(StringUtils.equals(handlerExcelData.getOffGradeAscription(),"0")){


                    handlerExcelData.setOffGradeAscription("生产反馈不合格");


                }else if(StringUtils.equals(handlerExcelData.getOffGradeAscription(),"1")){


                    handlerExcelData.setOffGradeAscription("检测不合格");


                }


                handlerExcelData.setClassification(categoriesNoConformities.stream().filter(f-> StringUtils.equals(f.getDictValue(),handlerExcelData.getClassification())).findFirst().orElse(new SysDictData()).getDictLabel());


                handlerExcelData.setOffGradeAscription(attributionNoConformities.stream().filter(f-> StringUtils.equals(f.getDictValue(),handlerExcelData.getOffGradeAscription())).findFirst().orElse(new SysDictData()).getDictLabel());


                return handlerExcelData;


            }).collect(Collectors.toList());


            //设置response


@@ -138,7 +125,6 @@


        //获取不合格处理记录


        UnqualifiedHandlerVO vo = baseMapper.findById(pushOADto.getHandlerId());




        System.out.println(vo);


//        if (vo.getRequestId() != null) {


//            throw new ErrorException("该不合格处理已提交过OA");


//        }