From b0ae9e5d1c8add200ded8957c068223b9703c1e3 Mon Sep 17 00:00:00 2001 From: lixiangyu <lixiangyu@xalxzn.com> Date: 星期三, 27 八月 2025 18:00:09 +0800 Subject: [PATCH] feat(cms): 为 RatedLife 实体添加字典注解- 在 RatedLife 实体的 cuttingId 字段上添加了 @Dict 注解 - 优化了 RatedLifeController 中的代码格式和注释 --- src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml index 925e4b8..c422823 100644 --- a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml +++ b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml @@ -1,13 +1,11 @@ <?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.pms.mapper.PmsMaterialProcessMapper"> - <select id="getpmsMaterialProcessListData" parameterType="Map" resultType="Map"> - select * from pms_material_process WHERE 1=1 - <if test="params.materialNumber != null and params.materialNumber != ''"> - AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%') - </if> - <if test="params.materialName != null and params.materialName != ''"> - AND material_name LIKE CONCAT('%', #{params.materialName}, '%') - </if> + + <select id="queryPageList" resultType="org.jeecg.modules.pms.entity.PmsMaterialProcess"> + select pbm.*, po.order_code + from pms_material_process pbm + left join mes_production_order po on pbm.order_id = po.id + ${ew.customSqlSegment} </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3