Merge remote-tracking branch 'origin/master'

linwei

2024-02-22 9269fc94626bd9ed8c6c3d9e021d37b22d86a665

 src/main/java/org/springblade/modules/taskPlaceSelfCheck/mapper/TaskPlaceSelfCheckMapper.java

@@ -19,9 +19,11 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO;
import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel;
import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

/**
@@ -39,7 +41,12 @@
    * @param taskPlaceSelfCheck
    * @return
    */
   List<TaskPlaceSelfCheckVO> selectTaskPlaceSelfCheckPage(IPage page, @Param("palce") TaskPlaceSelfCheckVO taskPlaceSelfCheck);
   List<TaskPlaceSelfCheckVO> selectTaskPlaceSelfCheckPage(IPage page,
                                             @Param("place") TaskPlaceSelfCheckVO taskPlaceSelfCheck,
                                             @Param("isAdministrator") Integer isAdministrator,
                                             @Param("regionChildCodesList") List<String> regionChildCodesList,
                                             @Param("gridCodeList") List<String> gridCodeList,
                                             @Param("nineTypeList") List<String> nineTypeList);

   /**
    * 查询消防自查记任务表
@@ -47,7 +54,7 @@
    * @param taskPlaceSelfCheck 消防自查记任务表ID
    * @return 消防自查记任务表
    */
   public TaskPlaceSelfCheckDTO selectTaskPlaceSelfCheckById(  @Param("palce") TaskPlaceSelfCheckEntity taskPlaceSelfCheck);
   public TaskPlaceSelfCheckDTO selectTaskPlaceSelfCheckById(@Param("place") TaskPlaceSelfCheckEntity taskPlaceSelfCheck);

   /**
    * 查询消防自查记任务表列表
@@ -56,4 +63,18 @@
    * @return 消防自查记任务表集合
    */
   public List<TaskPlaceSelfCheckDTO> selectTaskPlaceSelfCheckList(TaskPlaceSelfCheckDTO taskPlaceSelfCheckDTO);

   /**
    * 导出消防自查信息
    * @param taskPlaceSelfCheck
    * @param isAdministrator
    * @param regionChildCodesList
    * @param gridCodeList
    * @return
    */
   List<TaskPlaceSelfCheckExcel> exportTaskPlaceSelfCheck(@Param("nineTypeList") List<String> nineTypeList,
                                             @Param("place") TaskPlaceSelfCheckVO taskPlaceSelfCheck,
                                             @Param("isAdministrator") Integer isAdministrator,
                                             @Param("regionChildCodesList") List<String> regionChildCodesList,
                                             @Param("gridCodeList") List<String> gridCodeList);
}