diff --git a/src/main/java/com/heai/modules/pad/controller/PadController.java b/src/main/java/com/heai/modules/pad/controller/PadController.java index c7b7d0d..9c41f3e 100644 --- a/src/main/java/com/heai/modules/pad/controller/PadController.java +++ b/src/main/java/com/heai/modules/pad/controller/PadController.java @@ -153,9 +153,9 @@ public class PadController { * @throw */ @GetMapping("/searchDelHeaderList") - public R searchDelHeaderList(String site,String startDate,String endDate,String customerId,String delNotifyNo, + public R searchDelHeaderList(String site,String startDate,String endDate,String customerId,String delNotifyNo,String shipFlag, @RequestParam(value = "no",defaultValue = "1")Integer no,@RequestParam(value = "size",defaultValue = "50")Integer size){ - IPage iPage = delNotifyHeaderService.searchDelHeaderByPage(site, startDate, endDate, customerId, delNotifyNo, no, size); + IPage iPage = delNotifyHeaderService.searchDelHeaderByPage(site, startDate, endDate, customerId, delNotifyNo, no, size,shipFlag); return R.ok().put("data",iPage); } /** diff --git a/src/main/java/com/heai/modules/pad/dao/DelNotifyHeaderMapper.java b/src/main/java/com/heai/modules/pad/dao/DelNotifyHeaderMapper.java index a648721..3a2a650 100644 --- a/src/main/java/com/heai/modules/pad/dao/DelNotifyHeaderMapper.java +++ b/src/main/java/com/heai/modules/pad/dao/DelNotifyHeaderMapper.java @@ -16,5 +16,6 @@ public interface DelNotifyHeaderMapper extends BaseMapper { @Param("customerId")String customerId, @Param("delNotifyNo")String delNotifyNo, @Param("startDate")String startDate, - @Param("endDate")String endDate); + @Param("endDate")String endDate, + @Param("shipFlag")String shipFlag); } diff --git a/src/main/java/com/heai/modules/pad/service/DelNotifyHeaderService.java b/src/main/java/com/heai/modules/pad/service/DelNotifyHeaderService.java index dbb7ba8..7c33055 100644 --- a/src/main/java/com/heai/modules/pad/service/DelNotifyHeaderService.java +++ b/src/main/java/com/heai/modules/pad/service/DelNotifyHeaderService.java @@ -9,5 +9,5 @@ public interface DelNotifyHeaderService extends IService { IPage searchDelHeaderByPage(String site, String startDate, String endDate, String customerId, String delNotifyNo, - Integer no, Integer size); + Integer no, Integer size,String shipFlag); } diff --git a/src/main/java/com/heai/modules/pad/service/impl/DelNotifyHeaderServiceImpl.java b/src/main/java/com/heai/modules/pad/service/impl/DelNotifyHeaderServiceImpl.java index 2aa251f..be0a309 100644 --- a/src/main/java/com/heai/modules/pad/service/impl/DelNotifyHeaderServiceImpl.java +++ b/src/main/java/com/heai/modules/pad/service/impl/DelNotifyHeaderServiceImpl.java @@ -17,11 +17,11 @@ import org.springframework.util.StringUtils; public class DelNotifyHeaderServiceImpl extends ServiceImpl implements DelNotifyHeaderService { @Override - public IPage searchDelHeaderByPage(String site, String startDate, String endDate, String customerId, String delNotifyNo, Integer no, Integer size) { + public IPage searchDelHeaderByPage(String site, String startDate, String endDate, String customerId, String delNotifyNo, Integer no, Integer size,String shipFlag) { if (StringUtils.hasText(startDate) && StringUtils.hasText(endDate)){ startDate = startDate + " 00:00:00"; endDate = endDate + " 23:59:59"; } - return baseMapper.searchDelHeaderByPage(new Page<>(no,size),site,customerId,delNotifyNo,startDate,endDate); + return baseMapper.searchDelHeaderByPage(new Page<>(no,size),site,customerId,delNotifyNo,startDate,endDate,shipFlag); } } diff --git a/src/main/resources/mapper/pad/DelNotifyHeaderMapper.xml b/src/main/resources/mapper/pad/DelNotifyHeaderMapper.xml index 4924746..2a547f4 100644 --- a/src/main/resources/mapper/pad/DelNotifyHeaderMapper.xml +++ b/src/main/resources/mapper/pad/DelNotifyHeaderMapper.xml @@ -75,6 +75,9 @@ and T.NotifyDate <= #{endDate} + + and T.ShipFlag = #{shipFlag} + order by T.DelNotifyNo desc