From ed145c122a2c894f3157a116d66f644606101d71 Mon Sep 17 00:00:00 2001 From: houjianhui Date: Fri, 15 Sep 2017 18:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=94=B6=E6=AC=BE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/unlcn/ils/sales/api/query/OrderQuery.java | 14 +++++++++++++- .../unlcn/ils/sales/backend/bo/OrderQueryBO.java | 11 +++++++++++ .../sales/backend/service/OrderServiceImpl.java | 6 ++++-- .../main/resources/mappers/SaleOrderViewMapper.xml | 6 ++++++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java index 3352b8d..2fa840f 100644 --- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java +++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java @@ -37,6 +37,9 @@ public class OrderQuery { // 支付状态 @ApiModelProperty(value = "支付状态") private Integer payStatus; + // 附件审核状态 + @ApiModelProperty(value = "附件审核状态") + private Integer attachAuditStatus; public String getCode() { return code; @@ -110,6 +113,14 @@ public class OrderQuery { this.payStatus = payStatus; } + public Integer getAttachAuditStatus() { + return attachAuditStatus; + } + + public void setAttachAuditStatus(Integer attachAuditStatus) { + this.attachAuditStatus = attachAuditStatus; + } + @Override public String toString() { return "OrderQuery{" + @@ -121,7 +132,8 @@ public class OrderQuery { ", pickDateBegin=" + pickDateBegin + ", pickDateEnd=" + pickDateEnd + ", auditStatus='" + auditStatus + '\'' + - ", payStatus='" + payStatus + '\'' + + ", payStatus=" + payStatus + + ", attachAuditStatus=" + attachAuditStatus + '}'; } } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java index 0d0b46e..73d7d1a 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java @@ -26,6 +26,8 @@ public class OrderQueryBO { private String auditStatus; // 支付状态 private Integer payStatus; + // 附件审核状态 + private Integer attachAuditStatus; public String getCode() { return code; @@ -99,6 +101,14 @@ public class OrderQueryBO { this.payStatus = payStatus; } + public Integer getAttachAuditStatus() { + return attachAuditStatus; + } + + public void setAttachAuditStatus(Integer attachAuditStatus) { + this.attachAuditStatus = attachAuditStatus; + } + @Override public String toString() { return "OrderQueryBO{" + @@ -111,6 +121,7 @@ public class OrderQueryBO { ", pickDateEnd=" + pickDateEnd + ", auditStatus='" + auditStatus + '\'' + ", payStatus=" + payStatus + + ", attachAuditStatus=" + attachAuditStatus + '}'; } } diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java index 406bd8d..9710d82 100644 --- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java +++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java @@ -10,7 +10,6 @@ import com.google.common.collect.Lists; import com.unlcn.ils.sales.backend.bo.*; import com.unlcn.ils.sales.backend.constant.AutoConfConstant; import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum; -import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum; import com.unlcn.ils.sales.backend.enums.OrderPayStatusEnum; import com.unlcn.ils.sales.backend.enums.OrderStatusEnum; import com.unlcn.ils.sales.backend.util.UniquenessUtil; @@ -221,6 +220,7 @@ public class OrderServiceImpl implements OrderService { queryMap.put("pickDateBegin", queryBO.getPickDateBegin()); queryMap.put("pickDateEnd", queryBO.getPickDateEnd()); queryMap.put("payStatus", queryBO.getPayStatus()); + queryMap.put("attachAuditStatus", queryBO.getAttachAuditStatus()); return buildListSaleOrder(queryMap, pageVo); } @@ -237,6 +237,8 @@ public class OrderServiceImpl implements OrderService { queryMap.put("auditStatus", queryBO.getAuditStatus()); queryMap.put("pickDateBegin", queryBO.getPickDateBegin()); queryMap.put("pickDateEnd", queryBO.getPickDateEnd()); + queryMap.put("payStatus", queryBO.getPayStatus()); + queryMap.put("attachAuditStatus", queryBO.getAttachAuditStatus()); return buildListSaleOrder(queryMap, pageVo); } @@ -284,7 +286,7 @@ public class OrderServiceImpl implements OrderService { item.setPayStatus(OrderPayStatusEnum.ORDER_TOUCH.getValue()); orderMapper.updateByPrimaryKeySelective(item); // 更新审核表中状态 - orderAuditService.updateAuditStatusByOrderId(item.getId(), OrderAuditStatusEnum.ORDER_AWAIT.getValue()); + //orderAuditService.updateAuditStatusByOrderId(item.getId(), OrderAuditStatusEnum.ORDER_AWAIT.getValue()); }); } return 0; diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml index deb6ee5..368ad86 100644 --- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml +++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml @@ -109,6 +109,9 @@ AND so.order_status = #{orderStatus, jdbcType=INTEGER} + + AND so.attach_audit_status = #{attachAuditStatus, jdbcType=INTEGER} + AND soa.depart_region_code = #{departRegionCode, jdbcType=VARCHAR} @@ -160,6 +163,9 @@ AND so.order_status = #{orderStatus, jdbcType=INTEGER} + + AND so.attach_audit_status = #{attachAuditStatus, jdbcType=INTEGER} + AND soa.depart_region_code = #{departRegionCode, jdbcType=VARCHAR} -- Gitee