From bc0e6504f935fe54a3a68160db313f6d4f089b17 Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期五, 02 六月 2023 21:22:44 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0
---
src/main/java/com/product/administration/service/CooperatesService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index ab7811f..ce0262d 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -119,9 +119,9 @@
fse.addSubDataTable(dd);
json = BaseUtil.dataTableToTreeData(dt, "code", "tricode", null, false);
}
- String sql = " select count(*) sum from product_oa_cooperate_flow_node where cooperate_uuid =? and status =? ";
- String sql1 = " select count(*) sum from product_oa_cooperate_flow_node where cooperate_uuid =? ";
- String sql0 = " select count(*) sum from product_oa_cooperate_flow_node where cooperate_uuid =? and (status =? or status is null) ";
+ String sql = " select count(*) sum from product_oa_cooperate_flow_node where cooperate_uuid =? and status =? and tricode is not null";
+ String sql1 = " select count(*) sum from product_oa_cooperate_flow_node where cooperate_uuid =? and tricode is not null";
+ String sql0 = " select count(*) sum from product_oa_cooperate_flow_node where cooperate_uuid =? and (status =? or status is null) and tricode is not null";
FieldSetEntity fss = baseDao.getFieldSetEntityBySQL(sql1, new Object[]{fs.getString(CmnConst.UUID)}, true);
FieldSetEntity fs0 = baseDao.getFieldSetEntityBySQL(sql0, new Object[]{fs.getString(CmnConst.UUID), 0}, true);
FieldSetEntity fs1 = baseDao.getFieldSetEntityBySQL(sql, new Object[]{fs.getString(CmnConst.UUID), 1}, true);
@@ -129,7 +129,7 @@
if (fss.getInteger("sum") == null) {
fse.setValue("totals", 0);//娴佺▼鍏辨湁浜烘暟
} else {
- fse.setValue("totals", fss.getInteger("sum") - 1);
+ fse.setValue("totals", fss.getInteger("sum"));
}
if (fs0.getInteger("sum") == null) {
fse.setValue("uncollectd", 0);//鏈敹鏈姙浜烘暟
@@ -144,7 +144,7 @@
if (fs2.getInteger("sum") == null) {
fse.setValue("done", 0);//宸叉敹宸插姙浜烘暟
} else {
- fse.setValue("done", fs2.getInteger("sum") - 1);
+ fse.setValue("done", fs2.getInteger("sum"));
}
int a = fse.getInteger("totals") - fse.getInteger("uncollectd") - fse.getInteger("received") - fse.getInteger("done");
fse.setValue("not_yet", a);//鏈埌鐜妭浜烘暟
@@ -268,6 +268,11 @@
return baseDao.add(fs);
}
+ @Override
+ public boolean delSupplyText(FieldSetEntity fs) {
+ return baseDao.delete(fs.getTableName(),new String[]{fs.getUUID()});
+ }
+
/**
* @description: 鍗忓悓鍔炲叕鍌姙
* @author: ZhouJie
--
Gitblit v1.9.2