Browse Source

新建年度预算增加项目总额

ly 2 days ago
parent
commit
0ab90d2331

+ 5 - 0
src/main/java/com/liang/entity/PrjProject.java

@@ -207,5 +207,10 @@ public class PrjProject implements Serializable {
207 207
      */
208 208
 
209 209
     private Integer sqrxm;
210
+
211
+    /**
212
+     * 项目总额
213
+     */
214
+    private Double xmze;
210 215
 }
211 216
 

+ 3 - 1
src/main/resources/mapper/PrjProjectDao.xml

@@ -41,6 +41,7 @@
41 41
         <result property="nf" column="NF" jdbcType="VARCHAR"/>
42 42
         <result property="nys" column="NYS" jdbcType="INTEGER"/>
43 43
         <result property="sfxg" column="SFXG" jdbcType="INTEGER"/>
44
+        <result property="xmze" column="XMZE" jdbcType="DOUBLE"/>
44 45
     </resultMap>
45 46
 
46 47
     <resultMap type="com.liang.entity.FeeManagemant" id="FeeManagementMap">
@@ -523,7 +524,8 @@
523 524
         where id in (select dkyfzrid from
524 525
         (select DISTINCT zwmc, SUBSTRING(dkyfzr, number,CHARINDEX(',',dkyfzr+',',number)-number) as dkyfzrid
525 526
         from prj_Project WITH(nolock) ,master..spt_values with(nolock) where number >= 1 and len(DKYFZR) > number
526
-        and SUBSTRING(','+DKYFZR,number,1)=',' and ID = p.ID) t)) B for xml path('')),1,1,'')) as DKYFZRXM
527
+        and SUBSTRING(','+DKYFZR,number,1)=',' and ID = p.ID) t)) B for xml path('')),1,1,'')) as DKYFZRXM,
528
+        COALESCE((select SUM(pf.CZJE) from prj_FeeScheme pf where pf.ZB = p.ID), 0.00) AS XMZE
527 529
         from prj_Project p
528 530
         left join base_ProjectType t on t.XMLX = p.XMLX
529 531
         left join sys_user_info u on u.user_id = p.CJR

+ 1 - 0
src/main/resources/templates/annualbudget/list.html

@@ -50,6 +50,7 @@
50 50
                                 </select>
51 51
                             </div>
52 52
                         </div>
53
+                        <br/>
53 54
                         <div class="layui-inline">
54 55
                             <label class="layui-form-label" style="width: 70px">项目类型</label>
55 56
                             <div class="layui-input-inline" style="width: 140px">

+ 8 - 5
src/main/resources/templates/annualbudget/list_project.html

@@ -17,7 +17,7 @@
17 17
                 <form class="layui-form" action="" lay-filter="search-form">
18 18
                     <div class="layui-form-item">
19 19
                         <div class="layui-inline" style="margin-left: -10px">
20
-                            <label class="layui-form-label" style="width: 60px">中文名称</label>
20
+                            <label class="layui-form-label" style="width: 60px">项目名称</label>
21 21
                             <div class="layui-input-inline" style="width: 200px">
22 22
                                 <input type="text" id="zwmc" name="zwmc" autocomplete="off" class="layui-input">
23 23
                             </div>
@@ -85,12 +85,15 @@
85 85
             // defaultToolbar: ['filter', 'exports', 'print'],
86 86
             cols: [
87 87
                 [
88
-                    {type: 'numbers'},
89
-                    {field: 'zwmc', width: '35%', title: '中文名称'},
88
+                    {type: 'numbers',title: '序号'},
89
+                    {field: 'zwmc', width: '35%', title: '项目名称'},
90 90
                     {field: 'erpbh', width: '15%', title: 'ERP编号'},
91
-                    {field: 'xmlxmc', width: '18%', title: '项目类型'},
91
+                    {field: 'xmze',width: '11%',title: '总额(万元)',align: 'right'},
92
+                    {field: 'ssbmmc',width: '11%',title: '所属部门'},
93
+                    {field: 'cjrxm',width: '7%',title: '创建人'},
92 94
                     {field: 'qs', width: '10%', title: '起始', align: 'center'},
93
-                    {field: 'wc', width: '10%', title: '完成', align: 'center'}
95
+                    {field: 'wc', width: '10%', title: '完成', align: 'center'},
96
+                    {field: 'xmlxmc', width: '18%', title: '项目类型'},
94 97
                 ]
95 98
             ],
96 99
             autoSort: false,