|
|
@@ -195,6 +195,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tNew.setOrderNo(task.getOrderNo());
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(tNew);
|
|
|
//新增奖金信息
|
|
|
+ System.out.println(task.getProjectStatus());
|
|
|
if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode()||task.getProjectStatus()==ProjectNewStage.LS.getCode()||
|
|
|
task.getProjectStatus()==ProjectNewStage.GS.getCode()) {
|
|
|
TOrderBonus tb=new TOrderBonus();
|
|
|
@@ -248,9 +249,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
@SuppressWarnings("null")
|
|
|
@Override
|
|
|
- public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String starTime, String endTime) {
|
|
|
- if(endTime!=null) endTime=endTime+" 23:59:59";
|
|
|
- List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,starTime,endTime);
|
|
|
+ public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime) {
|
|
|
+ if(StringUtils.isNoneBlank(endTime)) endTime=endTime+" 23:59:59";
|
|
|
+ List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime);
|
|
|
if (list==null && list.size()==0) {
|
|
|
return null;
|
|
|
}
|