feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复 - 新增标...

liding

3 小时以前 fbd4ecb70baf2e671876ca809a81f6e6fe7342ee

feat(inspect): 新增检测标准方法报告文本功能并优化报告生成
- 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复
- 新增标准模板价格字段及对应的数据模型和数据库映射
- 订单费用详情查询逻辑重构为基于模板价格计算方式
- 新增标准模板与设备绑定关系的数据结构和管理功能
- 委托编号唯一性校验逻辑增强

 basic-server/src/main/java/com/ruoyi/basic/dto/StandardTreeTemplateBindingVo.java

@@ -1,12 +1,23 @@
package com.ruoyi.basic.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.ArrayList;
import java.util.List;

@Data
public class StandardTreeTemplateBindingVo {
    @ApiModelProperty("模板ID")
    private Integer templateId;
    @ApiModelProperty("模板名称")
    private String name;
    @ApiModelProperty("检验项目")
    private String number;
    @ApiModelProperty("备注")
    private String remark;
    @ApiModelProperty("排序")
    private Integer sort;
    @ApiModelProperty("设备ID集合")
    private List<Integer> deviceIds = new ArrayList<>();
}

 basic-server/src/main/java/com/ruoyi/basic/dto/TemplateBindingItemDto.java

@@ -1,9 +1,17 @@
package com.ruoyi.basic.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.ArrayList;
import java.util.List;

@Data
public class TemplateBindingItemDto {
    @ApiModelProperty("模板ID")
    private Integer templateId;
    @ApiModelProperty("排序")
    private Integer sort;
    @ApiModelProperty("设备ID集合")
    private List<Integer> deviceIds = new ArrayList<>();
}

 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeTemplateDeviceMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.ruoyi.basic.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.basic.pojo.StandardTreeTemplateDevice;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/** æ ‡å‡†æ¨¡æ¿é»˜è®¤è®¾å¤‡ Mapper。 */
public interface StandardTreeTemplateDeviceMapper extends BaseMapper<StandardTreeTemplateDevice> {

    List<Integer> selectExistingDeviceIds(@Param("deviceIds") List<Integer> deviceIds);
}

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java

@@ -6,6 +6,7 @@
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
@@ -73,4 +74,10 @@
     */
    @ApiModelProperty("模板编号")
    private String number;

    /**
     * ä»·æ ¼(元)
     */
    @ApiModelProperty("ä»·æ ¼(元)")
    private BigDecimal price;
}

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTreeTemplateDevice.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.ruoyi.basic.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.time.LocalDateTime;

/** æ ‡å‡†ä¸‹åŽŸå§‹è®°å½•æ¨¡æ¿ä¸Žé»˜è®¤è®¾å¤‡çš„绑定关系。 */
@Data
@TableName("standard_tree_template_device")
public class StandardTreeTemplateDevice {

    @TableId(type = IdType.AUTO)
    private Integer id;

    private Integer standardTreeId;

    private Integer templateId;

    private Integer deviceId;

    private Integer sort;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
}

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

