diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 07e3f9e0..d2c4bd14 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1184,7 +1184,7 @@ public class ExcelService implements IExcelService { SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); String year1 = simpleDateFormat1.format(date1); String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; - stringBuilder.append(string+" "); + stringBuilder1.append(string+" "+"\n"); } } PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(stringBuilder1.toString()); @@ -1199,7 +1199,7 @@ public class ExcelService implements IExcelService { SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); String year1 = simpleDateFormat1.format(date1); String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; - stringBuilder.append(string+" "); + stringBuilder2.append(string+" "+"\n"); } } PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(stringBuilder2.toString()); diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index a6d489ba..728fe153 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -59,18 +59,20 @@ if(a.aa = 0,c.start_time,null) as start_timeP, if(a.aa = 1,c.end_time,null) as endTime, if(a.aa = 0,c.end_time,null) as endTimeP - FROM `t_compete_project_config` c LEFT JOIN t_compete_project p on c.project_id = p.id LEFT JOIN ( - SELECT - id, - if(FROM_UNIXTIME(start_time/1000,'%h') <= 12,1 ,0) as aa - FROM - t_compete_project_config + SELECT + id, + if(FROM_UNIXTIME(start_time/1000,'%H') < 12,1 ,0) as aa + FROM + t_compete_project_config b + where b.rec_status=0 )a on c.id = a.id where c.project_id = p.id + and c.rec_status = 0 + and p.rec_status = 0 ORDER BY c.start_time