| 
					
				 | 
			
			
				@ -624,7 +624,9 @@ public class FamilyContractService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setSignSource("2");//签约来源【1 社区签约 2 移动签约】 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //******************扣费接口**********************/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setExpensesStatus("0");   //扣费状态 【0未扣费 1已扣费 2已退费】 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setBegin(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear() + 1 + "-06-30 23:59:59", "yyyy-MM-dd HH:mmm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setSignYear(DateUtil.getSignYear() + ""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -926,7 +928,11 @@ public class FamilyContractService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        SignFamily sf = new SignFamily(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String signCode = getCode(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setSignYear(DateUtil.getSignYear() + "");//设置签约年度 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setBegin(DateUtil.getNowDateShort()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //===1.3.9 修改 ====== 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setBegin(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //==================== 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setCode(signCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sf.setCzrq(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1321,7 +1327,8 @@ public class FamilyContractService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            // 更新签约日期 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sf.setBegin(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sf.setEnd(DateUtil.stringToDate(DateUtil.getSignYear() + 1 + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 |