|
|
@@ -338,7 +338,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId, String starTime,String endTime , Integer pageNo,
|
|
|
+ public Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId, String starTime,String endTime ,Integer type, Integer pageNo,
|
|
|
Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
@@ -347,6 +347,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
|
|
|
if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
|
|
|
if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
|
|
|
+ if(type!=null&&type==1)params.put("fid", TokenManager.getAdminId());
|
|
|
Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskHoursListByPage", "selectTaskHoursListCount", params, pageNo, pageSize);
|
|
|
|
|
|
return p;
|
|
|
@@ -354,9 +355,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime) {
|
|
|
+ public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime,Integer type) {
|
|
|
if(StringUtils.isNoneBlank(endTime)) endTime=endTime+" 23:59:59";
|
|
|
- List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime);
|
|
|
+ String fid=null;
|
|
|
+ if(type!=null&&type==1)fid=TokenManager.getAdminId();
|
|
|
+ List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime,fid);
|
|
|
if (list==null || list.size()==0) return null;
|
|
|
String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","工时","合同编号","签单日期","派单日期"};
|
|
|
String filePath = uploadPath + "/TaskHours";
|