Skip to content

C
cyyy
Commit 00205b40 by zhangfeng
Options

简报

parent 06588980
Showing with 22 additions and 18 deletions
src/main/java/com/corp/cyyy/re/service/DowService.java
...@@ -176,26 +176,26 @@ public class DowService extends BaseService<Dow>{ ...@@ -176,26 +176,26 @@ public class DowService extends BaseService<Dow>{
// //
if (dow.get("sun")!=null) { if (dow.get("sun")!=null) {
if (StringUtils.isNotEmpty(dow.get("sun").toString())) { 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); dow.set("sun", bq);
}else { }else {
Double bq = dgDow(0.00,dow.getBudgtType(),fp.getType()); Double bq = dgDowKS(0.00,dow.getBudgtType(),fp.getType());
dow.set("sun", bq); dow.set("sun", bq);
} }
}else { }else {
Double bq = dgDow(0.00, dow.getBudgtType(),fp.getType()); Double bq = dgDowKS(0.00, dow.getBudgtType(),fp.getType());
dow.set("sun", bq); dow.set("sun", bq);
} }
if (dow.get("sunb")!=null) { if (dow.get("sunb")!=null) {
if (StringUtils.isNotEmpty(dow.get("sunb").toString())) { 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); dow.set("sunb", bq);
}else { }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); dow.set("sunb", bq);
} }
}else { }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); dow.set("sunb", bq);
} }
} }
...@@ -208,7 +208,7 @@ public class DowService extends BaseService<Dow>{ ...@@ -208,7 +208,7 @@ public class DowService extends BaseService<Dow>{
* 全院预算递归查询下级预算类型金额 * 全院预算递归查询下级预算类型金额
* @param 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>{ ...@@ -226,7 +226,7 @@ public class DowService extends BaseService<Dow>{
} }
//查看是否还有下级如果有再次调任此方法 //查看是否还有下级如果有再次调任此方法
for (Dow dow : list) { for (Dow dow : list) {
dq=dgDow(dq, dow.getId().toString()); dq=dgDowKS(dq, dow.getId().toString(),org);
} }
return dq; return dq;
...@@ -235,7 +235,7 @@ public class DowService extends BaseService<Dow>{ ...@@ -235,7 +235,7 @@ public class DowService extends BaseService<Dow>{
*全院追加 递归查询下级预算类型金额 *全院追加 递归查询下级预算类型金额
* @param 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); List<Dow>list=dowDao.getParentId(Id,org);
if (list.size()<1) { if (list.size()<1) {
...@@ -251,7 +251,7 @@ public class DowService extends BaseService<Dow>{ ...@@ -251,7 +251,7 @@ public class DowService extends BaseService<Dow>{
} }
//查看是否还有下级如果有再次调任此方法 //查看是否还有下级如果有再次调任此方法
for (Dow dow : list) { for (Dow dow : list) {
dq=dgDowZJ(dq, dow.getId().toString(),org); dq=dgDowZJks(dq, dow.getId().toString(),org);
} }
return dq; return dq;
......
src/main/resources/sql/re/dow.md
...@@ -81,12 +81,13 @@ getKS ...@@ -81,12 +81,13 @@ getKS
`dow` d `dow` d
LEFT JOIN (SELECT * FROM budget_declaratio WHERE LEFT JOIN (SELECT * FROM budget_declaratio WHERE
DTYPE = '1' ) b ON d.BUDGT_TYPE = b.TYPE 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
@if(!isEmpty(type)){ WHERE 1 = 1
@if(!isEmpty(type)){
AND FULL_NAME=#type# AND FULL_NAME=#type#
OR ISNULL(FULL_NAME)
@} @}
)
o on b.DEPT_ID=o.ID
GROUP BY GROUP BY
d.ID d.ID
...@@ -101,11 +102,12 @@ getKS ...@@ -101,11 +102,12 @@ getKS
`dow` d `dow` d
LEFT JOIN (SELECT * FROM budget_declaratio WHERE LEFT JOIN (SELECT * FROM budget_declaratio WHERE
DTYPE = '2' ) b ON d.BUDGT_TYPE = b.TYPE 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
@if(!isEmpty(type)){ WHERE 1 = 1
@if(!isEmpty(type)){
AND FULL_NAME=#type# AND FULL_NAME=#type#
OR ISNULL(FULL_NAME)
@} @}
) o on b.DEPT_ID=o.ID
GROUP BY GROUP BY
d.ID d.ID
......
src/main/resources/static/js/dubget/budgetDeclaratio/cwcindex.js
...@@ -132,6 +132,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { ...@@ -132,6 +132,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}else if(obj.event === 'instList'){ }else if(obj.event === 'instList'){
debugger;
layer.open({ layer.open({
type: 2, type: 2,
shade: false, shade: false,
......
src/main/resources/static/js/dubget/budgtType/edit.js
...@@ -24,8 +24,9 @@ layui.define([ 'form', 'laydate', 'table','budgtTypeApi'], function(exports) { ...@@ -24,8 +24,9 @@ layui.define([ 'form', 'laydate', 'table','budgtTypeApi'], function(exports) {
}, },
initSubmit:function(){ initSubmit:function(){
$("#updateButton").click(function(){ $("#updateButton").click(function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
form.on('submit(form)', function(){ form.on('submit(form)', function(){
$(this).addClass('layui-btn-disabled').attr('disabled',true);
budgtTypeApi.updateBudgtType($('#updateForm'),function(){ budgtTypeApi.updateBudgtType($('#updateForm'),function(){
parent.window.dataReload(); parent.window.dataReload();
Common.info("更新成功"); Common.info("更新成功");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment