Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmDeviceRepairServiceImpl.java

@@ -111,7 +111,8 @@ public class CrmDeviceRepairServiceImpl extends AbstractCrudService<CrmDeviceRep
     public CommonPage<CrmDeviceRepair> page(CrmDeviceRepairVO crmDeviceRepairVO){
         IPage<CrmDeviceRepair> page = new Page<>(crmDeviceRepairVO.getCurrent(),crmDeviceRepairVO.getSize());
         LambdaQueryWrapper<CrmDeviceRepair> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(crmDeviceRepairVO.getProjectName()),CrmDeviceRepair::getProjectName,crmDeviceRepairVO.getProjectName())
+        queryWrapper.eq(StringUtils.isNotBlank(crmDeviceRepairVO.getRepairCode()),CrmDeviceRepair::getRepairCode,crmDeviceRepairVO.getRepairCode())
+                .like(StringUtils.isNotBlank(crmDeviceRepairVO.getProjectName()),CrmDeviceRepair::getProjectName,crmDeviceRepairVO.getProjectName())
                 .like(StringUtils.isNotBlank(crmDeviceRepairVO.getReflectName()),CrmDeviceRepair::getReflectName,crmDeviceRepairVO.getReflectName())
                 .eq(crmDeviceRepairVO.getRepairStatus() != null,CrmDeviceRepair::getRepairStatus,crmDeviceRepairVO.getRepairStatus())
                 .between(StringUtils.isNotBlank(crmDeviceRepairVO.getStartTime()) && StringUtils.isNotBlank(crmDeviceRepairVO.getEndTime()),CrmDeviceRepair::getCreateTime,crmDeviceRepairVO.getStartTime(),crmDeviceRepairVO.getEndTime())

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/CrmDeviceRepairVO.java

@@ -14,6 +14,11 @@ public class CrmDeviceRepairVO {
      */
     private Integer size;
 
+    /**
+     * 报修单编码
+     */
+    private String repairCode;
+
     /**
      * 项目名称
      */