Ver código fonte

app,调整锅炉响应字段、管道查询字段

yangguanjin 5 dias atrás
pai
commit
f34fff85e1

+ 5 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipboiler/vo/EquipBoilerPageRespVO.java

@@ -2,6 +2,7 @@ package cn.start.tz.module.pressure2.controller.admin.equipboiler.vo;
 
 import cn.start.tz.framework.excel.core.annotations.DictFormat;
 import cn.start.tz.framework.excel.core.convert.DictConvert;
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -40,6 +41,10 @@ public class EquipBoilerPageRespVO {
     @ExcelProperty("设备注册代码")
     private String equipCode;
 
+    @Schema(description = "设备名称")
+    @ExcelIgnore
+    private String equipName;
+
     @Schema(description = "使用证号")
     @ExcelProperty("使用证号")
     private String useRegisterNo;

+ 1 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/equippipe/EquipPipeMapper.java

@@ -45,6 +45,7 @@ public interface EquipPipeMapper extends BaseMapperX<EquipPipeDO> {
     default PageResult<EquipPipeDO> selectPage(EquipPipePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<EquipPipeDO>()
                 .likeIfPresent(EquipPipeDO::getUnitName, reqVO.getUnitName())
+                .likeIfPresent(EquipPipeDO::getCertificateNo, reqVO.getCertificateNo())
                 .eqIfPresent(EquipPipeDO::getUnitCode, reqVO.getUnitCode())
                 .eqIfPresent(EquipPipeDO::getPostalCode, reqVO.getPostalCode())
                 .eqIfPresent(EquipPipeDO::getUnitNature, reqVO.getUnitNature())

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipe/EquipPipeServiceImpl.java

@@ -219,6 +219,9 @@ public class EquipPipeServiceImpl extends ServiceImpl<EquipPipeMapper, EquipPipe
         if (pageReqVO.getUnitName() != null){
             pageReqVO.setUnitName(pageReqVO.getUnitName().trim());
         }
+        if (pageReqVO.getCertificateNo() != null) {
+            pageReqVO.setCertificateNo(pageReqVO.getCertificateNo().trim());
+        }
         return equipPipeMapper.selectPage(pageReqVO);
     }