diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml index bdde7309..6fbf487c 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml @@ -43,17 +43,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" )file on s.pid = file.rel_id - and Pcode = #{pcode} - and create_by = #{createBy} - and equipModel = #{equipModel} + and pcode like concat('%', #{pcode}, '%') + and equipModel like concat('%', #{equipModel}, '%') and equipName like concat('%', #{equipName}, '%') - and specification = #{specification} - and differences = #{differences} + and specification like concat('%', #{specification}, '%') + and differences like concat('%', #{differences}, '%') and create_time between #{params.beginCreateTime} and #{params.endCreateTime} - and update_by = #{updateBy} - and use_status = #{useStatus} engineer = #{engineer} diff --git a/ruoyi-admin/src/main/resources/templates/system/model/model.html b/ruoyi-admin/src/main/resources/templates/system/model/model.html index c67224c8..d9ad6896 100644 --- a/ruoyi-admin/src/main/resources/templates/system/model/model.html +++ b/ruoyi-admin/src/main/resources/templates/system/model/model.html @@ -30,16 +30,16 @@ +
  • + + +
  • -
  • -
  • - - -
  •  搜索  重置