费用申请中查看年度预算错误问题

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

@@ -632,6 +632,18 @@ public class PrjAnnualbudgetController extends BaseController {
         return "annualbudget/view_annualbudget";
     }
 
+    @RequestMapping(value = "/forNdysView1/{rws}/{nf}", method = RequestMethod.GET)
+    public String forNdysView1(Model model, @PathVariable Integer rws,@PathVariable Integer nf) {
+        PrjAnnualbudget annualbudget = prjAnnualbudgetService.queryByRws1(rws,nf);
+        model.addAttribute("annualbudget", annualbudget);
+        if (ProjectTypeEnnum.GWGSKJXM.msg().equals(annualbudget.getXmlxmc())) {
+            model.addAttribute("ysmc", "陕西公司出资总额");
+        } else {
+            model.addAttribute("ysmc", "项目总预算");
+        }
+        return "annualbudget/view_annualbudget";
+    }
+
     /**
      * 新建数据(提交审批)
      *

src/main/java/com/liang/dao/PrjAnnualbudgetDao.java

@@ -147,5 +147,7 @@ public interface PrjAnnualbudgetDao {
     BigDecimal getNYSSum(@Param("id") Integer id, @Param("rwsId") Integer rwsId);
 
     void updateSJYZXSum(Integer rws);
+
+    PrjAnnualbudget queryByRws1(@Param("rws") Integer rws, @Param("nf") Integer nf);
 }
 

src/main/java/com/liang/service/PrjAnnualbudgetService.java

@@ -113,4 +113,6 @@ public interface PrjAnnualbudgetService {
     int updateSpzt(PrjAnnualbudget annualbudget);
 
     void updateSJYZXAndXTJSYZX(Integer rws);
+
+    PrjAnnualbudget queryByRws1(Integer rws, Integer nf);
 }

src/main/java/com/liang/service/impl/PrjAnnualbudgetServiceImpl.java

@@ -150,4 +150,9 @@ public class PrjAnnualbudgetServiceImpl implements PrjAnnualbudgetService {
             prjAnnualbudgetDao.updateSJYZXSum(rws);
         }
     }
+
+    @Override
+    public PrjAnnualbudget queryByRws1(Integer rws, Integer nf) {
+        return prjAnnualbudgetDao.queryByRws1(rws,nf);
+    }
 }

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -519,5 +519,14 @@
                                 where sr.id = #{id})
         )
     </select>
+    <select id="queryByRws1" resultType="com.liang.entity.PrjAnnualbudget">
+        select TOP 1 a.*, u.name as SQRXM
+        from prj_AnnualBudget a
+                 left join
+             sys_user_info u on u.user_id = a.SQR
+                 INNER JOIN sta_BudgetApproval s ON a.RWS = s.XMID
+        where RWS = #{rws}
+          AND a.NF = #{nf}
+    </select>
 </mapper>
 

src/main/resources/templates/annualbudget/add_apply.html

@@ -537,6 +537,7 @@
         var fyId = -1;
         var xmId = $("#xmid").val();
         var ysId = $("#ysid").val();
+        var nf   =$("#nf").val();
         var ysqjeOne = -1;
         var ybzjeOne = -1;
 
@@ -3474,7 +3475,7 @@
                     // maxmin: true,
                     shadeClose: true,
                     area: ['1010px', layerheight + 'px'],
-                    content: AjaxUtil.ctx + 'prjAnnualbudget/forNdysView/' + xmId,
+                    content: AjaxUtil.ctx + 'prjAnnualbudget/forNdysView1/' + xmId+'/'+nf,
                     end: function () {
                         layer.close(index);
                     }

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

@@ -507,6 +507,7 @@
 
         var fyId = $("#id").val();
         var xmId = $("#xmid").val();
+        var nf  =$("#nf").val();
         var ysqjeOne = -1;
         var xgqsqje = [[${budgetapproval.sqje}]];
         if ($("#fylbmc").val().indexOf("设备使用费") > -1) {
@@ -3450,7 +3451,7 @@
                 // maxmin: true,
                 shadeClose: true,
                 area: ['1010px', layerheight + 'px'],
-                content: AjaxUtil.ctx + 'prjAnnualbudget/forNdysView/' + xmId,
+                content: AjaxUtil.ctx + 'prjAnnualbudget/forNdysView1/' + xmId+'/'+nf,
                 end: function () {
                     layer.close(index);
                 }

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

@@ -309,6 +309,7 @@
 
         var fyId = $("#id").val();
         var xmId = $("#xmid").val();
+        var nf = $("#nf").val();
 
         if ($("#fylbmc").val().indexOf("临时") > -1 && $("#fylbmc").val().indexOf("人工费") > -1)
             document.getElementById('lsryDiv').style.display = 'block';
@@ -1269,7 +1270,7 @@
                 // maxmin: true,
                 shadeClose: true,
                 area: ['1010px', layerheight + 'px'],
-                content: AjaxUtil.ctx + 'prjAnnualbudget/forNdysView/' + xmId,
+                content: AjaxUtil.ctx + 'prjAnnualbudget/forNdysView1/' + xmId +'/'+ nf,
                 end: function () {
                     layer.close(index);
                 }