feat: 1委托单 2下单详情 3检验任务 4检验任务复核 5检验任务详情 6标准维护 7检验单详情 8报告编制

liding

2 天以前 901bab9b8b1c3773a644bdc74f5eafd666591aeb

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java

@@ -6,11 +6,14 @@
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.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.mapper.StandardTemplateMapper;
import com.ruoyi.basic.mapper.StandardTreeTemplateBindingMapper;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.basic.pojo.StandardTreeTemplateBinding;
import com.ruoyi.basic.service.StandardTemplateService;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.GZipUtil;
import com.ruoyi.common.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

@@ -29,6 +32,8 @@

    private StandardTemplateMapper standardTemplateMapper;

    private StandardTreeTemplateBindingMapper standardTreeTemplateBindingMapper;


    private final NumberGenerator<StandardTemplate> numberGenerator;

@@ -45,12 +50,19 @@
                    StandardTemplate::getNumber);
            standardTemplate.setNumber(giveCode);
        }
        if (StringUtils.isNotBlank(standardTemplate.getThing())) {
            standardTemplate.setThing(GZipUtil.compress(standardTemplate.getThing()));
        } else {
            standardTemplate.setThing(null);
        }
        return standardTemplateMapper.insert(standardTemplate);
    }

    @Override
    public int upStandardTemplate(StandardTemplate standardTemplate) {
        if(standardTemplate.getThing().equals("")){
        if (StringUtils.isNotBlank(standardTemplate.getThing())) {
            standardTemplate.setThing(GZipUtil.compress(standardTemplate.getThing()));
        } else {
            standardTemplate.setThing(null);
        }
        return standardTemplateMapper.updateById(standardTemplate);
@@ -58,12 +70,23 @@

    @Override
    public int delStandardTemplate(Integer id) {
        // 判断是否被绑定
        int count = standardTemplateMapper.countBindTemplateItemParameter(id);
        if (count > 0) {
            throw new RuntimeException("该模板已绑定检验项目参数，禁止删除");
        }
        Long bindingCount = standardTreeTemplateBindingMapper.selectCount(Wrappers.<StandardTreeTemplateBinding>lambdaQuery()
                .eq(StandardTreeTemplateBinding::getTemplateId, id));
        if (bindingCount > 0) {
            throw new RuntimeException("该模板已绑定标准库，禁止删除");
        }
        return standardTemplateMapper.deleteById(id);
    }

    @Override
    public List<StandardTemplate> getStandardTemplate() {
        return standardTemplateMapper.selectList(Wrappers.<StandardTemplate>lambdaQuery().select(StandardTemplate::getId,StandardTemplate::getName));
        return standardTemplateMapper.selectList(Wrappers.<StandardTemplate>lambdaQuery()
                .select(StandardTemplate::getId, StandardTemplate::getName, StandardTemplate::getNumber, StandardTemplate::getRemark));
    }

    @Override
@@ -74,19 +97,8 @@
        if(standardTemplate==null){
            return null;
        }else{
            return standardTemplate.getThing();
            return GZipUtil.uncompress(standardTemplate.getThing());
        }
        // 查询压缩后的数据
//        String thing = standardTemplateMapper.selectCompressThing(templateId);
//        if (StringUtils.isNotBlank(thing)) {
//            try {
//                return DecompressMySQLData.decompress(java.util.Base64.getDecoder().decode(thing));
//            } catch (Exception e) {
//                throw new RuntimeException(e);
//            }
//        } else {
//            return null;
//        }
    }

    @Override