修改问题

src/main/java/com/corp/cyyy/dubget/web/BudgetDeclaratioController.java

@@ -308,6 +308,66 @@ public class BudgetDeclaratioController{
         budgetDeclaratioService.queryByCondition(page);
         return JsonResult.success(page);
     }
+    @PostMapping(MODEL + "/zxhjlist.json")
+    @Function("budgetDeclaratio.query")
+    @ResponseBody
+    public JsonResult<Map<String, Object>> zxhjlist(BudgetDeclaratioQuery condtion)
+    {
+    	CoreUser user = paltformService.getCurrentUser();
+    	if (condtion.getType()!=null&&condtion.getType().equals("xg,")) {
+    		condtion.setType("xg");
+		}
+    	if (condtion.getType()==null||!condtion.getType().equals("xg")) {
+    	
+    	CoreOrg org=recordService.getOrg(user.getOrgId());
+    	condtion.setOrgId(org.getId().toString());
+    	}
+    	if (StringUtils.isNotEmpty(condtion.getExamine())) {
+    		if (condtion.getExamine().equals("yld")) {
+    			PageQuery query =new PageQuery<>();
+    			 query.setPara("userId",user.getId());
+				reService.queryByConditionORG(query);
+				List<ReOrg> list = query.getList();
+				 ArrayList orgid = new ArrayList<>();
+				for (ReOrg coreOrg : list) {
+					orgid.add(coreOrg.getOrgId());
+				}
+			/*	String str="";
+				if (StringUtils.isNotEmpty(orgid)) {
+					str= orgid.substring(0, orgid.length()-1);
+				}*/
+				
+    			//condtion.setTypeState("'1','2','3'");
+    			PageQuery page = condtion.getPageQuery();
+    			page.setPara("str", orgid);
+    			page.setPageSize(Long.MAX_VALUE);
+    	       List<BudgetDeclaratio> lists = budgetDeclaratioService.queryByConditionYLD(page).getList();
+    	       BigDecimal bu=new BigDecimal("0");
+    	       for (BudgetDeclaratio budgetDeclaratio : lists) {
+    	    	   bu=bu.add(budgetDeclaratio.getBudget());
+			}
+    	       Map<String, Object> map=new HashMap<>();
+    	       map.put("bu", bu);
+    	        return JsonResult.success(map);
+			}else if (condtion.getExamine().equals("cwc")) {
+				condtion.setOrgId(null);
+    			condtion.setTypeState("'2','3'");
+
+			}
+		}/*else {
+			condtion.setTypeState("'-1','0','1','3'");
+		}*/
+        PageQuery page = condtion.getPageQuery();
+    	page.setPageSize(Long.MAX_VALUE);
+        List<BudgetDeclaratio> list=budgetDeclaratioService.queryByCondition(page).getList();
+	       BigDecimal bu=new BigDecimal("0");
+	       for (BudgetDeclaratio budgetDeclaratio : list) {
+	    	   bu=bu.add(budgetDeclaratio.getBudget());
+		}
+	       Map<String, Object> map=new HashMap<>();
+	       map.put("bu", bu);
+        return JsonResult.success(map);
+    }
     @PostMapping(MODEL + "/hj.json")
     @Function("budgetDeclaratio.query")
     @ResponseBody

src/main/java/com/corp/cyyy/dubget/web/query/BudgetDeclaratioTJQuery.java

@@ -18,6 +18,7 @@ public class BudgetDeclaratioTJQuery extends PageParam {
     private String user;
          
     private String tjtype;   
+    @Query(name = "年度", display = true)      
     private String year;
     private String examine;
     private String typeState;

src/main/resources/static/js/dubget/budget/index.js

@@ -65,7 +65,16 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                             	return (d.budget-d.replyQuota).toLocaleString();
                             }
                     },
+                    {
+
+                        field : '', 
+                            title : '进度',
+                            templet: function (d) {
+                            	//consonle.log(parseFloat(budget));
+                            	return GetPercent((parseFloat(d.budget)-parseFloat(d.replyQuota)),d.budget)
                             	
+                            }
+                    },
                     {
 
                         field : 'number', 

src/main/resources/static/js/dubget/budgetDeclaratio/index.js

@@ -116,6 +116,19 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                  }
         	
         });
+             var   far=$("#searchForm");
+             var data = far.serializeJson();
+             $.ajax({
+            	 url:Common.ctxPath + '/dubget/budgetDeclaratio/zxhjlist.json?dtype=1',
+            	 type:"post",
+            	 data:data,
+            	   success:function(result){
+            		   $("#bu").text(parseInt(result.data.bu).toLocaleString())
+            		 //  $("#re").text(parseInt(result.data.re).toLocaleString())
+                    }
+             })  
+        
+        
         }
             
         });

src/main/resources/templates/dubget/budgetDeclaratio/index.html

@@ -9,7 +9,7 @@
      <layui:accessButton function="budgetDeclaratio.exportDocument"  action="exportDocument">导出</layui:accessButton>-->
      <layui:accessButton function="budgetDeclaratio.importDocument"  action="importDocument">导入</layui:accessButton> 
 </div>
-
+<h1>预算总额<i id="bu" style="color: red;">0</i></h1>
 <table id="budgetDeclaratioTable" lay-filter="budgetDeclaratioTable"></table>
 <!--#} -->
 <script>