计量加单位

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ScheduledTasks.java

@@ -0,0 +1,27 @@
+package org.springblade.manager.controller;
+
+import org.springblade.manager.service.IWbsTreeContractService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ScheduledTasks {
+    private int i = 0;  //18
+    private final IWbsTreeContractService iWbsTreeContractService;
+
+    @Autowired
+    public ScheduledTasks(IWbsTreeContractService iWbsTreeContractService) {
+        this.iWbsTreeContractService = iWbsTreeContractService;
+    }
+    /**递归设置m_wbs_tree_contract 的 p_id 和 ancestors*/
+    //@Scheduled(fixedDelay = 5000) // 上一次任务执行完毕后等待5秒再执行下一次
+    public void runTask() {
+        //246 i=88,183 i=83
+        if(i==6){
+            return;
+        }
+        iWbsTreeContractService.diGuiWbs(i);
+        i++;
+    }
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ScheduledTasks1.java

@@ -2,6 +2,7 @@ package org.springblade.manager.controller;
 
 import org.springblade.manager.service.IWbsTreePrivateService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -13,10 +14,11 @@ public class ScheduledTasks1 {
     public ScheduledTasks1(IWbsTreePrivateService iWbsTreePrivateService) {
         this.iWbsTreePrivateService = iWbsTreePrivateService;
     }
-
+    /**递归设置m_wbs_tree_private 的 p_id 和 ancestors*/
     //@Scheduled(fixedDelay = 5000) // 上一次任务执行完毕后等待5秒再执行下一次
     public void runTask() {
-        if(i==99){
+        //246 i=105, 183 i=88
+        if(i==89){
             return;
         }
         iWbsTreePrivateService.diGuiWbs(i);

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -3183,7 +3183,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                       monthlyReport.setBeforeEndMoney(beforeEndMoney);
                       BigDecimal percentage = monthlyReport.getBeforeEndMoney().divide(monthlyReport.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                       percentage = percentage.setScale(2, BigDecimal.ROUND_HALF_UP); // 设置
-                      if(!percentage.equals(0.00)){
+                      if(percentage.compareTo(BigDecimal.ZERO)!=0){
                           monthlyReport.setBeforeEndC(percentage+"%");
                       }
 
@@ -3197,7 +3197,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
              monthlyReport.setNowMoney((BigDecimal)o);
               BigDecimal percentage = monthlyReport.getNowMoney().divide(monthlyReport.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
               percentage = percentage.setScale(2, BigDecimal.ROUND_HALF_UP); // 设置小数位数为2
-              if(!percentage.equals(0.00)){
+              if(percentage.compareTo(BigDecimal.ZERO)!=0){
                   monthlyReport.setNowC(percentage+"%");
               }
 
@@ -3218,7 +3218,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             if(ObjectUtil.isNotEmpty(monthlyReport.getNowEndMoney())){
                 BigDecimal percentage = monthlyReport.getNowEndMoney().divide(monthlyReport.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 percentage = percentage.setScale(2, BigDecimal.ROUND_HALF_UP); // 设置
-                if(!percentage.equals(0.00)){
+                if(percentage.compareTo(BigDecimal.ZERO)!=0){
                     monthlyReport.setNowEndC(percentage+"%");
                 }
 
@@ -3260,7 +3260,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
              m3.setBeforeEndMoney(beforeEndMoney);
              BigDecimal percentage1 = m3.getBeforeEndMoney().divide(m3.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
              percentage1 = percentage1.setScale(2, BigDecimal.ROUND_HALF_UP);
-            if(!percentage1.equals(0.00)){
+            if(percentage1.compareTo(BigDecimal.ZERO)!=0){
                 m3.setBeforeEndC(percentage1+"%");
             }
 
@@ -3268,14 +3268,14 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         m3.setNowMoney(nowMoney);
         BigDecimal percentage2 = m3.getNowMoney().divide(m3.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
         percentage2 = percentage2.setScale(2, BigDecimal.ROUND_HALF_UP);
-        if(!percentage2.equals(0.00)){
+        if(percentage2.compareTo(BigDecimal.ZERO)!=0){
             m3.setNowC(percentage2+"%");
         }
 
         m3.setNowEndMoney(nowEndMoney);
         BigDecimal percentage3 = m3.getNowEndMoney().divide(m3.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
         percentage3 = percentage3.setScale(2, BigDecimal.ROUND_HALF_UP);
-        if(!percentage3.equals(0.00)){
+        if(percentage3.compareTo(BigDecimal.ZERO)!=0){
             m3.setNowEndC(percentage3+"%");
         }
 
@@ -3323,7 +3323,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         m11.setNowMoney(m3.getNowMoney());
         BigDecimal percentage7 = m11.getNowMoney().divide(m11.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
         percentage7 = percentage7.setScale(2, BigDecimal.ROUND_HALF_UP);
-        if(!percentage7.equals(0.00)){
+        if(percentage7.compareTo(BigDecimal.ZERO)!=0){
             m11.setNowC(percentage7+"%");
         }
 
@@ -3380,7 +3380,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             m19.setBeforeEndMoney(m11.getBeforeEndMoney().subtract(m18.getBeforeEndMoney()));
             BigDecimal percentage4 = m19.getBeforeEndMoney().divide(m11.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             percentage4 = percentage4.setScale(2, BigDecimal.ROUND_HALF_UP);
-            if(!percentage4.equals(0.00)){
+            if(percentage4.compareTo(BigDecimal.ZERO)!=0){
                 m19.setBeforeEndC(percentage4+"%");
             }
 
@@ -3388,14 +3388,14 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         m19.setNowMoney(m11.getNowMoney().subtract(m18.getNowMoney()));
         BigDecimal percentage5 = m19.getNowMoney().divide(m11.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
         percentage5 = percentage5.setScale(2, BigDecimal.ROUND_HALF_UP);
-        if(!percentage5.equals(0.00)){
+        if(percentage5.compareTo(BigDecimal.ZERO)!=0){
             m19.setNowC(percentage5+"%");
         }
 
         m19.setNowEndMoney(m11.getNowEndMoney().subtract(m18.getNowEndMoney()));
         BigDecimal percentage6 = m19.getNowEndMoney().divide(m11.getAfterCurrentMeterMoney(), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
         percentage6 = percentage6.setScale(2, BigDecimal.ROUND_HALF_UP);
-        if(!percentage6.equals(0.00)){
+        if(percentage6.compareTo(BigDecimal.ZERO)!=0){
             m19.setNowEndC(percentage6+"%");
         }
 
@@ -3547,6 +3547,9 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     //原合同金额
                     vo.setCurrentMeterMoney(form.getContractMoney().setScale(0, RoundingMode.HALF_UP));
                     vo.setSort(query.indexOf(form));
+                    if(ObjectUtil.isNotEmpty(form.getUnit())){
+                        vo.setUnit(form.getUnit());
+                    }
                     break;
                 }
             }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -2602,11 +2602,18 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         System.out.println("66666666666");
     }
     public void diGuiWbs(int i) {
+        List<Long>contractIds=new ArrayList<>();
+        contractIds.add(1750755552044064769L);
+        contractIds.add(1750756463776702465L);
+        contractIds.add(1750756833940807682L);
+        contractIds.add(1750757133997121538L);
+        contractIds.add(1750757280558686209L);
+        contractIds.add(1750757576810766337L);
         QueryWrapper<WbsTreeContract> wbsTreeContractQueryWrapper = new QueryWrapper<>();
         wbsTreeContractQueryWrapper.select("p_key_id","id","p_id","wbs_id","contract_id","parent_id","ancestors");
         wbsTreeContractQueryWrapper.eq("parent_id",0);
         wbsTreeContractQueryWrapper.eq("is_deleted",0);
-        wbsTreeContractQueryWrapper.isNotNull("contract_id");
+        wbsTreeContractQueryWrapper.in("contract_id",contractIds);
         wbsTreeContractQueryWrapper.isNotNull("wbs_id");
         List<WbsTreeContract> list = this.list(wbsTreeContractQueryWrapper);
         if(!list.isEmpty()){
@@ -2620,7 +2627,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
             //递归设置pid和ancestors
             setPidAndAncestors(map,wbsTreeContract,updateList);
-            System.out.println("第"+i+"次递归:"+updateList.size());
             for (WbsTreeContract contract : updateList) {
                 UpdateWrapper wrapper=new UpdateWrapper();
                 wrapper.set("p_id",contract.getPId());
@@ -2629,7 +2635,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 this.update(wrapper);
             }
         }
-        System.out.println(Colour.RED.getCode()+"第"+i+"次递归完成"+Colour.RESET.getCode());
+        System.out.println(Colour.RED.getCode()+"第"+i+"次递归完成============================================================================================="+Colour.RESET.getCode());
 
 
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -19,6 +19,7 @@ import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 import org.springblade.business.feign.InformationQueryClient;
 import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.Colour;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -2994,7 +2995,6 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
 
             //递归设置pid和ancestors
             setPidAndAncestors(map,wbsTreePrivate,updateList);
-            System.out.println("第"+i+"次递归:"+updateList.size());
             for (WbsTreePrivate wbsTreePrivate1 : updateList) {
                UpdateWrapper<WbsTreePrivate>wrapper=new UpdateWrapper<>();
                 wrapper.set("p_id",wbsTreePrivate1.getPId());
@@ -3003,7 +3003,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 this.update(wrapper);
             }
         }
-        System.out.println("第"+i+"次递归完成");
+        System.out.println(Colour.RED.getCode()+"第"+i+"次递归完成======================================================================================="+Colour.RESET.getCode());
 
 
     }