提交

in-client-qn-ui/src/views/record/index.vue

@@ -21,6 +21,18 @@
             ></el-date-picker>
           </el-form-item>
 
+
+          <el-form-item>
+            <el-select clearable v-model="searchForm.type" placeholder="请选择">
+              <el-option
+                v-for="item in types"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
           <el-form-item>
             <el-button
               icon="el-icon-search"
@@ -107,11 +119,10 @@
     data() {
       return {
         tableData: [],
-        types: [{label:"拉取原始数据",value:"PULL_INIT"},
-          {label:"推送原始数据",value:"PUSH_INIT"},
-          {label:"拉取修正数据",value:"PULL_CORRECT"},
+        types: [
+          {label:"修正DQ数据",value:"PULL_CORRECT"},
           {label:"交互权限",value:"COM_PERMISSON"},
-          {label:"拉取修正文件",value:"PULL_CORRECT_JY"},
+          {label:"修正DQ文件",value:"PULL_CORRECT_JY"},
           {label:"修正数据",value:"CORRECT_DATA"},
           {label:"回传数据",value:"BACK_DATA"},
           {label:"回传文件解析",value:"BACK_DATA_FILE"},
@@ -121,6 +132,7 @@
           {label:"回传统计数据",value:"BACK_STAT_ALL"},
           {label:"下发超短期修正",value:"CORRULTRSHOR"},
           {label:"下发检修计划",value:"REPAPLAN"},
+          {label:"文件解析",value:"BACK_FILE_ANALYSIS"},
         ],
         searchForm: {},
         times: [

in-client-qn/src/main/java/com/jiayue/insu/inclientqn/controller/RecordController.java

@@ -33,11 +33,14 @@ public class RecordController {
     @GetMapping("/page")
     public R getPage(Page page, Record record) {
         LambdaQueryWrapper<Record> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(record.getType()!=null){
+            lambdaQueryWrapper.eq(Record::getType,record.getType());
+        }
         if(record.getStartTime()!=null && record.getEndTime()!=null){
             lambdaQueryWrapper.between(Record::getCreateTime,record.getStartTime(),record.getEndTime());
-            lambdaQueryWrapper.orderByDesc(Record::getCreateTime);
-        }
 
+        }
+        lambdaQueryWrapper.orderByDesc(Record::getCreateTime);
         return R.ok(recordService.page(page, lambdaQueryWrapper));
     }