pqc查询机型编号新增
This commit is contained in:
parent
b736a816ca
commit
c6430a07f3
|
|
@ -3,6 +3,7 @@ package com.nflg.qms.admin.controller;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO;
|
||||||
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleModelNoSearchQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO;
|
||||||
import com.nflg.qms.admin.pojo.vo.PqcInspectionRuleDetailVO;
|
import com.nflg.qms.admin.pojo.vo.PqcInspectionRuleDetailVO;
|
||||||
import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO;
|
import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO;
|
||||||
|
|
@ -52,6 +53,14 @@ public class QmsPqcInspectionRuleController extends BaseController {
|
||||||
return ApiResult.success(ruleControllerService.search(qo));
|
return ApiResult.success(ruleControllerService.search(qo));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询PQC标准检测机型编号(去重)
|
||||||
|
*/
|
||||||
|
@PostMapping("/modelNos")
|
||||||
|
public ApiResult<PageData<String>> modelNos(@RequestBody PqcInspectionRuleModelNoSearchQO qo) {
|
||||||
|
return ApiResult.success(ruleControllerService.searchModelNos(qo));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取规则详情
|
* 获取规则详情
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
package com.nflg.qms.admin.pojo.qo;
|
||||||
|
|
||||||
|
import com.nflg.wms.common.pojo.qo.PageQO;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PQC标准检测机型编号查询参数
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class PqcInspectionRuleModelNoSearchQO extends PageQO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 机型编号(模糊查询)
|
||||||
|
*/
|
||||||
|
private String modelNo;
|
||||||
|
}
|
||||||
|
|
@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO;
|
||||||
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleModelNoSearchQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO;
|
||||||
import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO;
|
import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO;
|
||||||
import com.nflg.qms.admin.pojo.vo.PqcInspectionRuleDetailVO;
|
import com.nflg.qms.admin.pojo.vo.PqcInspectionRuleDetailVO;
|
||||||
|
|
@ -28,6 +29,11 @@ public interface QmsPqcInspectionRuleControllerService {
|
||||||
*/
|
*/
|
||||||
PageData<PqcInspectionRuleVO> search(PqcInspectionRuleSearchQO qo);
|
PageData<PqcInspectionRuleVO> search(PqcInspectionRuleSearchQO qo);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询PQC标准检测机型编号(去重)
|
||||||
|
*/
|
||||||
|
PageData<String> searchModelNos(PqcInspectionRuleModelNoSearchQO qo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取规则详情(含检查点和检查项)
|
* 获取规则详情(含检查点和检查项)
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAddQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleAuditQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleEditQO;
|
||||||
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleModelNoSearchQO;
|
||||||
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO;
|
import com.nflg.qms.admin.pojo.qo.PqcInspectionRuleSearchQO;
|
||||||
import com.nflg.qms.admin.pojo.vo.PqcInspectionPointItemVO;
|
import com.nflg.qms.admin.pojo.vo.PqcInspectionPointItemVO;
|
||||||
import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO;
|
import com.nflg.qms.admin.pojo.vo.PqcInspectionPointListVO;
|
||||||
|
|
@ -207,6 +208,23 @@ public class QmsPqcInspectionRuleControllerServiceImpl implements QmsPqcInspecti
|
||||||
return PageUtil.Page(voList, (int) page.getCurrent(), (int) page.getSize());
|
return PageUtil.Page(voList, (int) page.getCurrent(), (int) page.getSize());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageData<String> searchModelNos(PqcInspectionRuleModelNoSearchQO qo) {
|
||||||
|
List<String> modelNos = ruleService.lambdaQuery()
|
||||||
|
.select(QmsPqcInspectionRule::getModelNo)
|
||||||
|
.like(StrUtil.isNotBlank(qo.getModelNo()), QmsPqcInspectionRule::getModelNo, qo.getModelNo())
|
||||||
|
.isNotNull(QmsPqcInspectionRule::getModelNo)
|
||||||
|
.list()
|
||||||
|
.stream()
|
||||||
|
.map(QmsPqcInspectionRule::getModelNo)
|
||||||
|
.filter(StrUtil::isNotBlank)
|
||||||
|
.distinct()
|
||||||
|
.sorted()
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
return PageUtil.Page(modelNos, qo.getPage(), qo.getPageSize());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PqcInspectionRuleDetailVO getDetail(Long id) {
|
public PqcInspectionRuleDetailVO getDetail(Long id) {
|
||||||
QmsPqcInspectionRule rule = ruleService.getById(id);
|
QmsPqcInspectionRule rule = ruleService.getById(id);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue