|
@ -43,9 +43,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc |
|
|
@Override |
|
|
@Override |
|
|
public Result governrankdatadaily(ScreenJobFormDTO formDto) { |
|
|
public Result governrankdatadaily(ScreenJobFormDTO formDto) { |
|
|
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1)); |
|
|
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1)); |
|
|
if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) { |
|
|
|
|
|
yearMonthDay = formDto.getYearMonth(); |
|
|
|
|
|
} |
|
|
|
|
|
List<ScreenGovernRankDataDailyResultDTO> data = baseDao.governrankdatadaily(); |
|
|
List<ScreenGovernRankDataDailyResultDTO> data = baseDao.governrankdatadaily(); |
|
|
List<ScreenGovernRankDataDailyResultDTO> agencyData = baseDao.governrankdatadailyAgency(); |
|
|
List<ScreenGovernRankDataDailyResultDTO> agencyData = baseDao.governrankdatadailyAgency(); |
|
|
List<ScreenGovernRankDataDailyResultDTO> noRespData = baseDao.governrankdatadailyNoResp(); |
|
|
List<ScreenGovernRankDataDailyResultDTO> noRespData = baseDao.governrankdatadailyNoResp(); |
|
@ -100,9 +98,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc |
|
|
@Override |
|
|
@Override |
|
|
public Result gridgoverndaily(ScreenJobFormDTO formDto) { |
|
|
public Result gridgoverndaily(ScreenJobFormDTO formDto) { |
|
|
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1)); |
|
|
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1)); |
|
|
if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) { |
|
|
|
|
|
yearMonthDay = formDto.getYearMonth(); |
|
|
|
|
|
} |
|
|
|
|
|
List<ScreenGridGovernDailyResultDTO> data = baseDao.gridgoverndaily(); |
|
|
List<ScreenGridGovernDailyResultDTO> data = baseDao.gridgoverndaily(); |
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
jsonObject.put("isFirst", true); |
|
|
jsonObject.put("isFirst", true); |
|
@ -115,9 +111,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc |
|
|
@Override |
|
|
@Override |
|
|
public Result agencygoverndaily(ScreenJobFormDTO formDto) { |
|
|
public Result agencygoverndaily(ScreenJobFormDTO formDto) { |
|
|
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1)); |
|
|
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1)); |
|
|
if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) { |
|
|
|
|
|
yearMonthDay = formDto.getYearMonth(); |
|
|
|
|
|
} |
|
|
|
|
|
List<ScreenAgencyGovernDailyResultDTO> data = baseDao.agencygoverndaily(); |
|
|
List<ScreenAgencyGovernDailyResultDTO> data = baseDao.agencygoverndaily(); |
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
jsonObject.put("isFirst", true); |
|
|
jsonObject.put("isFirst", true); |
|
|