|  | @@ -184,7 +184,7 @@ public class WorkMaterialModelListController {
 | 
												
													
														
															|  |          model.addAttribute("taxMax",taxMax);
 |  |          model.addAttribute("taxMax",taxMax);
 | 
												
													
														
															|  |          model.addAttribute("taxMin",taxMin);
 |  |          model.addAttribute("taxMin",taxMin);
 | 
												
													
														
															|  |          model.addAttribute("workCollect",workMaterialCollectTotal);
 |  |          model.addAttribute("workCollect",workMaterialCollectTotal);
 | 
												
													
														
															|  | -        return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView";
 |  | 
 | 
												
													
														
															|  | 
 |  | +        return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelView";
 | 
												
													
														
															|  |      }
 |  |      }
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |      //转换时间
 |  |      //转换时间
 | 
												
											
												
													
														
															|  | @@ -222,7 +222,6 @@ public class WorkMaterialModelListController {
 | 
												
													
														
															|  |          model.addAttribute("itemId",workMaterialCollectEngineer.getId());
 |  |          model.addAttribute("itemId",workMaterialCollectEngineer.getId());
 | 
												
													
														
															|  |          model.addAttribute("workEng",workMaterialCollectEngineer);
 |  |          model.addAttribute("workEng",workMaterialCollectEngineer);
 | 
												
													
														
															|  |          model.addAttribute("workType",workMaterialCollectType);
 |  |          model.addAttribute("workType",workMaterialCollectType);
 | 
												
													
														
															|  | -        model.addAttribute("workEng",workMaterialCollectTotal);
 |  | 
 | 
												
													
														
															|  |          return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView";
 |  |          return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView";
 | 
												
													
														
															|  |      }
 |  |      }
 | 
												
													
														
															|  |  
 |  |  
 |