Merge remote-tracking branch 'origin/master'

linwei

2026-01-31 8261ceda58718fe8becb795d09e152a3b61a6f22

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdMaterialMapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/mapper/GdImplementationListMapper.java
@@ -14,11 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementation.mapper;
package org.sxkj.gd.implement.mapper;

import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
import org.sxkj.gd.implementation.vo.GdImplementationListVO;
import org.sxkj.gd.implementation.excel.GdImplementationListExcel;
import org.sxkj.gd.implement.dto.GdMaterialDTO;
import org.sxkj.gd.implement.entity.GdMaterialEntity;
import org.sxkj.gd.implement.vo.GdMaterialVO;
import org.sxkj.gd.implement.excel.GdMaterialExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,21 +27,21 @@
import java.util.List;

/**
 * 实施清单表（实时清单管理） Mapper 接口
 * 材料信息表 Mapper 接口
 *
 * @author lw
 * @since 2026-01-14
 * @author Aix
 * @since 2026-01-31
 */
public interface GdImplementationListMapper extends BaseMapper<GdImplementationListEntity> {
public interface GdMaterialMapper extends BaseMapper<GdMaterialEntity> {

   /**
    * 自定义分页
    *
    * @param page
    * @param gdImplementationList
    * @param gdMaterial
    * @return
    */
   List<GdImplementationListVO> selectGdImplementationListPage(IPage page, GdImplementationListVO gdImplementationList);
   List<GdMaterialVO> selectGdMaterialPage(IPage page, GdMaterialDTO gdMaterial);


   /**
@@ -49,6 +50,6 @@
    * @param queryWrapper
    * @return
    */
   List<GdImplementationListExcel> exportGdImplementationList(@Param("ew") Wrapper<GdImplementationListEntity> queryWrapper);
   List<GdMaterialExcel> exportGdMaterial(@Param("ew") Wrapper<GdMaterialEntity> queryWrapper);

}