瀏覽代碼

工时导出新增项目状态

Signed-off-by: anderx <312518615@qq.com>
anderx 6 年之前
父節點
當前提交
18895c503d

+ 2 - 1
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -43,7 +43,7 @@ public class ExportExcelUtil {
 		XSSFFont font = workbook.createFont();  
 		// font.setColor(HSSFFont.COLOR_RED);  
 		font.setFontName("微软雅黑");
-		font.setFontHeightInPoints((short) 22);//字体大小  
+		font.setFontHeightInPoints((short) 14);//字体大小  
 		  
 		// 设置样式  
 		XSSFCellStyle cellStyle = workbook.createCellStyle();  
@@ -499,6 +499,7 @@ public class ExportExcelUtil {
 					case "客户名称": o = ob.getUserName(); break;
 					case "任务负责人": o = ob.getReceiverName(); break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); break;
+					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
 					case "工时": o = ob.getHours().toString(); break;
 					case "合同编号":o =ob.getContractNo();break;
 					case "签单日期":o =ob.getSignTime();break;

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

@@ -471,7 +471,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if(type!=null&&type==1)fid=TokenManager.getAdminId();
 		List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,orderNo,startTime,endTime,fid);
 		if (list==null || list.size()==0) return null;
-		String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","工时","合同编号","签单日期","派单日期"};
+		String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","项目状态","工时","合同编号","签单日期","派单日期"};
 		String filePath = uploadPath + "/TaskHours";
 		XSSFWorkbook wb = ExportExcelUtil.exportTaskHoursListData(list, comment, filePath);
 		return wb;