zhuo
2025-02-25 2c6f87e7a430f52f709c4686dbecc767ca377e2c
报告生成查询字典值
已修改7个文件
已添加1个文件
111 ■■■■ 文件已修改
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/constant/DictDataConstants.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -30,6 +30,7 @@
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.basic.service.StandardTemplateService;
import com.ruoyi.common.constant.DictDataConstants;
import com.ruoyi.common.constant.InsOrderTypeConstants;
import com.ruoyi.common.core.domain.entity.Custom;
import com.ruoyi.common.core.domain.entity.InformationNotification;
@@ -1514,9 +1515,9 @@
            standardMethod2.append("、").append(s);
        }
        standardMethod2.replace(0, 1, "");
        // todo: æŸ¥è¯¢å­—典检测类型
//        List<SysDictData> sysDictData = iSysDictTypeService.selectDictDataByName("");
        String orderType = null;
        // æ ·å“ç±»åž‹
        String orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE, insOrder.getOrderType());
        List<RowRenderData> rows = new ArrayList<>();
        List<TextRenderData> text = new ArrayList<>();
@@ -2275,18 +2276,23 @@
        String modelStr = CollUtil.join(models, "\n");
        String finalModelStr = modelStr;
        // todo: æŸ¥è¯¢å­—å…¸
        //        List<SysDictData> sysDictData = iSysDictTypeService.selectDictDataByName("");
        // æ£€æµ‹ç±»åž‹
        String orderType = null;
        String formType = null;
        orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE, insOrder.getOrderType());
        // åˆ¤æ–­ç¬¬ä¸€ä¸ªå­—典是否为空
        if (StringUtils.isBlank(orderType)) {
            orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE1, insOrder.getOrderType());
        }
        // æ¥æ ·æ–¹å¼
        String formType = iSysDictTypeService.selectLabelByDict(DictDataConstants.FORM_TYPE, insOrder.getFormType());
        // æ ·å“çŠ¶æ€
        String sampleStatus = null;
        String sampleStatus = iSysDictTypeService.selectLabelByDict(DictDataConstants.SAMPLE_STATUS_LIST, insOrder.getSampleStatus());;
        ConfigureBuilder builder = Configure.builder();
        builder.useSpringEL(true);
        List<Map<String, String>> finalDeviceList = deviceList;
        Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).last("limit 1")).getUserId();
        Custom custom = customMapper.selectById(insOrder.getCompanyId());
        // æŸ¥è¯¢åˆ¤æ–­æ˜¯å¦æœ‰ä¸åˆ¤å®šé¡¹ç›®,和全都是判定项
@@ -2379,6 +2385,7 @@
        String finalResultCh = resultCh;
        String finalResultEn = resultEn;
        String finalOrderType = orderType;
        InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
        XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
                new HashMap<String, Object>() {{
@@ -2403,7 +2410,7 @@
                    put("images", images);
                    put("examineUrl", null);
                    put("ratifyUrl", null);
                    put("orderType", orderType);
                    put("orderType", finalOrderType);
                    put("getTime", finalSendTime.format(DateTimeFormatter.ofPattern("yyyyå¹´MM月dd日")));
                    put("getTimeEn", monthNames[finalSendTime.getMonthValue() - 1] + " " + finalSendTime.format(DateTimeFormatter.ofPattern("dd, yyyy")));
                    put("seal1", null);
ruoyi-common/src/main/java/com/ruoyi/common/constant/DictDataConstants.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.common.constant;
import lombok.Data;
/**
 * å­—典类型
 *
 * @Author zhuo
 * @Date 2025/2/25
 */
public class DictDataConstants {
    // æ£€éªŒç±»åž‹(原材料)
    public static final String CHECK_TYPE = "check_type";
    // æ£€éªŒç±»åž‹(成品)
    public static final String CHECK_TYPE1 = "check_type1";
    // æ¥æ ·æ–¹å¼
    public static final String FORM_TYPE = "form_type";
    // æ ·å“çŠ¶æ€
    public static final String SAMPLE_STATUS_LIST = "sample_status_list";
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDictType;
import org.apache.ibatis.annotations.Param;
/**
 * å­—典表 æ•°æ®å±‚
@@ -84,5 +85,20 @@
     */
    public SysDictType checkDictTypeUnique(String dictType);
    /**
     * æ ¹æ®å­—典名称查询字典数据
     *
     * @param dictName å­—典名称
     * @return å­—典数据集合信息
     */
    List<SysDictType> selectList(String dictName);
    /**
     * æ ¹æ®å­—典编号, å­—典值value查询label内容
     *
     * @param dictType å­—典类型
     * @param dictValue å­—典值
     * @return ç»“æžœ
     */
    String selectLabelByDict(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
}
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
@@ -103,4 +103,13 @@
     * @return ç»“æžœ
     */
    public boolean checkDictTypeUnique(SysDictType dictType);
    /**
     * æ ¹æ®å­—典编号, å­—典值value查询label内容
     *
     * @param dictType å­—典类型
     * @param dictValue å­—典值
     * @return ç»“æžœ
     */
    public String selectLabelByDict(String dictType, String dictValue);
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -235,4 +235,16 @@
        }
        return UserConstants.UNIQUE;
    }
    /**
     * æ ¹æ®å­—典编号, å­—典值value查询label内容
     *
     * @param dictType å­—典类型
     * @param dictValue å­—典值
     * @return ç»“æžœ
     */
    @Override
    public String selectLabelByDict(String dictType, String dictValue) {
        return dictTypeMapper.selectLabelByDict(dictType, dictValue);
    }
}
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -140,4 +140,12 @@
        from sys_dict_type
        where dict_name = #{dictName}
    </select>
    <!-- æ ¹æ®å­—典编号, å­—典值value查询label内容 -->
    <select id="selectLabelByDict" resultType="java.lang.String">
        select dict_label
        from sys_dict_data
        where dict_type = #{dictType}
          and dict_value = #{dictValue}
    </select>
</mapper>
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -69,6 +69,9 @@
        <if test="userName != null and userName != ''">
            AND u.account like concat('%', #{userName}, '%')
        </if>
        <if test="nickName != null and nickName != ''">
            AND u.name like concat('%', #{nickName}, '%')
        </if>
        <if test="status != null and status != ''">
            AND u.status = #{status}
        </if>