任务书增加经费及预算

src/main/java/com/liang/entity/PrjProject.java

@@ -227,5 +227,15 @@ public class PrjProject implements Serializable {
      * 已付总额
      */
     private  Double yfze;
+
+    /**
+     * 经费
+     */
+    private Double jf;
+
+    /**
+     * 出资总额
+     */
+    private Double czze;
 }
 

src/main/resources/mapper/PrjProjectDao.xml

@@ -45,6 +45,8 @@
         <result property="sqze" column="SQZE" jdbcType="DOUBLE"/>
         <result property="bzze" column="BZZE" jdbcType="DOUBLE"/>
         <result property="yfze" column="YFZE" jdbcType="DOUBLE"/>
+        <result property="jf" column="JF" jdbcType="DOUBLE"/>
+        <result property="czze" column="CZZE" jdbcType="DOUBLE"/>
     </resultMap>
 
     <resultMap type="com.liang.entity.FeeManagemant" id="FeeManagementMap">
@@ -500,7 +502,9 @@
         AND sp.SPZT = '审批结束'
         ) * 10000,
         0.00
-        ) AS YFZE
+        ) AS YFZE,
+        COALESCE((SELECT SUM(pf.CZJE) FROM prj_FeeScheme pf WHERE pf.ZB=p.ID) * 10000,0.00) AS CZZE,
+        COALESCE((SELECT SUM(ps.JF) FROM prj_SubTopic ps WHERE ps.XM = p.ID)*10000,0.00) AS JF
         FROM
         prj_Project p
         LEFT JOIN base_ProjectType t ON t.XMLX = p.XMLX

src/main/resources/templates/prjproject/list.html

@@ -206,9 +206,11 @@
                     {field: 'zwmc', width: '26%', title: '中文名称'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},
-                    {field: 'sqze',width: '10%',title: '申请总额(元)',align: 'right'},
-                    {field: 'bzze', width: '10%', title: '报账总额(元)',align: 'right'},
-                    {field: 'yfze',width: '10%',title: '已付总额(元)',align: 'right'},
+                    {field: 'jf',width: '7%' ,title: '子课题经费(元)' ,align: 'right'},
+                    {field: 'czze', width: '7%',title: '出资总额(元)', align: 'right'},
+                    {field: 'sqze',width: '7%',title: '申请总额(元)',align: 'right'},
+                    {field: 'bzze', width: '7%', title: '报账总额(元)',align: 'right'},
+                    {field: 'yfze',width: '7%',title: '已付总额(元)',align: 'right'},
                     {field: 'xmlxmc', width: '15%', title: '项目类型'},
                     {field: 'qs', width: '8%', title: '起始', align: 'center'},
                     {field: 'wc', width: '8%', title: '完成', align: 'center'},

src/main/resources/templates/prjproject/list_deptproject.html

@@ -162,6 +162,11 @@
                     {field: 'zwmc', width: '26%', title: '中文名称'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},
+                    {field: 'jf',width: '7%' ,title: '子课题经费(元)' ,align: 'right'},
+                    {field: 'czze', width: '7%',title: '出资总额(元)', align: 'right'},
+                    {field: 'sqze',width: '7%',title: '申请总额(元)',align: 'right'},
+                    {field: 'bzze', width: '7%', title: '报账总额(元)',align: 'right'},
+                    {field: 'yfze',width: '7%',title: '已付总额(元)',align: 'right'},
                     {field: 'xmlxmc', width: '15%', title: '项目类型'},
                     {field: 'qs', width: '8%', title: '起始', align: 'center'},
                     {field: 'wc', width: '8%', title: '完成', align: 'center'},

src/main/resources/templates/prjproject/list_myproject.html

@@ -157,6 +157,11 @@
                     {field: 'zwmc', width: '26%', title: '中文名称'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},
+                    {field: 'jf',width: '7%' ,title: '子课题经费(元)' ,align: 'right'},
+                    {field: 'czze', width: '7%',title: '出资总额(元)', align: 'right'},
+                    {field: 'sqze',width: '7%',title: '申请总额(元)',align: 'right'},
+                    {field: 'bzze', width: '7%', title: '报账总额(元)',align: 'right'},
+                    {field: 'yfze',width: '7%',title: '已付总额(元)',align: 'right'},
                     {field: 'xmlxmc', width: '15%', title: '项目类型'},
                     {field: 'qs', width: '8%', title: '起始', align: 'center'},
                     {field: 'wc', width: '8%', title: '完成', align: 'center'},

src/main/resources/templates/prjsubtopic/view.html

@@ -176,7 +176,7 @@
             data: dataCompany,
             cols: [
                 [
-                    {field: 'xh', title: '序号', width: '8%', align: 'center'},
+                    {type: 'numbers', title: '序号', width: '8%', align: 'center'},
                     {field: 'dwmc', title: '单位', width: '30%'},
                     {field: 'zyyjnr', title: '主要研究内容', width: '40%'},
                     {field: 'jf', title: '经费(万元)'}
@@ -224,7 +224,7 @@
             data: dataPlan,
             cols: [
                 [
-                    {type: 'numbers', align: 'center'},
+                    {type: 'numbers', align: 'center',title: '序号'},
                     {field: 'yjnr', title: '研究内容', width: '35%'},
                     {field: 'khzb', title: '考核指标', width: '25%'},
                     {field: 'qssj', title: '起始时间', width: '15%', align: 'center'},