Browse Source

【NEW】增加 线别 查询接口

zhaomn 2 years ago
parent
commit
a78b6d3807
17 changed files with 79 additions and 0 deletions
  1. 8 0
      railway-business/src/main/java/com/railway/business/bi/controller/ShowBpdjxjhController.java
  2. 1 0
      railway-business/src/main/java/com/railway/business/bi/controller/ShowSbxjController.java
  3. 8 0
      railway-business/src/main/java/com/railway/business/bi/controller/ShowTestPlanDtController.java
  4. 8 0
      railway-business/src/main/java/com/railway/business/bi/controller/ShowYdtsController.java
  5. 2 0
      railway-business/src/main/java/com/railway/business/bi/mapper/ShowBpdjxjhMapper.java
  6. 2 0
      railway-business/src/main/java/com/railway/business/bi/mapper/ShowTestPlanDtMapper.java
  7. 2 0
      railway-business/src/main/java/com/railway/business/bi/mapper/ShowYdtsMapper.java
  8. 1 0
      railway-business/src/main/java/com/railway/business/bi/service/IShowBpdjxjhService.java
  9. 1 0
      railway-business/src/main/java/com/railway/business/bi/service/IShowTestPlanDtService.java
  10. 1 0
      railway-business/src/main/java/com/railway/business/bi/service/IShowYdtsService.java
  11. 5 0
      railway-business/src/main/java/com/railway/business/bi/service/impl/ShowBpdjxjhServiceImpl.java
  12. 5 0
      railway-business/src/main/java/com/railway/business/bi/service/impl/ShowTestPlanDtServiceImpl.java
  13. 5 0
      railway-business/src/main/java/com/railway/business/bi/service/impl/ShowYdtsServiceImpl.java
  14. 9 0
      railway-business/src/main/resources/mapper/bi/ShowBpdjxjhMapper.xml
  15. 3 0
      railway-business/src/main/resources/mapper/bi/ShowSbxjMapper.xml
  16. 9 0
      railway-business/src/main/resources/mapper/bi/ShowTestPlanDtMapper.xml
  17. 9 0
      railway-business/src/main/resources/mapper/bi/ShowYdtsMapper.xml

+ 8 - 0
railway-business/src/main/java/com/railway/business/bi/controller/ShowBpdjxjhController.java

@@ -4,6 +4,7 @@ import com.railway.business.bi.domain.ShowBpdjxjh;
 import com.railway.business.bi.domain.vo.BpdjxjhQuery;
 import com.railway.business.bi.domain.vo.BpdjxjhQuery;
 import com.railway.business.bi.service.IShowBpdjxjhService;
 import com.railway.business.bi.service.IShowBpdjxjhService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -36,4 +37,11 @@ public class ShowBpdjxjhController extends BaseController {
     return getDataTable(list);
     return getDataTable(list);
   }
   }
 
 
+  @ApiOperation(value = "线别列表")
+  @GetMapping(value = "/listLine")
+  public AjaxResult getList() {
+    List<String> list = showBpdjxjhService.getLineList();
+    return AjaxResult.success(list);
+  }
+
 }
 }

+ 1 - 0
railway-business/src/main/java/com/railway/business/bi/controller/ShowSbxjController.java

@@ -49,6 +49,7 @@ public class ShowSbxjController extends BaseController {
   @GetMapping(value = "listBd")
   @GetMapping(value = "listBd")
   public TableDataInfo getBdList(ShowSbxj showSbxj) {
   public TableDataInfo getBdList(ShowSbxj showSbxj) {
     startPage();
     startPage();
+    showSbxj.setQybds("1");
     List<ShowSbxj> list = showSbxjService.getList(showSbxj);
     List<ShowSbxj> list = showSbxjService.getList(showSbxj);
     return getDataTable(list);
     return getDataTable(list);
   }
   }

+ 8 - 0
railway-business/src/main/java/com/railway/business/bi/controller/ShowTestPlanDtController.java

@@ -4,6 +4,7 @@ import com.railway.business.bi.domain.ShowTestPlanDt;
 import com.railway.business.bi.domain.vo.TestPlanDtQuery;
 import com.railway.business.bi.domain.vo.TestPlanDtQuery;
 import com.railway.business.bi.service.IShowTestPlanDtService;
 import com.railway.business.bi.service.IShowTestPlanDtService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -36,4 +37,11 @@ public class ShowTestPlanDtController extends BaseController {
     return getDataTable(list);
     return getDataTable(list);
   }
   }
 
 
