From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/resources/mapper/technology/TechnologyRoutingMapper.xml | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
index fcf2890..bda31ba 100644
--- a/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyRoutingMapper.xml
@@ -2,19 +2,60 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.technology.mapper.TechnologyRoutingMapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.technology.pojo.TechnologyRouting">
- <id column="id" property="id" />
- <result column="product_model_id" property="productModelId" />
- <result column="description" property="description" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="process_route_code" property="processRouteCode" />
- <result column="bom_id" property="bomId" />
- <result column="create_user" property="createUser" />
- <result column="dept_id" property="deptId" />
+ <id column="id" property="id"/>
+ <result column="product_model_id" property="productModelId"/>
+ <result column="description" property="description"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="process_route_code" property="processRouteCode"/>
+ <result column="bom_id" property="bomId"/>
+ <result column="create_user" property="createUser"/>
+ <result column="dept_id" property="deptId"/>
</resultMap>
+ <select id="pageTechnologyRouting" resultType="com.ruoyi.technology.bean.vo.TechnologyRoutingVo">
+ select tr.id,
+ tr.product_model_id as productModelId,
+ tr.description,
+ tr.create_time as createTime,
+ tr.update_time as updateTime,
+ tr.process_route_code as processRouteCode,
+ tr.bom_id as bomId,
+ tr.create_user as createUser,
+ tr.dept_id as deptId,
+ p.product_name as productName,
+ pm.model,
+ tb.bom_no as bomNo
+ from technology_routing tr
+ left join product_model pm on tr.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join technology_bom tb on tr.bom_id = tb.id
+ <where>
+ <if test="c != null">
+ <if test="c.id != null">
+ and tr.id = #{c.id}
+ </if>
+ <if test="c.productModelId != null">
+ and tr.product_model_id = #{c.productModelId}
+ </if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
+ </if>
+ <if test="c.bomId != null">
+ and tr.bom_id = #{c.bomId}
+ </if>
+ <if test="c.processRouteCode != null and c.processRouteCode != ''">
+ and tr.process_route_code like concat('%', #{c.processRouteCode}, '%')
+ </if>
+ <if test="c.description != null and c.description != ''">
+ and tr.description like concat('%', #{c.description}, '%')
+ </if>
+ </if>
+ </where>
+ order by tr.id desc
+ </select>
+
<update id="updateProductModelByBomId">
update technology_routing
set product_model_id = #{productModelId}
--
Gitblit v1.9.3