Merge remote-tracking branch 'origin/master'

src/main/java/com/liang/controller/PrjProjectController.java

@@ -2229,9 +2229,10 @@ public class PrjProjectController extends BaseController {
     }
 
     @ResponseBody
-    @RequestMapping(value = "/byjlist", method = RequestMethod.POST)
+    @RequestMapping(value = "/byjlist/{nf}", method = RequestMethod.POST)
     public BaseResult byjlist(@RequestParam("page") Integer pageNum,
                               @RequestParam("limit") Integer pageSize,
+                              @PathVariable("nf") String nf,
                               @RequestParam(required = false, defaultValue = "", value = "zwmc") String zwmc,
                               @RequestParam(required = false, defaultValue = "", value = "erpbh") String erpbh,
                               @RequestParam(required = false, defaultValue = "", value = "xmlx") String xmlx,
@@ -2245,6 +2246,7 @@ public class PrjProjectController extends BaseController {
         paraMap.put("zwmc", zwmc);
         paraMap.put("erpbh", erpbh);
         paraMap.put("xmlx", xmlx);
+        paraMap.put("nf",nf);
 
         List<PrjProject> list = prjProjectService.getByjProjectList(paraMap);
 

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -1168,12 +1168,13 @@ public class StaBudgetapprovalController extends BaseController {
         return BaseResult.success(result);
     }
 
-    @RequestMapping(value = "/init_project", method = RequestMethod.GET)
-    public String init_project(Model model) {
+    @RequestMapping(value = "/init_project/{nf}", method = RequestMethod.GET)
+    public String init_project(Model model,@PathVariable String nf) {
         //项目类型
         List<Map<String, String>> xmlxList = projecttypeService.getXMLX();
         model.addAttribute("xmlxList", xmlxList);
 
+        model.addAttribute("nf",nf);
         return "stabudgetapproval/list_project";
     }
 

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

@@ -169,7 +169,18 @@ public class PrjProject implements Serializable {
      * @return
      */
     private double ysje;
+    /**
+     * 年份
+     */
+    private String nf;
 
+    public String getNf() {
+        return nf;
+    }
+
+    public void setNf(String nf) {
+        this.nf = nf;
+    }
 
     public Integer getId() {
         return id;

src/main/resources/mapper/PrjProjectDao.xml

@@ -38,6 +38,7 @@
         <result property="fyly" column="FYLY" jdbcType="VARCHAR"/>
         <result property="dkyfzr" column="DKYFZR" jdbcType="VARCHAR"/>
         <result property="fj2" column="FJ2" jdbcType="VARCHAR"/>
+        <result property="nf" column="NF" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap type="com.liang.entity.FeeManagemant" id="FeeManagementMap">
@@ -618,7 +619,7 @@
 
     <!--年度预算项目列表-->
     <select id="getByjProjectList" resultMap="PrjProjectMap" parameterType="map">
-        select DISTINCT p.ID, p.ZWMC, p.QS, p.WC, p.ERPBH, p.XMLX, t.XMLXMC, p.SSBM, d.dept_name as SSBMMC,
+        select DISTINCT p.ID, p.ZWMC, p.QS, p.WC, p.ERPBH, p.XMLX, t.XMLXMC, p.SSBM, d.dept_name as SSBMMC,b.NF,
         (select TOP 1 RY from prj_Member where XM = p.ID and XMJS = 1) as XMFZR,
         (select TOP 1 RYXM from prj_Member where XM = p.ID and XMJS = 1) as XMFZRXM,
         (SELECT STUFF((SELECT ','+XM from (select xm from base_Person
@@ -635,6 +636,9 @@
         where p.XMMB != 1
         and p.SPZT = '审批结束'
         and CONCAT(p.ID, f.NF) in (select CONCAT(RWS, NF) from prj_AnnualBudget)
+        <if test="nf != null and nf !=''">
+            and b.nf = #{nf}
+        </if>
         <if test="zwmc != null and zwmc != ''">
             and p.ZWMC like '%'+#{zwmc}+'%'
         </if>

src/main/resources/templates/stabudgetapproval/connect_project.html

@@ -354,7 +354,7 @@
                     shade: 0.3,
                     maxmin: true,
                     area: ['1200px', '750px'],
-                    content: AjaxUtil.ctx + 'staBudgetapproval/init_project',
+                    content: AjaxUtil.ctx + 'staBudgetapproval/init_project/' + $("#nf").val(),
                     end: function (obj) {
                         xmId = parseInt(localStorage.getItem("rws"));
                         var updateflag = localStorage.getItem("updateflag");

src/main/resources/templates/stabudgetapproval/list_project.html

@@ -75,7 +75,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjProject/byjlist',
+            url: AjaxUtil.ctx + 'prjProject/byjlist/'+[[${nf}]],
             method: 'post',
             // toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'exports', 'print'],
@@ -85,6 +85,7 @@
                     {field: 'zwmc', width: '35%', title: '中文名称'},
                     {field: 'erpbh', width: '15%', title: 'ERP编号'},
                     {field: 'xmlxmc', width: '18%', title: '项目类型'},
+                    {field: 'nf', width: '10%', title: '年份', align: 'center'},
                     {field: 'qs', width: '10%', title: '起始', align: 'center'},
                     {field: 'wc', width: '10%', title: '完成', align: 'center'}
                 ]