|
|
@@ -70,7 +70,6 @@ import com.goafanti.common.model.TTaskLog;
|
|
|
import com.goafanti.common.model.TaskHoursCount;
|
|
|
import com.goafanti.common.model.TaskLog;
|
|
|
import com.goafanti.common.model.TaskProgress;
|
|
|
-import com.goafanti.common.task.OrderDunTask;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.ExportExcelUtil;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
@@ -225,7 +224,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<TOrderTaskListBo> orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId ,
|
|
|
- String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,String startSignTime,String endSignTime,Integer pageNo,Integer pageSize) {
|
|
|
+ String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,String startTime,String endTime,Integer pageNo,Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
@@ -239,8 +238,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
|
|
|
if (approval !=null) params.put("approval", approval);
|
|
|
if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
|
|
|
- if (StringUtils.isNotBlank(startSignTime)) params.put("startSignTime", startSignTime);
|
|
|
- if (StringUtils.isNotBlank(endSignTime)) params.put("endSignTime", endSignTime);
|
|
|
+ if (StringUtils.isNotBlank(startTime)) params.put("startTime", startTime);
|
|
|
+ if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime);
|
|
|
if (null != taskStatus) params.put("taskStatus", taskStatus);
|
|
|
if (outsourceStatus !=null) params.put("outsourceStatus", outsourceStatus);
|
|
|
List<String> fids=new ArrayList<>();
|
|
|
@@ -730,7 +729,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) taskHoursList(ib, pageNo, pageSize).getList();
|
|
|
//合同编号 订单编号 客户名称 订单部门 订单负责人 项目类别 项目编号 项目名称 项目负责人 项目价格(万元) 数量(个) 任务状态 项目状态 工时 签单时间 派单时间 分配时间 完成时间
|
|
|
- String[] comment = {"合同编号","订单编号","客户名称","订单部门","订单负责人","项目类别","项目编号","项目名称","项目负责人","项目价格(万元)","数量(个)","任务状态","项目状态","是否外包","工时","签单日期","派单日期","分配时间","完成时间"};
|
|
|
+ String[] comment = {"合同编号","订单编号","客户名称","订单部门","订单负责人","项目类别","项目编号","项目名称","项目负责人","项目价格(万元)",
|
|
|
+ "数量(个)","任务状态","项目状态","是否外包","工时","签单日期","派单日期","分配时间","完成时间" ,"成本(万元)","已付(万元)" };
|
|
|
String fileName ="工时信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
|
|
|
//type 0 变更
|
|
|
XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"工时信息");
|
|
|
@@ -764,6 +764,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
case "完成时间": o = ob.getTaskEndTime(); break;
|
|
|
case "签单日期": o = ob.getSignTime(); break;
|
|
|
case "派单日期": o = ob.getCreteTime();break;
|
|
|
+ case "成本(万元)": o = ob.getCostAmount(); break;
|
|
|
+ case "已付(万元)": o = ob.getPartyAmount(); break;
|
|
|
default: o = ""; break;
|
|
|
}
|
|
|
XSSFCell c = r.createCell(i);
|