Commit 0e22f1d4 authored by limei's avatar limei

根据模型id和模型所属机构查询不合格项

parent bec3e674
package com.yeejoin.amos.boot.module.tdc.api.entity; package com.yeejoin.amos.boot.module.tdc.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -9,11 +12,15 @@ import lombok.experimental.Accessors; ...@@ -9,11 +12,15 @@ import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
@Data @Data
@EqualsAndHashCode(callSuper = true )
@Accessors(chain = true) @Accessors(chain = true)
@TableName("tdc_check_result") @TableName("tdc_check_result")
public class CheckResult extends BaseEntity { @ApiModel(value="CheckResult对象", description="检验结果表")
public class CheckResult {
private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
@ApiModelProperty(value="模型Id") @ApiModelProperty(value="模型Id")
private String modelId; private String modelId;
......
...@@ -47,9 +47,9 @@ public class CheckResultController extends BaseController { ...@@ -47,9 +47,9 @@ public class CheckResultController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/selectCheckResult/{amosOrgCode}/{modelId}") @GetMapping(value = "/selectCheckResult/{modelId}/{amosOrgCode}")
@ApiOperation(httpMethod = "GET",value = "查询最后一次校验模型", notes = "查询最后一次校验模型") @ApiOperation(httpMethod = "GET",value = "查询最后一次校验模型", notes = "查询最后一次校验模型")
public ResponseModel<List<CheckResult>> selectCheckResult(@PathVariable String amosOrgCode, @PathVariable String modelId) { public ResponseModel<List<CheckResult>> selectCheckResult(@PathVariable String modelId,@PathVariable String amosOrgCode) {
return ResponseHelper.buildResponse(checkResultService.selectCheckResult(amosOrgCode,modelId)); return ResponseHelper.buildResponse(checkResultService.selectCheckResult(modelId,amosOrgCode));
} }
} }
...@@ -29,8 +29,8 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult> ...@@ -29,8 +29,8 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
public List<CheckResult> selectCheckResult(String modelId,String amosOrgCode) { public List<CheckResult> selectCheckResult(String modelId,String amosOrgCode) {
LambdaQueryWrapper<CheckResult> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CheckResult> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CheckResult::getCheckItemResult, "1") wrapper.eq(CheckResult::getCheckItemResult, "1")
.eq(CheckResult::getAmosOrgCode, amosOrgCode) .eq(CheckResult::getAmosOrgCode, amosOrgCode)
.eq(CheckResult::getModelId, modelId); .eq(CheckResult::getModelId, modelId);
return baseMapper.selectList(wrapper); return baseMapper.selectList(wrapper);
} }
......
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