@@ -50,6 +50,9 @@
                    StandardTemplate::getNumber);
            standardTemplate.setNumber(giveCode);
        }
        if (standardTemplate.getPrice() == null) {
            standardTemplate.setPrice(java.math.BigDecimal.ZERO);
        }
        if (StringUtils.isNotBlank(standardTemplate.getThing())) {
            standardTemplate.setThing(GZipUtil.compress(standardTemplate.getThing()));
        } else {
@@ -60,6 +63,9 @@

    @Override
    public int upStandardTemplate(StandardTemplate standardTemplate) {
        if (standardTemplate.getPrice() == null) {
            standardTemplate.setPrice(java.math.BigDecimal.ZERO);
        }
        if (StringUtils.isNotBlank(standardTemplate.getThing())) {
            standardTemplate.setThing(GZipUtil.compress(standardTemplate.getThing()));
        } else {
@@ -128,6 +134,9 @@
        // æŸ¥è¯¢æ—§æ¨¡æ¿
        StandardTemplate standardTemplate = baseMapper.selectById(newTemplate.getId());
        newTemplate.setThing(standardTemplate.getThing());
        if (newTemplate.getPrice() == null) {
            newTemplate.setPrice(java.math.BigDecimal.ZERO);
        }

        if (StringUtils.isBlank(newTemplate.getNumber())) {
            String giveCode = numberGenerator.generateNumberWithPrefix(5,

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

@@ -18,6 +18,7 @@
import com.ruoyi.basic.mapper.StandardProductListMapper;
import com.ruoyi.basic.mapper.StandardTreeMapper;
import com.ruoyi.basic.mapper.StandardTreeTemplateBindingMapper;
import com.ruoyi.basic.mapper.StandardTreeTemplateDeviceMapper;
import com.ruoyi.basic.mapper.StructureItemParameterMapper;
import com.ruoyi.basic.mapper.StructureTestObjectMapper;
import com.ruoyi.basic.pojo.Laboratory;
@@ -25,6 +26,7 @@
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.basic.pojo.StandardTreeTemplateBinding;
import com.ruoyi.basic.pojo.StandardTreeTemplateDevice;
import com.ruoyi.basic.pojo.StructureItemParameter;
import com.ruoyi.basic.pojo.StructureTestObject;
import com.ruoyi.basic.service.StandardTreeService;
@@ -45,6 +47,7 @@
import java.util.HashSet;
import java.util.Comparator;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * @author Administrator
@@ -68,6 +71,8 @@
    private LaboratoryMapper laboratoryMapper;

    private StandardTreeTemplateBindingMapper standardTreeTemplateBindingMapper;

    private StandardTreeTemplateDeviceMapper standardTreeTemplateDeviceMapper;

    private StandardTemplateService standardTemplateService;

@@ -204,6 +209,8 @@
        }
        standardTreeTemplateBindingMapper.delete(Wrappers.<StandardTreeTemplateBinding>lambdaQuery()
                .eq(StandardTreeTemplateBinding::getStandardTreeId, standardTree.getId()));
        standardTreeTemplateDeviceMapper.delete(Wrappers.<StandardTreeTemplateDevice>lambdaQuery()
                .eq(StandardTreeTemplateDevice::getStandardTreeId, standardTree.getId()));
        standardTreeMapper.deleteById(standardTree.getId());
        standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaQuery()
                .eq(StandardProductList::getLaboratory, industry)
@@ -384,6 +391,15 @@
                Wrappers.<StandardTreeTemplateBinding>lambdaQuery()
                        .eq(StandardTreeTemplateBinding::getStandardTreeId, standardTreeId)
                        .orderByAsc(StandardTreeTemplateBinding::getSort, StandardTreeTemplateBinding::getId));
        Map<Integer, List<Integer>> deviceIdsByTemplate = standardTreeTemplateDeviceMapper.selectList(
                        Wrappers.<StandardTreeTemplateDevice>lambdaQuery()
                                .eq(StandardTreeTemplateDevice::getStandardTreeId, standardTreeId)
                                .orderByAsc(StandardTreeTemplateDevice::getSort,
                                        StandardTreeTemplateDevice::getId))
                .stream().collect(Collectors.groupingBy(
                        StandardTreeTemplateDevice::getTemplateId,
                        LinkedHashMap::new,
                        Collectors.mapping(StandardTreeTemplateDevice::getDeviceId, Collectors.toList())));
        List<StandardTreeTemplateBindingVo> result = new ArrayList<>();
        for (StandardTreeTemplateBinding binding : bindings) {
            StandardTemplate template = standardTemplateService.getById(binding.getTemplateId());
@@ -396,6 +412,7 @@
            vo.setNumber(template.getNumber());
            vo.setRemark(template.getRemark());
            vo.setSort(binding.getSort());
            vo.setDeviceIds(deviceIdsByTemplate.getOrDefault(template.getId(), new ArrayList<>()));
            result.add(vo);
        }
        return result;
@@ -410,6 +427,7 @@
        ensureTwoLevelStandard(dto.getStandardTreeId());
        List<TemplateBindingItemDto> templates = dto.getTemplates() == null ? new ArrayList<>() : dto.getTemplates();
        Set<Integer> templateIds = new HashSet<>();
        Set<Integer> allDeviceIds = new HashSet<>();
        List<StandardTreeTemplateBinding> bindings = new ArrayList<>();
        int index = 0;
        for (TemplateBindingItemDto item : templates) {
@@ -425,12 +443,38 @@
            binding.setTemplateId(item.getTemplateId());
            binding.setSort(item.getSort() == null ? index : item.getSort());
            bindings.add(binding);
            if (item.getDeviceIds() != null) {
                allDeviceIds.addAll(item.getDeviceIds().stream()
                        .filter(Objects::nonNull).collect(Collectors.toSet()));
            }
            index++;
        }
        if (!allDeviceIds.isEmpty()) {
            List<Integer> requestedDeviceIds = new ArrayList<>(allDeviceIds);
            if (standardTreeTemplateDeviceMapper.selectExistingDeviceIds(requestedDeviceIds).size()
                    != requestedDeviceIds.size()) {
                throw new BaseException("所选设备不存在，请刷新设备列表后重试");
            }
        }
        standardTreeTemplateDeviceMapper.delete(Wrappers.<StandardTreeTemplateDevice>lambdaQuery()
                .eq(StandardTreeTemplateDevice::getStandardTreeId, dto.getStandardTreeId()));
        standardTreeTemplateBindingMapper.delete(Wrappers.<StandardTreeTemplateBinding>lambdaQuery()
                .eq(StandardTreeTemplateBinding::getStandardTreeId, dto.getStandardTreeId()));
        for (StandardTreeTemplateBinding binding : bindings) {
        for (int bindingIndex = 0; bindingIndex < bindings.size(); bindingIndex++) {
            StandardTreeTemplateBinding binding = bindings.get(bindingIndex);
            standardTreeTemplateBindingMapper.insert(binding);
            TemplateBindingItemDto item = templates.get(bindingIndex);
            List<Integer> deviceIds = item.getDeviceIds() == null ? new ArrayList<>()
                    : item.getDeviceIds().stream().filter(Objects::nonNull).distinct()
                            .collect(Collectors.toList());
            for (int deviceIndex = 0; deviceIndex < deviceIds.size(); deviceIndex++) {
                StandardTreeTemplateDevice relation = new StandardTreeTemplateDevice();
                relation.setStandardTreeId(dto.getStandardTreeId());
                relation.setTemplateId(item.getTemplateId());
                relation.setDeviceId(deviceIds.get(deviceIndex));
                relation.setSort(deviceIndex);
                standardTreeTemplateDeviceMapper.insert(relation);
            }
        }
        return true;
    }

 basic-server/src/main/resources/mapper/StandardTemplateMapper.xml

@@ -17,7 +17,7 @@

    <select id="selectStandardTemplatePageList" resultType="com.ruoyi.basic.pojo.StandardTemplate">
        select * from (
        select st.id, st.name,st.number, st.remark, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time
        select st.id, st.name,st.number, st.price, st.remark, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time
        from standard_template st
        left join user u2 on u2.id = st.create_user
        left join user u3 on u3.id = st.update_user

 basic-server/src/main/resources/mapper/StandardTreeTemplateDeviceMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.StandardTreeTemplateDeviceMapper">
    <select id="selectExistingDeviceIds" resultType="java.lang.Integer">
        select id from device where id in
        <foreach collection='deviceIds' item='deviceId' open='(' separator=',' close=')'>
            #{deviceId}
        </foreach>
    </select>
</mapper>

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java

@@ -2,11 +2,9 @@



import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.pojo.InsOrderRates;
import com.ruoyi.inspect.service.InsOrderRatesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -51,8 +49,7 @@
    @ApiOperation(value = "查询订单费用详情")
    @GetMapping("/selectRatesDetail")
    public Result selectRatesDetail(Page page, Integer insOrderId) {
        return Result.success(insOrderRatesService.page(page, Wrappers.<InsOrderRates>lambdaQuery()
                .eq(InsOrderRates::getInsOrderId, insOrderId)));
        return Result.success(insOrderRatesService.selectTemplateRatesDetail(page, insOrderId));
    }

}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/TemplateRateDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.inspect.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class TemplateRateDto {
    @ApiModelProperty("检验项目")
    private String number;
    @ApiModelProperty("模板名称")
    private String name;
    @ApiModelProperty("ä»·æ ¼(元)")
    private BigDecimal price;
}

 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java

@@ -42,6 +42,10 @@

    String getStandardMethodCode(@Param("id") Integer id);

    String getStandardMethodReportText(@Param("id") Integer id);

    String getStandardMethodReportTextByCode(@Param("code") String code);

    int updateStatus(@Param("id") Integer id);

    String selLaboratoryCode(@Param("laboratory") String laboratory);

 inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.dto.TemplateRateDto;
import com.ruoyi.inspect.pojo.InsOrderRates;
import org.apache.ibatis.annotations.Param;

@@ -21,5 +22,11 @@
     * @return
     */
    IPage<SampleOrderDto> selectInsOrderRates(Page page, @Param("ew") QueryWrapper<SampleOrderDto> ew);

    /**
     * æŸ¥è¯¢è®¢å•è´¹ç”¨è¯¦æƒ…（模板价格）
     * @return
     */
    IPage<TemplateRateDto> selectTemplateRatesDetail(Page page, @Param("insOrderId") Integer insOrderId);
}


 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderRatesService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.dto.TemplateRateDto;
import com.ruoyi.inspect.pojo.InsOrderRates;

/**
@@ -21,5 +22,13 @@
     * @return
     */
    IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto);

    /**
     * æŸ¥è¯¢è®¢å•è´¹ç”¨è¯¦æƒ…（模板价格）
     * @param page
     * @param insOrderId
     * @return
     */
    IPage<TemplateRateDto> selectTemplateRatesDetail(Page page, Integer insOrderId);
}


 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java

