Browse Source

下载项目列表BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
1d67e75b15

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1037,7 +1037,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		OutputStream out = response.getOutputStream();
 		try {
 			List<TOrderTaskBo> list=selectOrderTask(orderNo);
-    		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","项目负责人","是否主项目","项目别类","项目名称","项目数量","服务市价","证书編号","项目状态","项目说明"};
+    		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","项目负责人","是否主项目","项目别类","项目名称","项目数量","服务市价","证书編号","项目状态","项目说明","外包(内部)公司","外包(内部)价格"};
     		String fileName ="项目信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"项目信息");
@@ -1067,6 +1067,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
     				case "证书編号": o = ob.getCertificateNumber(); break;
     				case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
     				case "项目说明": o = ob.getTaskComment(); break;
+    				case "外包(内部)公司": o = ob.getOutsourceName(); break;
+    				case "外包(内部)价格": o = ob.getOutsourcePrice()!=null?ob.getOutsourcePrice().toString():""; break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);