Преглед на файлове

app,调整锅炉响应字段和查询字段

yangguanjin преди 5 дни
родител
ревизия
964ad066bc

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

@@ -47,4 +47,7 @@ public class EquipBoilerPageReqVO extends PageParam {
 
     @Schema(description = "关联部门")
     private String relatedDepartment;
+
+    @Schema(description = "出厂编号")
+    private String factoryCode;
 }

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

@@ -45,6 +45,10 @@ public class EquipBoilerPageRespVO {
     @ExcelIgnore
     private String equipName;
 
+    @Schema(description = "出厂编号")
+    @ExcelIgnore
+    private String factoryCode;
+
     @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/equipboiler/EquipBoilerMapper.java

@@ -48,6 +48,7 @@ public interface EquipBoilerMapper extends BaseMapperX<EquipBoilerDO> {
                 .likeIfPresent(EquipBoilerDO::getUseRegisterNo, reqVO.getUseRegisterNo())
                 .likeIfPresent(EquipBoilerDO::getUnitCode, reqVO.getUnitCode())
                 .likeIfPresent(EquipBoilerDO::getUnitName, reqVO.getUnitName())
+                .likeIfPresent(EquipBoilerDO::getFactoryCode, reqVO.getFactoryCode())
                 .eqIfPresent(EquipBoilerDO::getType, reqVO.getType())
                 .eqIfPresent(EquipBoilerDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(EquipBoilerDO::getUseStatus, reqVO.getUseStatus())

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

@@ -265,6 +265,9 @@ public class EquipBoilerServiceImpl extends ServiceImpl<EquipBoilerMapper, Equip
         if (pageReqVO.getUnitName() != null){
             pageReqVO.setUnitName(pageReqVO.getUnitName().trim());
         }
+        if (pageReqVO.getFactoryCode() != null) {
+            pageReqVO.setFactoryCode(pageReqVO.getFactoryCode().trim());
+        }
         PageResult<EquipBoilerDO> equipBoilerDOPageResult = equipBoilerMapper.selectPage(pageReqVO);
         if (equipBoilerDOPageResult.getList() == null){
             return null;