| 
					
				 | 
			
			
				@@ -1,6 +1,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 package org.jeecg.modules.capacity.controller; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.text.SimpleDateFormat; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Arrays; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.Date; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.stream.Collectors; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -11,6 +13,7 @@ import javax.servlet.http.HttpServletRequest; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import javax.servlet.http.HttpServletResponse; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.jeecg.common.api.vo.Result; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.jeecg.common.system.query.QueryGenerator; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import org.jeecg.common.util.DateUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.jeecg.common.util.oConvertUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.jeecg.modules.capacity.entity.SyCapacityControl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.jeecg.modules.capacity.service.ISyCapacityControlService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -94,6 +97,15 @@ public class SyCapacityControlController extends JeecgController<SyCapacityContr 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@ApiOperation(value="产能控制-编辑", notes="产能控制-编辑") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	public Result<String> edit(@RequestBody SyCapacityControl syCapacityControl) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		//获得时间修改 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		Date date = DateUtils.getDate(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		//获得原额度 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		SyCapacityControl queryCapacity = syCapacityControlService.getById(syCapacityControl.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if(!queryCapacity.getCapacityQuota().equals(syCapacityControl.getCapacityQuota())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			//保存 修改时间和额度 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			syCapacityControl.setRemarks(syCapacityControl.getRemarks()+format.format(date)+":"+queryCapacity.getCapacityQuota()+" "); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		syCapacityControlService.updateById(syCapacityControl); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		return Result.OK("编辑成功!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 |