diff --git a/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java b/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java index d30ecba8..ef6b89a2 100644 --- a/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java +++ b/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java @@ -90,6 +90,9 @@ public class BazVisitInstance implements Serializable { private String targetAddress; private String targetMapAddress; + /** 遗失定位标识 */ + private Integer missLocalFlag; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime finishedTime; diff --git a/src/main/java/com/qs/serve/modules/baz/entity/so/BazVisitInstanceSo.java b/src/main/java/com/qs/serve/modules/baz/entity/so/BazVisitInstanceSo.java index e58b961e..50cf2657 100644 --- a/src/main/java/com/qs/serve/modules/baz/entity/so/BazVisitInstanceSo.java +++ b/src/main/java/com/qs/serve/modules/baz/entity/so/BazVisitInstanceSo.java @@ -57,8 +57,8 @@ public class BazVisitInstanceSo implements Serializable { /** 目标名称 */ private String targetName; - /** 备注 */ - private String remark; + /** 遗失定位标识 */ + private Integer missLocalFlag; @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") diff --git a/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java b/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java index dd046719..69d171c8 100644 --- a/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java @@ -190,6 +190,14 @@ public class BazVisitInstanceServiceImpl extends ServiceImpl countLqw = new LambdaQueryWrapper<>(); countLqw.eq(BazVisitInstanceFlow::getVisitInstanceId,instanceFlowDb.getVisitInstanceId()); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java index 81a388f6..1b97eaa5 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java @@ -68,6 +68,15 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl saveExtendBo = targetCenters.stream().filter(a->a.getId()==null).collect(Collectors.toList()); List updExtendBo = targetCenters.stream().filter(a->a.getId()!=null).collect(Collectors.toList()); - List updateIds = targetCenters.stream().filter(a->a.getId()!=null - ).map(a->a.getId()).collect(Collectors.toList()); + List updateIds = targetCenters.stream().filter(a->a.getId()!=null).map(BmsCenterExtendBo.Item::getId).collect(Collectors.toList()); LocalDateTime nowTime = param.getExtendDate().atStartOfDay(); //更新被继承成本 @@ -287,7 +304,6 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(BmsCenterExtend::getCenterType,param.getType()); - lqw.eq(BmsCenterExtend::getCenterId,param.getSourceCenterId()); lqw.in(BmsCenterExtend::getId,updateIds); List sourcesCenterList = this.list(lqw); for (BmsCenterExtend centerExtend : sourcesCenterList) { @@ -297,7 +313,6 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl delUsrLqw = new LambdaQueryWrapper<>(); delUsrLqw.eq(BmsCenterExtendUser::getChildExtId,centerExtend.getId()); centerExtendUserService.remove(delUsrLqw);