From 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 28 五月 2025 15:41:41 +0800 Subject: [PATCH] 1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceTypeMapper.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceTypeMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceTypeMapper.xml index 9736052..1539214 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceTypeMapper.xml +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceTypeMapper.xml @@ -1,4 +1,29 @@ <?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="org.jeecg.modules.dnc.mapper.DeviceTypeMapper"> + <select id="getDeviceTypeByAttribution" resultType="org.jeecg.modules.dnc.entity.DeviceType"> + SELECT + nc_device_type.*, + nc_device_management.device_management_name, + nc_device_management.device_management_code + FROM + nc_device_type + LEFT JOIN nc_device_management + ON nc_device_type.device_management_id = nc_device_management.id + WHERE + 1 = 1 + <if test="attributionIds != null and attributionIds.size() > 0"> + AND nc_device_type.attribution_id IN + <foreach collection="attributionIds" item="attributionId" open="(" close=")" separator=","> + #{attributionId} + </foreach> + </if> + AND nc_device_type.attribution_type = #{attributionType} + <if test="deviceManagementName != null and deviceManagementName != ''"> + AND nc_device_management.device_management_name LIKE CONCAT('%', #{deviceManagementName}, '%') + </if> + <if test="deviceManagementCode != null and deviceManagementCode != ''"> + AND nc_device_management.device_management_code LIKE CONCAT('%', #{deviceManagementCode}, '%') + </if> + </select> </mapper> -- Gitblit v1.9.3