【定制专题】采集状态逻辑优化

src/main/java/com/zzsn/event/external/controller/ExternalController.java

@@ -116,14 +116,24 @@ public class ExternalController {
             Date now = new Date();
             for (SubjectPage record : records) {
                 Date timeDisable = record.getTimeDisable();
-                if (timeDisable != null) {
-                    if (timeDisable.before(now)) {
-                        record.setCollectStatus("已完成");
-                    } else {
+                String estimateStatus = record.getEstimateStatus();
+                Integer status = record.getStatus();
+                if (status == 0) {
+                    record.setCollectStatus("未启用");
+                } else {
+                    if (timeDisable != null) {
+                        if (timeDisable.before(now)) {
+                            if ("已完成".equals(estimateStatus) && status == 1) {
+                                record.setCollectStatus("已完成");
+                            } else if (!"已完成".equals(estimateStatus) && status == 1) {
+                                record.setCollectStatus("采集中");
+                            }
+                        } else if (status == 1){
+                            record.setCollectStatus("采集中");
+                        }
+                    } else if (status == 1){
                         record.setCollectStatus("采集中");
                     }
-                } else {
-                    record.setCollectStatus("采集中");
                 }
             }
         }