diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/InspectGoodsController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/InspectGoodsController.java index 7788704..ab925eb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/InspectGoodsController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/InspectGoodsController.java @@ -6,12 +6,14 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import com.bonus.canteen.core.ims.domain.param.InspectGoodsAdd; +import com.bonus.canteen.core.ims.domain.param.InspectGoodsQuery; import com.bonus.canteen.core.ims.domain.param.InspectGoodsUpdate; import com.bonus.canteen.core.ims.domain.vo.InspectGoodsVO; import com.bonus.common.log.enums.OperaType; //import com.bonus.canteen.core.ims.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -49,7 +51,10 @@ public class InspectGoodsController extends BaseController { @ApiOperation(value = "查询验货单列表") //@RequiresPermissions("ims:goods:list") @PostMapping("/list") - public TableDataInfo list(@RequestBody InspectGoods inspectGoods) { + public TableDataInfo list(@RequestBody InspectGoodsQuery inspectGoodsQuery) { + InspectGoods inspectGoods = new InspectGoods(); + BeanUtils.copyProperties(inspectGoodsQuery, inspectGoods); + inspectGoods.setDeliverySupplierId(inspectGoodsQuery.getSupplierId()); startPage(); List list = inspectGoodsService.selectInspectGoodsList(inspectGoods); return getDataTable(list); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java index 940e95e..0650bcb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java @@ -128,6 +128,10 @@ public class InspectGoods extends BaseEntity { @ApiModelProperty(value = "附件,多个则逗号分隔") private String inspectAttachment; + @Excel(name = "送货供应商id") + @ApiModelProperty(value = "送货供应商id") + private Long supplierId; + private List inspectGoodsDetails; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsQuery.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsQuery.java index 28023ef..15e1584 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsQuery.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsQuery.java @@ -1,18 +1,13 @@ package com.bonus.canteen.core.ims.domain.param; -import com.bonus.canteen.core.ims.domain.InspectGoodsDetail; import com.bonus.common.core.annotation.Excel; -import com.bonus.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.List; /** * 验货单对象 ims_inspect_goods @@ -38,7 +33,7 @@ public class InspectGoodsQuery implements Serializable { /** 送货供应商id */ @Excel(name = "送货供应商id") @ApiModelProperty(value = "送货供应商id") - private Long deliverySupplierId; + private Long supplierId; /** 是否入库(1是2否) */ @Excel(name = "是否入库(1是2否)") @@ -49,6 +44,8 @@ public class InspectGoodsQuery implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDateTime; + private String searchValue; + @ApiModelProperty("结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endDateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml index e4d89e9..c07ea27 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml @@ -68,6 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and iig.inspect_goods_code like CONCAT('%',#{inspectGoodsCode},'%') + + and (iig.relate_delivery_goods_id like CONCAT('%',#{searchValue},'%') + or iig.inspect_goods_code like CONCAT('%',#{searchValue},'%') + or iig.delivery_man like CONCAT('%',#{searchValue},'%') + ) + and iig.inspect_date = ]]> #{startDateTime}