Browse Source

付款取值调整

ly 3 months ago
parent
commit
2d71e9ff72

+ 7 - 1
src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -2187,6 +2187,9 @@ public class StaBudgetapprovalController extends BaseController {
2187 2187
         return resultMap;
2188 2188
     }
2189 2189
 
2190
+
2191
+    @Resource
2192
+    private StaPayapprovalService staPayapprovalService;
2190 2193
     /**
2191 2194
      * 获取单科目下项目报账总额
2192 2195
      */
@@ -2204,7 +2207,10 @@ public class StaBudgetapprovalController extends BaseController {
2204 2207
         Map<Object,Object> map = new HashMap<>();
2205 2208
         map.put("fymc",st.getFymc());
2206 2209
         map.put("nys",st.getNys());
2207
-        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getBz(map);
2210
+        map.put("id",st.getXmid());
2211
+        // 此处传入值硬使用 项目整体汇总值,而非单项目汇总值
2212
+       /* List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getBz(map);*/
2213
+        List<PrjAnnualbudget> list = staPayapprovalService.getXmzys(map);
2208 2214
         if (list.size() == 0){
2209 2215
             return BaseResult.failure(-1,"报账金额为空!");
2210 2216
         }

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

@@ -121,5 +121,10 @@ public class PrjAnnualbudget implements Serializable {
121 121
      */
122 122
     private Double czze;
123 123
 
124
+    /**
125
+     * 费用名称
126
+     */
127
+    private String fymc;
128
+
124 129
 }
125 130