Browse Source

Test修改

anderx 6 years ago
parent
commit
5f661a445d

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

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

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

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

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

@@ -55,7 +55,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String depId, String orderNo, String name, String type,Integer pageNo,
+	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, String type,Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
@@ -63,7 +63,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("financeId", TokenManager.getAdminId());
 		}
-		if(StringUtils.isNotBlank(depId))params.put("depId", depId);
+		if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
 		if(StringUtils.isNotBlank(type))params.put("type", type);
 		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
 		if(StringUtils.isNotBlank(name))params.put("name", name);
@@ -98,12 +98,12 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer type, String depId, String orderNo, String name,
+	public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer type, String orderDep, String orderNo, String name,
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		if(StringUtils.isNotBlank(depId))params.put("depId", depId);
+		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(type!=null)params.put("type", type);

+ 2 - 2
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.02
+static.host=//sb.jishutao.com/1.1.01
 avatar.host=//sb.jishutao.com
 
 #连生产
 #avatar.host=//static.kedexinxi.com
-#static.host=//s.kedexinxi.com/1.1.02
+#static.host=//s.kedexinxi.com/1.1.01
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload