Ver código fonte

修改项目进度计算逻辑修改,新增判空

anderx 1 ano atrás
pai
commit
f75ae8c991

+ 1 - 1
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -40,7 +40,7 @@ public class TaskDetailsController extends BaseController {
     public Result<TaskDetails> add(TaskDetails taskDetails,Integer type) {
         Result<TaskDetails> res = new Result<>();
         if (taskDetailsService.checkTid(taskDetails)){
-            res.getError().add(buildError("项目进度与年份", ErrorConstants.PARAM_BEING_ERROR));
+            res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"项目进度与年份"));
             return res;
         }
         return res.data(this.taskDetailsService.insert(taskDetails,type));

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

@@ -221,9 +221,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             BigDecimal actualRdAmount = taskDetails.getActualRdAmount();
             BigDecimal res3 = actualRdNumber.divide(actualRdAmount, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
             taskDetails.setActualRdRate(res3.doubleValue());
-            BigDecimal res4 = getBigDecimal(actualRdAmount, actualRdNumber, taskDetails);
+            if (taskDetails.getLastRdSalesAmount()!=null && taskDetails.getLastRdBudget()!=null&&
+                    taskDetails.getBeforeLastRdSalesAmount()!=null && taskDetails.getBeforeLastRdBudget()!=null){
+                BigDecimal res4 = getBigDecimal(actualRdAmount, actualRdNumber, taskDetails);
                 taskDetails.setThreeYearsActualRdRate(res4.doubleValue());
-
+            }
         }
         //计算立项资料占比
         if (taskDetails.getProjectApprovalWriteNumber()!=null){
@@ -313,7 +315,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
 
     @Override
     public Object logDetails(Integer id) {
-        TaskDetailsLog taskDetailsLog = taskDetailsLogMapper.selectById(id);
+        TaskDetailsLog log = taskDetailsLogMapper.selectById(id);
+        TaskDetails taskDetails = taskDetailsMapper.selectById(log.getTdid());
         return null;
     }