Browse Source

[fix] 工程管理

修复开发修改单后端查询接口和前端列表页面,单号查询改为模糊查询,料号查询改为模糊查询,录入时间查询改为区间匹配查询
dev
liuxiaoxu 4 days ago
parent
commit
c0ffcf3927
  1. 7
      ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
  2. 8
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

7
ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml

@ -52,13 +52,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectErpDevelopModifyorderList" parameterType="ErpDevelopModifyorderVo" resultMap="ErpDevelopModifyorderResult"> <select id="selectErpDevelopModifyorderList" parameterType="ErpDevelopModifyorderVo" resultMap="ErpDevelopModifyorderResult">
<include refid="selectErpDevelopModifyorderVo"/> <include refid="selectErpDevelopModifyorderVo"/>
<where> <where>
<if test="developOrderCode != null and developOrderCode != ''"> and develop_order_code = #{developOrderCode}</if> <if test="developOrderCode != null and developOrderCode != ''"> and develop_order_code like concat('%', #{developOrderCode}, '%')</if>
<if test="materialNo != null and materialNo != ''"> and material_no = #{materialNo}</if> <if test="materialNo != null and materialNo != ''"> and material_no like concat('%', #{materialNo}, '%')</if>
<if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if> <if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
<if test="finshStatus != null and finshStatus != ''"> and finsh_status = #{finshStatus}</if> <if test="finshStatus != null and finshStatus != ''"> and finsh_status = #{finshStatus}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if> <if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
</where> </where>
order by audit_status asc ,create_time desc order by audit_status asc ,create_time desc
</select> </select>

8
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

@ -12,7 +12,7 @@
<ul> <ul>
<li> <li>
<label>开发修改单号:</label> <label>开发修改单号:</label>
<input type="text" name="developOderCode"/> <input type="text" name="developOrderCode"/>
</li> </li>
<li> <li>
<label>料号:</label> <label>料号:</label>
@ -42,9 +42,11 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li class="select-time">
<label>录入时间:</label> <label>录入时间:</label>
<input type="text" class="time-input" placeholder="请选择录入时间" name="createTime"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li> </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>

Loading…
Cancel
Save