Merge remote-tracking branch 'origin/master'

linwei

2026-01-31 8261ceda58718fe8becb795d09e152a3b61a6f22

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

copy from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/mapper/GdImplementationListMapper.java
copy to drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdThingListMaterialRelMapper.java
File was copied from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/mapper/GdImplementationListMapper.java
@@ -14,11 +14,11 @@
 *  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.entity.GdThingListMaterialRelEntity;
import org.sxkj.gd.implement.vo.GdThingListMaterialRelVO;
import org.sxkj.gd.implement.excel.GdThingListMaterialRelExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,21 +26,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 GdThingListMaterialRelMapper extends BaseMapper<GdThingListMaterialRelEntity> {

   /**
    * 自定义分页
    *
    * @param page
    * @param gdImplementationList
    * @param gdThingListMaterialRel
    * @return
    */
   List<GdImplementationListVO> selectGdImplementationListPage(IPage page, GdImplementationListVO gdImplementationList);
   List<GdThingListMaterialRelVO> selectGdThingListMaterialRelPage(IPage page, GdThingListMaterialRelVO gdThingListMaterialRel);


   /**
@@ -49,6 +49,6 @@
    * @param queryWrapper
    * @return
    */
   List<GdImplementationListExcel> exportGdImplementationList(@Param("ew") Wrapper<GdImplementationListEntity> queryWrapper);
   List<GdThingListMaterialRelExcel> exportGdThingListMaterialRel(@Param("ew") Wrapper<GdThingListMaterialRelEntity> queryWrapper);

}