anderx 3 years ago
parent
commit
c7466bf194

+ 1 - 2
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -42,8 +42,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	private AdminLocationService	adminLocationService;
 	@Resource
 	private RedisUtil redisUtil;
-	@Resource
-	private RedisTemplate  redisTemplate;
+
 
 	/**管理员列表*/
 	@RequestMapping(value = "/adminList", method = RequestMethod.GET)

+ 12 - 10
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -8,20 +8,14 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.net.URLConnection;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
@@ -553,7 +547,15 @@ public class NewExcelUtil<T> {
 				String dateFormat = attr.dateFormat();
 				String readConverterExp = attr.readConverterExp();
 				String separator = attr.separator();
-				if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
+				String enumsName = attr.enumsName();
+				String methodName="getValueByCode";
+				if (StringUtils.isNotBlank(enumsName)&& StringUtils.isNotNull(value)) {
+					Class<?> clazz=Class.forName(enumsName);
+					Object[] os=clazz.getEnumConstants();
+					Method method=clazz.getDeclaredMethod(methodName,Integer.class);
+					Object s=method.invoke(clazz,value);
+					setCellVo(s.toString(), attr, cell);
+				}else if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
 					cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
 				} else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
 					cell.setCellValue(convertByExp(toStr(value), readConverterExp, separator));

