|
|
@@ -92,16 +92,16 @@ public class TTsFlplanController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
- if (i == 0) {
|
|
|
- list.get(i).setStudy("1");
|
|
|
- }
|
|
|
- if ((list.get(i).getPlanStatus() == 5||list.get(i).getPlanStatus() == 1) && i <= list.size() - 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 (i == 0) {
|
|
|
+ list.get(i).setStudy(1);
|
|
|
+ }
|
|
|
+ if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 1) {
|
|
|
+ list.get(i).setStudy(1);
|
|
|
+ list.get(i + 1).setStudy(1);
|
|
|
+ }
|
|
|
+ if (list.get(i).getStudy()==null){
|
|
|
+ list.get(i).setStudy(0);
|
|
|
+ }
|
|
|
}
|
|
|
startPage();
|
|
|
return getDataTable(list);
|
|
|
@@ -116,14 +116,14 @@ public class TTsFlplanController extends BaseController {
|
|
|
List<TTsFlplan> list = tTsFlplanService.selectTTsFlplanList(tTsFlplan);
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
if (i == 0) {
|
|
|
- list.get(i).setStudy("1");
|
|
|
+ list.get(i).setStudy(1);
|
|
|
}
|
|
|
- if ((list.get(i).getPlanStatus() == 5||list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
|
|
|
- list.get(i).setStudy("1");
|
|
|
- list.get(i + 1).setStudy("1");
|
|
|
+ if (list.get(i).getPlanStatus() == 5 && i <= list.size() - 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);
|