总部核对增加“产品名称”栏位。

eseawind · Nov 21, 2014 · 353ecb6 · 353ecb6
1 parent ef66921
commit 353ecb6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/oa_sail_portal/src/com/china/center/oa/sail/action/ParentOutAction.java b/oa_sail_portal/src/com/china/center/oa/sail/action/ParentOutAction.java
@@ -8387,6 +8387,11 @@ else if ("6".equals(queryType))
 						String.valueOf(OutConstant.STATUS_PASS));
 			}
 
+            //Filter by product name
+            String productName = request.getParameter("product_name");
+            if (!StringTools.isNullOrNone(productName)){
+                condtion.addCondition(" and exists (select b.id from t_center_base b where b.outId=OutBean.fullId and b.productName like '%"+productName+"%')");
+            }
 			condtion.addCondition("order by changeTime desc");
 		}
 		// 总裁审批赠送
@@ -8493,6 +8498,7 @@ else if ("11".equals(queryType))
 			condtion.addFlaseCondition();
 		}
 
+
 		if (!condtion.containOrder())
 		{
 			condtion.addCondition("order by OutBean.id desc");

diff --git a/oa_sail_portal/webroot/sail/queryOut.jsp b/oa_sail_portal/webroot/sail/queryOut.jsp
@@ -1058,11 +1058,18 @@ function clears()
                             <option value="1">否</option>
                         </select></td>
 
-						<td colspan="2" align="right"><input type="button" id="query_b"
-							onclick="query()" class="button_class"
-							value="&nbsp;&nbsp;查 询&nbsp;&nbsp;">&nbsp;&nbsp;
-							<input type="button" onclick="res()" class="button_class" value="&nbsp;&nbsp;重 置&nbsp;&nbsp;"></td>
+                        <td width="15%" align="center">产品名称</td>
+                        <td align="center"><input type="text" name="product_name"></td>
 					</tr>
+
+                    <tr class="content2">
+
+                        <td colspan="4" align="right"><input type="button" id="query_b"
+                                                             onclick="query()" class="button_class"
+                                                             value="&nbsp;&nbsp;查 询&nbsp;&nbsp;">&nbsp;&nbsp;
+                            <input type="button" onclick="res()" class="button_class" value="&nbsp;&nbsp;重 置&nbsp;&nbsp;">
+                        </td>
+                    </tr>
 				</table>
 				</td>
 			</tr>