sweet

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -73,8 +73,8 @@ public class SweetAppletController {
     @ApiOperation("时间表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "dateTime", value = "时间 全部传 \"\"", required = false),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "stage", value = "舞台 全部传 \"\"", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "dateTime", value = "时间 全部不传", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "stage", value = "舞台 全部不传", required = false),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isSign", value = "是否签名(1是0否)", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = false),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = false),
@@ -103,7 +103,7 @@ public class SweetAppletController {
             endPosition = (page) * size;
         }
 
-        if (page != null && dateTime==null) {
+        if (page == null && dateTime == null) {
             try {
                 dateTime = data.getDate().get(0);
             } catch (Exception e) {
@@ -112,25 +112,25 @@ public class SweetAppletController {
         }
 
         for (SweetManualArtistListDto item : artistData) {
-            boolean isSave = false;
+            boolean isSave = true;
             if (isSign == 1) {
-                if (item.getSignatureStart() != null) {
-                    //保留
-                    isSave = true;
+                if (item.getSignatureStart() == null) {
+                    //不保留
+                    isSave = false;
                 }
             }
 
-            if (dateTime!=null) {
-                if (item.getPerformanceStart().contains(dateTime)) {
-                    //保留
-                    isSave = true;
+            if (dateTime != null) {
+                if (!item.getPerformanceStart().contains(dateTime)) {
+                    //不保留
+                    isSave = false;
                 }
             }
 
-            if (stage!=null) {
-                if (item.getTitle().equalsIgnoreCase(stage)) {
+            if (stage != null) {
+                if (!item.getTitle().equalsIgnoreCase(stage)) {
                     //保留
-                    isSave = true;
+                    isSave = false;
                 }
             }
 
@@ -146,19 +146,22 @@ public class SweetAppletController {
                 item.setIsWatch(0);
                 item.setIsSign(0);
 
+                if (relationData.getWatchList() != null) {
                     for (String artistsId : relationData.getWatchList()) {
                         if (artistsId.equalsIgnoreCase(item.getArtistId())) {
                             item.setIsWatch(1);
                             break;
                         }
                     }
-
+                }
+                if (relationData.getSignList() != null) {
                     for (String artistsId : relationData.getSignList()) {
                         if (artistsId.equalsIgnoreCase(item.getArtistId())) {
                             item.setIsSign(1);
                             break;
                         }
                     }
+                }
 
                 returnArtist.add(item);
             }