运管开发

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java

@@ -200,10 +200,10 @@ public class BsSgcDfJbxx extends BaseEntity
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recordTakeEffectTime;
+    private Date effDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recordLoseEfficacyTime;
+    private Date exprDate;
 
     private String adcd;
 

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java

@@ -230,9 +230,9 @@ public class BsSgcSzGcda extends BaseEntity
     private String auxiliaryGateHolesWidth;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recordTakeEffectTime;
+    private Date effDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recordLoseEfficacyTime;
+    private Date exprDate;
 
 }

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java

@@ -50,23 +50,7 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
         //获取已完成
         List<BsSgcSzAqrw> fin = records.stream().filter(x -> x.getTaskStatus().equals("1")).collect(Collectors.toList());
 
-       /* for (BsSgcSzAqrw bsSgcSzAqrw : noFin) {
-            List<BsSgcSzSafeJbxx> jbxxList = bsSgcSzSafeJbxxMapper.selectBatchIds(Arrays.asList(bsSgcSzAqrw.getSluiceIds()));
 
-//            List<BsSgcSzSafeJbxx> no = jbxxList.stream().filter(x -> x.getSecurityStatus().equals("0")).collect(Collectors.toList());
-
-            bsSgcSzAqrw.setIncompletionNumber((long) no.size());
-
-            bsSgcSzAqrw.setCompletionNumber(bsSgcSzAqrw.getTaskSluiceNumber()-no.size());
-
-
-        }
-
-        ArrayList<BsSgcSzAqrw> bsSgcSzAqrws = new ArrayList<>();
-
-        bsSgcSzAqrws.addAll(noFin);
-        bsSgcSzAqrws.addAll(fin);
-        page.setRecords(bsSgcSzAqrws);*/
         return page;
 
     }