xujun

science-admin/src/main/java/com/yiboshi/science/entity/ComTalentBudget.java

@@ -48,6 +48,10 @@ public class ComTalentBudget extends BaseEntity {
     /** 第五年预算 */
     @ApiModelProperty(value = "第五年预算", position = 7)
     private BigDecimal yearValue5;
+
+    /** 合计 */
+    @ApiModelProperty(value = "合计", position = 7)
+    private BigDecimal amountFee;
     
     /** 预算科目名称 */
     @ApiModelProperty(value = "预算科目名称", position = 8)

science-admin/src/main/java/com/yiboshi/science/param/dto/ComTalentBudgetDTO.java

@@ -43,6 +43,9 @@ public class ComTalentBudgetDTO extends BaseDTO {
     @ApiModelProperty(value = "第五年预算")
     private BigDecimal yearValue5;
 
+    @ApiModelProperty(value = "合计", position = 7)
+    private BigDecimal amountFee;
+
     @ApiModelProperty(value = "排序")
     private Integer showIndex;
 

science-admin/src/main/java/com/yiboshi/science/param/query/ComTalentBudgetQueryVO.java

@@ -43,6 +43,9 @@ public class ComTalentBudgetQueryVO extends PaginationVO {
     @ApiModelProperty(value = "第五年预算")
     private BigDecimal yearValue5;
 
+    @ApiModelProperty(value = "合计", position = 7)
+    private BigDecimal amountFee;
+
     @ApiModelProperty(value = "排序")
     private Integer showIndex;
 

science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentApplyServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -133,6 +134,9 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
         List<ComTalentBudgetDTO> bugetList = comTalentBudgetService.getList();
         dto.setBudgetList(bugetList);
 
+        dto.setApplyFund(new BigDecimal(0.00));
+        dto.setOtherFund(new BigDecimal(0.00));
+        dto.setTotalFund(new BigDecimal(0.00));
         dto.setReportYear(comBatchService.getReportYear(null, CommonEnum.timeType.talentApply.getCode()));
         dto.setCompleteStatus("0,0,0,0,0,0");
         dto.setTalentState(CommonEnum.projState.draft.getCode());
@@ -170,6 +174,13 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
         List<ComPersonScientificGainDTO> scientificList = comPersonScientificGainService.getListByTalentId(dto.getId());
         dto.setScientificList(scientificList);
 
+        if (Objects.isNull(dto.getApplyFund()))
+            dto.setApplyFund(new BigDecimal(0.00));
+        if (Objects.isNull(dto.getOtherFund()))
+            dto.setOtherFund(new BigDecimal(0.00));
+        if (Objects.isNull(dto.getTotalFund()))
+            dto.setTotalFund(new BigDecimal(0.00));
+
         return dto;
     }
 

science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentBudgetServiceImpl.java

@@ -72,6 +72,7 @@ public class ComTalentBudgetServiceImpl extends BaseServiceImpl<ComTalentBudgetD
             newVO.setYearValue3(new BigDecimal(0.00));
             newVO.setYearValue4(new BigDecimal(0.00));
             newVO.setYearValue5(new BigDecimal(0.00));
+            newVO.setAmountFee(new BigDecimal(0.00));
             newVO.setBudgetName(p.getName());
             newVO.setShowIndex(i);
             newVO.setIsRequired(p.getIsRequired());