追溯查询bug修改

src/main/java/com/glxp/api/req/trace/TraceDlTaskRequest.java

@@ -1,12 +1,13 @@
 package com.glxp.api.req.trace;
 
+import com.glxp.api.util.page.ListPageRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ApiModel("追踪任务请求")
-public class TraceDlTaskRequest {
+public class TraceDlTaskRequest extends ListPageRequest {
     @ApiModelProperty(value = "任务id")
     private Long taskId;
 }

src/main/java/com/glxp/api/req/trace/TraceOrderUploadRequest.java

@@ -27,7 +27,7 @@ public class TraceOrderUploadRequest {
      * 1:入库；2：出库
      */
     @ApiModelProperty(value = "1:入库；2：出库")
-    private Byte inOutType;
+    private Integer inOutType;
 
     /**
      * 单据类型

src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java

@@ -85,7 +85,7 @@ public class TraceTaskDlResponse {
     /**
      * 生成日期
      */
-    @ApiModelProperty(value = "生成日期")
+    @ApiModelProperty(value = "生产日期")
     private String produceDate;
     /**
      * 失效日期

src/main/resources/schemas/schema_v2.1.sql

@@ -26,6 +26,9 @@ CALL Pro_Temp_ColumnWork('basic_udi_product', 'chsType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udi_product', 'importType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udi_product', 'purchaseType', 'tinyint', 1);
 
+CALL Pro_Temp_ColumnWork('io_stat_set_detail', 'setIdFk', 'varchar(255)', 1);
+
+
 /*
  Navicat Premium Data Transfer
 
@@ -159,8 +162,8 @@ CREATE TABLE IF NOT EXISTS `io_stat_set_detail`
 
 
 
-
+CREATE TABLE IF NOT EXISTS `anncmnt_manu`
-CREATE TABLE  IF NOT EXISTS `anncmnt_manu`  (
+(
     `id`              int                                                           NOT NULL AUTO_INCREMENT,
     `name`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '医疗器械注册人名称（企业名称）',
     `creditCode`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '统一社会信用号',
@@ -186,12 +189,16 @@ CREATE TABLE  IF NOT EXISTS `anncmnt_manu`  (
     `approvalDate`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '发证日期',
     `expireDate`      datetime(0)                                                   NULL DEFAULT NULL COMMENT '有效期至',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '器械公告-生产企业信息表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '器械公告-生产企业信息表'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for anncmnt_manu_cert
 -- ----------------------------
-CREATE TABLE  IF NOT EXISTS `anncmnt_manu_cert`  (
+CREATE TABLE IF NOT EXISTS `anncmnt_manu_cert`
+(
     `id`             int                                                           NOT NULL AUTO_INCREMENT,
     `zczbhhzbapzbh`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册/备案证号（外键）',
     `ylqxzcrbarmc`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '医疗器械注册人',
@@ -210,12 +217,16 @@ CREATE TABLE  IF NOT EXISTS `anncmnt_manu_cert`  (
     `pauseStartTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '暂停使用时间',
     `pauseEndTime`   datetime(0)                                                   NULL DEFAULT NULL COMMENT '暂停使用截止时间',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '器械公告-生产企业证书信息' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '器械公告-生产企业证书信息'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for anncmnt_product
 -- ----------------------------
-CREATE TABLE  IF NOT EXISTS `anncmnt_product`  (
+CREATE TABLE IF NOT EXISTS `anncmnt_product`
+(
     `id`             int                                                           NOT NULL AUTO_INCREMENT,
     `productName`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品通用名称',
     `ggxh`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格型号',
@@ -235,12 +246,16 @@ CREATE TABLE  IF NOT EXISTS `anncmnt_product`  (
     `pauseStartTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '暂停使用时间',
     `pauseEndTime`   datetime(0)                                                   NULL DEFAULT NULL COMMENT '恢复使用时间',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for anncmnt_product_batch
 -- ----------------------------
-CREATE TABLE  IF NOT EXISTS `anncmnt_product_batch`  (
+CREATE TABLE IF NOT EXISTS `anncmnt_product_batch`
+(
     `id`             int                                                           NOT NULL AUTO_INCREMENT,
     `productIdFk`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品Id外键',
     `productName`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品名称',
@@ -258,12 +273,16 @@ CREATE TABLE  IF NOT EXISTS `anncmnt_product_batch`  (
     `pauseStartTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '暂停使用时间',
     `pauseEndTime`   datetime(0)                                                   NULL DEFAULT NULL COMMENT '恢复使用时间',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for anncmnt_ylqxzcr
 -- ----------------------------
-CREATE TABLE  IF NOT EXISTS `anncmnt_ylqxzcr`  (
+CREATE TABLE IF NOT EXISTS `anncmnt_ylqxzcr`
+(
     `id`             int                                                           NOT NULL AUTO_INCREMENT,
     `name`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '医疗器械注册人名称（企业名称）',
     `creditCode`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '统一社会信用号',
@@ -283,12 +302,16 @@ CREATE TABLE  IF NOT EXISTS `anncmnt_ylqxzcr`  (
     `pauseStartTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '暂停使用时间',
     `pauseEndTime`   datetime(0)                                                   NULL DEFAULT NULL COMMENT '恢复使用时间',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '器械公告-医疗器械注册人信息表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '器械公告-医疗器械注册人信息表'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for anncmnt_ylqxzczh
 -- ----------------------------
-CREATE TABLE  IF NOT EXISTS `anncmnt_ylqxzczh`  (
+CREATE TABLE IF NOT EXISTS `anncmnt_ylqxzczh`
+(
     `id`             int                                                           NOT NULL AUTO_INCREMENT COMMENT '证书状态:1:异常',
     `code`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '证书编号',
     `productName`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品名称',
@@ -313,7 +336,10 @@ CREATE TABLE  IF NOT EXISTS `anncmnt_ylqxzczh`  (
     `pauseStartTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '暂停使用时间',
     `pauseEndTime`   datetime(0)                                                   NULL DEFAULT NULL COMMENT '暂停使用截止时间',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '器械公告-注册/备案证号表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '器械公告-注册/备案证号表'
+  ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;