对接修改

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/hardware/vo/HardwarePageReqVO.java

@@ -73,4 +73,10 @@ public class HardwarePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "开始时间")
+    private String startTime;
+
+    @Schema(description = "结束时间")
+    private String endTime;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/hardware/HardwareMapper.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.hardware.HardwareDO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.iscs.controller.admin.hardware.vo.*;
 
@@ -35,7 +36,9 @@ public interface HardwareMapper extends BaseMapperX<HardwareDO> {
                 .eqIfPresent(HardwareDO::getUsedLife, reqVO.getUsedLife())
                 .eqIfPresent(HardwareDO::getSerialNumber, reqVO.getSerialNumber())
                 .eqIfPresent(HardwareDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(HardwareDO::getCreateTime, reqVO.getCreateTime())
+                .ge(StringUtils.isNotBlank(reqVO.getStartTime()), HardwareDO::getCreateTime, reqVO.getStartTime())
+                .le(StringUtils.isNotBlank(reqVO.getEndTime()), HardwareDO::getCreateTime, reqVO.getEndTime())
+                // .betweenIfPresent(HardwareDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(HardwareDO::getId));
     }
 

yudao-module-iscs/src/main/resources/mapper/LockTypeMapper.xml

@@ -18,6 +18,7 @@
         isc_lock_type l
         LEFT JOIN isc_hardware_type h ON l.id = h.id
         <where>
+            l.deleted = 0
             <if test="vo.lockTypeCode != null and vo.lockTypeCode.trim != ''">
                 and l.lock_type_code like concat('%',#{vo.lockTypeCode},'%')
             </if>