Browse Source

[fix] 工程管理

修复产品型号不能根据产品型号id查询问题,并且产品型号id查询修改为模糊查询
设备型号、设备名称、规格说明、差异说明也都修改为模糊查询
dev
liuxiaoxu 2 months ago
parent
commit
b6c34800df
  1. 11
      ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml
  2. 8
      ruoyi-admin/src/main/resources/templates/system/model/model.html

11
ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml

@ -43,17 +43,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)file )file
on s.pid = file.rel_id on s.pid = file.rel_id
<where> <where>
<if test="pcode != null and pcode != ''"> and Pcode = #{pcode}</if> <if test="pcode != null and pcode != ''"> and pcode like concat('%', #{pcode}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if> <if test="equipModel != null and equipModel != ''"> and equipModel like concat('%', #{equipModel}, '%')</if>
<if test="equipModel != null and equipModel != ''"> and equipModel = #{equipModel}</if>
<if test="equipName != null and equipName != ''"> and equipName like concat('%', #{equipName}, '%')</if> <if test="equipName != null and equipName != ''"> and equipName like concat('%', #{equipName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if> <if test="specification != null and specification != ''"> and specification like concat('%', #{specification}, '%') </if>
<if test="differences != null and differences != ''"> and differences = #{differences}</if> <if test="differences != null and differences != ''"> and differences like concat('%', #{differences}, '%')</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
and create_time between #{params.beginCreateTime} and #{params.endCreateTime} and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if> </if>
<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
<if test="useStatus != null and useStatus != ''"> and use_status = #{useStatus}</if>
<if test="engineer !=null and engineer != ''">engineer = #{engineer}</if> <if test="engineer !=null and engineer != ''">engineer = #{engineer}</if>
</where> </where>
</select> </select>

8
ruoyi-admin/src/main/resources/templates/system/model/model.html

@ -30,16 +30,16 @@
<label>差异说明:</label> <label>差异说明:</label>
<input type="text" name="differences"/> <input type="text" name="differences"/>
</li> </li>
<li>
<label>工程员:</label>
<input type="text" name="engineer"/>
</li>
<li class="select-time"> <li class="select-time">
<label>录入时间:</label> <label>录入时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li> </li>
<li>
<label>工程员:</label>
<input type="text" name="engineer"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>

Loading…
Cancel
Save