Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/FlowQueryController.java

@@ -38,7 +38,6 @@ public class FlowQueryController {
         return BaseResponse.create(res);
     }
 
-
     @ApiOperation("隐形码模糊查询")
     @GetMapping("/invisibleCode/like")
     public BaseResponse<GetInvisibleCodeRes> invisibleCode (@Validated GetInvisibleCodeReq getInvisibleCodeReq) {

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/FlowQueryRecordController.java

@@ -60,8 +60,8 @@ public class FlowQueryRecordController {
      * 获取流向查询记录 详细信息
      */
     @ApiOperation("获取流向查询记录 详细信息")
-    @GetMapping(value = "/getInfo/{id}")
-    public BaseResponse<GetFlowQueryRecordInfo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
+    @GetMapping(value = "/getInfo")
+    public BaseResponse<GetFlowQueryRecordInfo> getInfo(@NotNull(message = "主键不能为空") Long id) {
         GetFlowQueryRecordInfo recordInfo = flowQueryRecordService.getDetailsById(id);
         return BaseResponse.create(recordInfo);
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/FlowQueryRecordInfoVo.java

@@ -71,7 +71,7 @@ public class FlowQueryRecordInfoVo implements Serializable {
      * 查询时间
      */
     @ApiModelProperty(value = "查询时间")
-    private String queryTime;
+    private LocalDateTime queryTime;
 
     /**
      * 品牌

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/AddFlowQueryRecordReq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,6 +21,7 @@ import java.util.List;
  */
 @Data
 @ApiModel
+@NoArgsConstructor
 public class AddFlowQueryRecordReq {
 
     /**

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/PageListFlowQueryRecordReq.java

@@ -21,6 +21,8 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 public class PageListFlowQueryRecordReq extends PageReq implements Serializable {
+    @ApiModelProperty(value = "编号")
+    private Long id;
 
     /**
      * 箱码
@@ -47,10 +49,10 @@ public class PageListFlowQueryRecordReq extends PageReq implements Serializable
     private Integer queryPlatform;
 
     /**
-     * 查询用户ID
+     * 查询用户名称
      */
-    @ApiModelProperty(value = "查询用户ID")
-    private Long queryUserId;
+    @ApiModelProperty(value = "查询用户名称")
+    private String queryUserName;
 
     /**
      * 查询时间-开始

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetFlowQueryRecordInfo.java

@@ -56,7 +56,8 @@ public class GetFlowQueryRecordInfo implements Serializable {
      * 查询时间
      */
     @ApiModelProperty(value = "查询时间")
-    private String queryTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime queryTime;
 
 
     /**

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/FlowQueryRecordMapper.xml

@@ -90,6 +90,10 @@
         `flow_query_record`
         <where>
             `is_delete`=0
+            <!-- 编号 -->
+            <if test="param.id!=null">
+                AND `id` = #{param.id}
+            </if>
             <!-- 箱码，不支持模糊搜索 -->
             <if test="param.boxCode!=null and param.boxCode!=''">
                 AND `box_code` = #{param.boxCode}
@@ -110,9 +114,9 @@
                 AND `query_platform` = #{param.queryPlatform}
             </if>
 
-            <!-- 查询用户ID -->
-            <if test="param.queryUserId!=null ">
-                AND `create_by` = #{param.queryUserId}
+            <!-- 查询用户名称 -->
+            <if test="param.queryUserName!=null and param.queryUserName!=''">
+                AND `create_user_name` = #{param.queryUserName}
             </if>
 
             <!-- 创建时间-开始 -->