不合格接口

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/entity/CheckResult.java

@@ -13,13 +13,46 @@ import java.util.Date;
 @Accessors(chain = true)
 @TableName("tdc_check_result")
 public class CheckResult extends BaseEntity {
+    
+
+    @ApiModelProperty(value="模型Id")
+    private String modelId;
+
+    @ApiModelProperty(value="检查项")
+    private String checkItem;
+
+    @ApiModelProperty(value="检查项名称")
+    private String checkItemLabel;
+
+    @ApiModelProperty(value="检查项值")
+    private String checkItemValue;
+
+    @ApiModelProperty(value="检查项标准值")
+    private String checkItemRealValue;
+
+    @ApiModelProperty(value="检查项结果")
+    private String checkItemResult;
 
     @ApiModelProperty(value="校验时间")
     private Date checkDate;
 
+    @ApiModelProperty(value="批次号")
+    private String batchNo;
+
+    @ApiModelProperty(value="检查结果说明")
+    private String checkExplain;
+
+    @ApiModelProperty(value="校验类型")
+    private String checkType;
+
+    @ApiModelProperty(value="模型所属机构")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value="模型所属机构名称")
+    private String amosOrgName;
+
     @ApiModelProperty(value="模型名称")
     private String modelName;
 
 
-
 }

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckResultService.java

@@ -13,4 +13,7 @@ public interface CheckResultService extends IService<CheckResult> {
 
 
     List<CheckResultDto> selectResult(String code);
+
+    List<CheckResult> selectCheckResult(String modelId,String amosOrgCode);
+
 }

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckResultController.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.tdc.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
-import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
 import io.swagger.annotations.Api;
@@ -41,4 +40,16 @@ public class CheckResultController extends BaseController {
     public ResponseModel<List<CheckResultDto>> selectResult(@PathVariable(value = "code") String code) {
         return ResponseHelper.buildResponse(checkResultService.selectResult(code));
     }
+
+    /**
+     * 根据amosOrgCode、modelId查询不合格项
+     * return
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/selectCheckResult/{amosOrgCode}/{modelId}")
+    @ApiOperation(httpMethod = "GET",value = "查询最后一次校验模型",  notes = "查询最后一次校验模型")
+    public ResponseModel<List<CheckResult>> selectCheckResult(@PathVariable String amosOrgCode, @PathVariable String modelId) {
+        return ResponseHelper.buildResponse(checkResultService.selectCheckResult(amosOrgCode,modelId));
+    }
 }

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckResultImpl.java

 package com.yeejoin.amos.boot.module.tdc.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckResultMapper;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
@@ -24,4 +27,14 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
     public List<CheckResultDto> selectResult(String code) {
         return checkResultMapper.selectResult(code);
     }
+
+    @Override
+    public List<CheckResult> selectCheckResult(String modelId,String amosOrgCode) {
+        LambdaQueryWrapper<CheckResult> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CheckResult::getCheckItemResult, "1")
+        .eq(CheckResult::getAmosOrgCode, amosOrgCode)
+        .eq(CheckResult::getModelId, modelId);
+        return baseMapper.selectList(wrapper);
+    }
+
 }