修改列表展示接口

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/dto/CheckModelDto.java

+package com.yeejoin.amos.boot.module.tdc.api.dto;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CheckModelDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "模型名称")
+    private String modelName;
+
+    @ApiModelProperty(value = "机构code")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构名称")
+    private String amosOrgName;
+
+    @ApiModelProperty(value = "指标表名")
+    private String idxTableName;
+
+    @ApiModelProperty(value = "校验状态")
+    private int checkStatus;
+
+    @ApiModelProperty(value = "校验时间")
+    private Date checkDate;
+
+    @ApiModelProperty(value = "模型图片地址")
+    private String modelPictureUrl;
+
+    @ApiModelProperty(value = "模型规则知识包")
+    private String modelRule;
+
+    @ApiModelProperty(value = "指标模型所属项目id")
+    private String projectId;
+
+    @ApiModelProperty(value = "指标模型表id")
+    private String tableId;
+
+    @ApiModelProperty(value = "模型校验项数量")
+    private int checkItemAmount;
+
+    private String circle;
+
+
+}

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

@@ -58,5 +58,4 @@ public class CheckModel {
     @ApiModelProperty(value = "模型校验项数量")
     private int checkItemAmount;
 
-    private String circle;
 }

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/CheckModelMapper.java

 package com.yeejoin.amos.boot.module.tdc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tdc.api.dto.CheckModelDto;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
 import org.mapstruct.Mapper;
 
@@ -10,4 +13,6 @@ import org.mapstruct.Mapper;
  */
 @Mapper
 public interface CheckModelMapper extends BaseMapper<CheckModel> {
+
+    IPage<CheckModelDto> selectByOrgCode(Page page, String amosOrgCode);
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tdc.api.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tdc.api.dto.CheckModelDto;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
 import org.springframework.stereotype.Service;
 
@@ -19,7 +20,7 @@ public interface CheckModelService extends IService<CheckModel> {
      * @return 模型list
      */
 //    List<CheckModel> selectByOrgCode(String amosOrgCode);
-    IPage<CheckModel> selectByOrgCode(int current, int size, String amosOrgCode);
+    IPage<CheckModelDto> selectByOrgCode(int current, int size, String amosOrgCode);
 
     List<CheckModel> selectByOrgCode(String amosOrgCode);
 

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/CheckModelMapper.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tdc.api.mapper.CheckModelMapper">
 
+    <select id="selectByOrgCode" resultType="com.yeejoin.amos.boot.module.tdc.api.dto.CheckModelDto">
+        select `*`,'●' as circle from tdc_model
+        <where>
+            <if test = "amosOrgCode != null and amosOrgCode != ''">
+                and amosOrgCode=#{amosOrgCode}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

 package com.yeejoin.amos.boot.module.tdc.biz.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.tdc.api.dto.CheckModelDto;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckModelService;
 import io.swagger.annotations.Api;
@@ -32,7 +33,7 @@ public class CheckModelController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @GetMapping(value = "selectByOrgCode")
     @ApiOperation(httpMethod = "GET",value = "根据amosOrgCode查询模型列表",  notes = "根据amosOrgCode查询模型列表")
-    public ResponseModel<IPage<CheckModel>> selectByOrgCode(int current, int size, String amosOrgCode) {
+    public ResponseModel<IPage<CheckModelDto>> selectByOrgCode(int current, int size, String amosOrgCode) {
         return ResponseHelper.buildResponse(checkModelService.selectByOrgCode(current,size,amosOrgCode));
     }
 

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.module.tdc.api.dto.CheckModelDto;
 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;
@@ -39,27 +40,23 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
     CheckResultMapper checkResultMapper;
 
     @Autowired
+    CheckModelMapper checkModelMapper;
+
+    @Autowired
     IdxFeignService idxFeignService;
 
     @Autowired
     RuleTrigger ruleTrigger;
 
     @Override
-    public IPage<CheckModel> selectByOrgCode(int current, int size, String amosOrgCode) {
+    public IPage<CheckModelDto> selectByOrgCode(int current, int size, String amosOrgCode) {
         Page page = new Page(current,size);
 
-        if(ValidationUtil.isEmpty(amosOrgCode)){
-            return this.page(page);
-
-        }else{
-            LambdaQueryWrapper<CheckModel> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(CheckModel::getAmosOrgCode, amosOrgCode);
-//        return baseMapper.selectList(wrapper);
-            return this.page(page,wrapper);
-        }
+        return checkModelMapper.selectByOrgCode(page,amosOrgCode);
 
     }
 
+
     @Override
     public List<CheckModel> selectByOrgCode(String amosOrgCode) {
         LambdaQueryWrapper<CheckModel> wrapper = new LambdaQueryWrapper<>();
@@ -67,6 +64,8 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
         return baseMapper.selectList(wrapper);
     }
 
+
+
     @Override
     public CheckModel selectOneByDate(String amosOrgCode) {
         LambdaQueryWrapper<CheckModel> wrapper = new LambdaQueryWrapper<>();