Browse Source

版本切换

anderx 3 years ago
parent
commit
b3880fa0ce

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

@@ -328,12 +328,12 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @throws IOException
 	 */
 	@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
-	public Result exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) {
+	public Result exportMyTaskList(inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) {
 		if(pageSize==null)pageSize=999999;
 		@SuppressWarnings("unchecked")
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) orderProjectService.taskHoursList(ib,  pageNo, pageSize).getList();
 		NewExcelUtil<TOrderTaskListBo> excel=new NewExcelUtil<>(TOrderTaskListBo.class);
-		return excel.exportExcel(list, "工时信息记录表");
+		return excel.exportExcel(list, "工时信息记录表",uploadPath);
 	}
 
 	/**

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

@@ -50,7 +50,7 @@ yxy_max=100
 yxjl_max=100
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.48
+static.host=//static.jishutao.com/1.2.49
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.27
 #static.host=http://172.16.1.187/prod/1.2.25