|
@@ -1,5 +1,7 @@
|
|
package org.springblade.manager.controller;
|
|
package org.springblade.manager.controller;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
import com.spire.xls.*;
|
|
import com.spire.xls.*;
|
|
@@ -204,7 +206,7 @@ public class WbsTreeContractController extends BladeController {
|
|
parentId = primaryKeyId;
|
|
parentId = primaryKeyId;
|
|
}
|
|
}
|
|
List<WbsTreeContractLazyVO> vos;
|
|
List<WbsTreeContractLazyVO> vos;
|
|
- /*String dataInfoId;
|
|
|
|
|
|
+ String dataInfoId;
|
|
if (("1").equals(classifyType)) {
|
|
if (("1").equals(classifyType)) {
|
|
dataInfoId = contractId + "_" + parentId + "_" + classifyType + "_" + tableOwner;
|
|
dataInfoId = contractId + "_" + parentId + "_" + classifyType + "_" + tableOwner;
|
|
} else {
|
|
} else {
|
|
@@ -213,13 +215,13 @@ public class WbsTreeContractController extends BladeController {
|
|
Object data = redisTemplate.opsForValue().get("blade-manager::contract:wbstree:" + dataInfoId);
|
|
Object data = redisTemplate.opsForValue().get("blade-manager::contract:wbstree:" + dataInfoId);
|
|
if (data != null) {
|
|
if (data != null) {
|
|
vos = JSON.parseArray(data.toString(), WbsTreeContractLazyVO.class);
|
|
vos = JSON.parseArray(data.toString(), WbsTreeContractLazyVO.class);
|
|
- } else {*/
|
|
|
|
|
|
+ } else {
|
|
vos = iWbsTreeContractService.lazyQueryContractWbsTree(parentId, contractId, contractIdRelation, tableOwner);
|
|
vos = iWbsTreeContractService.lazyQueryContractWbsTree(parentId, contractId, contractIdRelation, tableOwner);
|
|
- /*if (vos != null) {
|
|
|
|
|
|
+ if (vos != null) {
|
|
JSONArray array = JSONArray.parseArray(JSON.toJSONString(vos));
|
|
JSONArray array = JSONArray.parseArray(JSON.toJSONString(vos));
|
|
redisTemplate.opsForValue().set("blade-manager::contract:wbstree:" + dataInfoId, JSON.toJSON(array).toString());
|
|
redisTemplate.opsForValue().set("blade-manager::contract:wbstree:" + dataInfoId, JSON.toJSON(array).toString());
|
|
}
|
|
}
|
|
- }*/
|
|
|
|
|
|
+ }
|
|
return R.data(vos);
|
|
return R.data(vos);
|
|
}
|
|
}
|
|
|
|
|