@@ -46,6 +46,7 @@
import com.ruoyi.inspect.service.*;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.PreserveReportPicturePlaceholderHandler;
import com.ruoyi.inspect.util.ReportSignaturePictureUtils;
import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
import com.ruoyi.inspect.vo.InsOrderPlanVO;
import com.ruoyi.inspect.vo.InsSampleUserVO;
@@ -1217,13 +1218,12 @@
                .last("FOR UPDATE"));
        boolean isInspectionReport = Objects.equals(INSPECTION_REPORT, reportType);
        registerInsResults = isInspectionReport && Boolean.TRUE.equals(registerInsResults);
        // 1. åˆ¤æ–­æ˜¯å¦æœ‰é‡å¤ç¼–号, æœ‰é‡å¤ç¼–号做提醒
        // 1. å§”托编号全局唯一，提交复核时再次校验，防止并发或历史数据绕过生成校验。
        Long codeCount = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
                .ne(InsOrder::getState, -1)
                .ne(InsOrder::getIfsInventoryId, order.getIfsInventoryId())
                .ne(InsOrder::getId, orderId)
                .eq(InsOrder::getEntrustCode, order.getEntrustCode()));
        if (codeCount > 0) {
            throw new ErrorException("当前编号有重复, è¯·å…ˆåŽ»ä¿®æ”¹é‡å¤ç¼–号");
            throw new ErrorException("样品/委托单已存在，请确认样品编号");
        }

        // 2. åˆ¤æ–­è¯¥è®¢å•æ˜¯å¦æ˜¯ç¬¬ä¸€æ¬¡ç”Ÿäº§(后续报告生成只取第一次提交时间)
