From 424621143dbb328ecee8ac62a5d49b99476a27fd Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Sat, 9 May 2026 19:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6=20=20oms?=
=?UTF-8?q?-gw=E6=8E=A8=E9=80=81-=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E6=8E=A8=E9=80=81=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/mhd/system/api/WmsServiceFeign.java | 4 ++--
.../repository/todo/UserShipperDO.java | 15 +++++++++++++++
.../resources/mapper/UserShipperMapper.xml | 18 ++++++++++++++++++
.../materialBaseInfo/MaterialBaseInfoApi.java | 4 ++--
4 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
index 249511e40..ad996d832 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
@@ -104,6 +104,6 @@ public interface WmsServiceFeign {
@PostMapping("/materialBaseInfoApi/updatePushStatus")
public AjaxResult updateMaterialPushStatus(@RequestParam("materialBaseInfoId") Long materialBaseInfoId,
@RequestParam("pushStatus") Integer pushStatus,
- @RequestParam("pushTime") String pushTime,
- @RequestParam("pushBy") Long pushBy);
+ @RequestParam(value = "pushTime",required = false) String pushTime,
+ @RequestParam(value = "pushBy",required = false) Long pushBy);
}
\ No newline at end of file
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java
index d58dc3547..5d0438c74 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java
@@ -288,4 +288,19 @@ public class UserShipperDO extends UserDO {
@ApiModelProperty(name = "备注")
private String userRemark;
+
+ @ApiModelProperty("更新时间起")
+ private String updateTimeFrom;
+
+ @ApiModelProperty("更新时间止")
+ private String updateTimeTo;
+
+ @ApiModelProperty("推送状态")
+ private Integer pushStatus;
+
+ @ApiModelProperty("推送时间起")
+ private String pushTimeFrom;
+
+ @ApiModelProperty("推送时间止")
+ private String pushTimeTo;
}
diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
index b64400011..86bf79790 100644
--- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
@@ -315,6 +315,24 @@
and DATE_FORMAT(a.create_time,'%Y-%m-%d')
DATE_FORMAT(#{createTimeTo},'%Y-%m-%d')
+ /*更新时间*/
+
+ and DATE_FORMAT(a.update_time,'%Y-%m-%d') >= #{updateTimeFrom}
+
+
+ and DATE_FORMAT(a.update_time,'%Y-%m-%d') <= #{updateTimeTo}
+
+ /*推送状态*/
+
+ and b.push_status = #{pushStatus}
+
+ /*推送时间*/
+
+ and DATE_FORMAT(b.push_time,'%Y-%m-%d') >= #{pushTimeFrom}
+
+
+ and DATE_FORMAT(b.push_time,'%Y-%m-%d') <= #{pushTimeTo}
+
/*审核时间*/
and DATE_FORMAT(b.shipper_fill_time,'%Y-%m-%d') =]]>
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
index 4cd524029..779f6d345 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
@@ -116,8 +116,8 @@ public class MaterialBaseInfoApi extends BaseController {
@PostMapping("/updatePushStatus")
public AjaxResult updateMaterialPushStatus(@RequestParam("materialBaseInfoId") Long materialBaseInfoId,
@RequestParam("pushStatus") Integer pushStatus,
- @RequestParam("pushTime") String pushTime,
- @RequestParam("pushBy") Long pushBy){
+ @RequestParam(value = "pushTime",required = false) String pushTime,
+ @RequestParam(value = "pushBy",required = false) Long pushBy){
Date pushTimeDate = null;
if (StringUtils.isNotBlank(pushTime)) {
pushTimeDate = DateUtil.parse(pushTime);