|
@@ -400,6 +400,10 @@ export function countGroupService(start, end){
|
|
|
"table": "precount",
|
|
"table": "precount",
|
|
|
"column": "c_path",
|
|
"column": "c_path",
|
|
|
"alias": "service_path"
|
|
"alias": "service_path"
|
|
|
|
|
+ }, {
|
|
|
|
|
+ "table": "precount",
|
|
|
|
|
+ "column": "c_type",
|
|
|
|
|
+ "alias": "service_type"
|
|
|
}
|
|
}
|
|
|
]),
|
|
]),
|
|
|
"groupBy": JSON.stringify([
|
|
"groupBy": JSON.stringify([
|
|
@@ -409,7 +413,11 @@ export function countGroupService(start, end){
|
|
|
},{
|
|
},{
|
|
|
"table": "precount",
|
|
"table": "precount",
|
|
|
"column": "c_path"
|
|
"column": "c_path"
|
|
|
- },
|
|
|
|
|
|
|
+ },{
|
|
|
|
|
+
|
|
|
|
|
+ "table": "precount",
|
|
|
|
|
+ "column": "c_type"
|
|
|
|
|
+ }
|
|
|
]),
|
|
]),
|
|
|
"conditionsList": JSON.stringify([
|
|
"conditionsList": JSON.stringify([
|
|
|
...timeCheckers(start, end),
|
|
...timeCheckers(start, end),
|
|
@@ -420,6 +428,41 @@ export function countGroupService(start, end){
|
|
|
|
|
|
|
|
return resolveDmsMultiTableResult(postform(multiSearch, data));
|
|
return resolveDmsMultiTableResult(postform(multiSearch, data));
|
|
|
}
|
|
}
|
|
|
|
|
+export function countType(start, end){
|
|
|
|
|
+
|
|
|
|
|
+ let data = {
|
|
|
|
|
+ "columnId": preCountDmsId,
|
|
|
|
|
+ "autoSelectItem": false,
|
|
|
|
|
+ "page": 1,
|
|
|
|
|
+ "pageSize": 10000,
|
|
|
|
|
+ "columnAlias": "precount",
|
|
|
|
|
+ "selectItem": JSON.stringify([
|
|
|
|
|
+ {
|
|
|
|
|
+ "table": "precount",
|
|
|
|
|
+ "column": "c_count",
|
|
|
|
|
+ "function": "sum",
|
|
|
|
|
+ "alias": "count"
|
|
|
|
|
+ },{
|
|
|
|
|
+ "table": "precount",
|
|
|
|
|
+ "column": "c_type",
|
|
|
|
|
+ "alias": "service_type"
|
|
|
|
|
+ }
|
|
|
|
|
+ ]),
|
|
|
|
|
+ "groupBy": JSON.stringify([
|
|
|
|
|
+ {
|
|
|
|
|
+ "table": "precount",
|
|
|
|
|
+ "column": "c_type"
|
|
|
|
|
+ }
|
|
|
|
|
+ ]),
|
|
|
|
|
+ "conditionsList": JSON.stringify([
|
|
|
|
|
+ ...timeCheckers(start, end),
|
|
|
|
|
+ ...notNullAndEmptyCheckers("precount","c_type"),
|
|
|
|
|
+ ]),
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return resolveDmsMultiTableResult(postform(multiSearch, data));
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
export function countUnitActive(start, end){
|
|
export function countUnitActive(start, end){
|
|
|
let data = {
|
|
let data = {
|
|
|
"columnId": preCountDmsId,
|
|
"columnId": preCountDmsId,
|