公式相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/FB02.java

@@ -5,6 +5,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.manager.dto.FormData;
 import org.springblade.manager.entity.FormulaDataBlock;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -74,8 +77,10 @@ public class FB02 extends EvaSummary<Item02>{
                 int pass = ib.stream().mapToInt(ItemBlock::getSubPass).sum();
                 if (total > 0) {
                     double rate = (double) pass / (double) total;
-                    if (rate >= 0 && rate <= 100) {
-                        xm.setPassRate(rate);
+                    if (rate >= 0.9 && rate <= 100) {
+                        xm.setPassRate(new BigDecimal(rate*100).setScale(1, RoundingMode.HALF_UP).doubleValue());
+                    }else{
+                        xm.setPassRate(100D);
                     }
                 }
                 this.getDatas().add(xm);

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

@@ -1579,7 +1579,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     /*调整页数并返回当所有页*/
    public List<WbsTreeContract>  adjustPageSize(int pageSizeNow,WtcEva wtc,List<FormData> processFds){
        try {
-           List<WbsTreeContract> list =this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getInitTableName,wtc.getInitTableName()).eq(WbsTreeContract::getContractId,wtc.getContractId()).eq(WbsTreeContract::getParentId,wtc.getParentId()).orderByDesc(WbsTreeContract::getCreateTime));
+           List<WbsTreeContract> list =this.wbsTreeContractService.list(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getInitTableName,wtc.getInitTableName()).eq(WbsTreeContract::getContractId,wtc.getContractId()).eq(WbsTreeContract::getParentId,wtc.getParentId()).orderByAsc(WbsTreeContract::getCreateTime));
            int length=list.size();
            if(pageSizeNow>0&&pageSizeNow!=length){
                int dx = pageSizeNow-length;
@@ -2493,8 +2493,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             + pkeyId, WtcEva.class);
             if(wtcEva.isEva()){
                 List<FormData> processFds = this.createFormDataByTableName(wtcEva.getInitTableName());
-                FB02 fb02 = new FB02(processFds);
                 LinkedList<String> treeCode = new LinkedList<>(FormulaUtils.treeCodeSplit(wtcEva.getTreeCode()));
+                FB02 fb02 = new FB02(processFds);
                 List<FormulaDataBlock> formulaDataBlocks = this.getSqlList("select a.id,a.type,a.sw_id swId,a.contract_id contractId,a.val from m_formula_data_block a join (select parent_id from m_wbs_tree_contract where tree_code like '" + treeCode.getLast() + "%' and contract_id =" + wtcEva.getContractId() + " and major_data_type=2 and is_deleted=0 ORDER BY tree_code)b on a.sw_id=b.parent_id ", FormulaDataBlock.class);
                 if (formulaDataBlocks!=null&&formulaDataBlocks.size() > 0) {
                     /*就是分项工程节点的父节点名称*/