Browse Source

省内特批修改搜索

anderx 6 years ago
parent
commit
31532dca92

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -743,6 +743,9 @@
 	<if test="name !=null">
 	and c.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
+	<if test="userName !=null">
+	and a.unit_name like CONCAT('%',#{userName,jdbcType=VARCHAR},'%')
+	</if>
 	<if test="orderDep !=null">
 	and b.order_dep= #{orderDep,jdbcType=VARCHAR}
 	</if>
@@ -780,6 +783,9 @@
 	<if test="name !=null">
 	and c.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
+	<if test="userName !=null">
+	and a.unit_name like CONCAT('%',#{userName,jdbcType=VARCHAR},'%')
+	</if>
 	<if test="orderDep !=null">
 	and b.order_dep= #{orderDep,jdbcType=VARCHAR}
 	</if>

+ 2 - 2
src/main/java/com/goafanti/order/controller/OrderInvoiceApiController.java

@@ -117,10 +117,10 @@ public class OrderInvoiceApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/approvalOrderInvoiceList",method = RequestMethod.GET)
-	public Result approvalOrderInvoiceList(Integer status,Integer approval,Integer type,String orderDep,String orderNo ,String name,Integer pageNo,Integer pageSize){
+	public Result approvalOrderInvoiceList(Integer status,Integer approval,Integer type,String orderDep,String orderNo ,String name,String userName,Integer pageNo,Integer pageSize){
 		Result res = new Result();
 		
-		res.data(orderInvoiceService.approvalOrderInvoiceList( status,approval,type, orderDep, orderNo, name,pageNo,pageSize));
+		res.data(orderInvoiceService.approvalOrderInvoiceList( status,approval,type, orderDep, orderNo, name,userName,pageNo,pageSize));
 		return res;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderInvoiceService.java

@@ -36,7 +36,7 @@ public interface OrderInvoiceService {
 
 	int updatefinanceExamine(Integer id, Integer examine, String reason);
 
-	Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer status,Integer approval,Integer type, String orderDep, String orderNo, String name, Integer pageNo,
+	Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer status,Integer approval,Integer type, String orderDep, String orderNo, String name,String userName,Integer pageNo,
 			Integer pageSize);
 
 	int updateapprovalExamine(Integer id, Integer examine, String reason);

+ 2 - 3
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -112,7 +112,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer status,Integer approval,Integer type, String orderDep, String orderNo, String name,
+	public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer status,Integer approval,Integer type, String orderDep, String orderNo, String name,String userName,
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
@@ -120,6 +120,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
 		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
 		if(StringUtils.isNotBlank(name))params.put("name", name);
+		if(StringUtils.isNotBlank(userName))params.put("userName", userName);
 		if(approval!=null)params.put("approval", approval);
 		if(status!=null)params.put("status", status);
 		//0省内 1省外 2查看所有省外
@@ -133,8 +134,6 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
 			params.put("aDep", a.getDepartmentId());
 		}
-		
-		
 		return (Pagination<TOrderInvoiceBo>)findPage("approvalOrderInvoiceList", "approvalOrderInvoiceCount", params, pageNo, pageSize);
 	}
 

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.19
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.19
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.19
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.19
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload