From 00205b404b3b65569429d3b9d78c83366ae496d2 Mon Sep 17 00:00:00 2001
From: zhangfeng <462269006>
Date: Mon, 10 May 2021 10:41:37 +0800
Subject: [PATCH] 简报
---
filesystem/temp/简报202120210508101724.xls.202105081017-c670817c-262d-48e8-8a6e-b8c503200bd6 | Bin 0 -> 51712 bytes
filesystem/temp/简报202120210508101907.xls.202105081019-3845a9e2-72da-4695-837a-e483fd88aa32 | Bin 0 -> 51712 bytes
filesystem/temp/简报202120210508102330.xls.202105081023-2c851fce-2938-4d8b-bbb1-6c226d908931 | Bin 0 -> 51712 bytes
filesystem/temp/简报202120210508104227.xls.202105081042-d7fa529e-13a9-481a-bc2e-6a12a2dce6b6 | Bin 0 -> 51712 bytes
filesystem/temp/简报202120210508104810.xls.202105081048-63af7b22-5502-44da-b4c4-fa399a0bb962 | Bin 0 -> 51712 bytes
filesystem/temp/简报202120210508104900.xls.202105081049-f4645584-ae7e-46d2-bf00-6205a9028075 | Bin 0 -> 51712 bytes
filesystem/temp/简报202120210508104952.xls.202105081049-fe220431-7607-48de-aea0-596fd3142e59 | Bin 0 -> 51712 bytes
filesystem/temp/简报202120210508105447.xls.202105081054-853e70a4-0aca-4386-ab07-0d4e45a93cd1 | Bin 0 -> 51712 bytes
src/main/java/com/corp/cyyy/re/service/DowService.java | 20 ++++++++++----------
src/main/resources/sql/re/dow.md | 16 +++++++++-------
src/main/resources/static/js/dubget/budgetDeclaratio/cwcindex.js | 1 +
src/main/resources/static/js/dubget/budgtType/edit.js | 3 ++-
12 files changed, 22 insertions(+), 18 deletions(-)
create mode 100644 filesystem/temp/简报202120210508101724.xls.202105081017-c670817c-262d-48e8-8a6e-b8c503200bd6
create mode 100644 filesystem/temp/简报202120210508101907.xls.202105081019-3845a9e2-72da-4695-837a-e483fd88aa32
create mode 100644 filesystem/temp/简报202120210508102330.xls.202105081023-2c851fce-2938-4d8b-bbb1-6c226d908931
create mode 100644 filesystem/temp/简报202120210508104227.xls.202105081042-d7fa529e-13a9-481a-bc2e-6a12a2dce6b6
create mode 100644 filesystem/temp/简报202120210508104810.xls.202105081048-63af7b22-5502-44da-b4c4-fa399a0bb962
create mode 100644 filesystem/temp/简报202120210508104900.xls.202105081049-f4645584-ae7e-46d2-bf00-6205a9028075
create mode 100644 filesystem/temp/简报202120210508104952.xls.202105081049-fe220431-7607-48de-aea0-596fd3142e59
create mode 100644 filesystem/temp/简报202120210508105447.xls.202105081054-853e70a4-0aca-4386-ab07-0d4e45a93cd1
diff --git "a/filesystem/temp/\347\256\200\346\212\245202120210508101724.xls.202105081017-c670817c-262d-48e8-8a6e-b8c503200bd6" "b/filesystem/temp/\347\256\200\346\212\245202120210508101724.xls.202105081017-c670817c-262d-48e8-8a6e-b8c503200bd6"
new file mode 100644
index 0000000..a763a1f
Binary files /dev/null and "b/filesystem/temp/\347\256\200\346\212\245202120210508101724.xls.202105081017-c670817c-262d-48e8-8a6e-b8c503200bd6" differ
diff --git "a/filesystem/temp/\347\256\200\346\212\245202120210508101907.xls.202105081019-3845a9e2-72da-4695-837a-e483fd88aa32" "b/filesystem/temp/\347\256\200\346\212\245202120210508101907.xls.202105081019-3845a9e2-72da-4695-837a-e483fd88aa32"
new file mode 100644
index 0000000..a763a1f
Binary files /dev/null and "b/filesystem/temp/\347\256\200\346\212\245202120210508101907.xls.202105081019-3845a9e2-72da-4695-837a-e483fd88aa32" differ
diff --git "a/filesystem/temp/\347\256\200\346\212\245202120210508102330.xls.202105081023-2c851fce-2938-4d8b-bbb1-6c226d908931" "b/filesystem/temp/\347\256\200\346\212\245202120210508102330.xls.202105081023-2c851fce-2938-4d8b-bbb1-6c226d908931"
new file mode 100644
index 0000000..a763a1f
Binary files /dev/null and "b/filesystem/temp/\347\256\200\346\212\245202120210508102330.xls.202105081023-2c851fce-2938-4d8b-bbb1-6c226d908931" differ
diff --git "a/filesystem/temp/\347\256\200\346\212\245202120210508104227.xls.202105081042-d7fa529e-13a9-481a-bc2e-6a12a2dce6b6" "b/filesystem/temp/\347\256\200\346\212\245202120210508104227.xls.202105081042-d7fa529e-13a9-481a-bc2e-6a12a2dce6b6"
new file mode 100644
index 0000000..9cde25d
Binary files /dev/null and "b/filesystem/temp/\347\256\200\346\212\245202120210508104227.xls.202105081042-d7fa529e-13a9-481a-bc2e-6a12a2dce6b6" differ
diff --git "a/filesystem/temp/\347\256\200\346\212\245202120210508104810.xls.202105081048-63af7b22-5502-44da-b4c4-fa399a0bb962" "b/filesystem/temp/\347\256\200\346\212\245202120210508104810.xls.202105081048-63af7b22-5502-44da-b4c4-fa399a0bb962"
new file mode 100644
index 0000000..9cde25d
Binary files /dev/null and "b/filesystem/temp/\347\256\200\346\212\245202120210508104810.xls.202105081048-63af7b22-5502-44da-b4c4-fa399a0bb962" differ
diff --git "a/filesystem/temp/\347\256\200\346\212\245202120210508104900.xls.202105081049-f4645584-ae7e-46d2-bf00-6205a9028075" "b/filesystem/temp/\347\256\200\346\212\245202120210508104900.xls.202105081049-f4645584-ae7e-46d2-bf00-6205a9028075"
new file mode 100644
index 0000000..9cde25d
Binary files /dev/null and "b/filesystem/temp/\347\256\200\346\212\245202120210508104900.xls.202105081049-f4645584-ae7e-46d2-bf00-6205a9028075" differ
diff --git "a/filesystem/temp/\347\256\200\346\212\245202120210508104952.xls.202105081049-fe220431-7607-48de-aea0-596fd3142e59" "b/filesystem/temp/\347\256\200\346\212\245202120210508104952.xls.202105081049-fe220431-7607-48de-aea0-596fd3142e59"
new file mode 100644
index 0000000..9cde25d
Binary files /dev/null and "b/filesystem/temp/\347\256\200\346\212\245202120210508104952.xls.202105081049-fe220431-7607-48de-aea0-596fd3142e59" differ
diff --git "a/filesystem/temp/\347\256\200\346\212\245202120210508105447.xls.202105081054-853e70a4-0aca-4386-ab07-0d4e45a93cd1" "b/filesystem/temp/\347\256\200\346\212\245202120210508105447.xls.202105081054-853e70a4-0aca-4386-ab07-0d4e45a93cd1"
new file mode 100644
index 0000000..32aaca2
Binary files /dev/null and "b/filesystem/temp/\347\256\200\346\212\245202120210508105447.xls.202105081054-853e70a4-0aca-4386-ab07-0d4e45a93cd1" differ
diff --git a/src/main/java/com/corp/cyyy/re/service/DowService.java b/src/main/java/com/corp/cyyy/re/service/DowService.java
index d60e71e..179393c 100644
--- a/src/main/java/com/corp/cyyy/re/service/DowService.java
+++ b/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;
diff --git a/src/main/resources/sql/re/dow.md b/src/main/resources/sql/re/dow.md
index aa2c6ca..3a9644a 100644
--- a/src/main/resources/sql/re/dow.md
+++ b/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
- @if(!isEmpty(type)){
+ 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
- @if(!isEmpty(type)){
+ 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
diff --git a/src/main/resources/static/js/dubget/budgetDeclaratio/cwcindex.js b/src/main/resources/static/js/dubget/budgetDeclaratio/cwcindex.js
index bb2e3ec..839bcbf 100644
--- a/src/main/resources/static/js/dubget/budgetDeclaratio/cwcindex.js
+++ b/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,
diff --git a/src/main/resources/static/js/dubget/budgtType/edit.js b/src/main/resources/static/js/dubget/budgtType/edit.js
index 6821751..85773e6 100644
--- a/src/main/resources/static/js/dubget/budgtType/edit.js
+++ b/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("更新成功");
--
libgit2 0.26.0