Parcourir la source

【CHG】修改查询条件

zhaomn il y a 2 ans
Parent
commit
342c775cd1

+ 10 - 0
railway-business/src/main/java/com/railway/business/bi/controller/ShowBdycController.java

@@ -32,6 +32,16 @@ public class ShowBdycController extends BaseController {
   @GetMapping(value = "/list")
   public TableDataInfo getList(BdycQuery showBdyc) {
     startPage();
+    showBdyc.setFoundMode("0");
+    List<ShowBdyc> list = showBdycService.getList(showBdyc);
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "自主发现问题列表")
+  @GetMapping(value = "/listSelf")
+  public TableDataInfo getListBySelf(BdycQuery showBdyc) {
+    startPage();
+    showBdyc.setFoundMode("1");
     List<ShowBdyc> list = showBdycService.getList(showBdyc);
     return getDataTable(list);
   }

+ 10 - 0
railway-business/src/main/java/com/railway/business/bi/controller/ShowDlycController.java

@@ -32,6 +32,16 @@ public class ShowDlycController extends BaseController {
   @GetMapping(value = "/list")
   public TableDataInfo getList(DlycQuery showDlyc) {
     startPage();
+    showDlyc.setFoundMode("0");
+    List<ShowDlyc> list = showDlycService.getList(showDlyc);
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "自主发现问题列表")
+  @GetMapping(value = "/listSelf")
+  public TableDataInfo getListBySelf(DlycQuery showDlyc) {
+    startPage();
+    showDlyc.setFoundMode("1");
     List<ShowDlyc> list = showDlycService.getList(showDlyc);
     return getDataTable(list);
   }

+ 3 - 0
railway-business/src/main/java/com/railway/business/bi/domain/ShowBdyc.java

@@ -91,6 +91,9 @@ public class ShowBdyc extends BaseEntity {
   @ApiModelProperty(value = "导入文件记录ID")
   private Long fileId;
 
+  @ApiModelProperty(value = "发现方式:0调度推送,1自主发现")
+  private String foundMode;
+
   public ShowBdyc() {
   }
 

+ 3 - 0
railway-business/src/main/java/com/railway/business/bi/domain/ShowDlyc.java

@@ -87,6 +87,9 @@ public class ShowDlyc extends BaseEntity {
   @ApiModelProperty(value = "导入文件记录ID")
   private Long fileId;
 
+  @ApiModelProperty(value = "发现方式:0调度推送,1自主发现")
+  private String foundMode;
+
   public ShowDlyc() {
   }
 

+ 3 - 0
railway-business/src/main/java/com/railway/business/bi/domain/vo/BdycQuery.java

@@ -42,4 +42,7 @@ public class BdycQuery implements Serializable {
   @ApiModelProperty(value = "导入文件记录ID")
   private Long fileId;
 
+  @ApiModelProperty(value = "发现方式:0调度推送,1自主发现")
+  private String foundMode;
+
 }

+ 3 - 0
railway-business/src/main/java/com/railway/business/bi/domain/vo/DlycQuery.java

@@ -38,4 +38,7 @@ public class DlycQuery implements Serializable {
   @ApiModelProperty(value = "导入文件记录ID")
   private Long fileId;
 
+  @ApiModelProperty(value = "发现方式:0调度推送,1自主发现")
+  private String foundMode;
+
 }

+ 9 - 0
railway-business/src/main/resources/mapper/bi/ShowBdycMapper.xml

@@ -110,6 +110,9 @@
       <if test='null != fileId'>
         file_id,
       </if>
+      <if test='null != foundMode'>
+        found_mode,
+      </if>
       <if test='null != delFlag'>
         del_flag
       </if>
@@ -169,6 +172,9 @@
       <if test='null != fileId'>
         #{fileId},
       </if>
+      <if test='null != foundMode'>
+        #{foundMode},
+      </if>
       <if test='null != delFlag'>
         #{delFlag}
       </if>
@@ -243,6 +249,9 @@
       <if test="fileId!=null ">
         and file_id=#{fileId}
       </if>
+      <if test="foundMode!=null and foundMode!=''">
+        found_mode=#{foundMode})
+      </if>
     </where>
   </select>
 

+ 10 - 2
railway-business/src/main/resources/mapper/bi/ShowDlycMapper.xml

@@ -28,8 +28,7 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    id
-    ,
+    id,
     qxsbmc,
     ssgq,
     sdjb,
@@ -106,6 +105,9 @@
       <if test='null != fileId'>
         file_id,
       </if>
+      <if test='null != foundMode'>
+        found_mode,
+      </if>
       <if test='null != delFlag'>
         del_flag
       </if>
@@ -162,6 +164,9 @@
       <if test='null != fileId'>
         #{fileId},
       </if>
+      <if test='null != foundMode'>
+        #{foundMode},
+      </if>
       <if test='null != delFlag'>
         #{delFlag}
       </if>
@@ -231,6 +236,9 @@
       <if test="fileId!=null ">
         and file_id=#{fileId}
       </if>
+      <if test="foundMode!=null and foundMode!=''">
+        found_mode=#{foundMode})
+      </if>
     </where>
   </select>
 

Fichier diff supprimé car celui-ci est trop grand
+ 4 - 0
sql/view.sql


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff