debug

src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java

@@ -384,7 +384,7 @@ public class BmsRegionController {
         }
         //删除商品限制
         bmsRuleRegionService.removeByRegionId(id);
-        boolean result = bmsRegionService.removeById(id);
+        bmsRegionService.removeById(id);
         //清空临时表
         hisUserSupplierService.cleanTable();
         return R.ok();

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

@@ -57,19 +57,19 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
     @Override
     public boolean updateBmsRegionById(BmsRegion param){
         BmsRegion ori = this.getById(param.getId());
+        String[] paths = ori.getPathIds().split("_");
+        for (String path : paths) {
+            if(path.equals(ori.getPid())){
+                Assert.throwEx("不能选子节点为父级节点");
+            }
+        }
         param = this.flushSetLevel(param);
         boolean changePid = !ori.getPid().equals(param.getPid());
-//        if(changePid){
-//            Assert.throwEx("当前版本限制上下级变更");
-//        }
         boolean b = this.updateById(param);
         if(!ori.getName().equals(param.getName())||changePid) {
-            BmsRegion parentRegion = this.updatePathByPid(param.getId());
+            //更新相关表(网点)
+            this.updatePathByPid(param.getId());
             if(changePid){
-                //hisUserSupplierService.cleanTable();
-                /*停用的逻辑
-                hisUserChannelPointService.removeRegion(2,ori.getPathIds());
-                hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());*/
                 //更新客户
                 BmsRegion currentRegion = this.getById(param.getId());
                 List<BmsSupplier> regionSupplierList = bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getId()),ori.getLevel());
@@ -271,6 +271,11 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
         this.updateById(param);
     }
 
+    /**
+     * 更新含路径相关的表，如网点
+     * @param pid
+     * @return
+     */
     private BmsRegion updatePathByPid(String pid){
         BmsRegion parRegion = this.getById(pid);
         List<BmsRegion> regionList =  this.listChild(pid);

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -370,21 +370,21 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private void buildMainData4ROI(TbsCostApply tbsCostApply, Map<String, Object> data) {
         YtdQtdToOAVo ytdQtdToOAVo =  birRoiRateService.buildYtdAndQtdData(tbsCostApply);
         data.put("ytdCusExpenseRate",ytdQtdToOAVo.getYtdCustomerPercent()==null?
-                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP));
+                "0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP)+"");
         data.put("ytdEmpExpenseRate",ytdQtdToOAVo.getYtdUserPercent()==null?
-                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdUserPercent()).setScale(2, RoundingMode.HALF_UP));
+                "0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdUserPercent()).setScale(2, RoundingMode.HALF_UP)+"");
         data.put("ytdAdminiExpenseRate",ytdQtdToOAVo.getYtdRegionPercent()==null?
-                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegionPercent()).setScale(2, RoundingMode.HALF_UP));
+                "0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegionPercent()).setScale(2, RoundingMode.HALF_UP)+"");
         data.put("ytdSalesExpenseRate",ytdQtdToOAVo.getYtdRegion2Percent()==null?
-                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP));
+                "0":BigDecimal.valueOf(ytdQtdToOAVo.getYtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP)+"");
         data.put("cusExpenseRate",ytdQtdToOAVo.getQtdCustomerPercent()==null?
-                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP));
+                "0":BigDecimal.valueOf(ytdQtdToOAVo.getQtdCustomerPercent()).setScale(2, RoundingMode.HALF_UP)+"");
         data.put("empExpenseRate",ytdQtdToOAVo.getQtdUserPercent()==null?
-                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdUserPercent()).setScale(2, RoundingMode.HALF_UP));
+                "0":BigDecimal.valueOf(ytdQtdToOAVo.getQtdUserPercent()).setScale(2, RoundingMode.HALF_UP)+"");
         data.put("salesExpenseRate",ytdQtdToOAVo.getQtdRegionPercent()==null?
-                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegionPercent()).setScale(2, RoundingMode.HALF_UP));
+                "0":BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegionPercent()).setScale(2, RoundingMode.HALF_UP)+"");
         data.put("adminiExpenseRate",ytdQtdToOAVo.getQtdRegion2Percent()==null?
-                BigDecimal.ZERO:BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP));
+                "0":BigDecimal.valueOf(ytdQtdToOAVo.getQtdRegion2Percent()).setScale(2, RoundingMode.HALF_UP)+"");
 
         //插入记录表前移除历史记录
 //        tbsCostPercentMapper.delByCostApplyId(tbsCostApply.getId());