简报

src/main/java/com/corp/cyyy/re/service/DowService.java

@@ -176,26 +176,26 @@ public class DowService extends BaseService<Dow>{
 			//
 			if (dow.get("sun")!=null) {
 				if (StringUtils.isNotEmpty(dow.get("sun").toString())) {
-					Double bq = dgDow(Double.valueOf(dow.get("sun").toString()),dow.getBudgtType().toString(),fp.getType());
+					Double bq = dgDowKS(Double.valueOf(dow.get("sun").toString()),dow.getBudgtType().toString(),fp.getType());
 					dow.set("sun", bq);
 				}else {
-					Double bq = dgDow(0.00,dow.getBudgtType(),fp.getType());
+					Double bq = dgDowKS(0.00,dow.getBudgtType(),fp.getType());
 					dow.set("sun", bq);
 				}
 			}else {
-				Double bq = dgDow(0.00, dow.getBudgtType(),fp.getType());
+				Double bq = dgDowKS(0.00, dow.getBudgtType(),fp.getType());
 				dow.set("sun", bq);
 			}
 			if (dow.get("sunb")!=null) {
 				if (StringUtils.isNotEmpty(dow.get("sunb").toString())) {
-					Double bq = dgDowZJ(Double.valueOf(dow.get("sunb").toString()), dow.getBudgtType().toString(),fp.getType());
+					Double bq = dgDowZJks(Double.valueOf(dow.get("sunb").toString()), dow.getBudgtType().toString(),fp.getType());
 					dow.set("sunb", bq);
 				}else {
-					Double bq = dgDowZJ(0.00, dow.getBudgtType().toString(),fp.getType());
+					Double bq = dgDowZJks(0.00, dow.getBudgtType().toString(),fp.getType());
 					dow.set("sunb", bq);
 				}
 			}else {
-				Double bq = dgDowZJ(0.00, dow.getBudgtType().toString(),fp.getType());
+				Double bq = dgDowZJks(0.00, dow.getBudgtType().toString(),fp.getType());
 				dow.set("sunb", bq);
 			}
 		}
@@ -208,7 +208,7 @@ public class DowService extends BaseService<Dow>{
 	 * 全院预算递归查询下级预算类型金额
 	 * @param dow
 	 */
-	private Double dgDow(Double dq,String Id,String org) {
+	private Double dgDowKS(Double dq,String Id,String org) {
 		
 		
 		//先获取当前的金额
@@ -226,7 +226,7 @@ public class DowService extends BaseService<Dow>{
 		}
 		//查看是否还有下级如果有再次调任此方法
 		for (Dow dow : list) {
-			dq=dgDow(dq, dow.getId().toString());
+			dq=dgDowKS(dq, dow.getId().toString(),org);
 		}
 		
 		return dq;
@@ -235,7 +235,7 @@ public class DowService extends BaseService<Dow>{
 	 *全院追加 递归查询下级预算类型金额
 	 * @param dow
 	 */
-	private Double dgDowZJ(Double dq,String Id,String org) {
+	private Double dgDowZJks(Double dq,String Id,String org) {
 		//先获取当前的金额
 		List<Dow>list=dowDao.getParentId(Id,org);
 		if (list.size()<1) {
@@ -251,7 +251,7 @@ public class DowService extends BaseService<Dow>{
 		}
 		//查看是否还有下级如果有再次调任此方法
 		for (Dow dow : list) {
-			dq=dgDowZJ(dq, dow.getId().toString(),org);
+			dq=dgDowZJks(dq, dow.getId().toString(),org);
 		}
 		
 		return dq;

src/main/resources/sql/re/dow.md

@@ -81,12 +81,13 @@ getKS
 			`dow` d
 			LEFT JOIN (SELECT * FROM budget_declaratio WHERE
 			DTYPE = '1' ) b ON d.BUDGT_TYPE = b.TYPE 
-			LEFT JOIN (SELECT * FROM core_org WHERE 1=1 	
+			LEFT JOIN  core_org o on b.DEPT_ID=o.ID
+				WHERE 1 = 1 
 				@if(!isEmpty(type)){
        		AND FULL_NAME=#type#
+       		OR ISNULL(FULL_NAME)
     		@} 
-    		) 
-    		o on b.DEPT_ID=o.ID
+    		
 
 		GROUP BY
 			d.ID 
@@ -101,11 +102,12 @@ getKS
 			`dow` d
 					LEFT JOIN (SELECT * FROM budget_declaratio WHERE
 			DTYPE = '2' ) b ON d.BUDGT_TYPE = b.TYPE 
-			LEFT JOIN (SELECT * FROM core_org WHERE 1=1 	
+				LEFT JOIN  core_org o on b.DEPT_ID=o.ID
+				WHERE 1 = 1 
 				@if(!isEmpty(type)){
        		AND FULL_NAME=#type#
+       		OR ISNULL(FULL_NAME)
     		@} 
-    		) o on b.DEPT_ID=o.ID
 	
 		GROUP BY
 			d.ID 

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

@@ -132,6 +132,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     
                 	
                 }else if(obj.event === 'instList'){
+                	debugger;
         	    	layer.open({
         	    	  	type: 2,
         	    	  	shade: false,

src/main/resources/static/js/dubget/budgtType/edit.js

@@ -24,8 +24,9 @@ layui.define([ 'form', 'laydate', 'table','budgtTypeApi'], function(exports) {
         },
         initSubmit:function(){
             $("#updateButton").click(function(){
-            	$(this).addClass('layui-btn-disabled').attr('disabled',true);
+            	
                 form.on('submit(form)', function(){
+                	$(this).addClass('layui-btn-disabled').attr('disabled',true);
                     budgtTypeApi.updateBudgtType($('#updateForm'),function(){
                        parent.window.dataReload();
                        Common.info("更新成功");