소스 검색

会员进度详情去掉增字比对

anderx 1 년 전
부모
커밋
4fbb7d53d6
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

+ 3 - 3
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -294,13 +294,13 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         //计算实际研发占比
         if(taskDetails.getActualRdNumber() !=null &&
                 taskDetails.getActualRdAmount() !=null){
-            BigDecimal actualRdNumber = BigDecimal.valueOf(taskDetails.getActualRdNumber());
+            BigDecimal actualSalesAmount = taskDetails.getActualSalesAmount();
             BigDecimal actualRdAmount = taskDetails.getActualRdAmount();
-            BigDecimal res3 = actualRdNumber.divide(actualRdAmount, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
+            BigDecimal res3 = actualRdAmount.divide(actualSalesAmount, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
             taskDetails.setActualRdRate(res3.doubleValue());
             if (taskDetails.getLastRdSalesAmount()!=null && taskDetails.getLastRdBudget()!=null&&
                     taskDetails.getBeforeLastRdSalesAmount()!=null && taskDetails.getBeforeLastRdBudget()!=null){
-                BigDecimal res4 = getBigDecimal(actualRdAmount, actualRdNumber, taskDetails);
+                BigDecimal res4 = getBigDecimal(actualRdAmount, actualSalesAmount, taskDetails);
                 taskDetails.setThreeYearsActualRdRate(res4.doubleValue());
             }
         }