测试反馈问题5

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/EntrustDataInfoVO.java

@@ -18,8 +18,7 @@ package org.springblade.business.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.business.entity.EntrustInfo;
+
 
 /**
  * 委托单信息表视图实体类

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

@@ -74,6 +74,8 @@ public class ConstructionSchedule implements  DataModel{
     @JSONField(name = "key_18",label="单项计划完成-ZJ",ordinal = 12)
     private String itemProgress;
     /**单项计划完成*/
+    @JSONField(name = "key_26",label="上期末累计占该合同金额-ZJ",ordinal = 12)
+    private String prePayPercent;
     @JSONField(name = "key_19",label="本期占该合同金额-ZJ",ordinal = 12)
     private String currentPayPercent;
     /**本期末累计占变更后的总金额*/

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

@@ -26,6 +26,8 @@ public class InterimMeter implements  DataModel{
 
     @JSONField(name = "key_2",label="部位名称")
     private String partName;
+    @JSONField(name = "key_18",label="起讫桩号")
+    private String stakeRange;
 
     @JSONField(name = "key_3",label="交工证书编号")
     private String certificateNumber;

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

@@ -2,6 +2,9 @@ package org.springblade.manager.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang.StringUtils;
+import org.springblade.core.tool.utils.RegexUtil;
+
 import java.math.BigDecimal;
 
 /**
@@ -64,4 +67,19 @@ public class MeterApply {
 
         @ApiModelProperty(value = "合同图号")
         private String contractPicture;
+        @ApiModelProperty(value = "开始桩号")
+        private String startStake;
+        @ApiModelProperty(value = "结束桩号")
+        private String endStake;
+        @ApiModelProperty(value = "单元名称")
+        private String nodeName;
+
+        public String getStakeRange(){
+                if(startStake!=null&&endStake!=null){
+                        return startStake+"~"+endStake;
+                }else if(nodeName!=null){
+                      return   RegexUtil.findResult("(?i)\\w*k\\d+\\+[\\d.]+~\\w*k\\d+\\+[\\d.]+",nodeName);
+                }
+                return "";
+        }
 }

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

@@ -926,6 +926,8 @@ public class ExecutorMeter extends FormulaExecutor {
                 sis.setCurrentPayPercent(ratioFc.apply(sis.getCurrentPeriodPay(), sis.getChangeMoney()));
                 /* 本期末累计支付金额占合同比*/
                 sis.setPayPercent(ratioFc.apply(sis.getCurrentPeriodEndPay(),sis.getChangeMoney()));
+                /**上期末占合合同金额*/
+                sis.setPayPercent(ratioFc.apply(subtractFc.apply(sis.getCurrentPeriodEndPay(),sis.getCurrentPeriodPay()),sis.getContractMoney()));
                 /*变更金额*/
                 sis.setChangeMoneyAll(subtractFc.apply(sis.getChangeMoney(),sis.getContractMoney()));
                 /*变更金额*/
@@ -1023,7 +1025,7 @@ public class ExecutorMeter extends FormulaExecutor {
                 String brief="开工日期："+baseInfo.getStartDatePlan()+" 始算工期日："+baseInfo.getStartDate()
                         +" 合同完成日期："+baseInfo.getEndDatePlan()+" 合同期限"+contractDay+"天 时间延长"+extended+"天 修改后合同期限"+ totalDay
                         +"天（即至"+baseInfo.getEndDate()+"）"
-                        + "\n 合同总价"+baseInfo.getContractAmount().divide(new BigDecimal(10000),2,RoundingMode.HALF_UP)+"万元、暂定金"
+                        + "\n 合同总价"+CustomFunction.xN(baseInfo.getContractAmount(),0.0001)+"万元、暂定金"
                         +CustomFunction.xN(baseInfo.getProvisionalSum(),0.0001)+"万元、工程量清单金额"
                         +CustomFunction.xN(baseInfo.getBOQAmount(),0.0001)+"万元、工程量变更（"+CustomFunction.xN(changeTokenTotal,0.0001)+"）万元、估计最终金额"+CustomFunction.xN(totalMoney,0.0001)+"万元，时间已过"
                         +passDay+"天，占合同工期"+StringUtils.number2String(ratioFc.apply(passDay,totalDay),2)+"%";

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

@@ -161,7 +161,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<MeterApply>> getMeterApplyFc() {
         return   MeterPeriodId->{
-            String sql="select a.id,contract_unit_id,contract_period_id,period_number,meter_number,engineer_divide,part_name,certificate_number,meter_money,change_token_number,picture_url,picture_name,a.calculate_formula ,b.contract_picture from  s_middle_meter_apply a join s_meter_tree_contract b on a.contract_unit_id= b.id where a.contract_period_id="+MeterPeriodId;
+            String sql="select a.id,contract_unit_id,contract_period_id,period_number,meter_number,engineer_divide,part_name,certificate_number,meter_money,change_token_number,picture_url,picture_name,a.calculate_formula ,b.contract_picture ,b.start_stake,b.end_stake,b.node_name  from  s_middle_meter_apply a join s_meter_tree_contract b on a.contract_unit_id= b.id where a.contract_period_id="+MeterPeriodId;
             return getEntityList(sql,MeterApply.class);
         };
     }