diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.java index 6aab066..549e430 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.java @@ -1,9 +1,10 @@ package com.hnac.hzims.safeproduct.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.safeproduct.dto.ConferenceExportDTO; import com.hnac.hzims.safeproduct.entity.ConferencePlanEntity; import org.apache.ibatis.annotations.Mapper; +import org.springblade.core.datascope.annotation.UserDataAuth; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; import java.util.List; @@ -14,7 +15,7 @@ import java.util.List; * @date 2023-12-27 */ @Mapper -public interface ConferencePlanMapper extends BaseMapper { +public interface ConferencePlanMapper extends UserDataScopeBaseMapper { /** * 根据单位和计划时间查询会议记录 @@ -23,5 +24,6 @@ public interface ConferencePlanMapper extends BaseMapper { * @param endTime 计划结束时间 * @return 会议记录列表 */ + @UserDataAuth List getConferenceByUnitAndDate(String unit, String startTime, String endTime); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml index 8b5f204..d8981d2 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml @@ -3,7 +3,8 @@ SELECT t1.id, t1.code, t2.unit, t2.scheduled_start_time, t2.scheduled_end_time, t1.actual_start_time, t1.actual_end_time, - t2.location, t2.host, t2.conference_method, t2.theme, t2.conference_status, t1.recorder, t1.content + t2.location, t2.host, t2.conference_method, t2.theme, t2.conference_status, t1.recorder, t1.content, t1.create_user, + t1.create_dept FROM hzims_conference_record t1 LEFT JOIN hzims_conference_plan t2 ON t1.conference_plan_id = t2.id @@ -38,4 +39,16 @@ ORDER BY t1.create_time DESC + + \ No newline at end of file diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java index fb4fa22..b2f88f4 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java @@ -178,9 +178,6 @@ public class ConferenceRecordServiceImpl extends ServiceImpl getConferenceByMonth(String month) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().like(ConferenceRecordEntity::getCreateTime, month) - .orderByDesc(ConferenceRecordEntity::getCode); - return this.list(queryWrapper); + return baseMapper.selectConferenceByMonth(month); } }