@@ -1985,13 +1985,13 @@
                || report.getExamineTime() != null;
        if (submitted) {
            User writer = getReportSigner(report.getWriteUserId(), "编制人");
            marks.put("writeUrl", Pictures.ofLocal(imgUrl + "/" + writer.getSignatureUrl()).create());
            marks.put("writeUrl", ReportSignaturePictureUtils.create(imgUrl, writer.getSignatureUrl()));
            marks.put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(report.getWriteTime())).create());
            marks.put("insUrl", Pictures.ofLocal(imgUrl + "/" + writer.getSignatureUrl()).create());
            marks.put("insUrl", ReportSignaturePictureUtils.create(imgUrl, writer.getSignatureUrl()));
        }
        if (Objects.equals(report.getIsExamine(), 1)) {
            User examiner = getReportSigner(report.getExamineUserId(), "审核人");
            marks.put("examineUrl", Pictures.ofLocal(imgUrl + "/" + examiner.getSignatureUrl()).create());
            marks.put("examineUrl", ReportSignaturePictureUtils.create(imgUrl, examiner.getSignatureUrl()));
            marks.put("examineDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(report.getExamineTime())).create());
        }
        return marks;
@@ -2536,13 +2536,18 @@
        enterFactoryReport.setLotBatchNo(ifsInventoryQuantity.getUpdateBatchNo());

        // æ£€æµ‹ä¾æ®
        Set<String> standardMethod = new HashSet<>();
        Set<String> standardMethod = new LinkedHashSet<>();
        StringBuilder standardMethod2 = new StringBuilder();
        standardMethod.add(baseMapper.getStandardMethodCode(insSample.getStandardMethodListId()));
        String reportStandardMethod = baseMapper.getStandardMethodReportText(insSample.getStandardMethodListId());
        if (StringUtils.isNotBlank(reportStandardMethod)) {
            standardMethod.add(reportStandardMethod);
        }
        for (String s : standardMethod) {
            standardMethod2.append("、").append(s);
        }
        standardMethod2.replace(0, 1, "");
        if (standardMethod2.length() > 0) {
            standardMethod2.deleteCharAt(0);
        }

        // æ ·å“ç±»åž‹
        String orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE, insOrder.getOrderType());
