xujun

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

@@ -43,5 +43,7 @@ public class ComProjectFundPlan extends BaseEntity {
     /** 年度5资金数额 */
     @ApiModelProperty(value = "年度5资金数额", position = 3 )
     private BigDecimal yearValue5;
-
+    /** 总金额 */
+    @ApiModelProperty(value = "总金额", position = 3)
+    private BigDecimal totalAmount;
 }
\ No newline at end of file

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

@@ -46,4 +46,7 @@ public class ComProjectFundPlanDTO extends BaseDTO {
     /** 年度5资金数额 */
     @ApiModelProperty(value = "年度5资金数额", position = 3 )
     private BigDecimal yearValue5;
+    /** 总金额 */
+    @ApiModelProperty(value = "总金额", position = 3)
+    private BigDecimal totalAmount;
 }
\ No newline at end of file

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

@@ -43,4 +43,7 @@ public class ComProjectFundPlanQueryVO extends PaginationVO{
     /** 年度5资金数额 */
     @ApiModelProperty(value = "年度5资金数额", position = 3 )
     private BigDecimal yearValue5;
+    /** 总金额 */
+    @ApiModelProperty(value = "总金额", position = 3)
+    private BigDecimal totalAmount;
 }
\ No newline at end of file

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

@@ -46,6 +46,7 @@ public class ComProjectFundPlanServiceImpl extends BaseServiceImpl<ComProjectFun
             newVO.setYearValue3(new BigDecimal(0.00));
             newVO.setYearValue4(new BigDecimal(0.00));
             newVO.setYearValue5(new BigDecimal(0.00));
+            newVO.setTotalAmount(new BigDecimal(0.00));
             newVO.setFundName(e.getName());
             fundPlanList.add(newVO);
         });

science-admin/src/main/resources/mapper/ComProjectFundPlanDAO.xml

@@ -4,7 +4,7 @@
 <!-- 经费申请表（任务书/项目申请书） -->
 <mapper namespace="com.yiboshi.science.dao.ComProjectFundPlanDAO">
     <sql id="allColumns">
-        id, fund_id, object_id, year_value1, year_value2, year_value3, year_value4, year_value5, created, updated
+        id, fund_id, object_id, year_value1, year_value2, year_value3, year_value4, year_value5, total_amount, created, updated
     </sql>
     <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectFundPlanDTO">
         SELECT a.*, b.name as fundName