提交 214a6e29 作者: zhangqiliang

退货管理的查询,只查询显示:已申请 已驳回 已通过 已关闭4个状态的数据

父级 9f19577c
...@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
...@@ -81,6 +82,8 @@ public class RejectController { ...@@ -81,6 +82,8 @@ public class RejectController {
@PostMapping("/query") @PostMapping("/query")
@ApiOperation(value = "退货列表查询") @ApiOperation(value = "退货列表查询")
public BaseResponse<List<Delivery>> queryReject(Delivery Delivery){ public BaseResponse<List<Delivery>> queryReject(Delivery Delivery){
List<String> list= Arrays.asList("已申请","已驳回","已通过","已关闭");
Delivery.setStatusList(list);
return new BaseResponse(this.deliveryMapper.selectDeliveryList(Delivery)); return new BaseResponse(this.deliveryMapper.selectDeliveryList(Delivery));
} }
@GetMapping("/detail") @GetMapping("/detail")
......
...@@ -217,11 +217,17 @@ public class Delivery extends PageVo implements Serializable { ...@@ -217,11 +217,17 @@ public class Delivery extends PageVo implements Serializable {
@ApiModelProperty(value = "退货原因") @ApiModelProperty(value = "退货原因")
private String reason; private String reason;
/** /**
* 退货状态 已申请 已驳回 已通过 已关闭 * 状态集合
* *
* @mbg.generated * @mbg.generated
*/ */
@ApiModelProperty(value = "退货状态 已申请 已驳回 已通过 已关闭") private List<String> statusList;
/**
* 状态 已申请 已驳回 已通过 已关闭
*
* @mbg.generated
*/
@ApiModelProperty(value = "状态 已申请 已驳回 已通过 已关闭")
private String status; private String status;
/** /**
* 退货的审批时间 * 退货的审批时间
......
...@@ -120,6 +120,12 @@ ...@@ -120,6 +120,12 @@
<if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if> <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''"> and UPDATED_BY = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''"> and UPDATED_BY = #{updatedBy}</if>
<if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if> <if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if>
<if test="statusList!=null and statusList.size > 0">
and status in
<foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where> </where>
</select> </select>
<select id="selectByLogisticOrder" parameterType="string" resultMap="BaseResultMap"> <select id="selectByLogisticOrder" parameterType="string" resultMap="BaseResultMap">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论