|
@@ -59,14 +59,14 @@ public class TTsFirstplanController extends BaseController {
|
|
|
List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
|
|
List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
if (i == 0) {
|
|
if (i == 0) {
|
|
|
- list.get(i).setStudy("1");
|
|
|
|
|
|
|
+ list.get(i).setStudy(1);
|
|
|
}
|
|
}
|
|
|
if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
|
|
if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
|
|
|
- list.get(i).setStudy("1");
|
|
|
|
|
- list.get(i + 1).setStudy("1");
|
|
|
|
|
|
|
+ list.get(i).setStudy(1);
|
|
|
|
|
+ list.get(i + 1).setStudy(1);
|
|
|
}
|
|
}
|
|
|
- if (StringUtils.isEmpty(list.get(i).getStudy())){
|
|
|
|
|
- list.get(i).setStudy("0");
|
|
|
|
|
|
|
+ if (list.get(i).getStudy()==null){
|
|
|
|
|
+ list.get(i).setStudy(0);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
@@ -77,14 +77,14 @@ public class TTsFirstplanController extends BaseController {
|
|
|
List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
|
|
List<TTsFirstplan> list = tTsFirstplanService.selectTTsFirstplanList(tTsFirstplan);
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
if (i == 0) {
|
|
if (i == 0) {
|
|
|
- list.get(i).setStudy("1");
|
|
|
|
|
|
|
+ list.get(i).setStudy(1);
|
|
|
}
|
|
}
|
|
|
if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
|
|
if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
|
|
|
- list.get(i).setStudy("1");
|
|
|
|
|
- list.get(i + 1).setStudy("1");
|
|
|
|
|
|
|
+ list.get(i).setStudy(1);
|
|
|
|
|
+ list.get(i + 1).setStudy(1);
|
|
|
}
|
|
}
|
|
|
- if (StringUtils.isEmpty(list.get(i).getStudy())){
|
|
|
|
|
- list.get(i).setStudy("0");
|
|
|
|
|
|
|
+ if (list.get(i).getStudy()==null){
|
|
|
|
|
+ list.get(i).setStudy(0);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return AjaxResult.success(list);
|
|
return AjaxResult.success(list);
|