Commit 77b114eb authored by qinhu's avatar qinhu

质量控制--列表and查看详情--联调

parent bfe18a88
......@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.ChangeStockQuery;
import cn.wise.sc.cement.business.model.query.ChangeValidDateQuery;
import cn.wise.sc.cement.business.model.query.StandardQuery;
import cn.wise.sc.cement.business.model.vo.StandardValueVo;
import cn.wise.sc.cement.business.service.IStandardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -156,10 +157,10 @@ public class StandardController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation("获取样本标准值列表")
@GetMapping("/detailList")
public BaseResponse<List<StandardValueVo>> getStandardDetailList(){
return standardService.getStandardDetailList();
}
}
......@@ -51,6 +51,7 @@ public class EntrustReport {
* 检测依据 ids
*/
private String methodNumbers;
/**
* 检测依据名字
*/
......@@ -80,6 +81,7 @@ public class EntrustReport {
* 项目编号
*/
private String entrustCode;
/**
* 项目类型
*/
......
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.Standard;
import cn.wise.sc.cement.business.model.vo.StandardValueVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* Mapper 接口
......@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface StandardMapper extends BaseMapper<Standard> {
List<StandardValueVo> getStandardDetaulList();
}
......@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wise.sc.cement.business.mapper.StandardMapper">
<select id="getStandardDetaulList" resultType="cn.wise.sc.cement.business.model.vo.StandardValueVo">
SELECT standard_id as id,element_value,element_name FROM `standard_value` sv
LEFT JOIN
(SELECT id FROM standard) s
ON sv.standard_id = s.id
</select>
</mapper>
......@@ -6,10 +6,13 @@ import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.ChangeStockQuery;
import cn.wise.sc.cement.business.model.query.ChangeValidDateQuery;
import cn.wise.sc.cement.business.model.query.StandardQuery;
import cn.wise.sc.cement.business.model.vo.StandardValueVo;
import cn.wise.sc.cement.business.model.vo.StandardVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 服务类
......@@ -36,6 +39,5 @@ public interface IStandardService extends IService<Standard> {
BaseResponse<String> overdue(Integer id);
BaseResponse<List<StandardValueVo>> getStandardDetailList();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment