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/base/mapper/xml/ShiftMapper.xml | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml index cb85843..ce54435 100644 --- a/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml +++ b/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml @@ -2,4 +2,12 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.base.mapper.ShiftMapper"> + <select id="selectShiftListByFactoryId" resultType="org.jeecg.modules.base.entity.Shift"> + select + t1.*, + t2.id as group_id + from base_shift t1 + inner join base_shift_group t2 on t1.id = t2.shift_id + where t1.del_flag = 0 and t1.shift_status = '1' and t2.del_flag = 0 and t2.factory_id = #{factoryId} + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3