From 66de1a166391376d71a028c2069e90e9c509d499 Mon Sep 17 00:00:00 2001 From: 郑永安 <zyazyz250@sina.com> Date: 星期四, 20 七月 2023 09:08:34 +0800 Subject: [PATCH] params add --- src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemMapper.java | 4 src/main/java/com/gk/hotwork/Mapper/RiskControlClassifyMapper.java | 4 + src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckWorkRepository.java | 4 + src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java | 2 src/main/java/com/gk/hotwork/Mapper/RiskAnaUintMapper.java | 4 + src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java | 14 ++-- src/main/java/com/gk/hotwork/Mapper/SelfCheckInfoMapper.java | 2 src/main/java/com/gk/hotwork/Mapper/AppFileInfoMapper.java | 2 src/main/java/com/gk/hotwork/Mapper/DictionaryTypeInfoMapper.java | 2 src/main/java/com/gk/hotwork/Mapper/HelpDocInfoMapper.java | 4 + src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java | 2 src/main/java/com/gk/hotwork/Mapper/ReserveMapper.java | 2 src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskRepository.java | 24 ++++---- src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java | 6 +- src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java | 4 + src/main/java/com/gk/hotwork/Mapper/BlackListInfoMapper.java | 4 + src/main/java/com/gk/hotwork/Mapper/SmsLogInfoMapper.java | 4 + src/main/java/com/gk/hotwork/Mapper/MajorEquipmentDataMapper.java | 2 src/main/java/com/gk/hotwork/Mapper/HiddenDangerMapper.java | 4 src/main/java/com/gk/hotwork/Mapper/MajorEquipmentMapper.java | 4 + src/main/java/com/gk/hotwork/Mapper/ElementManagementMapper.java | 2 src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java | 4 src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java | 10 +- src/main/java/com/gk/hotwork/Mapper/EmergencyPlanMapper.java | 4 + src/main/java/com/gk/hotwork/Mapper/MajorEquipmentAlarmMapper.java | 2 src/main/java/com/gk/hotwork/Mapper/WarningInfoMapper.java | 4 + 26 files changed, 72 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/gk/hotwork/Mapper/AppFileInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/AppFileInfoMapper.java index f0ead90..af01ff4 100644 --- a/src/main/java/com/gk/hotwork/Mapper/AppFileInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/AppFileInfoMapper.java @@ -19,7 +19,7 @@ int updateByPrimaryKey(AppFileInfo record); - List<AppFileInfo> selectDataGrid(Page<AppFileInfo> page, Map<String, Object> condition); + List<AppFileInfo> selectDataGrid(@Param("page") Page<AppFileInfo> page,@Param("condition") Map<String, Object> condition); AppFileInfo selectNew(@Param("filetype") String filetype); } diff --git a/src/main/java/com/gk/hotwork/Mapper/BlackListInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/BlackListInfoMapper.java index 117c41b..8c25561 100644 --- a/src/main/java/com/gk/hotwork/Mapper/BlackListInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/BlackListInfoMapper.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gk.hotwork.Domain.BlackListInfo; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -11,5 +13,5 @@ @Repository public interface BlackListInfoMapper extends BaseMapper<BlackListInfo> { - List<BlackListInfo> selectDataGrid(Map<String, Object> condition, Page<BlackListInfo> page); + List<BlackListInfo> selectDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<BlackListInfo> page); } \ No newline at end of file diff --git a/src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java index 21cba15..53119d3 100644 --- a/src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/DepartmentInfoMapper.java @@ -13,7 +13,7 @@ @Repository public interface DepartmentInfoMapper extends BaseMapper<DepartmentInfo> { - List<DepartmentVo> selectDataGrid(Page<DepartmentVo> page, Map<String, Object> condition); + List<DepartmentVo> selectDataGrid(@Param("page") Page<DepartmentVo> page,@Param("condition") Map<String, Object> condition); DepartmentInfo selectExistByName(@Param("id") Long id,@Param("department") String department); @@ -21,9 +21,9 @@ DepartmentInfo selectSafety(@Param("id") Long id); - Integer selectCountForExam(Map<String, Object> params); + Integer selectCountForExam(@Param("params") Map<String, Object> params); - List<DepartmentInfo> selectPageForExam(Map<String, Object> params); + List<DepartmentInfo> selectPageForExam(@Param("params") Map<String, Object> params); DepartmentInfo getInfoByName(String departmentName); diff --git a/src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java index bc03b68..f4b1d54 100644 --- a/src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/DictionaryItemInfoMapper.java @@ -25,7 +25,7 @@ int updateByPrimaryKey(DictionaryItemInfo record); - List<DictionaryItemInfo> selectDataGrid(Page<DictionaryItemInfo> page, Map<String, Object> condition); + List<DictionaryItemInfo> selectDataGrid(@Param("page") Page<DictionaryItemInfo> page,@Param("condition") Map<String, Object> condition); List<DictionaryTypeInfo> selectExistInfo(@Param("id") Long id,@Param("value") String value,@Param("text") String text); diff --git a/src/main/java/com/gk/hotwork/Mapper/DictionaryTypeInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/DictionaryTypeInfoMapper.java index 88930ce..a409638 100644 --- a/src/main/java/com/gk/hotwork/Mapper/DictionaryTypeInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/DictionaryTypeInfoMapper.java @@ -23,7 +23,7 @@ int updateByPrimaryKey(DictionaryTypeInfo record); - List<DictionaryTypeInfo> selectDataGrid(Page<DictionaryTypeInfo> page, Map<String, Object> condition); + List<DictionaryTypeInfo> selectDataGrid(@Param("page") Page<DictionaryTypeInfo> page,@Param("condition") Map<String, Object> condition); List<DictionaryTypeInfo> selectExistInfo(@Param("id") Long id,@Param("code") String code,@Param("text") String text); } diff --git a/src/main/java/com/gk/hotwork/Mapper/ElementManagementMapper.java b/src/main/java/com/gk/hotwork/Mapper/ElementManagementMapper.java index 4ecaa5c..4c5e68b 100644 --- a/src/main/java/com/gk/hotwork/Mapper/ElementManagementMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/ElementManagementMapper.java @@ -13,7 +13,7 @@ @Repository public interface ElementManagementMapper extends BaseMapper<ElementManagement> { - IPage<ElementManagement> selectPages(Page<ElementManagement> page,@Param("params") Map<String, Object> params); + IPage<ElementManagement> selectPages(@Param("page") Page<ElementManagement> page,@Param("params") Map<String, Object> params); List<ElementManagement> getParentElement(); diff --git a/src/main/java/com/gk/hotwork/Mapper/EmergencyPlanMapper.java b/src/main/java/com/gk/hotwork/Mapper/EmergencyPlanMapper.java index 5e11d20..966564f 100644 --- a/src/main/java/com/gk/hotwork/Mapper/EmergencyPlanMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/EmergencyPlanMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gk.hotwork.Domain.EmergencyPlan; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.Map; @@ -11,5 +13,5 @@ @Repository public interface EmergencyPlanMapper extends BaseMapper<EmergencyPlan> { - IPage<EmergencyPlan> selectPages(Page<EmergencyPlan> page, Map<String, Object> params); + IPage<EmergencyPlan> selectPages(@Param("page") Page<EmergencyPlan> page,@Param("params") Map<String, Object> params); } diff --git a/src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java index 7e81454..85e0be0 100644 --- a/src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/EquipmentInfoMapper.java @@ -12,7 +12,7 @@ @Repository public interface EquipmentInfoMapper extends BaseMapper<EquipmentInfo> { - List<EquipmentInfo> selectDataGrid(Page<EquipmentInfo> page, Map<String, Object> condition); + List<EquipmentInfo> selectDataGrid(@Param("page") Page<EquipmentInfo> page,@Param("condition") Map<String, Object> condition); EquipmentInfo selectExistByNumber(@Param("id") Long id,@Param("number") String number); @@ -20,7 +20,7 @@ List<EquipmentInfo> selectByTask(@Param("taskcode") String taskcode); - List<EquipmentInfo> selectByTaskAndWorker(@Param("code")String code, @Param("worker")String worker); + List<EquipmentInfo> selectByTaskAndWorker(@Param("code")String code, @Param("worker") String worker); List<EquipmentInfo> selectUsingByTask(@Param("code") String code); } diff --git a/src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java index db19f42..aa4b46a 100644 --- a/src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/GasWarnInfoMapper.java @@ -12,7 +12,7 @@ @Repository public interface GasWarnInfoMapper extends BaseMapper<GasWarnInfo> { - List<GasWarnInfo> selectDataGrid(Page<GasWarnInfo> page, Map<String, Object> condition); + List<GasWarnInfo> selectDataGrid(@Param("page") Page<GasWarnInfo> page,@Param("condition") Map<String, Object> condition); GasWarnInfo selectExistByType(@Param("id") Long id,@Param("warntype") String warntype,@Param("gastype") String gastype); diff --git a/src/main/java/com/gk/hotwork/Mapper/HelpDocInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/HelpDocInfoMapper.java index 4c39408..b4b7fa4 100644 --- a/src/main/java/com/gk/hotwork/Mapper/HelpDocInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/HelpDocInfoMapper.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gk.hotwork.Domain.HelpDocInfo; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -11,5 +13,5 @@ @Repository public interface HelpDocInfoMapper extends BaseMapper<HelpDocInfo> { - List<HelpDocInfo> selectDataGrid(Page<HelpDocInfo> page, Map<String, Object> condition); + List<HelpDocInfo> selectDataGrid(@Param("page") Page<HelpDocInfo> page,@Param("condition") Map<String, Object> condition); } diff --git a/src/main/java/com/gk/hotwork/Mapper/HiddenDangerMapper.java b/src/main/java/com/gk/hotwork/Mapper/HiddenDangerMapper.java index 21dc87e..2b051bd 100644 --- a/src/main/java/com/gk/hotwork/Mapper/HiddenDangerMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/HiddenDangerMapper.java @@ -17,9 +17,9 @@ List<HiddenDanger> selectPages(@Param("params") Map params); - List<HiddenDanger> selectDataGrid(Map<String, Object> condition, Page<HiddenDanger> page); + List<HiddenDanger> selectDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<HiddenDanger> page); - List<HiddenDanger> selectStatisticsData(Map<String, Object> condition, Page<HiddenDanger> page); + List<HiddenDanger> selectStatisticsData(@Param("condition") Map<String, Object> condition,@Param("page") Page<HiddenDanger> page); int countNumInMonth(Long id); } diff --git a/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentAlarmMapper.java b/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentAlarmMapper.java index ecbfe16..f1f9a9a 100644 --- a/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentAlarmMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentAlarmMapper.java @@ -13,7 +13,7 @@ @Repository public interface MajorEquipmentAlarmMapper extends BaseMapper<MajorEquipmentAlarm> { - IPage<MajorEquipmentAlarm> selectPages(Page<MajorEquipmentAlarm> page, Map<String, Object> params); + IPage<MajorEquipmentAlarm> selectPages(@Param("page") Page<MajorEquipmentAlarm> page,@Param("params") Map<String, Object> params); void deleteByEquipmentId(@Param("id") Long id , @Param("updateBy") String updateBy , @Param("updateTime") Date updateTime); } diff --git a/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentDataMapper.java b/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentDataMapper.java index c5be7e7..798975f 100644 --- a/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentDataMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentDataMapper.java @@ -13,7 +13,7 @@ @Repository public interface MajorEquipmentDataMapper extends BaseMapper<MajorEquipmentData> { - IPage<MajorEquipmentData> selectPages(Page<MajorEquipmentData> page, Map<String, Object> params); + IPage<MajorEquipmentData> selectPages(@Param("page") Page<MajorEquipmentData> page,@Param("params") Map<String, Object> params); void deleteByEquipmentId(@Param("id") Long id , @Param("updateBy") String updateBy , @Param("updateTime") Date updateTime); } diff --git a/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentMapper.java b/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentMapper.java index 5207a51..1015b72 100644 --- a/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/MajorEquipmentMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gk.hotwork.Domain.MajorEquipment; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -12,7 +14,7 @@ @Repository public interface MajorEquipmentMapper extends BaseMapper<MajorEquipment> { - IPage<MajorEquipment> selectPages(Page<MajorEquipment> page, Map<String, Object> params); + IPage<MajorEquipment> selectPages(@Param("page") Page<MajorEquipment> page,@Param("params") Map<String, Object> params); List<MajorEquipment> getMajorEquipment(); diff --git a/src/main/java/com/gk/hotwork/Mapper/ReserveMapper.java b/src/main/java/com/gk/hotwork/Mapper/ReserveMapper.java index bfc423f..8c9adce 100644 --- a/src/main/java/com/gk/hotwork/Mapper/ReserveMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/ReserveMapper.java @@ -11,7 +11,7 @@ @Repository public interface ReserveMapper extends BaseMapper<Reserve> { - Page statistics(Page<Map> page, Map params); + Page statistics(@Param("page") Page<Map> page,@Param("params") Map params); Map selectStatisticsTotal(@Param("params") Map params); diff --git a/src/main/java/com/gk/hotwork/Mapper/RiskAnaUintMapper.java b/src/main/java/com/gk/hotwork/Mapper/RiskAnaUintMapper.java index 2acfdcc..3d01e27 100644 --- a/src/main/java/com/gk/hotwork/Mapper/RiskAnaUintMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/RiskAnaUintMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gk.hotwork.Domain.RiskAnaUnit; import com.gk.hotwork.Domain.UserInfo; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -13,7 +15,7 @@ @Repository public interface RiskAnaUintMapper extends BaseMapper<RiskAnaUnit> { - IPage<RiskAnaUnit> selectPages(Page<RiskAnaUnit> page, Map<String, Object> params, UserInfo user); + IPage<RiskAnaUnit> selectPages(@Param("page") Page<RiskAnaUnit> page,@Param("params") Map<String, Object> params,@Param("user") UserInfo user); List<Map> selectDepartmentAnalysis(); diff --git a/src/main/java/com/gk/hotwork/Mapper/RiskControlClassifyMapper.java b/src/main/java/com/gk/hotwork/Mapper/RiskControlClassifyMapper.java index 7fbcfeb..527f41d 100644 --- a/src/main/java/com/gk/hotwork/Mapper/RiskControlClassifyMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/RiskControlClassifyMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gk.hotwork.Domain.RiskControlClassify; import com.gk.hotwork.Domain.UserInfo; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.Map; @@ -13,7 +15,7 @@ @Repository public interface RiskControlClassifyMapper extends BaseMapper<RiskControlClassify> { - IPage<RiskControlClassify> selectPages(Page<RiskControlClassify> page, Map<String, Object> filter, UserInfo user); + IPage<RiskControlClassify> selectPages(@Param("page") Page<RiskControlClassify> page,@Param("filter") Map<String, Object> filter,@Param("user") UserInfo user); RiskControlClassify getByClassify1AndClassify12(String classify1, String classify2); /** diff --git a/src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemMapper.java b/src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemMapper.java index 095fc08..15f1c69 100644 --- a/src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/SafetyInspectionItemMapper.java @@ -13,7 +13,7 @@ @Repository public interface SafetyInspectionItemMapper extends BaseMapper<SafetyInspectionItem> { - IPage<SafetyInspectionItem> selectPages(Page<SafetyInspectionItem> page, Map<String, Object> params); + IPage<SafetyInspectionItem> selectPages(Page<SafetyInspectionItem> page,@Param("params") Map<String, Object> params); List<SafetyInspectionItem> infoElementA(@Param("id") Long id); @@ -21,5 +21,5 @@ void updateSafetyInspectionItem(@Param("param") SafetyInspectionItem param); - IPage<SafetyInspectionItem> selectCPages(Page<SafetyInspectionItem> page, Map<String, Object> params); + IPage<SafetyInspectionItem> selectCPages(Page<SafetyInspectionItem> page,@Param("params") Map<String, Object> params); } diff --git a/src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java b/src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java index 6dd278e..e944a23 100644 --- a/src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/SafetySelfInspectionMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gk.hotwork.Domain.SafetySelfInspection; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.Map; @@ -11,6 +13,6 @@ @Repository public interface SafetySelfInspectionMapper extends BaseMapper<SafetySelfInspection> { - IPage<SafetySelfInspection> selectPages(Page<SafetySelfInspection> page, Map<String, Object> params); + IPage<SafetySelfInspection> selectPages(@Param("page") Page<SafetySelfInspection> page,@Param("params") Map<String, Object> params); } diff --git a/src/main/java/com/gk/hotwork/Mapper/SelfCheckInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/SelfCheckInfoMapper.java index 157a5ab..2c2caba 100644 --- a/src/main/java/com/gk/hotwork/Mapper/SelfCheckInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/SelfCheckInfoMapper.java @@ -15,7 +15,7 @@ List<SelfCheckVo> selectByType(@Param("type") String type); - List<SelfCheckInfo> selectDataGrid(Page<SelfCheckInfo> page, Map<String, Object> condition); + List<SelfCheckInfo> selectDataGrid(@Param("page") Page<SelfCheckInfo> page,@Param("condition") Map<String, Object> condition); List<SelfCheckInfo> selectByIds(@Param("idList") List<Long> idList); } diff --git a/src/main/java/com/gk/hotwork/Mapper/SmsLogInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/SmsLogInfoMapper.java index 20908b9..c9a8af0 100644 --- a/src/main/java/com/gk/hotwork/Mapper/SmsLogInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/SmsLogInfoMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gk.hotwork.Domain.SmsLogInfo; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @Repository @@ -14,7 +16,7 @@ int updateByPrimaryKey(SmsLogInfo record); - SmsLogInfo selectByTel(String mobile, String starttime, String endtime, Byte type); + SmsLogInfo selectByTel(@Param("mobile") String mobile,@Param("starttime") String starttime,@Param("endtime") String endtime,@Param("type") Byte type); void deleteByTime(String seventime); } diff --git a/src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java index 59a98df..3f4669a 100644 --- a/src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/TaskInfoMapper.java @@ -16,23 +16,23 @@ @Repository public interface TaskInfoMapper extends BaseMapper<TaskInfo> { - List<TaskInfo> selectTaskDataGrid(Map<String, Object> condition, Page<TaskInfo> page); + List<TaskInfo> selectTaskDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page); Integer getTotalByYear(Integer year); - List<TaskInfo> selectTaskDataGridByDep(Map<String, Object> condition, Page<TaskInfo> page); + List<TaskInfo> selectTaskDataGridByDep(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page); List<ActiveTaskInfo> selectActiveTaskList(Date time,Byte type); - List<TaskInfo> selectDataGridViewable(Map<String, Object> condition, Page<TaskInfo> page); + List<TaskInfo> selectDataGridViewable(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page); - List<TaskInfo> getWaitReviewDataGrid(Map<String, Object> condition, Page<TaskInfo> page); + List<TaskInfo> getWaitReviewDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page); List<TaskVo> getPendingTask(@Param("type")String type, @Param("name") String name); List<TaskVo> getDoingTask(); - List<WorkShowTaskVo> selectPageWorkTodayDetail(Page<WorkShowTaskVo> page, Map params); + List<WorkShowTaskVo> selectPageWorkTodayDetail(@Param("page") Page<WorkShowTaskVo> page,@Param("params") Map params); int selectCountWorkToday(Byte flag); @@ -40,7 +40,7 @@ List<Map> selectCountWorkEverydayInMonth(@Param("days")int[] index,@Param("startTime") Date startTime,@Param("status") Byte status); - List<TaskInfo> selectStatisticsData(Map<String, Object> condition, Page<TaskInfo> page); + List<TaskInfo> selectStatisticsData(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page); - List<TaskInfo> selectDataGridTesting(Map<String, Object> condition, Page<TaskInfo> page); + List<TaskInfo> selectDataGridTesting(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page); } diff --git a/src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java index 6dfc7c6..8a50a51 100644 --- a/src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/UserInfoMapper.java @@ -20,9 +20,9 @@ UserInfo selectByPrimaryKey(Long id); - List<UserVo> selectUserDataGrid(Page<UserVo> page, Map<String, Object> record); - List<UserVo> selectCompanyUserDataList(Page<UserVo> page, Map<String, Object> record); - List<UserVo> selectSuperviseUserDataList(Page<UserVo> page, Map<String, Object> record); + List<UserVo> selectUserDataGrid(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record); + List<UserVo> selectCompanyUserDataList(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record); + List<UserVo> selectSuperviseUserDataList(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record); List<UserInfo> selectUserInfo(@Param("id") Long id, @Param("username") String username); @@ -42,7 +42,7 @@ List<UserInfo> selectPageForExam(Map<Object, Object> params); - UserInfo getByRealName(String realname, String depName); + UserInfo getByRealName(@Param("realname") String realname,@Param("depName") String depName); AccountUserVo getAccountByDepartment(@Param("department") String department); @@ -62,7 +62,7 @@ UserInfo getByUserId(Long userId); - List<UserVo> selectExpertUserDataList(Page<UserVo> page, Map<String, Object> record); + List<UserVo> selectExpertUserDataList(@Param("page") Page<UserVo> page,@Param("record") Map<String, Object> record); List<UserInfo> selectExpertList(String realname); } diff --git a/src/main/java/com/gk/hotwork/Mapper/WarningInfoMapper.java b/src/main/java/com/gk/hotwork/Mapper/WarningInfoMapper.java index 6421404..f6e69d3 100644 --- a/src/main/java/com/gk/hotwork/Mapper/WarningInfoMapper.java +++ b/src/main/java/com/gk/hotwork/Mapper/WarningInfoMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gk.hotwork.Domain.TaskInfo; import com.gk.hotwork.Domain.WarningInfo; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -12,5 +14,5 @@ @Repository public interface WarningInfoMapper extends BaseMapper<WarningInfo> { - List<WarningInfo> selectTaskDataGrid(Map<String, Object> condition, Page<TaskInfo> page); + List<WarningInfo> selectTaskDataGrid(@Param("condition") Map<String, Object> condition,@Param("page") Page<TaskInfo> page); } \ No newline at end of file diff --git a/src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskRepository.java b/src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskRepository.java index 6ce8e8c..22e23be 100644 --- a/src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskRepository.java +++ b/src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckTaskRepository.java @@ -26,11 +26,11 @@ /** * 隐患排查任务-分页查询 */ - IPage<PreventDangerCheckTask> getTaskPage(Page<Object> page, PreventDangerCheckTaskQueryReqDTO taskQueryReqDTO); + IPage<PreventDangerCheckTask> getTaskPage(@Param("page") Page<Object> page,@Param("taskQueryReqDTO") PreventDangerCheckTaskQueryReqDTO taskQueryReqDTO); /** * 隐患排查任务-分页查询-手机端使用 */ - IPage<PreventDangerCheckTask> getTaskPageForMobile(Page<Object> page, PreventDangerCheckTaskQueryReqDTO taskQueryReqDTO); + IPage<PreventDangerCheckTask> getTaskPageForMobile(@Param("page") Page<Object> page,@Param("taskQueryReqDTO") PreventDangerCheckTaskQueryReqDTO taskQueryReqDTO); /** * 隐患排查任务-修改 */ @@ -50,7 +50,7 @@ /** * 隐患排查任务-通过id修改任务状态 */ - int updateTaskStatus(Long taskId, Byte taskStatus); + int updateTaskStatus(@Param("taskId") Long taskId,@Param("taskStatus") Byte taskStatus); /** * 设置任务为超时 * */ @@ -83,17 +83,17 @@ */ int taskToUser(PreventTaskToUserParams taskToUserParams); - List<Map> selectInspectorsStatistics(Long depId, List<String> list, LocalDateTime startTime, LocalDateTime endTime); + List<Map> selectInspectorsStatistics(@Param("depId") Long depId,@Param("list") List<String> list,@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime); - List<Map> selectInspectionCompleted(Long depId, Byte status, List<String> list, LocalDateTime startTime, LocalDateTime endTime); + List<Map> selectInspectionCompleted(@Param("depId") Long depId,@Param("status") Byte status,@Param("list") List<String> list,@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime); /** * 排查任务-检查是否已经创建 */ - PreventDangerCheckTask getTaskByCheckWorkIdAndStartTime(Long workId, Date checkTime); + PreventDangerCheckTask getTaskByCheckWorkIdAndStartTime(@Param("workId") Long workId,@Param("checkTime") Date checkTime); /** * 排查任务-查询应该已经过期,但是还在执行中状态的任务 */ - List<PreventDangerCheckTask> listOverTask(Date startTime, Date endTime); + List<PreventDangerCheckTask> listOverTask(@Param("startTime") Date startTime,@Param("endTime") Date endTime); /** * 排查任务-查询应该已经开始,但是还在待执行状态的任务 */ @@ -101,15 +101,15 @@ /**查询应该已经结束,但是还在执行中状态的任务*/ List<PreventDangerCheckTask> listTimeOutTask(Date endTime); - List<Map> selectInspectionTask(Long depId, List<String> list, LocalDateTime startTime, LocalDateTime endTime); + List<Map> selectInspectionTask(@Param("depId") Long depId,@Param("list") List<String> list,@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime); - List<Map> selectInspectionClaimedTask(Long depId, List<String> list, LocalDateTime startTime, LocalDateTime endTime); + List<Map> selectInspectionClaimedTask(@Param("depId") Long depId,@Param("list") List<String> list,@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime); - List<Map> selectInspectionCompletedTask(Long depId, List<String> list, LocalDateTime startTime, LocalDateTime endTime); + List<Map> selectInspectionCompletedTask(@Param("depId") Long depId,@Param("list") List<String> list,@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime); - List<Map> selectInspectionUnCompletedTask(Long depId, List<String> list, LocalDateTime startTime, LocalDateTime endTime); + List<Map> selectInspectionUnCompletedTask(@Param("depId") Long depId,@Param("list") List<String> list,@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime); - List<PreventDangerCheckTaskRectifyDO> selectPreventDangerPage(Page<PreventDangerCheckTaskRectifyDO> page, @Param("query") Map<String, Object> params); + List<PreventDangerCheckTaskRectifyDO> selectPreventDangerPage(@Param("page") Page<PreventDangerCheckTaskRectifyDO> page, @Param("query") Map<String, Object> params); Map<String, Integer> selectRectifyNum(); diff --git a/src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckWorkRepository.java b/src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckWorkRepository.java index d30dee0..aac8d0f 100644 --- a/src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckWorkRepository.java +++ b/src/main/java/com/gk/hotwork/doublePrevention/repository/PreventDangerCheckWorkRepository.java @@ -10,6 +10,8 @@ import com.gk.hotwork.doublePrevention.repository.param.HandlerReportParam; import com.gk.hotwork.doublePrevention.repository.param.PreventDangerCheckWorkDeleteParams; import com.gk.hotwork.doublePrevention.repository.param.PreventDangerCheckWorkUpdateParams; + +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.Date; @@ -93,7 +95,7 @@ /** * 排查作业-检查待执行列表 */ - List<PreventDangerCheckWork> listExecCheckWork(Date startTime, Date endTime); + List<PreventDangerCheckWork> listExecCheckWork(@Param("startTime") Date startTime,@Param("endTime") Date endTime); /** * 排查作业-检查待执行列表 */ -- Gitblit v1.9.2