+ 32 - 14
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -43,7 +43,7 @@ public class TOrderTaskDetailBo {
 	private Integer ifCertificationFee;
 	private String certificationCorporate;
 	private BigDecimal certificationFee;
-	
+
 	/**
 	 * 任务状态
 	 */
@@ -80,8 +80,8 @@ public class TOrderTaskDetailBo {
 	 * 外包价格
 	 */
 	private String outsourcePrice;
-	
-	
+
+
 	private Integer splitStatus;
 	private String splitSuper;
 	private Integer splitId;
@@ -89,38 +89,56 @@ public class TOrderTaskDetailBo {
 	 * 项目分类
 	 */
 	private Integer bpType;
-	
+
 	/** 官费 */
 	private Integer officialCost;
 	/** 费减 */
 	private Integer costReduction;
-	
+
 	private Integer setUpStatus;
 	private String setUpTime;
 	private Integer spotCheckStatus;
 	private Integer highTechStatus;
-	
+
 	private Integer urgentDay;
 	private Integer ifMaterial;
 	private String specialComment;
 	private Integer rejectCount;
-	
+
 	private Integer certificatesCount;
-	private Integer authorizeCount; 
+	private Integer authorizeCount;
 	private Integer endCount;
 	private Integer acceptCount;
 	private BigDecimal commodityPrice;
 	private Integer	commodityQuantity;
 	private String timeRecord;
-	
+
 	private Integer	checkStatus;
-	
+
 	private Integer patentType;
-	
+
 	@SuppressWarnings("unused")
 	private String patentTypeName;
 
 	private Integer patentTransfer;
+	private Integer processStatus;
+	private String commodityId;
+
+	public String getCommodityId() {
+		return commodityId;
+	}
+
+	public void setCommodityId(String commodityId) {
+		this.commodityId = commodityId;
+	}
+
+	public Integer getProcessStatus() {
+		return processStatus;
+	}
+
+	public void setProcessStatus(Integer processStatus) {
+		this.processStatus = processStatus;
+	}
 
 	public Integer getPatentTransfer() {
 		return patentTransfer;
@@ -196,7 +214,7 @@ public class TOrderTaskDetailBo {
 	public void setRejectCount(Integer rejectCount) {
 		this.rejectCount = rejectCount;
 	}
-	
+
 	public Integer getSplitStatus() {
 		return splitStatus;
 	}
@@ -395,7 +413,7 @@ public class TOrderTaskDetailBo {
 	public void setTaskDate(String taskDate) {
 		this.taskDate = taskDate;
 	}
-	
+
 	public String getUserName() {
 		return userName;
 	}
@@ -546,7 +564,7 @@ public class TOrderTaskDetailBo {
 	public void setPatentType(Integer patentType) {
 		this.patentType = patentType;
 	}
-	
+
 	public String getPatentTypeName() {
 		if (getPatentType()!=null) {
 			return OfficialPatentType.getValueByCode(getPatentType());

+ 45 - 18
src/main/java/com/goafanti/order/bo/outOrderDunListBo.java

@@ -2,39 +2,73 @@ package com.goafanti.order.bo;
 
 import java.math.BigDecimal;
 
+import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.OrderDunSubject;
 
+import javax.naming.Name;
+
 public class outOrderDunListBo {
 	private String id;
+	@Excel(name = "合同编号")
 	private String contractNo;
+	@Excel(name = "订单编号")
 	private String orderNo;
+	@Excel(name = "客户名称")
 	private String userName;
+	@Excel(name = "订单负责人")
 	private String salesmanName;
+	@Excel(name = "订单部门")
+	private String depName;
+	@Excel(name = "订单状态",readConverterExp = "0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项")
+	private Integer orderStatus;
+	@Excel(name = "项目名称")
 	private String commodityName;
+	@Excel(name = "项目状态", enumsName = "com.goafanti.order.enums.NewProjectStatus")
 	private Integer projectStatus;
+	@Excel(name = "签单金额")
 	private BigDecimal totalAmount;
-	private Integer liquidationStatus;
+	@Excel(name = "已收款")
 	private BigDecimal settlementAmount;
-	private BigDecimal accountsReceivable;
+	@Excel(name = "未收款")
 	private BigDecimal uncollectedAmount;
-	private String startDate;
-	private String depName;
-	private String signDate;
-	private Integer orderStatus;
+	@Excel(name = "拨款比例")
+	private BigDecimal appropriationRatio;
+	@Excel(name = "结算状态",readConverterExp = "0=首付待付清,1=尾款待付清,2=已付清,3=退款待确认,4=全部退款")
+	private Integer liquidationStatus;
+	@Excel(name = "催收科目")
+	private String dunSubject;
 	private Integer projectType;
-	private Integer dunStatus;
 	private Integer dunType;
-	private String dunSubject;
-	private BigDecimal appropriationRatio;
+	@Excel(name = "应收款")
+	private BigDecimal accountsReceivable;
+	@Excel(name = "催款状态" ,readConverterExp = "0=未启动,1=已启动")
+	private Integer dunStatus;
+	@Excel(name = "启动日期")
+	private String startDate;
+	@Excel(name = "签单日期")
+	private String signDate;
+
+
+
 	private BigDecimal setUpAmount;
 	private String customizeName;
 	private String customizeTimes;
-
+	@Excel(name = "特批状态")
 	private Integer approval;
+	@Excel(name = "订单状态")
 	private Integer deleteSign;
+	@Excel(name = "会员订单",readConverterExp = "0=否,1=是")
 	private Integer memberType;
 
+	public void setDunSubject(String dunSubject) {
+		this.dunSubject = dunSubject;
+	}
+
+	public String getDunSubject() {
+		return dunSubject;
+	}
+
 	public Integer getApproval() {
 		return approval;
 	}
@@ -62,14 +96,7 @@ public class outOrderDunListBo {
 	public String getId() {
 		return id;
 	}
-	public String getDunSubject() {
-		//旧催款
-		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
-		//新催款
-		if(getDunType()!=null&&getDunType()!=0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
-		if(getDunType()!=null&&getDunType()==0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()))+getCustomizeName();
-		return dunSubject;
-	}
+
 
 	public String getCommodityName() {
 		return commodityName;

+ 5 - 14
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -173,9 +173,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		if (type==null)type=1;
 		res.setData(orderNewService.selectOrderTask(orderNo,type));
-
 		return res;
 	}
 	/**
@@ -369,11 +367,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value="/dunOrderNewList", method = RequestMethod.GET)
 	public Result dunOrderNewList(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String aid,
-			String adminName,String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer projectType,
+			String adminName,String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,
 								  Integer pageNo,Integer pageSize){
 		Result res=new Result();
 		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,specially,aid,  adminName, depId,newStatus,
-				approval,amountStatus,projectType,pageNo, pageSize));
+				approval,amountStatus,memberType,pageNo, pageSize));
 		return res;
 	}
 
@@ -601,16 +599,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
 	public Result exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially, String aid,String adminName,
 			String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,
-									 Integer pageNo,Integer pageSize,HttpServletResponse response){
-		 Result res = new Result();
- 		try {
- 			orderNewService.exportOrderDunData( name, orderNo,contractNo, starTime, endTime,specially, aid, adminName, depId,newStatus
-					, approval, amountStatus, memberType,pageNo, pageSize, response);
-		} catch (Exception e) {
-			res.getError().add(buildError("格式不正确"));
-			return res;
-		}
- 		return res;
+									 Integer pageNo,Integer pageSize){
+		return orderNewService.exportOrderDunData( name, orderNo,contractNo, starTime, endTime,specially, aid, adminName, depId,newStatus
+				, approval, amountStatus, memberType,pageNo, pageSize);
 	}
 	/**
 	 * 	项目列表下载

+ 16 - 0
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -519,6 +519,22 @@ public class OrderProjectApiController extends CertifyApiController {
 	}
 
 	/**
+	 * 会员项目修改
+	 * @param t
+	 * @return
+	 */
+	@RequestMapping(value = "/updateMemberProject" ,method = RequestMethod.POST)
+	public Result updateMemberProject(TOrderTask t){
+		Result res = new Result();
+		if(t.getId()==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"项目编号"));
+			return res;
+		}
+		return res.data(orderProjectService.updateMemberProject(t));
+
+	}
+
+	/**
 	 * 会员项目列表
 	 * @param in
 	 * @return

+ 4 - 4
src/main/java/com/goafanti/order/enums/LiquidationNewState.java

@@ -12,10 +12,10 @@ public enum LiquidationNewState {
 	ALREADY_PAY(2,"已付清"),
 	/** 退款待确认 **/
 	REBATESQUAN(3,"退款待确认"),
-	FULL_REFUND(3,"全部退款"),
+	FULL_REFUND(4,"全部退款"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
-	
+
 	private LiquidationNewState(Integer code, String desc) {
 		this.code = code;
 		this.desc = desc;
@@ -41,11 +41,11 @@ public enum LiquidationNewState {
             }
         }
         return  null;
-    }	
+    }
 	public static boolean containsType(Integer code) {
 		return status.containsKey(code);
 	}
-	
+
 	private Integer	code;
 	private String	desc;
 	public Integer getCode() {

+ 1 - 0
src/main/java/com/goafanti/order/enums/NewProjectStatus.java

@@ -51,6 +51,7 @@ public enum NewProjectStatus {
 		return INVALID;
 	}
 	public static String getValueByCode(Integer code){
+		if(code==null)return "";
         for(NewProjectStatus orderType:NewProjectStatus.values()){
             if(code.equals(orderType.getCode())){
                 return orderType.getDesc();

+ 5 - 4
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -7,6 +7,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.*;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
@@ -90,11 +91,11 @@ public interface OrderNewService {
 	 * @param pageSize
 	 */
 	Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,Integer specially, String aid,String adminName,String depId,
-			Integer newStatus,Integer approval,Integer amountStatus,Integer projectType,Integer pageNo, Integer pageSize);
+			Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,Integer pageNo, Integer pageSize);
 
-	void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String aid,String adminName,
-							String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,
-							Integer pageNo,Integer pageSize,HttpServletResponse response) throws  Exception;
+	Result exportOrderDunData(String name, String orderNo, String contractNo, String starTime, String endTime, Integer specially, String aid, String adminName,
+							  String depId, Integer newStatus, Integer approval, Integer amountStatus, Integer memberType,
+							  Integer pageNo, Integer pageSize);
 	/**
 	 * 新增催款记录
 	 */

+ 31 - 60
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -20,8 +20,10 @@ import java.util.UUID;
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
+import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.enums.*;
 import com.goafanti.organization.bo.*;
@@ -34,6 +36,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
@@ -130,6 +133,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private BusinessProjectMapper businessProjectMapper;
 	@Autowired
 	private BusinessCategoryMapper businessCategoryMapper;
+	@Value(value = "${upload.path}")
+	private String					uploadPath			= null;
 
 	Logger							logger	= LoggerFactory.getLogger(OrderNewServiceImpl.class);
 
@@ -298,6 +303,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public List<TOrderTaskBo> selectOrderTask(String orderNo,Integer type) {
+		if (TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
+			if (type==null)type=0;
+		}else {
+			if (type==null)type=1;
+		}
 		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo,type);
 			for (TOrderTaskBo t : list) {
 				if (TokenManager.hasRole(AFTConstants.SALESMAN)&&TokenManager.hasRole(AFTConstants.TECH)) {
@@ -874,9 +884,22 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		if(i!=null)params.put("shiroType", i);
 		Pagination<outOrderDunListBo> p = (Pagination<outOrderDunListBo>)findPage("selectDunOrderNewListByPage", "selectDunOrderNewListCount", params, pageNo, pageSize);
+		List<outOrderDunListBo> list = (List<outOrderDunListBo>) p.getList();
+		for (outOrderDunListBo o : list) {
+			o.setDunSubject(getDunSubject(o));
+		}
 		return p;
 	}
 
+	public String getDunSubject(outOrderDunListBo o) {
+		//旧催款
+		if(o.getDunSubject()!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(o.getDunSubject()));
+		//新催款
+		if(o.getDunType()!=null&&o.getDunType()!=0&&o.getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+o.getProjectType()+o.getDunType()));
+		if(o.getDunType()!=null&&o.getDunType()==0&&o.getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+o.getProjectType()+o.getDunType()))+o.getCustomizeName();
+		return "";
+	}
+
 	@Override
 	public int createDunLog( String dunId, String dumTime, String remarks, String attUrl) {
 		TDunLog d=new TDunLog();
@@ -1093,67 +1116,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 * @throws IOException
 	 */
 	@Override
-	public void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String aid,String adminName,
-			String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,
-								   Integer pageNo,Integer pageSize,HttpServletResponse response) throws Exception  {
-		OutputStream out = response.getOutputStream();
-		try {
-			@SuppressWarnings("unchecked")
+	public Result exportOrderDunData(String name, String orderNo, String contractNo, String starTime, String endTime, Integer specially, String aid, String adminName,
+									 String depId, Integer newStatus, Integer approval, Integer amountStatus, Integer memberType,
+									 Integer pageNo, Integer pageSize){
+
 			List<outOrderDunListBo> list=(List<outOrderDunListBo>) dunOrderNewList( name,  orderNo, contractNo, starTime,  endTime,specially,
 					 aid,  adminName, depId,newStatus, approval, amountStatus, memberType, pageNo,  pageSize).getList();
-
-    		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","应收款","已收款","拨款比例","结算状态","未收款","项目状态","催收科目","催款状态","催款启动时间","签单时间"};
-    		String fileName ="催款信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
-    		//type 0 变更
-    		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"催款信息");
-    		//根据列表编写文档
-    		XSSFSheet sheet =wb.getSheetAt(0);
-    		for (outOrderDunListBo ob : list) {
-    			//新增一行
-    			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
-    			for (int i = 0; i < comment.length; i++) {
-    				//当前列的只
-    				String o = "";
-    				switch (comment[i]) {
-//    "合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","项目负责人","签单金额","结算状态","已收款","应收款","项目状态","催收科目","催款启动时间"
-    				case "合同编号": o = ob.getContractNo(); break;
-    				case "订单编号": o = ob.getOrderNo(); break;
-    				case "客户名称": o = ob.getUserName(); break;
-    				case "订单负责人": o = ob.getSalesmanName(); break;
-    				case "订单部门": o = ob.getDepName(); break;
-    				case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus());break;
-    				case "签单金额": o = ob.getTotalAmount().toString(); break;
-    				case "已收款": o = bigToString(ob.getSettlementAmount()); break;
-    				case "未收款": o = bigToString(ob.getUncollectedAmount()); break;
-    				case "拨款比例": o = bigToString(ob.getAppropriationRatio()); break;
-    				case "结算状态": o = LiquidationNewState.getValueByCode(ob.getLiquidationStatus()); break;
-    				case "应收款": o = bigToString(ob.getAccountsReceivable()); break;
-    				case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
-    				case "催收科目": o = ob.getDunSubject(); break;
-    				case "催款状态": o = ob.getDunStatus()==0?"未启动":"已启动"; break;
-    				case "催款启动时间": o = ob.getStartDate(); break;
-    				case "签单时间": o = ob.getSignDate(); break;
-    				default: o = ""; break;
-    				}
-    				XSSFCell c = r.createCell(i);
-    				c.setCellValue(o);
-    			}
-    		}
-    		//返回名称及参数
-			 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));
-			 response.setContentType("application/octet-stream;charset=utf-8");
-    		 // 返回数据流
-			 wb.write(out);
-			 out.flush();
-			 out.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new BusinessException(new Error("表格生成错误。"));
-		}finally {
-			out.flush();
-			out.close();
-		}
-
+		NewExcelUtil<outOrderDunListBo> excelUtil = new NewExcelUtil<>(outOrderDunListBo.class);
+		return 	excelUtil.exportExcel(list,"催款截点统计表",uploadPath);
 	}
 
 	private String bigToString (BigDecimal o){
@@ -1239,7 +1209,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
-	public void  sendEmail(String dunId,AdminListBo a,TOrderNewBo b){
+	public void
+	sendEmail(String dunId,AdminListBo a,TOrderNewBo b){
 		LoggerUtils.debug(logger, "======================邮件信息发送===================");
 		String content = "<div>客户名称: "+ b.getUserName() +"</div><div>订单编号: " + b.getOrderNo() + "</div><div>合同编号: " + b.getContractNo() + "</div>";
 		String tite="订单驳回";

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

@@ -1143,9 +1143,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public int updateMemberProject(TOrderTask t) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
 		addOrderLog(task.getOrderNo(),OrderLogProcess.HYXMFQ.getCode(), "修改重新发起");
-		TOrderTaskDetailBo tt=new TOrderTaskDetailBo();
 		t.setProcessStatus(1);
-		return updateOrderTask(tt);
+		return orderNewService.updateOrderTask(t);
 	}
 
 }