From 8129b7ddaf315fc16edccd417e9663380a427311 Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期四, 25 五月 2023 09:47:48 +0800
Subject: [PATCH] 协同已读状态
---
src/main/java/com/product/administration/service/CooperatesService.java | 10 +++++-----
1 files changed, 5 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..a27cfb8 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);//鏈埌鐜妭浜烘暟
--
Gitblit v1.9.2