@@ -3214,7 +3219,7 @@
        insReport.setReportType(reportType);
        boolean showResult = Objects.equals(reportType, INSPECTION_REPORT);
        List<Map<String, Object>> tables = new ArrayList<>();
        Set<String> standardMethod = new HashSet<>();
        Set<String> standardMethod = new LinkedHashSet<>();
        Set<String> deviceSet = new HashSet<>();
        Set<String> models = new HashSet<>();
        // æŸ¥è¯¢æ£€éªŒé¡¹æ•°é‡
@@ -3227,11 +3232,13 @@
        /*基础报告(根据绘制的原始记录模版形成)*/
        samples.forEach(a -> {
            models.add(a.getModel());
            String standardMethodCode = baseMapper.getStandardMethodCode(a.getStandardMethodListId());
            if (StrUtil.isNotBlank(a.getSpecialStandardMethod())) {
                standardMethodCode = standardMethodCode + "+" + a.getSpecialStandardMethod();
            String standardMethodCode = baseMapper.getStandardMethodReportText(a.getStandardMethodListId());
            if (StrUtil.isNotBlank(standardMethodCode)) {
                if (StrUtil.isNotBlank(a.getSpecialStandardMethod())) {
                    standardMethodCode = standardMethodCode + "+" + a.getSpecialStandardMethod();
                }
                standardMethod.add(standardMethodCode);
            }
            standardMethod.add(standardMethodCode);
            for (InsProduct b : a.getInsProduct()) {
                if (b.getInsProductResult() != null) {
                    List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
@@ -3577,9 +3584,14 @@
        if (firstInspectDate == null) {
            firstInspectDate = insOrder.getSendTime();
        }
        if (firstInspectDate == null) {
            firstInspectDate = submitTime;
        }

        String insTime = firstInspectDate.format(DateTimeFormatter.ofPattern("yyyyå¹´MM月dd日")) + "-"
                + submitTime.format(DateTimeFormatter.ofPattern("yyyyå¹´MM月dd日"));
        String testStartDate = firstInspectDate.format(DateTimeFormatter.ofPattern("yyyyå¹´MM月dd日"));
        String testEndDate = submitTime.format(DateTimeFormatter.ofPattern("yyyyå¹´MM月dd日"));

        String insTimeEn = monthNames[firstInspectDate.getMonthValue() - 1] + " " + firstInspectDate.format(DateTimeFormatter.ofPattern("dd, yyyy")) + "-"
                + monthNames[submitTime.getMonthValue() - 1] + " " + submitTime.format(DateTimeFormatter.ofPattern("dd, yyyy"));
@@ -3636,11 +3648,8 @@
                productionDate = insOrder.getProductionDate().format(DateTimeFormatter.ofPattern("yyyyå¹´MM月dd日"));
            }
            batchNo = defaultReportText(insOrder.getProductionBatch(), "/");
            standardMethodText = templateSnapshots.stream()
                    .map(InsOrderStandardTemplate::getRemark)
                    .filter(StringUtils::isNotBlank)
                    .distinct()
                    .collect(Collectors.joining("；"));
            standardMethodText = defaultReportText(
                    baseMapper.getStandardMethodReportTextByCode(insOrder.getSample()), insOrder.getSample());
        }
        boolean containsOrganicChlorine = detectionResultRows.stream()
                .map(row -> row.get("itemName"))
@@ -3729,6 +3738,8 @@
                    put("batch", finalBatchNo);
                    put("phone", defaultReportText(insOrder.getPhone(), "/"));
                    put("testDate", insTime);
                    put("testStartDate", testStartDate);
                    put("testEndDate", testEndDate);
                    put("entrustNo", defaultReportText(insOrder.getEntrustCode(), "/"));
                    put("sampling", "/");
                    put("standard", finalStandardMethodText);

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.dto.TemplateRateDto;
import com.ruoyi.inspect.mapper.InsOrderRatesMapper;
import com.ruoyi.inspect.pojo.InsOrderRates;
import com.ruoyi.inspect.service.InsOrderRatesService;
@@ -29,5 +30,10 @@
    public IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto) {
        return baseMapper.selectInsOrderRates(page, QueryWrappers.queryWrappers(sampleOrderDto));
    }

    @Override
    public IPage<TemplateRateDto> selectTemplateRatesDetail(Page page, Integer insOrderId) {
        return baseMapper.selectTemplateRatesDetail(page, insOrderId);
    }
}


 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java

@@ -364,6 +364,15 @@
                }
            }
        });
        // ä¸‹å•æ—¶ç”Ÿæˆå§”托编号并校验唯一性；季度检验复用进厂检验编号，留待审核处理。
        if (!InsOrderTypeConstants.QUARTERLY_TEST.equals(insOrder.getOrderType())) {
            String entrustCode = buildEntrustCode(insOrder, Collections.emptyList());
            assertEntrustCodeUnique(entrustCode, insOrder.getId());
            insOrder.setEntrustCode(entrustCode);
            insOrderMapper.update(null, Wrappers.<InsOrder>lambdaUpdate()
                    .eq(InsOrder::getId, insOrder.getId())
                    .set(InsOrder::getEntrustCode, entrustCode));
        }
        //原材料下单或外购成品下单
        if (Objects.nonNull(insOrder.getTypeSource())&&Objects.nonNull(insOrder.getIfsInventoryId())) {
            // å§”托人就是报检人, ç”Ÿäº§å•ä½å°±æ˜¯ä¾›åº”商单位
@@ -573,11 +582,19 @@
            product.setSort(productSort++);
            insProductMapper.insert(product);
        }
        saveTemplateSnapshots(order.getId(), selections);
        saveTemplateSnapshots(order.getId(), selections, bindingMap);

        // ä¸‹å•æ—¶ç”Ÿæˆå§”托编号并校验唯一性，重复则提示，避免留到审核才报错。
        String entrustCode = buildEntrustCode(order, Collections.singletonList(sample));
        assertEntrustCodeUnique(entrustCode, order.getId());
        insOrderMapper.update(null, Wrappers.<InsOrder>lambdaUpdate()
                .eq(InsOrder::getId, order.getId())
                .set(InsOrder::getEntrustCode, entrustCode));
        return order.getId();
    }

    private void saveTemplateSnapshots(Integer orderId, List<OrderTemplateSelectionDto> selections) {
    private void saveTemplateSnapshots(Integer orderId, List<OrderTemplateSelectionDto> selections,
                                       Map<Integer, StandardTreeTemplateBindingVo> bindingMap) {
        for (OrderTemplateSelectionDto selection : selections) {
            StandardTemplate template = standardTemplateService.getById(selection.getTemplateId());
            if (template == null) {
@@ -592,6 +609,18 @@
            snapshot.setThing(template.getThing());
            snapshot.setSort(selection.getSort());
            insOrderStandardTemplateMapper.insert(snapshot);

            StandardTreeTemplateBindingVo binding = bindingMap.get(selection.getTemplateId());
            List<Integer> deviceIds = binding == null || binding.getDeviceIds() == null
                    ? Collections.emptyList() : binding.getDeviceIds();
            for (int index = 0; index < deviceIds.size(); index++) {
                InsOrderTemplateDevice relation = new InsOrderTemplateDevice();
                relation.setInsOrderId(orderId);
                relation.setTemplateId(selection.getTemplateId());
                relation.setDeviceId(deviceIds.get(index));
                relation.setSort(index);
                insOrderTemplateDeviceMapper.insert(relation);
            }
        }
    }

@@ -675,30 +704,12 @@
    public int upInsOrderOfState(InsOrder insOrder) {
        insOrder.setExamineTime(LocalDateTime.now());
        if (insOrder.getState() == 1) {
            //审核通过才会生成委托编号
            //委托编号已在下单时生成并校验唯一性，审核时复用；历史/季度检验订单兜底生成。
            InsOrder order = this.getById(insOrder.getId());
            List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
                    .eq(InsSample::getInsOrderId, insOrder.getId())
                    .orderByAsc(InsSample::getId));
            // å§”托编号按送样日期生成；新聚单样品订单的末两位取样品编号末两位。
            // åŽ†å²/外部订单未填写送样日期时回退到当天，避免影响原有流程。
            LocalDate entrustDate = order.getSampleDate() == null ? LocalDate.now() : order.getSampleDate();
            String entrustCodePrefix = "LMSY-"
                    + entrustDate.format(DateTimeFormatter.BASIC_ISO_DATE)
                    + "-";
            String no;
            if (isDirectTemplateOrder(order, insSamples)) {
                String sampleCode = insSamples.get(0).getSampleCode();
                if (StringUtils.isBlank(sampleCode) || sampleCode.trim().length() < 2) {
                    throw new ErrorException("样品编号不能为空且不能少于2位");
                }
                sampleCode = sampleCode.trim();
                no = entrustCodePrefix + sampleCode.substring(sampleCode.length() - 2);
            } else {
                no = numberGenerator.generateNumberWithPrefix(2,
                        entrustCodePrefix,
                        InsOrder::getEntrustCode);
            }
            String no = order.getEntrustCode();
            // åˆ¤æ–­æ˜¯å¦æ˜¯å­£åº¦æ£€éªŒ, æ˜¯å­£åº¦æ£€éªŒå–消原材料季度检验下单
            if (InsOrderTypeConstants.QUARTERLY_TEST.equals(order.getOrderType())) {
                ifsInventoryQuantityMapper.update(null,  Wrappers.<IfsInventoryQuantity>lambdaUpdate()
@@ -714,6 +725,10 @@
                  no = order1.getEntrustCode();
                }
            }
            if (StringUtils.isBlank(no)) {
                no = buildEntrustCode(order, insSamples);
            }
            assertEntrustCodeUnique(no, order.getId());

            int count = 1;
            for (InsSample insSample : insSamples) {
@@ -734,6 +749,37 @@
        return insOrderMapper.updateById(insOrder);
    }

    /**
     * å§”托编号全局唯一，生成编号和后续提交前均需排除当前订单后校验。
     */
    private void assertEntrustCodeUnique(String entrustCode, Integer currentOrderId) {
        Long count = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
                .eq(InsOrder::getEntrustCode, entrustCode)
                .ne(currentOrderId != null, InsOrder::getId, currentOrderId));
        if (count > 0) {
            throw new ErrorException("样品/委托单已存在，请确认样品编号");
        }
    }

    /**
     * ç”Ÿæˆå§”托编号：新聚直绑模板订单末两位取样品编号末两位，其余按送样日期生成序号。
     */
    private String buildEntrustCode(InsOrder order, List<InsSample> insSamples) {
        LocalDate entrustDate = order.getSampleDate() == null ? LocalDate.now() : order.getSampleDate();
        String entrustCodePrefix = "LMSY-"
                + entrustDate.format(DateTimeFormatter.BASIC_ISO_DATE)
                + "-";
        if (isDirectTemplateOrder(order, insSamples)) {
            String sampleCode = insSamples.get(0).getSampleCode();
            if (StringUtils.isBlank(sampleCode) || sampleCode.trim().length() < 2) {
                throw new ErrorException("样品编号不能为空且不能少于2位");
            }
            sampleCode = sampleCode.trim();
            return entrustCodePrefix + sampleCode.substring(sampleCode.length() - 2);
        }
        return numberGenerator.generateNumberWithPrefix(2, entrustCodePrefix, InsOrder::getEntrustCode);
    }

    @Override
    public Map<String, Object> getInsOrderAndSample(Integer id, String laboratory) {
        Map<String, Object> map = new HashMap<>();

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java

@@ -46,6 +46,7 @@
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
import com.ruoyi.inspect.util.PreserveReportPicturePlaceholderHandler;
import com.ruoyi.inspect.util.ReportSignaturePictureUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.InformationNotificationService;
import lombok.extern.slf4j.Slf4j;
@@ -228,9 +229,9 @@
        }

        Map<String, Object> writeMarks = new HashMap<String, Object>() {{
            put("writeUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
            put("writeUrl", ReportSignaturePictureUtils.create(imgUrl, signatureUrl));
            put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
            put("insUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
            put("insUrl", ReportSignaturePictureUtils.create(imgUrl, signatureUrl));
        }};
        writeMarksToReportFiles(insReport, writeMarks);

@@ -335,7 +336,7 @@
        informationNotificationService.addInformationNotification(info);
        String primaryReportUrl = getPrimaryReportUrl(insReport);
        Map<String, Object> examineMarks = new HashMap<String, Object>() {{
            put("examineUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
            put("examineUrl", ReportSignaturePictureUtils.create(imgUrl, signatureUrl));
            put("examineDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
        }};
        writeMarksToReportFiles(insReport, examineMarks);
@@ -478,7 +479,7 @@
        String finalUrl = primaryReportUrl.replace("/word", wordUrl);

        Map<String, Object> ratifyMarks = new HashMap<String, Object>() {{
            put("ratifyUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
            put("ratifyUrl", ReportSignaturePictureUtils.create(imgUrl, signatureUrl));
            put("ratifyDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
            put("seal1", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());
            put("seal2", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());

 inspect-server/src/main/java/com/ruoyi/inspect/util/ReportSignaturePictureUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.ruoyi.inspect.util;

import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;

import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;

/**
 * æŠ¥å‘Šç­¾åå›¾ç‰‡å·¥å…·ã€‚
 */
public final class ReportSignaturePictureUtils {

    private static final int MAX_WIDTH = 90;
    private static final int MAX_HEIGHT = 45;

    private ReportSignaturePictureUtils() {
    }

    /**
     * æŒ‰åŽŸå§‹æ¯”例将签名适配到报告签名单元格，避免图片越过单元格边界而被裁剪。
     */
    public static PictureRenderData create(String imageDirectory, String signatureUrl) {
        String signaturePath = imageDirectory + "/" + signatureUrl;
        try {
            BufferedImage image = ImageIO.read(new File(signaturePath));
            if (image != null && image.getWidth() > 0 && image.getHeight() > 0) {
                double scale = Math.min((double) MAX_WIDTH / image.getWidth(),
                        (double) MAX_HEIGHT / image.getHeight());
                int width = Math.max(1, (int) Math.round(image.getWidth() * scale));
                int height = Math.max(1, (int) Math.round(image.getHeight() * scale));
                return Pictures.ofLocal(signaturePath).size(width, height).create();
            }
        } catch (IOException ignored) {
            // å›¾ç‰‡å…ƒæ•°æ®è¯»å–失败时仍可尝试以默认尺寸写入报告。
        }
        return Pictures.ofLocal(signaturePath).size(MAX_WIDTH, MAX_HEIGHT).create();
    }
}

 inspect-server/src/main/resources/mapper/InsOrderMapper.xml

@@ -281,6 +281,23 @@
        from standard_method
        where id = #{id}
    </select>
    <select id="getStandardMethodReportText" resultType="java.lang.String">
        select case
                   when name is null or trim(name) = '' then code
                   else concat(code, '《', name, '》')
               end
        from standard_method
        where id = #{id}
    </select>
    <select id="getStandardMethodReportTextByCode" resultType="java.lang.String">
        select case
                   when name is null or trim(name) = '' then code
                   else concat(code, '《', name, '》')
               end
        from standard_method
        where code = #{code}
        limit 1
    </select>
    <select id="selLaboratoryCode" resultType="java.lang.String">
        select laboratory_code
        from laboratory

 inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml

@@ -11,26 +11,25 @@
        then io.sample_view
        else io.sample end                            sampleStr,
        GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
        sum(tempior.rates) + 200 total_price
        COALESCE(sum(st.price), 0) total_price
        from ins_order io
        LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
        left join (
        select ior.id, ior.ins_order_id, ior.rates from
        ins_order_rates ior
        left join ins_product ip on ip.id = ior.ins_product_id
        left join ins_order io2 on ior.ins_order_id = io2.id
        GROUP BY CASE
        WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ior.man_hour_group
        ELSE ior.id END,
        CASE WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ior.ins_sample_id ELSE ior.id END,
        CASE WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ip.radius ELSE ior.id END,
        CASE WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ip.cable_tag ELSE ior.id END,
        CASE WHEN ior.man_hour_group IS NOT NULL AND ior.man_hour_group != '' THEN ior.ins_order_id ELSE ior.id END) tempior on tempior.ins_order_id = io.id
        where tempior.id is not null
        left join ins_order_standard_template iost on iost.ins_order_id = io.id
        left join standard_template st on st.id = iost.template_id
        where iost.id is not null
        group by io.id) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>

    <!-- æŸ¥è¯¢è®¢å•è´¹ç”¨è¯¦æƒ…（模板价格） -->
    <select id="selectTemplateRatesDetail" resultType="com.ruoyi.inspect.dto.TemplateRateDto">
        select iost.number, iost.name, COALESCE(st.price, 0) as price
        from ins_order_standard_template iost
        left join standard_template st on st.id = iost.template_id
        where iost.ins_order_id = #{insOrderId}
        order by iost.sort, iost.id
    </select>

</mapper>

 inspect-server/src/main/resources/static/detection-report-template-v2.docx

Binary files differ

 inspect-server/src/main/resources/static/inspection-report-template-v2.docx

Binary files differ