Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -13,6 +13,7 @@ import com.jeeplus.modules.sg.overheadline.service.RuleRatioService;
 import com.jeeplus.modules.sg.overheadline.service.SettlementService;
 import com.jeeplus.modules.sg.overheadline.util.BashInfo;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
+import com.jeeplus.modules.sg.project.service.ItemService;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -40,6 +41,8 @@ public class OverheadLineController extends BaseController {
   private FeeAdjustService feeAdjustService;
   @Autowired
   private SettlementService settlementService;
+  @Autowired
+  private ItemService itemService;
 
 
   /**
@@ -444,7 +447,9 @@ public class OverheadLineController extends BaseController {
     String id = request.getParameter("id");
     String type = request.getParameter("type");
     try{
-      String fileName = "架空线路"+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+      WbsItem wbsItem = itemService.get(id);
+      String file = wbsItem.getItemName();
+      String fileName = file+ DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
       List<JkxlDetailFee> list = overheadLineService.findList(id,type);
       //导出
       new ExportExcel(null, JkxlDetailFee.class).setDataList(list).write(response, fileName).dispose();

src/main/webapp/webpage/modules/sg/project/updateItemForm.jsp

@@ -123,7 +123,6 @@
     }
     function view(id,type) {
         var url = '${ctx}/jkxl/list?id='+id+'&type='+type;
-        alert(url);
         parent.location.href=url;
     }
 </script>