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

cement-business/src/main/java/cn/wise/sc/cement/business/controller/QualityController.java

@@ -61,5 +61,4 @@ public class QualityController {
     }
 
 
-
 }

cement-business/src/main/java/cn/wise/sc/cement/business/controller/StandardController.java

@@ -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();
+	}
 }
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/EntrustReport.java

@@ -51,6 +51,7 @@ public class EntrustReport {
      * 检测依据 ids
      */
     private String methodNumbers;
+
     /**
      * 检测依据名字
      */
@@ -80,6 +81,7 @@ public class EntrustReport {
      * 项目编号
      */
     private String entrustCode;
+
     /**
      * 项目类型
      */

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/StandardMapper.java

 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();
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/StandardMapper.xml

@@ -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>

cement-business/src/main/java/cn/wise/sc/cement/business/service/IStandardService.java

@@ -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();
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java

@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.*;
+import cn.wise.sc.cement.business.model.vo.StandardValueVo;
 import cn.wise.sc.cement.business.model.vo.StandardVo;
 import cn.wise.sc.cement.business.service.IStandardEnterService;
 import cn.wise.sc.cement.business.service.IStandardService;
@@ -32,7 +33,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ztw
@@ -41,287 +42,304 @@ import java.util.List;
 @Service
 public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> implements IStandardService {
 
-	@Resource
-	private StandardMapper standardMapper;
-	@Autowired
-	private ISysUserService userService;
-	@Resource
-	private StandardEnterMapper standardEnterMapper;
-	@Resource
-	private StandardOutMapper standardOutMapper;
-	@Autowired
-	private IStandardValueService standardValueService;
-	@Autowired
-	private CommonServiceImpl commonService;
+    @Resource
+    private StandardMapper standardMapper;
+    @Autowired
+    private ISysUserService userService;
+    @Resource
+    private StandardEnterMapper standardEnterMapper;
+    @Resource
+    private StandardOutMapper standardOutMapper;
+    @Autowired
+    private IStandardValueService standardValueService;
+    @Autowired
+    private CommonServiceImpl commonService;
 
-	/**
-	 * 分页查询
-	 * @param pageQuery
-	 * @param name
-	 * @param supplierName
-	 * @return
-	 */
-	@Override
-	public BaseResponse<IPage<Standard>> getPage(PageQuery pageQuery, String name, String supplierName) {
-		QueryWrapper<Standard> qw = new QueryWrapper<>();
-		if(StringUtils.isNotEmpty(name)){
-			qw.like("name", name);
-		}
-		if(StringUtils.isNotEmpty(supplierName)){
-			qw.like("supplier_name", supplierName);
-		}
-		qw.orderByDesc("create_time");
-		IPage<Standard> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-		page = standardMapper.selectPage(page, qw);
-		return BaseResponse.okData(page);
-	}
+    /**
+     * 分页查询
+     *
+     * @param pageQuery
+     * @param name
+     * @param supplierName
+     * @return
+     */
+    @Override
+    public BaseResponse<IPage<Standard>> getPage(PageQuery pageQuery, String name, String supplierName) {
+        QueryWrapper<Standard> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
+        }
+        if (StringUtils.isNotEmpty(supplierName)) {
+            qw.like("supplier_name", supplierName);
+        }
+        qw.orderByDesc("create_time");
+        IPage<Standard> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+        page = standardMapper.selectPage(page, qw);
+        return BaseResponse.okData(page);
+    }
 
 
-	/**
-	 * 新增标样
-	 * @param query
-	 * @return
-	 */
-	@Transactional
-	@Override
-	public BaseResponse<Standard> create(StandardQuery query) {
-		if (StringUtils.isEmpty(query.getName())) {
-			return BaseResponse.errorMsg("标样名称不能为空!");
-		}
-		QueryWrapper<Standard> qw = new QueryWrapper<>();
-		qw.eq("name", query.getName());
-		int count = standardMapper.selectCount(qw);
-		if (count > 0) {
-			return BaseResponse.errorMsg(query.getName() + "已存在");
-		}
-		Standard standard = new Standard();
-		BeanUtils.copyProperties(query, standard);
-		standard.setStatus(1)
-				.setCreateTime(LocalDateTime.now());
-		standardMapper.insert(standard);
-		//添加标准值
-		if(query.getStandardValueQueryList() != null && query.getStandardValueQueryList().size()>0){
-			List<StandardValueQuery> standardValueQueryList = query.getStandardValueQueryList();
+    /**
+     * 新增标样
+     *
+     * @param query
+     * @return
+     */
+    @Transactional
+    @Override
+    public BaseResponse<Standard> create(StandardQuery query) {
+        if (StringUtils.isEmpty(query.getName())) {
+            return BaseResponse.errorMsg("标样名称不能为空!");
+        }
+        QueryWrapper<Standard> qw = new QueryWrapper<>();
+        qw.eq("name", query.getName());
+        int count = standardMapper.selectCount(qw);
+        if (count > 0) {
+            return BaseResponse.errorMsg(query.getName() + "已存在");
+        }
+        Standard standard = new Standard();
+        BeanUtils.copyProperties(query, standard);
+        standard.setStatus(1)
+                .setCreateTime(LocalDateTime.now());
+        standardMapper.insert(standard);
+        //添加标准值
+        if (query.getStandardValueQueryList() != null && query.getStandardValueQueryList().size() > 0) {
+            List<StandardValueQuery> standardValueQueryList = query.getStandardValueQueryList();
 
-			List<StandardValue> standardValueList = new ArrayList<>();
-			for(StandardValueQuery standardValueQuery : standardValueQueryList){
-				StandardValue standardValue = new StandardValue();
-				standardValue.setStandardId(standard.getId())
-						.setElementName(standardValueQuery.getElementName())
-						.setCreateTime(LocalDateTime.now());
-				if(standardValueQuery.getElementValue() != null && standardValueQuery.getElementValue().size()>0){
-					String elementValue = JSON.toJSON(standardValueQuery.getElementValue()).toString();
-					standardValue.setElementValue(elementValue);
-				}else{
-					standardValue.setElementValue(null);
-				}
-				standardValueList.add(standardValue);
-			}
-			standardValueService.saveBatch(standardValueList);
-		}
-		//标样入库记录添加
-		LoginUser loginUser = userService.getLoginUser();
-		StandardEnter enter = new StandardEnter();
-		enter.setStandardId(standard.getId())
-				.setUserId(loginUser.getId())
-				.setEnterNum(query.getStockNum())
-				.setCreateTime(LocalDateTime.now())
-				.setRemark("新增标样");
-		standardEnterMapper.insert(enter);
-		//保存标样材料信息
-		Boolean ref = commonService.saveEntityEnclosure(EntityEnclosure.EntityType.STANDARD_SAMPLE, standard.getId(), query.getEnclosureQueryList());
-		if(!ref){
-			return BaseResponse.errorMsg("保存保存校核附件失败!");
-		}
+            List<StandardValue> standardValueList = new ArrayList<>();
+            for (StandardValueQuery standardValueQuery : standardValueQueryList) {
+                StandardValue standardValue = new StandardValue();
+                standardValue.setStandardId(standard.getId())
+                        .setElementName(standardValueQuery.getElementName())
+                        .setCreateTime(LocalDateTime.now());
+                if (standardValueQuery.getElementValue() != null && standardValueQuery.getElementValue().size() > 0) {
+                    String elementValue = JSON.toJSON(standardValueQuery.getElementValue()).toString();
+                    standardValue.setElementValue(elementValue);
+                } else {
+                    standardValue.setElementValue(null);
+                }
+                standardValueList.add(standardValue);
+            }
+            standardValueService.saveBatch(standardValueList);
+        }
+        //标样入库记录添加
+        LoginUser loginUser = userService.getLoginUser();
+        StandardEnter enter = new StandardEnter();
+        enter.setStandardId(standard.getId())
+                .setUserId(loginUser.getId())
+                .setEnterNum(query.getStockNum())
+                .setCreateTime(LocalDateTime.now())
+                .setRemark("新增标样");
+        standardEnterMapper.insert(enter);
+        //保存标样材料信息
+        Boolean ref = commonService.saveEntityEnclosure(EntityEnclosure.EntityType.STANDARD_SAMPLE, standard.getId(), query.getEnclosureQueryList());
+        if (!ref) {
+            return BaseResponse.errorMsg("保存保存校核附件失败!");
+        }
 
-		return BaseResponse.okData(standard);
-	}
+        return BaseResponse.okData(standard);
+    }
 
-	/**
-	 * 修改标样
-	 * @param query
-	 * @return
-	 */
-	@Transactional
-	@Override
-	public BaseResponse<Standard> update(StandardQuery query) {
-		if (StringUtils.isEmpty(query.getName())) {
-			return BaseResponse.errorMsg("标样名称不能为空!");
-		}
-		QueryWrapper<Standard> qw = new QueryWrapper<>();
-		qw.eq("name", query.getName());
-		qw.ne("id", query.getId());
-		int count = standardMapper.selectCount(qw);
-		if (count > 0) {
-			return BaseResponse.errorMsg(query.getName() + "已存在");
-		}
-		Standard standard = new Standard();
-		BeanUtils.copyProperties(query, standard);
-		standardMapper.updateById(standard);
-		//添加标准值
-		if(query.getStandardValueQueryList() != null && query.getStandardValueQueryList().size()>0){
-			//删除之前的标准值信息
-			QueryWrapper<StandardValue> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("standard_id", standard.getId());
-			standardValueService.remove(queryWrapper);
-			//添加新的标准值
-			List<StandardValueQuery> standardValueQueryList = query.getStandardValueQueryList();
-			List<StandardValue> standardValueList = new ArrayList<>();
-			for(StandardValueQuery standardValueQuery : standardValueQueryList){
-				StandardValue standardValue = new StandardValue();
-				standardValue.setStandardId(standard.getId())
-						.setElementName(standardValueQuery.getElementName())
-						.setCreateTime(LocalDateTime.now());
-				if(standardValueQuery.getElementValue() != null && standardValueQuery.getElementValue().size()>0){
-					String elementValue = JSON.toJSON(standardValueQuery.getElementValue()).toString();
-					standardValue.setElementValue(elementValue);
-				}else{
-					standardValue.setElementValue(null);
-				}
-				standardValueList.add(standardValue);
-			}
-			standardValueService.saveBatch(standardValueList);
-		}
-		//保存标样材料信息
-		Boolean ref = commonService.saveEntityEnclosure(EntityEnclosure.EntityType.STANDARD_SAMPLE, standard.getId(), query.getEnclosureQueryList());
-		if(!ref){
-			return BaseResponse.errorMsg("保存保存校核附件失败!");
-		}
-		return BaseResponse.okData(standard);
-	}
+    /**
+     * 修改标样
+     *
+     * @param query
+     * @return
+     */
+    @Transactional
+    @Override
+    public BaseResponse<Standard> update(StandardQuery query) {
+        if (StringUtils.isEmpty(query.getName())) {
+            return BaseResponse.errorMsg("标样名称不能为空!");
+        }
+        QueryWrapper<Standard> qw = new QueryWrapper<>();
+        qw.eq("name", query.getName());
+        qw.ne("id", query.getId());
+        int count = standardMapper.selectCount(qw);
+        if (count > 0) {
+            return BaseResponse.errorMsg(query.getName() + "已存在");
+        }
+        Standard standard = new Standard();
+        BeanUtils.copyProperties(query, standard);
+        standardMapper.updateById(standard);
+        //添加标准值
+        if (query.getStandardValueQueryList() != null && query.getStandardValueQueryList().size() > 0) {
+            //删除之前的标准值信息
+            QueryWrapper<StandardValue> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("standard_id", standard.getId());
+            standardValueService.remove(queryWrapper);
+            //添加新的标准值
+            List<StandardValueQuery> standardValueQueryList = query.getStandardValueQueryList();
+            List<StandardValue> standardValueList = new ArrayList<>();
+            for (StandardValueQuery standardValueQuery : standardValueQueryList) {
+                StandardValue standardValue = new StandardValue();
+                standardValue.setStandardId(standard.getId())
+                        .setElementName(standardValueQuery.getElementName())
+                        .setCreateTime(LocalDateTime.now());
+                if (standardValueQuery.getElementValue() != null && standardValueQuery.getElementValue().size() > 0) {
+                    String elementValue = JSON.toJSON(standardValueQuery.getElementValue()).toString();
+                    standardValue.setElementValue(elementValue);
+                } else {
+                    standardValue.setElementValue(null);
+                }
+                standardValueList.add(standardValue);
+            }
+            standardValueService.saveBatch(standardValueList);
+        }
+        //保存标样材料信息
+        Boolean ref = commonService.saveEntityEnclosure(EntityEnclosure.EntityType.STANDARD_SAMPLE, standard.getId(), query.getEnclosureQueryList());
+        if (!ref) {
+            return BaseResponse.errorMsg("保存保存校核附件失败!");
+        }
+        return BaseResponse.okData(standard);
+    }
 
-	/**
-	 * 标样详情
-	 * @param id 标样表id
-	 * @return
-	 */
-	@Override
-	public BaseResponse<StandardVo> getDetail(Integer id){
-		Standard standard = standardMapper.selectById(id);
-		if(standard == null ){
-			return BaseResponse.errorMsg("信息错误!");
-		}
-		StandardVo standardVo = new StandardVo();
-		BeanUtils.copyProperties(standard, standardVo);
-		List<EntityEnclosure> entityEnclosureList = commonService.getEnclosureList
-				(EntityEnclosure.EntityType.STANDARD_SAMPLE, standard.getId());
+    /**
+     * 标样详情
+     *
+     * @param id 标样表id
+     * @return
+     */
+    @Override
+    public BaseResponse<StandardVo> getDetail(Integer id) {
+        Standard standard = standardMapper.selectById(id);
+        if (standard == null) {
+            return BaseResponse.errorMsg("信息错误!");
+        }
+        StandardVo standardVo = new StandardVo();
+        BeanUtils.copyProperties(standard, standardVo);
+        List<EntityEnclosure> entityEnclosureList = commonService.getEnclosureList
+                (EntityEnclosure.EntityType.STANDARD_SAMPLE, standard.getId());
 
-		List<EnclosureQuery> enclosureQueryList = new ArrayList<>();
-		for(EntityEnclosure entityEnclosure : entityEnclosureList){
-			EnclosureQuery enclosureQuery = new EnclosureQuery();
-			enclosureQuery.setAlias(entityEnclosure.getAlias())
-					.setEnclosureUrl(entityEnclosure.getEnclosureUrl())
-					.setExtName(entityEnclosure.getExtName());
-			enclosureQueryList.add(enclosureQuery);
-		}
-		standardVo.setEnclosureQueryList(enclosureQueryList);
+        List<EnclosureQuery> enclosureQueryList = new ArrayList<>();
+        for (EntityEnclosure entityEnclosure : entityEnclosureList) {
+            EnclosureQuery enclosureQuery = new EnclosureQuery();
+            enclosureQuery.setAlias(entityEnclosure.getAlias())
+                    .setEnclosureUrl(entityEnclosure.getEnclosureUrl())
+                    .setExtName(entityEnclosure.getExtName());
+            enclosureQueryList.add(enclosureQuery);
+        }
+        standardVo.setEnclosureQueryList(enclosureQueryList);
 
-		QueryWrapper<StandardValue> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("standard_id", standard.getId());
-		List<StandardValue> standardValueList = standardValueService.list(queryWrapper);
-		standardVo.setStandardValueList(standardValueList);
-		return BaseResponse.okData(standardVo);
-	}
+        QueryWrapper<StandardValue> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("standard_id", standard.getId());
+        List<StandardValue> standardValueList = standardValueService.list(queryWrapper);
+        standardVo.setStandardValueList(standardValueList);
+        return BaseResponse.okData(standardVo);
+    }
 
 
-	/**
-	 *新增入库
-	 * @param query
-	 * @return
-	 */
-	@Transactional
-	@Override
-	public BaseResponse<String> enter(ChangeStockQuery query) {
-		if (query == null || query.getId() == null ) {
-			return BaseResponse.errorMsg("参数错误!");
-		}
-		Standard standard = standardMapper.selectById(query.getId());
-		if(standard == null){
-			return BaseResponse.errorMsg("数据错误!");
-		}
-		StandardEnter enter = new StandardEnter();
-		enter.setStandardId(standard.getId())
-				.setUserId(userService.getLoginUser().getId())
-				.setEnterNum(query.getChangeNum())
-				.setCreateTime(LocalDateTime.now())
-				.setRemark(query.getRemark());
+    /**
+     * 新增入库
+     *
+     * @param query
+     * @return
+     */
+    @Transactional
+    @Override
+    public BaseResponse<String> enter(ChangeStockQuery query) {
+        if (query == null || query.getId() == null) {
+            return BaseResponse.errorMsg("参数错误!");
+        }
+        Standard standard = standardMapper.selectById(query.getId());
+        if (standard == null) {
+            return BaseResponse.errorMsg("数据错误!");
+        }
+        StandardEnter enter = new StandardEnter();
+        enter.setStandardId(standard.getId())
+                .setUserId(userService.getLoginUser().getId())
+                .setEnterNum(query.getChangeNum())
+                .setCreateTime(LocalDateTime.now())
+                .setRemark(query.getRemark());
 
-		standardEnterMapper.insert(enter);
-		standard.setStockNum(standard.getStockNum().add(enter.getEnterNum()));
-		standardMapper.updateById(standard);
-		return BaseResponse.okData("新增入库完成");
-	}
+        standardEnterMapper.insert(enter);
+        standard.setStockNum(standard.getStockNum().add(enter.getEnterNum()));
+        standardMapper.updateById(standard);
+        return BaseResponse.okData("新增入库完成");
+    }
 
-	/**
-	 * 领用出库
-	 * @param query
-	 * @return
-	 */
-	@Transactional
-	@Override
-	public BaseResponse<String> out(ChangeStockQuery query) {
-		if (query == null || query.getId() == null ) {
-			return BaseResponse.errorMsg("参数错误!");
-		}
-		Standard standard = standardMapper.selectById(query.getId());
-		if(standard == null){
-			return BaseResponse.errorMsg("数据错误!");
-		}
-		StandardOut out = new StandardOut();
-		out.setStandardId(standard.getId())
-				.setUserId(userService.getLoginUser().getId())
-				.setCollectNum(query.getChangeNum())
-				.setCreateTime(LocalDateTime.now())
-				.setRemark(query.getRemark());
-		standardOutMapper.insert(out);
-		standard.setStockNum(standard.getStockNum().subtract(out.getCollectNum()));
-		standardMapper.updateById(standard);
-		return BaseResponse.okData("领用出库完成");
-	}
+    /**
+     * 领用出库
+     *
+     * @param query
+     * @return
+     */
+    @Transactional
+    @Override
+    public BaseResponse<String> out(ChangeStockQuery query) {
+        if (query == null || query.getId() == null) {
+            return BaseResponse.errorMsg("参数错误!");
+        }
+        Standard standard = standardMapper.selectById(query.getId());
+        if (standard == null) {
+            return BaseResponse.errorMsg("数据错误!");
+        }
+        StandardOut out = new StandardOut();
+        out.setStandardId(standard.getId())
+                .setUserId(userService.getLoginUser().getId())
+                .setCollectNum(query.getChangeNum())
+                .setCreateTime(LocalDateTime.now())
+                .setRemark(query.getRemark());
+        standardOutMapper.insert(out);
+        standard.setStockNum(standard.getStockNum().subtract(out.getCollectNum()));
+        standardMapper.updateById(standard);
+        return BaseResponse.okData("领用出库完成");
+    }
 
-	/**
-	 * 变更有效期
-	 * @param query
-	 * @return
-	 */
-	@Transactional
-	@Override
-	public BaseResponse<String> changeValidDate(ChangeValidDateQuery query) {
-		if (query == null || query.getId() == null ) {
-			return BaseResponse.errorMsg("参数错误!");
-		}
-		Standard standard = standardMapper.selectById(query.getId());
-		if(standard == null){
-			return BaseResponse.errorMsg("数据错误!");
-		}
+    /**
+     * 变更有效期
+     *
+     * @param query
+     * @return
+     */
+    @Transactional
+    @Override
+    public BaseResponse<String> changeValidDate(ChangeValidDateQuery query) {
+        if (query == null || query.getId() == null) {
+            return BaseResponse.errorMsg("参数错误!");
+        }
+        Standard standard = standardMapper.selectById(query.getId());
+        if (standard == null) {
+            return BaseResponse.errorMsg("数据错误!");
+        }
 
-		standard.setValidDate(query.getValidDate());
-		standardMapper.updateById(standard);
-		return BaseResponse.okData("变更有效期完成");
-	}
+        standard.setValidDate(query.getValidDate());
+        standardMapper.updateById(standard);
+        return BaseResponse.okData("变更有效期完成");
+    }
 
 
-	/**
-	 * 过期处置
-	 * @param id
-	 * @return
-	 */
-	@Transactional
-	@Override
-	public BaseResponse<String> overdue(Integer id) {
-		if (id == null) {
-			return BaseResponse.errorMsg("参数错误!");
-		}
-		Standard standard = standardMapper.selectById(id);
-		if(standard == null){
-			return BaseResponse.errorMsg("数据错误!");
-		}
-		standard.setStatus(0);
-		standardMapper.updateById(standard);
-		return BaseResponse.okData("过期处置完成");
-	}
+    /**
+     * 过期处置
+     *
+     * @param id
+     * @return
+     */
+    @Transactional
+    @Override
+    public BaseResponse<String> overdue(Integer id) {
+        if (id == null) {
+            return BaseResponse.errorMsg("参数错误!");
+        }
+        Standard standard = standardMapper.selectById(id);
+        if (standard == null) {
+            return BaseResponse.errorMsg("数据错误!");
+        }
+        standard.setStatus(0);
+        standardMapper.updateById(standard);
+        return BaseResponse.okData("过期处置完成");
+    }
 
+    @Override
+    public BaseResponse<List<StandardValueVo>> getStandardDetailList() {
 
+        List<StandardValueVo> standardValueVos = standardMapper.getStandardDetaulList();
+        if (standardValueVos.size() != 0) {
+            return BaseResponse.okData(standardValueVos);
+        } else {
+            return BaseResponse.errorMsg("没找数据!");
+        }
+    }
 
 
 }