+  @ApiOperation(value = "线别列表")
+  @GetMapping(value = "/listLine")
+  public AjaxResult getList() {
+    List<String> list = showTestPlanDtService.getLineList();
+    return AjaxResult.success(list);
+  }
+
 }
 }

+ 8 - 0
railway-business/src/main/java/com/railway/business/bi/controller/ShowYdtsController.java

@@ -4,6 +4,7 @@ import com.railway.business.bi.domain.ShowYdts;
 import com.railway.business.bi.domain.vo.YdtsQuery;
 import com.railway.business.bi.domain.vo.YdtsQuery;
 import com.railway.business.bi.service.IShowYdtsService;
 import com.railway.business.bi.service.IShowYdtsService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -33,4 +34,11 @@ public class ShowYdtsController extends BaseController {
     return getDataTable(list);
     return getDataTable(list);
   }
   }
 
 
+  @ApiOperation(value = "线别列表")
+  @GetMapping(value = "/listLine")
+  public AjaxResult getList() {
+    List<String> list = showYdtsService.getLineList();
+    return AjaxResult.success(list);
+  }
+
 }
 }

+ 2 - 0
railway-business/src/main/java/com/railway/business/bi/mapper/ShowBpdjxjhMapper.java

@@ -3,6 +3,7 @@ package com.railway.business.bi.mapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.railway.business.bi.domain.ShowBpdjxjh;
 import com.railway.business.bi.domain.ShowBpdjxjh;
 import com.railway.business.bi.domain.vo.BpdjxjhQuery;
 import com.railway.business.bi.domain.vo.BpdjxjhQuery;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
@@ -56,4 +57,5 @@ public interface ShowBpdjxjhMapper {
    */
    */
   int getActual(String month);
   int getActual(String month);
 
 
+  List<String> getLineList();
 }
 }

+ 2 - 0
railway-business/src/main/java/com/railway/business/bi/mapper/ShowTestPlanDtMapper.java

@@ -3,6 +3,7 @@ package com.railway.business.bi.mapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.railway.business.bi.domain.ShowTestPlanDt;
 import com.railway.business.bi.domain.ShowTestPlanDt;
 import com.railway.business.bi.domain.vo.TestPlanDtQuery;
 import com.railway.business.bi.domain.vo.TestPlanDtQuery;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
@@ -42,4 +43,5 @@ public interface ShowTestPlanDtMapper {
    */
    */
   Page<ShowTestPlanDt> getList(TestPlanDtQuery query);
   Page<ShowTestPlanDt> getList(TestPlanDtQuery query);
 
 
+  List<String> getLineList();
 }
 }

+ 2 - 0
railway-business/src/main/java/com/railway/business/bi/mapper/ShowYdtsMapper.java

@@ -3,6 +3,7 @@ package com.railway.business.bi.mapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.railway.business.bi.domain.ShowYdts;
 import com.railway.business.bi.domain.ShowYdts;
 import com.railway.business.bi.domain.vo.YdtsQuery;
 import com.railway.business.bi.domain.vo.YdtsQuery;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
@@ -41,4 +42,5 @@ public interface ShowYdtsMapper {
     */
     */
     Page<ShowYdts> getList(YdtsQuery query);
     Page<ShowYdts> getList(YdtsQuery query);
 
 
+    List<String> getLineList();
 }
 }

+ 1 - 0
railway-business/src/main/java/com/railway/business/bi/service/IShowBpdjxjhService.java

@@ -37,4 +37,5 @@ public interface IShowBpdjxjhService {
    */
    */
   List<ShowBpdjxjh> getList(BpdjxjhQuery query);
   List<ShowBpdjxjh> getList(BpdjxjhQuery query);
 
 
+  List<String> getLineList();
 }
 }

+ 1 - 0
railway-business/src/main/java/com/railway/business/bi/service/IShowTestPlanDtService.java

@@ -37,4 +37,5 @@ public interface IShowTestPlanDtService {
     */
     */
     List<ShowTestPlanDt> getList(TestPlanDtQuery query);
     List<ShowTestPlanDt> getList(TestPlanDtQuery query);
 
 
+  List<String> getLineList();
 }
 }

