后继成本中心修复；拜访定位标识调整；

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;

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")

src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java

@@ -190,6 +190,14 @@ public class BazVisitInstanceServiceImpl extends ServiceImpl<BazVisitInstanceMap
         instanceFlow.setSubmitTime(LocalDateTime.now());
         instanceFlow.setRemark(param.getRemark());
         instanceFlowService.updateById(instanceFlow);
+        //定位信息缺失标识
+        if(instanceFlowDb.getPositionState().equals(2)
+                &&("0".equals(param.getValLocalX())|| "0".equals(param.getValLocalY()))){
+            BazVisitInstance visitInstance = new BazVisitInstance();
+            visitInstance.setMissLocalFlag(1);
+            visitInstance.setId(instanceFlowDb.getVisitInstanceId());
+            this.updateById(visitInstance);
+        }
         //完成自动更新
         LambdaQueryWrapper<BazVisitInstanceFlow> countLqw = new LambdaQueryWrapper<>();
         countLqw.eq(BazVisitInstanceFlow::getVisitInstanceId,instanceFlowDb.getVisitInstanceId());

src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java

@@ -68,6 +68,15 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl<BmsCenterExtendMappe
         if (this.checkIsStop(type,centerId)){
             Assert.throwEx("当前成本中心已分配");
         }
+        for (BmsCenterExtendBo.Item targetCenter : targetCenters) {
+            if(targetCenter.getTargetCenterId().equals(param.getSourceCenterId())){
+                Assert.throwEx("后继成本中心与当前成本中心相同");
+            }
+            boolean b = this.checkIsStop(type,targetCenter.getTargetCenterId());
+            if(b){
+                Assert.throwEx("部分后继成本中心已分配");
+            }
+        }
         TbsCenterDto centerDto = centerDtoService.getCenterDto(type,centerId);
         //停止时间
         //LocalDateTime nowTime = LocalDateTime.now();
@@ -247,10 +256,18 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl<BmsCenterExtendMappe
         if(totalRate.compareTo(n100)!=0){
             Assert.throwEx("权重合计必须百分百");
         }
+        for (BmsCenterExtendBo.Item targetCenter : targetCenters) {
+            if(targetCenter.getTargetCenterId().equals(param.getSourceCenterId())){
+                Assert.throwEx("后继成本中心与当前成本中心相同");
+            }
+            boolean b = this.checkIsStop(type,targetCenter.getTargetCenterId());
+            if(b){
+                Assert.throwEx("部分后继成本中心已分配");
+            }
+        }
         List<BmsCenterExtendBo.Item> saveExtendBo = targetCenters.stream().filter(a->a.getId()==null).collect(Collectors.toList());
         List<BmsCenterExtendBo.Item> updExtendBo = targetCenters.stream().filter(a->a.getId()!=null).collect(Collectors.toList());
-        List<Long> updateIds = targetCenters.stream().filter(a->a.getId()!=null
-            ).map(a->a.getId()).collect(Collectors.toList());
+        List<Long> 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<BmsCenterExtendMappe
         //更新
         LambdaQueryWrapper<BmsCenterExtend> lqw = new LambdaQueryWrapper<>();
         lqw.eq(BmsCenterExtend::getCenterType,param.getType());
-        lqw.eq(BmsCenterExtend::getCenterId,param.getSourceCenterId());
         lqw.in(BmsCenterExtend::getId,updateIds);
         List<BmsCenterExtend> sourcesCenterList = this.list(lqw);
         for (BmsCenterExtend centerExtend : sourcesCenterList) {
@@ -297,7 +313,6 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl<BmsCenterExtendMappe
                     centerExtend.setWeightRate(item.getWeightRate());
                     centerExtend.setStartTime(nowTime);
                     this.updateById(centerExtend);
-                    //todo bug boolean noUpdUserList = item.getUpdateUserListFlag()!=null&&item.getUpdateUserListFlag().equals(0);
                     LambdaQueryWrapper<BmsCenterExtendUser> delUsrLqw = new LambdaQueryWrapper<>();
                     delUsrLqw.eq(BmsCenterExtendUser::getChildExtId,centerExtend.getId());
                     centerExtendUserService.remove(delUsrLqw);