|
@@ -2,10 +2,12 @@ package com.ruoyi.project.plant.controller;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.file.ExcelUtils;
|
|
|
import com.ruoyi.project.plant.domain.TTargetreview;
|
|
|
import com.ruoyi.project.plant.service.ITStaffmgrService;
|
|
@@ -15,6 +17,7 @@ import com.ruoyi.project.system.domain.SysDept;
|
|
|
import com.ruoyi.project.system.domain.SysDictData;
|
|
|
import com.ruoyi.project.system.service.ISysDeptService;
|
|
|
import com.ruoyi.project.system.service.ISysDictTypeService;
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.poi.ss.usermodel.*;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -75,7 +78,19 @@ public class TTargetlistController extends BaseController
|
|
|
public TableDataInfo listMeasures(TTargetlist tTargetlist)
|
|
|
{
|
|
|
startPage();
|
|
|
- List<TTargetlist> list = tTargetlistService.selectListMeasures(tTargetlist);
|
|
|
+
|
|
|
+ List<TTargetlist> list;
|
|
|
+ if (StringUtils.isEmpty(tTargetlist.getYear())) {
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
+ tTargetlist.setYear(String.valueOf(calendar.get(Calendar.YEAR)));
|
|
|
+ list = tTargetlistService.selectListMeasures(tTargetlist);
|
|
|
+ if (CollectionUtils.isEmpty(list)) {
|
|
|
+ tTargetlist.setYear(String.valueOf(calendar.get(Calendar.YEAR)-1));
|
|
|
+ list = tTargetlistService.selectListMeasures(tTargetlist);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ list = tTargetlistService.selectListMeasures(tTargetlist);
|
|
|
+ }
|
|
|
for (TTargetlist t : list) {
|
|
|
if (t.getPrincipal() != null) {
|
|
|
String[] principal = t.getPrincipal().split(",");
|