采区下拉框及送样单列表展示

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineStopeController.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -39,5 +38,16 @@ public class TMineStopeController {
         return itMineStopeService.getPage(null, query);
     }
 
+    /**
+     * 采区下拉框
+     *
+     * @return
+     */
+    @ApiOperation(value = "矿区下拉框")
+    @RequestMapping(value = "/getStopeName", method = RequestMethod.GET)
+    public R getStopeName() {
+        return itMineStopeService.getStopeName();
+    }
+
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleLaboratorysheetController.java

@@ -98,5 +98,10 @@ public class TSampleLaboratorysheetController {
         param.setYh(yh);
         return itSampleLaboratorysheetService.getImage(param,response);
     }
+    @ApiOperation(value = "送样结果单列表展示")
+    @RequestMapping(value = "/getList",method = RequestMethod.GET)
+    public R getList() {
+        return itSampleLaboratorysheetService.getList();
+    }
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineStopeMapper.java

@@ -3,6 +3,8 @@ package cn.wise.sc.acquisition.business.mapper;
 import cn.wise.sc.acquisition.business.entity.TMineStope;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TMineStopeMapper extends BaseMapper<TMineStope> {
 
+    List<TMineStope> getStopeName();
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleLaboratorysheetMapper.java

@@ -2,6 +2,9 @@ package cn.wise.sc.acquisition.business.mapper;
 
 import cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.api.R;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TSampleLaboratorysheetMapper extends BaseMapper<TSampleLaboratorysheet> {
 
+    List<TSampleLaboratorysheet> getList();
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineStopeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TMineStopeMapper">
-
+    <select id="getStopeName" resultType="cn.wise.sc.acquisition.business.entity.TMineStope">
+        select StopeName,StepName,BlastAreaName from T_Mine_Stope
+    </select>
 </mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleLaboratorysheetMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TSampleLaboratorysheetMapper">
 
+    <select id="getList" resultType="cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet">
+        select * from T_Sample_LaboratorySheet
+    </select>
 </mapper>

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineStopeService.java

@@ -22,5 +22,5 @@ public interface ITMineStopeService extends IService<TMineStope> {
 
     R getByQuery(TMineStopeQuery query);
 
-
+    R getStopeName();
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleLaboratorysheetService.java

@@ -27,4 +27,5 @@ public interface ITSampleLaboratorysheetService extends IService<TSampleLaborato
 
     R getImage(TSampleLaboratorysheetQuery query, final HttpServletResponse response);
 
+    R getList();
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineStopeServiceImpl.java

@@ -15,6 +15,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务实现类
@@ -79,4 +81,10 @@ public class TMineStopeServiceImpl extends ServiceImpl<TMineStopeMapper, TMineSt
         return R.ok(baseMapper.selectOne(queryWrapper));
     }
 
+    @Override
+    public R getStopeName() {
+        List<TMineStope> stopeName = baseMapper.getStopeName();
+        return R.ok(stopeName);
+    }
+
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 /**
  * <p>
@@ -189,4 +190,11 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //如果下载失败才会执行return
         return R.failed("结果分析单中->该条数据没有图片");
     }
+
+    @Override
+    public R getList() {
+        List<TSampleLaboratorysheet> list = baseMapper.getList();
+
+        return R.ok(list);
+    }
 }

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.xml

@@ -80,5 +80,8 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getBalestHoleId" resultType="java.lang.String">
+        select BlastHoleID from T_Processes_BlastDesign_Hole
+    </select>
 
 </mapper>