+ 1 - 0
railway-business/src/main/java/com/railway/business/bi/service/IShowYdtsService.java

@@ -35,4 +35,5 @@ public interface IShowYdtsService{
     */
     */
     List<ShowYdts> getList(YdtsQuery query);
     List<ShowYdts> getList(YdtsQuery query);
 
 
+  List<String> getLineList();
 }
 }

+ 5 - 0
railway-business/src/main/java/com/railway/business/bi/service/impl/ShowBpdjxjhServiceImpl.java

@@ -72,4 +72,9 @@ public class ShowBpdjxjhServiceImpl implements IShowBpdjxjhService {
   public List<ShowBpdjxjh> getList(BpdjxjhQuery query) {
   public List<ShowBpdjxjh> getList(BpdjxjhQuery query) {
     return showBpdjxjhMapper.getList(query);
     return showBpdjxjhMapper.getList(query);
   }
   }
+
+  @Override
+  public List<String> getLineList() {
+    return showBpdjxjhMapper.getLineList();
+  }
 }
 }

+ 5 - 0
railway-business/src/main/java/com/railway/business/bi/service/impl/ShowTestPlanDtServiceImpl.java

@@ -73,4 +73,9 @@ public class ShowTestPlanDtServiceImpl implements IShowTestPlanDtService {
   public List<ShowTestPlanDt> getList(TestPlanDtQuery query) {
   public List<ShowTestPlanDt> getList(TestPlanDtQuery query) {
     return showTestPlanDtMapper.getList(query);
     return showTestPlanDtMapper.getList(query);
   }
   }
+
+  @Override
+  public List<String> getLineList() {
+    return showTestPlanDtMapper.getLineList();
+  }
 }
 }

+ 5 - 0
railway-business/src/main/java/com/railway/business/bi/service/impl/ShowYdtsServiceImpl.java

@@ -72,4 +72,9 @@ public class ShowYdtsServiceImpl implements IShowYdtsService {
   public List<ShowYdts> getList(YdtsQuery query) {
   public List<ShowYdts> getList(YdtsQuery query) {
     return showYdtsMapper.getList(query);
     return showYdtsMapper.getList(query);
   }
   }
+
+  @Override
+  public List<String> getLineList() {
+    return showYdtsMapper.getLineList();
+  }
 }
 }

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

@@ -187,4 +187,13 @@
     </where>
     </where>
   </select>
   </select>
 
 
+  <select id="getLineList" resultType="java.lang.String">
+    SELECT distinct lin_name
+    FROM show_bpdjxjh
+    <where>
+      del_flag='0'
+      and file_id = (select max(id) from show_file where data_type='bdsjxjh' and imp_result = '1')
+    </where>
+  </select>
+
 </mapper>
 </mapper>

+ 3 - 0
railway-business/src/main/resources/mapper/bi/ShowSbxjMapper.xml

@@ -388,6 +388,9 @@
       <if test="teamName!=null and teamName!=''">
       <if test="teamName!=null and teamName!=''">
         and team_name like concat('%', #{teamName}, '%')
         and team_name like concat('%', #{teamName}, '%')
       </if>
       </if>
+      <if test="qybds!=null and qybds!=''">
+        and qybds = #{qybds}
+      </if>
     </where>
     </where>
   </select>
   </select>
 
 

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

@@ -175,4 +175,13 @@
     </where>
     </where>
   </select>
   </select>
 
 
+  <select id="getLineList" resultType="java.lang.String">
+    SELECT distinct line_name
+    FROM show_test_plan_dt
+    <where>
+      del_flag='0'
+      and file_id = (select max(id) from show_file where data_type = 'jxjhdx' and imp_result = '1')
+    </where>
+  </select>
+
 </mapper>
 </mapper>

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

@@ -232,4 +232,13 @@
     </where>
     </where>
   </select>
   </select>
 
 
+  <select id="getLineList" resultType="java.lang.String">
+    SELECT distinct line_name
+    FROM show_ydts
+    <where>
+      del_flag='0'
+      and file_id = (select max(id) from show_file where data_type = 'scrw' and imp_result = '1')
+    </where>
+  </select>
+
 </mapper>
 </mapper>