物料管理 查询添加条件 oms-gw推送-物料管理 推送更新状态

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(value = "pushTime",required = false) String pushTime,
-                                  @RequestParam("pushBy") Long pushBy);
+                                  @RequestParam(value = "pushBy",required = false) Long pushBy);
 }

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;
 }

mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml

@@ -315,6 +315,24 @@
             and DATE_FORMAT(a.create_time,'%Y-%m-%d') <![CDATA[<=]]>
             DATE_FORMAT(#{createTimeTo},'%Y-%m-%d')
         </if>
+        /*更新时间*/
+        <if test="updateTimeFrom != null and updateTimeFrom != ''">
+            and DATE_FORMAT(a.update_time,'%Y-%m-%d') &gt;= #{updateTimeFrom}
+        </if>
+        <if test="updateTimeTo != null and updateTimeTo != ''">
+            and DATE_FORMAT(a.update_time,'%Y-%m-%d') &lt;= #{updateTimeTo}
+        </if>
+        /*推送状态*/
+        <if test="pushStatus != null">
+            and b.push_status = #{pushStatus}
+        </if>
+        /*推送时间*/
+        <if test="pushTimeFrom != null and pushTimeFrom != ''">
+            and DATE_FORMAT(b.push_time,'%Y-%m-%d') &gt;= #{pushTimeFrom}
+        </if>
+        <if test="pushTimeTo != null and pushTimeTo != ''">
+            and DATE_FORMAT(b.push_time,'%Y-%m-%d') &lt;= #{pushTimeTo}
+        </if>
         /*审核时间*/
         <if test="userAuthTimeFrom!=null and userAuthTimeTo!=null ">
             and DATE_FORMAT(b.shipper_fill_time,'%Y-%m-%d') <![CDATA[>=]]>

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(value = "pushTime",required = false) String pushTime,
-                                         @RequestParam("pushBy") Long pushBy){
+                                         @RequestParam(value = "pushBy",required = false) Long pushBy){
         Date pushTimeDate = null;
         if (StringUtils.isNotBlank(pushTime)) {
             pushTimeDate = DateUtil.parse(pushTime);