质保

src/main/java/com/unissoft/basic/service/impl/BasicWarrantyPreserveServiceImpl.java

@@ -39,19 +39,19 @@ public class BasicWarrantyPreserveServiceImpl extends ServiceImpl<BasicWarrantyP
             // 查询条件转Java对象
             BasicWarrantyPreserve warrantyPreserve = JSON.parseObject(condition, BasicWarrantyPreserve.class);
             // 获取查询条件
-            String houseCode = warrantyPreserve.getHouseCode();
-            String orgCode = warrantyPreserve.getOrgCode();
+            String assetNo = warrantyPreserve.getAssetNo();
+            String assetName = warrantyPreserve.getAssetName();
             //Integer qos = warrantyPreserve.getProtocolQos();
-            if (!StringUtils.isEmpty(houseCode)){
-                warrantyPreserveQW.like("house_code", houseCode);
+            if (!StringUtils.isEmpty(assetNo)){
+                warrantyPreserveQW.like("asset_no", assetNo);
             }
-            if (!StringUtils.isEmpty(orgCode)){
-                warrantyPreserveQW.like("org_code", orgCode);
+            if (!StringUtils.isEmpty(assetName)){
+                warrantyPreserveQW.like("asset_name", assetName);
                 //ew.eq("protocol_qos", qos);
             }
 
         }
-        warrantyPreserveQW.orderByDesc("warranty_time");
+        //warrantyPreserveQW.orderByDesc("warranty_time");
         IPage<BasicWarrantyPreserve> page = new Page<>(pageIndex, pageSize);
         return warrantyPreserveMapper.selectPage(page, warrantyPreserveQW);