修改2个字段

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/InformationQuery.java

@@ -31,7 +31,7 @@ public class InformationQuery extends BaseEntity {
 	@ApiModelProperty("文件编号")
     private String number;
     /**
-     * 与m_wbs_tree_contract的dept_category一致
+     * 与m_wbs_tree_contract的node_type一致
      */
 	@ApiModelProperty("类型")
     private Integer category;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ExcelInWbsTreeAndElementDTO.java

@@ -19,7 +19,7 @@ public class ExcelInWbsTreeAndElementDTO implements Serializable {
     /**
      * 表名
      */
-    private String deptName;
+    private String nodeName;
 
     /**
      * 实体表名

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/FormElementDTO.java

@@ -42,16 +42,16 @@ public class FormElementDTO extends WbsTree {
     private Long parentId;
 
     /**
-     * 部门类型
+     * 节点类型
      */
     @ApiModelProperty(value = "节点类型",required = true)
-    private Integer deptCategory;
+    private Integer nodeType;
 
     /**
-     * 部门名
+     * 节点名称
      */
     @ApiModelProperty(value = "节点名称",required = true)
-    private String deptName;
+    private String nodeName;
     /**
      * 表单类型
      */

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/FormElementDTO2.java

@@ -39,16 +39,16 @@ public class FormElementDTO2 extends WbsTree {
     private Long parentId;
 
     /**
-     * 部门类型
+     * 节点类型
      */
     @ApiModelProperty(value = "节点类型",required = true)
-    private Integer deptCategory;
+    private Integer nodeType;
 
     /**
-     * 部门名
+     * 节点名称
      */
     @ApiModelProperty(value = "节点名称",required = true)
-    private String deptName;
+    private String nodeName;
     /**
      * 表单类型
      */

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsFormElementDTO2.java

@@ -19,8 +19,8 @@ public class WbsFormElementDTO2 implements Serializable {
     /**
      * wbs表单名
      */
-    @JsonProperty(value = "deptName")
-    private String deptName;
+    @JsonProperty(value = "nodeName")
+    private String nodeName;
 
     /**
      * wbs表单sort

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeDTO.java

@@ -34,10 +34,10 @@ public class WbsTreeDTO extends WbsTree {
 	private Long parentId;
 
 	/**
-	 * 部门类型
+	 * 节点类型
 	 */
 	@ApiModelProperty(value = "节点类型",required = true)
-	private Integer deptCategory;
+	private Integer nodeType;
 
 	/**
 	 * '1'节点 '2'表单
@@ -46,13 +46,13 @@ public class WbsTreeDTO extends WbsTree {
 	private Integer type;
 
 	/**
-	 * 部门名
+	 * 节点名称
 	 */
 	@NotBlank(message = "名称不能为空")
 	@ApiModelProperty(value = "节点名称",required = true)
-	private String deptName;
+	private String nodeName;
 	/**
-	 * 部门全称
+	 * 节点全称
 	 */
 	@ApiModelProperty(value = "节点全称",hidden = true)
 	private String fullName;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeDTO2.java

@@ -19,8 +19,8 @@ public class WbsTreeDTO2 implements Serializable {
     /**
      * 节点名
      */
-    @JsonProperty(value = "deptName")
-    private String deptName;
+    @JsonProperty(value = "nodeName")
+    private String nodeName;
 
     /**
      * wbs节点sort

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreePrivateDTO3.java

@@ -16,7 +16,7 @@ public class WbsTreePrivateDTO3 implements Serializable {
     /**
      * 节点名称
      */
-    private String deptName;
+    private String nodeName;
 
     /**
      * 表单类型

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTree.java

@@ -40,10 +40,10 @@ public class WbsTree extends BaseEntity {
     private Long parentId;
 
     /**
-     * 部门类型
+     * 节点类型
      */
     @ApiModelProperty(value = "节点类型")
-    private Integer deptCategory;
+    private Integer nodeType;
 
     /**
      * '1'节点 '2'表单
@@ -52,12 +52,12 @@ public class WbsTree extends BaseEntity {
     private Integer type;
 
     /**
-     * 部门名
+     * 节点名称
      */
     @ApiModelProperty(value = "节点名称")
-    private String deptName;
+    private String nodeName;
     /**
-     * 部门全称
+     * 节点全称
      */
     @ApiModelProperty(value = "节点全称")
     private String fullName;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContract.java

@@ -73,10 +73,10 @@ public class WbsTreeContract extends BaseEntity {
     private Long parentId;
 
     /**
-     * 部门类型
+     * 节点类型
      */
     @ApiModelProperty(value = "节点类型")
-    private Integer deptCategory;
+    private Integer nodeType;
 
     /**
      * '1'节点 '2'表单
@@ -85,12 +85,12 @@ public class WbsTreeContract extends BaseEntity {
     private Integer type;
 
     /**
-     * 部门名
+     * 节点名称
      */
     @ApiModelProperty(value = "节点名称")
-    private String deptName;
+    private String nodeName;
     /**
-     * 部门全称
+     * 节点全称
      */
     @ApiModelProperty(value = "节点全称")
     private String fullName;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreePrivate.java

@@ -52,10 +52,10 @@ public class WbsTreePrivate extends BaseEntity {
     private Long parentId;
 
     /**
-     * 部门类型
+     * 节点类型
      */
     @ApiModelProperty(value = "节点类型")
-    private Integer deptCategory;
+    private Integer nodeType;
 
     /**
      * '1'节点 '2'表单
@@ -64,12 +64,12 @@ public class WbsTreePrivate extends BaseEntity {
     private Integer type;
 
     /**
-     * 部门名
+     * 节点名称
      */
     @ApiModelProperty(value = "节点名称")
-    private String deptName;
+    private String nodeName;
     /**
-     * 部门全称
+     * 节点全称
      */
     @ApiModelProperty(value = "节点全称")
     private String fullName;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TreeNodeVO.java

@@ -23,7 +23,7 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
 
     private Integer wbsType;
 
-    private Integer deptCategory;
+    private Integer nodeType;
 
     private Integer isExistForm;
 
@@ -102,12 +102,12 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
         this.isExistForm = isExistForm;
     }
 
-    public Integer getDeptCategory() {
-        return deptCategory;
+    public Integer getNodeType() {
+        return nodeType;
     }
 
-    public void setDeptCategory(Integer deptCategory) {
-        this.deptCategory = deptCategory;
+    public void setNodeType(Integer nodeType) {
+        this.nodeType = nodeType;
     }
 
     public Integer getWbsType() {
@@ -175,7 +175,7 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
     }
 
     public String toString() {
-        return "TreeNode(deptCategory=" + this.getDeptCategory() + ",tenantId" + this.getTenantId() + ",contractType" + this.getContractType()
+        return "TreeNode(nodeType=" + this.getNodeType() + ",tenantId" + this.getTenantId() + ",contractType" + this.getContractType()
                 + ",contractId" + this.getContractId()
                 + ",contractIdRelation" + this.getContractIdRelation()
                 + ",ancestors" + this.getAncestors()

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractTreeVO3.java

@@ -47,7 +47,7 @@ public class WbsTreeContractTreeVO3 implements INode<WbsTreeContractTreeVO3> {
         return this.children;
     }
 
-    private String deptCategory;
+    private String nodeType;
 
     private Long tenantId;
 

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractTreeVOS.java

@@ -50,7 +50,7 @@ public class WbsTreeContractTreeVOS extends WbsTreeContract implements INode<Wbs
     private Boolean notExsitChild = true;
 
     @ApiModelProperty("节点类型")
-    private Integer deptCategory;
+    private Integer nodeType;
 
     @ApiModelProperty("子节点")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO.java

@@ -39,7 +39,7 @@ public class WbsTreeContractVO implements INode<WbsTreeContractVO> {
 
     private Integer wbsType;
 
-    private Integer deptCategory;
+    private Integer nodeType;
 
     private String primaryKeyId;
 
@@ -66,12 +66,12 @@ public class WbsTreeContractVO implements INode<WbsTreeContractVO> {
         return hasChildren;
     }
 
-    public Integer getDeptCategory() {
-        return deptCategory;
+    public Integer getNodeType() {
+        return nodeType;
     }
 
-    public void setDeptCategory(Integer deptCategory) {
-        this.deptCategory = deptCategory;
+    public void setNodeType(Integer nodeType) {
+        this.nodeType = nodeType;
     }
 
     public Integer getWbsType() {
@@ -200,7 +200,7 @@ public class WbsTreeContractVO implements INode<WbsTreeContractVO> {
                 ", nodeName='" + nodeName + '\'' +
                 ", type=" + type +
                 ", wbsType=" + wbsType +
-                ", deptCategory=" + deptCategory +
+                ", nodeType=" + nodeType +
                 ", primaryKeyId='" + primaryKeyId + '\'' +
                 ", partitionCode='" + partitionCode + '\'' +
                 ", oldId='" + oldId + '\'' +

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO2.java

@@ -47,7 +47,7 @@ public class WbsTreeContractVO2 implements Serializable {
     /**
      * 节点名
      */
-    private String deptName;
+    private String nodeName;
     /**
      * 节点全称
      */

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO.java

@@ -56,7 +56,7 @@ public class WbsTreeVO extends WbsTree implements INode<WbsTreeVO> {
 	/**
 	 * 节点类型名称
 	 */
-	private String deptCategoryName;
+	private String nodeTypeName;
 
 	/**
 	 * 菜单||节点

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO2.java

@@ -37,7 +37,7 @@ public class WbsTreeVO2 implements INode<WbsTreeVO2> {
 
     private Integer wbsType;
 
-    private Integer deptCategory;
+    private Integer nodeType;
 
     private String tenantId;
 
@@ -88,12 +88,12 @@ public class WbsTreeVO2 implements INode<WbsTreeVO2> {
         this.isExistForm = isExistForm;
     }
 
-    public Integer getDeptCategory() {
-        return deptCategory;
+    public Integer getNodeType() {
+        return nodeType;
     }
 
-    public void setDeptCategory(Integer deptCategory) {
-        this.deptCategory = deptCategory;
+    public void getNodeType(Integer nodeType) {
+        this.nodeType = nodeType;
     }
 
     public Integer getWbsType() {
@@ -138,7 +138,7 @@ public class WbsTreeVO2 implements INode<WbsTreeVO2> {
 
 
     public String toString() {
-        return "TreeNode(deptCategory=" + this.getDeptCategory()
+        return "TreeNode(nodeType=" + this.getNodeType()
                 + ",tenantId" + this.getTenantId()
                 + ",ancestors" + this.getAncestors()
                 + ",isExistForm" + this.getIsExistForm()

blade-service/blade-business/src/main/java/org/springblade/business/controller/ConstructionLedgerController.java

@@ -116,7 +116,7 @@ public class ConstructionLedgerController extends BladeController {
 		}
 
 		List<QueryProcessDataVO> queryDataResult;
-		if(!new Integer("6").equals(node.getDeptCategory()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
+		if(!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
 			//非填报节点
 			queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), 1, vo.getContractId().toString());
 		} else {

blade-service/blade-business/src/main/java/org/springblade/business/controller/ImageClassificationFileController.java

@@ -580,7 +580,7 @@ public class ImageClassificationFileController extends BladeController {
 					//查询这些节点的信息
 					List<WbsTreeContract> wbsNodeList = this.wbsTreeContractClient.queryContractTreeNodeByPKIds(wbsIds);
 					if(wbsNodeList != null && wbsNodeList.size() > 0){
-						position = wbsNodeList.stream().map(node -> StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getDeptName()).distinct().collect(Collectors.joining());
+						position = wbsNodeList.stream().map(node -> StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getNodeName()).distinct().collect(Collectors.joining());
 					}
 				}
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -207,7 +207,7 @@ public class InformationWriteQueryController extends BladeController {
 				vos.setContractIdRelation(tree.getContractId());
 			}
 			vos.setParentId(tree.getParentId());
-			vos.setTitle(StringUtils.isNotEmpty(tree.getFullName()) ? tree.getFullName() : tree.getDeptName());
+			vos.setTitle(StringUtils.isNotEmpty(tree.getFullName()) ? tree.getFullName() : tree.getNodeName());
 			vos.setType(tree.getType());
 			vos.setWbsType(tree.getWbsType());
 
@@ -796,7 +796,7 @@ public class InformationWriteQueryController extends BladeController {
 						//找到复制的节点，将parentId更改为 parent.getId()
 						newData.setParentId(parent.getId());
 						//设置新名称
-						newData.setDeptName(vo.getNeedCopyNodeName());
+						newData.setNodeName(vo.getNeedCopyNodeName());
 						newData.setFullName(vo.getNeedCopyNodeName());
 					} else {
 						newData.setParentId(oldToNewIdMap.containsKey(node.getParentId()) ? oldToNewIdMap.get(node.getParentId()) : SnowFlakeUtil.getId());
@@ -819,7 +819,7 @@ public class InformationWriteQueryController extends BladeController {
 					//保存到集合中
 					saveList.add(newData);
 
-					if(new Integer("6").equals(node.getDeptCategory())){
+					if(new Integer("6").equals(node.getNodeType())){
 						//生成施工日志
 						this.createLedger(newData, saveLedger, nodeMap, null);
 					}
@@ -861,7 +861,7 @@ public class InformationWriteQueryController extends BladeController {
 							//找到复制的节点，将parentId更改为 parent.getId()
 							newData.setParentId(copyPath.getId());
 							//设置新名称
-							newData.setDeptName(copyBatch.getNodeName());
+							newData.setNodeName(copyBatch.getNodeName());
 							newData.setFullName(copyBatch.getNodeName());
 						} else {
 							newData.setParentId(oldToNewIdMap.containsKey(node.getParentId()) ? oldToNewIdMap.get(node.getParentId()) : SnowFlakeUtil.getId());
@@ -884,7 +884,7 @@ public class InformationWriteQueryController extends BladeController {
 						//保存到集合中
 						saveList.add(newData);
 
-						if(new Integer("6").equals(node.getDeptCategory())){
+						if(new Integer("6").equals(node.getNodeType())){
 							//生成施工日志
 							this.createLedger(newData, saveLedger, nodeMap, null);
 						}
@@ -938,7 +938,7 @@ public class InformationWriteQueryController extends BladeController {
 					}
 
 					if(parentNode != null){
-						ledger.setStation(StringUtils.isNotEmpty(parentNode.getFullName()) ? parentNode.getFullName() : parentNode.getDeptName());
+						ledger.setStation(StringUtils.isNotEmpty(parentNode.getFullName()) ? parentNode.getFullName() : parentNode.getNodeName());
 					}
 				}
 			}
@@ -953,13 +953,13 @@ public class InformationWriteQueryController extends BladeController {
 						parentNode = this.wbsTreePrivateClient.queryPeersNodeByProjectIdAndId(contractNode.getProjectId(), contractNode.getParentId());
 					}
 					if(parentNode != null){
-						ledger.setStation(StringUtils.isNotEmpty(parentNode.getFullName()) ? parentNode.getFullName() : parentNode.getDeptName());
+						ledger.setStation(StringUtils.isNotEmpty(parentNode.getFullName()) ? parentNode.getFullName() : parentNode.getNodeName());
 					}
 				}
 			}
 		}
 
-		ledger.setSite(StringUtils.isNotEmpty(newData.getFullName()) ? newData.getFullName() : newData.getDeptName());
+		ledger.setSite(StringUtils.isNotEmpty(newData.getFullName()) ? newData.getFullName() : newData.getNodeName());
 		ledger.setIsBeton(newData.getIsConcrete());
 		ledger.setWbsId(newData.getPKeyId());
 		ledger.setContractId(Long.parseLong(newData.getContractId()));
@@ -1065,7 +1065,7 @@ public class InformationWriteQueryController extends BladeController {
 			}
 
 			//删除掉首件工程
-			result.removeIf(vos -> vos.getDeptCategory() != null && vos.getDeptCategory() == 111);
+			result.removeIf(vos -> vos.getNodeType() != null && vos.getNodeType() == 111);
 
 
 			result.forEach(vos -> {
@@ -1080,7 +1080,7 @@ public class InformationWriteQueryController extends BladeController {
 				if(vos.getChildren() != null && vos.getChildren().size() > 0){
 					// 去掉首件
 					List<WbsTreeContractTreeVOS> children = vos.getChildren();
-					children = children.stream().filter(vo->vo.getDeptCategory()!=111).collect(Collectors.toList());
+					children = children.stream().filter(vo->vo.getNodeType()!=111).collect(Collectors.toList());
 					vos.setChildren(children);
 					//循环处理节点颜色
 					this.foreachSetNodeColor(children, queryDataResult);
@@ -1167,17 +1167,17 @@ public class InformationWriteQueryController extends BladeController {
 	@ApiOperation(value = "修改节点信息")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "pKeyId", value = "节点的primaryKeyId", required = true),
-			@ApiImplicitParam(name = "deptName", value = "节点的title", required = true),
+			@ApiImplicitParam(name = "nodeName", value = "节点的title", required = true),
 			@ApiImplicitParam(name = "partitionCode", value = "划分编号")
 	})
-	public R<Boolean> updateContractNodeParameter(@RequestParam Long pKeyId, @RequestParam String deptName, @RequestParam String partitionCode){
+	public R<Boolean> updateContractNodeParameter(@RequestParam Long pKeyId, @RequestParam String nodeName, @RequestParam String partitionCode){
 		WbsTreeContract node = new WbsTreeContract();
 		node.setPKeyId(pKeyId);
-		node.setDeptName(deptName);
+		node.setNodeName(nodeName);
 		node.setPartitionCode(partitionCode);
 
 		//只允许修改节点名称
-		if(StringUtils.isEmpty(node.getDeptName()) || "null".equals(String.valueOf(node.getPKeyId())) || StringUtils.isEmpty(String.valueOf(node.getPKeyId()))){
+		if(StringUtils.isEmpty(node.getNodeName()) || "null".equals(String.valueOf(node.getPKeyId())) || StringUtils.isEmpty(String.valueOf(node.getPKeyId()))){
 			return R.data(-1, false , "缺少参数");
 		}
 
@@ -1187,7 +1187,7 @@ public class InformationWriteQueryController extends BladeController {
 		try{
 			JSONObject json = new JSONObject();
 			json.put("operationObjIds", Func.toStrList(pKeyId.toString()));
-			json.put("operationObjName", StringUtils.isNotEmpty(queries.getFullName()) ? queries.getFullName() : queries.getDeptName());
+			json.put("operationObjName", StringUtils.isNotEmpty(queries.getFullName()) ? queries.getFullName() : queries.getNodeName());
 
 			this.operationLogClient.saveUserOperationLog(3, "资料管理", "工序资料", json);
 		}catch (Exception e){
@@ -1218,7 +1218,7 @@ public class InformationWriteQueryController extends BladeController {
 			//如果父节点不是0说明没到顶层
 			WbsTreeContract parentNode = this.wbsTreeContractClient.queryCurrentNodeAllParent(Long.parseLong(currentNode.getContractId()), currentNode.getParentId());
 			if(parentNode != null){
-				nodeName.append("-").append(StringUtils.isNotEmpty(parentNode.getFullName()) ? parentNode.getFullName() : parentNode.getDeptName());
+				nodeName.append("-").append(StringUtils.isNotEmpty(parentNode.getFullName()) ? parentNode.getFullName() : parentNode.getNodeName());
 				this.currentNodeAllParent(nodeName, parentNode);
 			}
 		}
@@ -1249,7 +1249,7 @@ public class InformationWriteQueryController extends BladeController {
 		//删除掉表格
         removeNodeList.removeIf(tree -> tree.getType() != null && new Integer("2").equals(tree.getType()));
 		//获取被删除节点名称
-		String nodeName = StringUtils.isNotEmpty(removeNode.getFullName()) ? removeNode.getFullName() : removeNode.getDeptName() + "," + removeNodeList.stream().map(wbs -> StringUtils.isNotEmpty(wbs.getFullName()) ? wbs.getFullName() : wbs.getDeptName()).collect(Collectors.joining());
+		String nodeName = StringUtils.isNotEmpty(removeNode.getFullName()) ? removeNode.getFullName() : removeNode.getNodeName() + "," + removeNodeList.stream().map(wbs -> StringUtils.isNotEmpty(wbs.getFullName()) ? wbs.getFullName() : wbs.getNodeName()).collect(Collectors.joining());
 
 		//获取当前节点下所有填报节点
 		List<QueryProcessDataVO> queryProcess = new ArrayList<>();
@@ -1280,7 +1280,7 @@ public class InformationWriteQueryController extends BladeController {
 		this.operationLogClient.saveUserOperationLog(4, "资料管理", "工序资料", json);
 
 		//保存进回收站
-		this.recycleBinClient.saveDelBusinessData(idArray, StringUtils.isNotEmpty(removeNode.getFullName()) ? removeNode.getFullName() : removeNode.getDeptName(), 2, parentNodeName.toString(), removeNode.getProjectId(), removeNode.getContractId());
+		this.recycleBinClient.saveDelBusinessData(idArray, StringUtils.isNotEmpty(removeNode.getFullName()) ? removeNode.getFullName() : removeNode.getNodeName(), 2, parentNodeName.toString(), removeNode.getProjectId(), removeNode.getContractId());
 
 		return R.data(this.wbsTreeContractClient.removeContractTreeNode(idArray));
 	}
@@ -1445,7 +1445,7 @@ public class InformationWriteQueryController extends BladeController {
 				//设置到保存集合中
 				saveList.add(newData);
 
-				if(new Integer("6").equals(newData.getDeptCategory())){
+				if(new Integer("6").equals(newData.getNodeType())){
 					//生成施工日志
 					this.createLedger(newData, saveLedger, null, nodeMap);
 				}
@@ -1478,7 +1478,7 @@ public class InformationWriteQueryController extends BladeController {
 			try{
 				JSONObject json = new JSONObject();
 				json.put("operationObjIds", JSONArray.parseArray(JSONObject.toJSONString(saveList.stream().map(WbsTreeContract::getPKeyId).distinct().collect(Collectors.toList())), String.class));
-				json.put("operationObjName", saveList.stream().map(wbs -> StringUtils.isNotEmpty(wbs.getFullName()) ? wbs.getFullName() : wbs.getDeptName()).collect(Collectors.joining()));
+				json.put("operationObjName", saveList.stream().map(wbs -> StringUtils.isNotEmpty(wbs.getFullName()) ? wbs.getFullName() : wbs.getNodeName()).collect(Collectors.joining()));
 				//保存操作记录
 				this.operationLogClient.saveUserOperationLog(operationType, "资料管理", "工序资料", json);
 
@@ -1550,7 +1550,7 @@ public class InformationWriteQueryController extends BladeController {
 			vos.setKey(wbsTreePrivate.getId().toString());
 			vos.setPrimaryKeyId(wbsTreePrivate.getPKeyId().toString());
 			vos.setParentId(wbsTreePrivate.getParentId());
-			vos.setTitle(wbsTreePrivate.getDeptName());
+			vos.setTitle(wbsTreePrivate.getNodeName());
 			vos.setType(wbsTreePrivate.getType());
 			vos.setWbsType(Integer.parseInt(wbsTreePrivate.getWbsType()));
 			//设置子级
@@ -1663,7 +1663,7 @@ public class InformationWriteQueryController extends BladeController {
 			node = this.wbsTreeContractClient.getContractWbsTreeByContractIdAndId(vo.getWbsId(), Long.parseLong(vo.getContractIdRelation()));
 		}
 
-		if(!new Integer("6").equals(node.getDeptCategory()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
+		if(!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
 			//不是工序，则查询当前节点下的所有填报节点
 			List<QueryProcessDataVO> queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), contract.getContractType(), StringUtils.isNotEmpty(vo.getContractIdRelation()) ? vo.getContractIdRelation() : vo.getContractId().toString());
 			if(StringUtils.isNotEmpty(vo.getIsFirst())){
@@ -1699,7 +1699,7 @@ public class InformationWriteQueryController extends BladeController {
 			parentId = primaryKeyId;
 		}
 		List<WbsTreeContractTreeVOS> rootTreeNode = this.queryContractTree(parentId, contractId, contractIdRelation);
-		rootTreeNode.removeIf(vos -> (vos.getDeptCategory() != null && vos.getDeptCategory() == 111));
+		rootTreeNode.removeIf(vos -> (vos.getNodeType() != null && vos.getNodeType() == 111));
 
 		return R.data(rootTreeNode);
 	}
@@ -1720,7 +1720,7 @@ public class InformationWriteQueryController extends BladeController {
 			parentId = primaryKeyId;
 		}
 		List<WbsTreeContractTreeVOS> rootTreeNode = this.queryContractTree(parentId, contractId, contractIdRelation);
-		rootTreeNode = rootTreeNode.stream().filter(vo -> vo.getDeptCategory() != null && vo.getDeptCategory() != 111).collect(Collectors.toList());
+		rootTreeNode = rootTreeNode.stream().filter(vo -> vo.getNodeType() != null && vo.getNodeType() != 111).collect(Collectors.toList());
 
 		return R.data(rootTreeNode);
 	}
@@ -1776,7 +1776,7 @@ public class InformationWriteQueryController extends BladeController {
 			}
 			//检查字符串
 			if(StringUtils.isNotEmpty(colorStatusValue.toString())){
-				if(new Integer("6").equals(vos.getDeptCategory())){
+				if(new Integer("6").equals(vos.getNodeType())){
 					//工序，则直接使用字符串的判断
 					vos.setColorStatus(new Integer(colorStatusValue.toString()));
 				} else {

blade-service/blade-business/src/main/java/org/springblade/business/controller/NeiWaiYeProgressController.java

@@ -60,11 +60,11 @@ public class NeiWaiYeProgressController {
             //获取当前节点的子节点
             List<WbsTreeContract> childList = this.wbsTreeContractClient.queryChildByParentId(node, "noeQueryTable", "");
             //删除掉首件的
-            childList.removeIf(child -> child.getDeptCategory() != null && child.getDeptCategory() == 111);
+            childList.removeIf(child -> child.getNodeType() != null && child.getNodeType() == 111);
 
             //获取当前节点下的所有填报节点
             List<QueryProcessDataVO> queryProcessDataVOList;
-            if(!new Integer("6").equals(node.getDeptCategory()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
+            if(!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
                 queryProcessDataVOList = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), 1, contractId);
             } else {
                 //填报节点
@@ -110,7 +110,7 @@ public class NeiWaiYeProgressController {
                     }
 
                     //添加返回结果
-                    result.add(new NeiWaiYeProgressVO(StringUtils.isNotEmpty(child.getFullName()) ? child.getFullName() : child.getDeptName(), amount, neiYeSuccessAmount, waiYeSuccessAmount));
+                    result.add(new NeiWaiYeProgressVO(StringUtils.isNotEmpty(child.getFullName()) ? child.getFullName() : child.getNodeName(), amount, neiYeSuccessAmount, waiYeSuccessAmount));
                 }
                 return R.data(result);
             }

blade-service/blade-business/src/main/java/org/springblade/business/controller/NeiYeController.java

@@ -73,7 +73,7 @@ public class NeiYeController {
             }
             //不是工序，则查询当前节点下的所有填报节点
             List<QueryProcessDataVO> queryDataResult;
-            if(!new Integer("6").equals(node.getDeptCategory()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
+            if(!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
                 //非填报节点
                 queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), contract.getContractType(), contractId);
             } else {
@@ -153,25 +153,25 @@ public class NeiYeController {
         if(vosMap.containsKey(parentId) || !"0".equals(parentId.trim())){
             //存在父节点信息，获取
             WbsTreeContractTreeVOS vos = vosMap.get(parentId);
-            if(new Integer("1").equals(vos.getDeptCategory())){
+            if(new Integer("1").equals(vos.getNodeType())){
                 //类型属于1则为单位工程
                 if(!resultMap.containsKey("unitProject")){
                     resultMap.put("unitProject", vos.getTitle());
                 }
 
-            } else if(new Integer("2").equals(vos.getDeptCategory())){
+            } else if(new Integer("2").equals(vos.getNodeType())){
                 //类型属于2则为分部工程
                 resultMap.put("partProject", vos.getTitle());
 
-            } else if(new Integer("3").equals(vos.getDeptCategory())){
+            } else if(new Integer("3").equals(vos.getNodeType())){
                 //类型属于3则为子分部工程
                 resultMap.put("partChildProject", vos.getTitle());
 
-            } else if(new Integer("4").equals(vos.getDeptCategory())){
+            } else if(new Integer("4").equals(vos.getNodeType())){
                 //类型属于4则为分项工程
                 resultMap.put("subentryProject", vos.getTitle());
 
-            } else if(new Integer("5").equals(vos.getDeptCategory())){
+            } else if(new Integer("5").equals(vos.getNodeType())){
                 //类型属于5则为子分项工程
                 resultMap.put("subentryChildProject", vos.getTitle());
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/TreeContractFirstController.java

@@ -282,7 +282,7 @@ public class TreeContractFirstController extends BladeController {
 						oneChild.append(",").append(child.getPKeyId());
 
 						//工序为6，不会再存在下级节点
-						if(!new Integer("6").equals(child.getDeptCategory())){
+						if(!new Integer("6").equals(child.getNodeType())){
 							//其子节点继续向下
 							this.foreachQueryChild(child.getPKeyId().toString(), idMap, treeMap, childList);
 						}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -59,7 +59,7 @@
         <result column="fileUrl" property="fileUrl"/>
         <result column="drawingsId" property="drawingsId"/>
         <result column="isFirst" property="isFirst"/>
-        <result column="deptCategory" property="deptCategory"/>
+        <result column="nodeType" property="nodeType"/>
         <result column="colorStatus" property="colorStatus"/>
     </resultMap>
 
@@ -73,14 +73,14 @@
         SELECT
             wtc.p_key_id AS primaryKeyId,
             wtc.id,
-            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.dept_name),wtc.dept_name) AS title,
+            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.node_name),wtc.node_name) AS title,
             wtc.parent_id AS parentId,
             wtc.contract_id AS contractId,
             wtc.old_id AS oldId,
             wtc.major_data_type AS majorDataType,
-            wtc.dept_category AS deptCategory,
+            wtc.node_type AS nodeType,
             CASE
-                wtc.dept_category
+                wtc.node_type
             WHEN 6 THEN 'true'
             ELSE 'false' END AS leaf,
             CASE
@@ -143,7 +143,7 @@
             wtc.p_key_id,
             wtc.ancestors,
             wtc.major_data_type,
-            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.dept_name),wtc.dept_name) AS title,
+            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.node_name),wtc.node_name) AS title,
             wtc.parent_id AS parentId,
             uiq.id AS informationQueryId,
             uiq.status,
@@ -175,8 +175,8 @@
             wtc.p_key_id,
             wtc.ancestors,
             wtc.major_data_type,
-            wtc.dept_category AS nodeType,
-            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.dept_name),wtc.dept_name) AS title,
+            wtc.node_type AS nodeType,
+            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.node_name),wtc.node_name) AS title,
             wtc.parent_id AS parentId,
             uiq.id AS informationQueryId,
             uiq.status,

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -129,7 +129,7 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
 			//设置文件题名
 			newData.setName(fileName);
 			//设置文件类型
-			newData.setCategory(contractTree.getDeptCategory());
+			newData.setCategory(contractTree.getNodeType());
 			//项目ID
 			newData.setProjectId(Long.parseLong(contractTree.getProjectId()));
 			//合同段ID

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1409,15 +1409,15 @@ public class ExcelTabController extends BladeController {
         Long id = wbsTreeContract.getId();
         wbsTreeContract.setPKeyId(newPkId);
         wbsTreeContract.setCreateTime(new Date());
-        String deptName = wbsTreeContractList2.get(0).getDeptName();
+        String nodeName = wbsTreeContractList2.get(0).getNodeName();
 
-        if (deptName.indexOf("__") >= 0) {
-            String oldName[] = deptName.split("__");
-            deptName = oldName[0] + "__" + (Integer.parseInt(oldName[1]) + 1);
+        if (nodeName.indexOf("__") >= 0) {
+            String oldName[] = nodeName.split("__");
+            nodeName = oldName[0] + "__" + (Integer.parseInt(oldName[1]) + 1);
         } else {
-            deptName = deptName + "__" + 1;
+            nodeName = nodeName + "__" + 1;
         }
-        wbsTreeContract.setDeptName(deptName);
+        wbsTreeContract.setNodeName(nodeName);
         wbsTreeContract.setIsCopeTab(2);
         wbsTreeContract.setIsTabPdf(1); // pdf 不能预览
         wbsTreeContract.setIsBussShow(1); // 是否隐藏表

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -122,7 +122,7 @@ public class WbsTreeController extends BladeController {
         if (wbsTreeService.submit(WbsTreeDTO)) {
             CacheUtil.clear(SYS_CACHE);
             Kv kv = Kv.create().set("id", String.valueOf(WbsTreeDTO.getId())).set("tenantId", WbsTreeDTO.getTenantId())
-                    .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, WbsTreeDTO.getDeptCategory()));
+                    .set("nodeTypeName", DictCache.getValue(DictEnum.ORG_CATEGORY, WbsTreeDTO.getNodeType()));
             return R.data(kv);
         }
         return R.fail("操作失败");
@@ -328,7 +328,7 @@ public class WbsTreeController extends BladeController {
     @RequestMapping(value = "/updateBatchNodeTableInfo", method = RequestMethod.POST)
     public R updateBatchNodeTableInfo(@RequestBody List<WbsTree> WbsTrees) {
         WbsTrees.forEach(wbsTree -> {
-            wbsTree.setFullName(wbsTree.getDeptName());
+            wbsTree.setFullName(wbsTree.getNodeName());
         });
         return R.status(wbsTreeService.updateBatchById(WbsTrees));
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java

@@ -109,11 +109,11 @@ public class WbsTreePrivateController extends BladeController {
                                         if(
                                                 (StringUtils.isNotEmpty(privateNode.getFullName(), tree.getFullName()) && !privateNode.getFullName().equals(tree.getFullName()))
                                                 ||
-                                                (StringUtils.isNotEmpty(privateNode.getDeptName(), tree.getDeptName()) && !privateNode.getDeptName().equals(tree.getDeptName()))
+                                                (StringUtils.isNotEmpty(privateNode.getNodeName(), tree.getNodeName()) && !privateNode.getNodeName().equals(tree.getNodeName()))
                                         ){
                                             //名字不同，需要修改
                                             privateNode.setFullName(tree.getFullName());
-                                            privateNode.setDeptName(tree.getDeptName());
+                                            privateNode.setNodeName(tree.getNodeName());
                                             updateList.add(privateNode);
                                         }
 
@@ -172,7 +172,7 @@ public class WbsTreePrivateController extends BladeController {
             }
             if(updateList.size() > 0){
                 for(WbsTreePrivate treePrivate : updateList){
-                    this.wbsTreePrivateService.update(Wrappers.<WbsTreePrivate>lambdaUpdate().set(WbsTreePrivate::getDeptName, treePrivate.getDeptName()).set(WbsTreePrivate::getFullName, treePrivate.getFullName()).eq(WbsTreePrivate::getPKeyId, treePrivate.getPKeyId()));
+                    this.wbsTreePrivateService.update(Wrappers.<WbsTreePrivate>lambdaUpdate().set(WbsTreePrivate::getNodeName, treePrivate.getNodeName()).set(WbsTreePrivate::getFullName, treePrivate.getFullName()).eq(WbsTreePrivate::getPKeyId, treePrivate.getPKeyId()));
                 }
             }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/excel/WbsTreeExcel.java

@@ -1,12 +1,9 @@
 package org.springblade.manager.excel;
 
-
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -26,35 +23,35 @@ public class WbsTreeExcel implements Serializable {
      * 单位工程
      */
     @ExcelProperty(value = "单位工程")
-    private String deptCategory1;
+    private String nodeType1;
     /**
      * 分部工程
      */
     @ExcelProperty(value = "分部工程")
-    private String deptCategory2;
+    private String nodeType2;
 
     /**
      * 子分部工程
      */
     @ExcelProperty(value = "子分部工程")
-    private String deptCategory3;
+    private String nodeType3;
 
     /**
      * 分项工程
      */
     @ExcelProperty(value = "分项工程")
-    private String deptCategory4;
+    private String nodeType4;
 
     /**
      * 子分项工程
      */
     @ExcelProperty(value = "子分项工程")
-    private String deptCategory5;
+    private String nodeType5;
     /**
      * 工序
      */
     @ExcelProperty(value = "工序")
-    private String deptCategory6;
+    private String nodeType6;
 
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -109,7 +109,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         List<WbsTreeContractTreeVOS> vos = JSONArray.parseArray(JSONObject.toJSONString(result), WbsTreeContractTreeVOS.class);
 
         vos.forEach(voData -> {
-            voData.setLeaf(new Integer("6").equals(voData.getDeptCategory()));
+            voData.setLeaf(new Integer("6").equals(voData.getNodeType()));
             voData.setId(voData.getOriginallyId());
             voData.setPrimaryKeyId(String.valueOf(voData.getOriginallyPkeyId()));
             //检查是否有下级
@@ -124,8 +124,8 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
     public Boolean updateContractNodeParameter(WbsTreeContract node) {
 
         LambdaUpdateWrapper<WbsTreeContract> wrappers = Wrappers.lambdaUpdate();
-        if (StringUtils.isNotEmpty(node.getDeptName())) {
-            wrappers.set(WbsTreeContract::getFullName, node.getDeptName());
+        if (StringUtils.isNotEmpty(node.getNodeName())) {
+            wrappers.set(WbsTreeContract::getFullName, node.getNodeName());
         }
         if (StringUtils.isNotEmpty(node.getPartitionCode())) {
             wrappers.set(WbsTreeContract::getPartitionCode, node.getPartitionCode());
@@ -169,7 +169,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         //不知道为什么通过远程调用时实体字段不是想要的，所以中间用字段相同且不继承其它实体的类转换一次
         List<WbsTreeContractTreeVOS> vos = JSONArray.parseArray(JSONObject.toJSONString(vo), WbsTreeContractTreeVOS.class);
         vos.forEach(voData -> {
-            voData.setLeaf(new Integer("6").equals(voData.getDeptCategory()));
+            voData.setLeaf(new Integer("6").equals(voData.getNodeType()));
             //检查是否有下级
             long count = this.wbsTreeContractService.count(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, voData.getId()).eq(WbsTreeContract::getContractId, contractId).eq(WbsTreeContract::getType, 1));
             voData.setNotExsitChild(count == 0);
@@ -194,21 +194,21 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         if (result != null && result.size() != 0) {
             List<WbsTreeContractTreeVOS> vosResult = new ArrayList<>();
             result.forEach(node -> {
-               if(new Integer("2").equals(contract.getContractType()) && Arrays.asList("8,10,11,12".split(",")).contains(node.getDeptCategory().toString())){
+               if(new Integer("2").equals(contract.getContractType()) && Arrays.asList("8,10,11,12".split(",")).contains(node.getNodeType().toString())){
                    //转换
                    WbsTreeContractTreeVOS vos = new WbsTreeContractTreeVOS();
-                   vos.setDeptCategory(node.getDeptCategory());
+                   vos.setNodeType(node.getNodeType());
                    vos.setPrimaryKeyId(String.valueOf(node.getPKeyId()));
-                   vos.setTitle(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getDeptName());
+                   vos.setTitle(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getNodeName());
                    vos.setExcelId(node.getExcelId());
                    //最终返回集合
                    vosResult.add(vos);
-               } else if(new Integer("1").equals(contract.getContractType()) && Arrays.asList("7,9,13".split(",")).contains(node.getDeptCategory().toString())){
+               } else if(new Integer("1").equals(contract.getContractType()) && Arrays.asList("7,9,13".split(",")).contains(node.getNodeType().toString())){
                    //转换
                    WbsTreeContractTreeVOS vos = new WbsTreeContractTreeVOS();
-                   vos.setDeptCategory(node.getDeptCategory());
+                   vos.setNodeType(node.getNodeType());
                    vos.setPrimaryKeyId(String.valueOf(node.getPKeyId()));
-                   vos.setTitle(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getDeptName());
+                   vos.setTitle(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getNodeName());
                    vos.setExcelId(node.getExcelId());
                    //最终返回集合
                    vosResult.add(vos);
@@ -229,7 +229,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
                     WbsTreeContractTreeVOS next = iterator.next();
                     if (next.getTitle().contains(dictBiz.getDictValue())) {
                         //设置图标
-                        switch (next.getDeptCategory()) {
+                        switch (next.getNodeType()) {
                             case 7:
                                 //施工日志
                                 next.setIconValue("hcicon-Excavator-3");

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreePrivateClientImpl.java

@@ -60,7 +60,7 @@ public class WbsTreePrivateClientImpl implements WbsTreePrivateClient {
             vos.setKey(wbsTreePrivateVO.getId().toString());
             vos.setPrimaryKeyId(wbsTreePrivateVO.getPKeyId().toString());
             vos.setParentId(wbsTreePrivateVO.getParentId());
-            vos.setTitle(wbsTreePrivateVO.getDeptName());
+            vos.setTitle(wbsTreePrivateVO.getNodeName());
             vos.setType(wbsTreePrivateVO.getType());
             vos.setWbsType(Integer.parseInt(wbsTreePrivateVO.getWbsType()));
             vos.setNotExsitChild(vos.getChildren().size() == 0);

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ContractInfoMapper.xml

@@ -220,9 +220,9 @@
         wbs_type AS wbsType,
         id,
         parent_id,
-        IFNULL(if(length(trim(full_name)) > 0, full_name, dept_name),dept_name) AS title,
+        IFNULL(if(length(trim(full_name)) > 0, full_name, node_name),node_name) AS title,
         type AS "type",
-        dept_category AS deptCategory,
+        node_type AS nodeType,
         id AS "value",
         id AS "key",
         partition_code,
@@ -261,10 +261,10 @@
         d.wbs_type AS "wbsType",
         d.id,
         d.parent_id AS "parentId",
-        IFNULL(if(length(trim(full_name)) > 0, full_name, dept_name),dept_name) AS title,
-        d.dept_name AS "nodeName",
+        IFNULL(if(length(trim(full_name)) > 0, full_name, node_name),node_name) AS title,
+        d.node_name AS "nodeName",
         d.type AS "type",
-        d.dept_category AS "deptCategory",
+        d.node_type AS "nodeType",
         d.id AS "value",
         d.id AS "key",
         partition_code,

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExcelTabMapper.xml

@@ -40,7 +40,7 @@
     <resultMap id="treeNodeResultMap2" type="org.springblade.manager.vo.WbsTreeVO">
         <id column="id" property="id"/>
         <result column="parent_id" property="parentId"/>
-        <result column="deptName" property="deptName"/>
+        <result column="nodeName" property="nodeName"/>
         <result column="has_children" property="hasChildren"/>
         <result column="type" property="type"/>
     </resultMap>
@@ -113,7 +113,7 @@
         dept.id,
         dept.is_link_table,
         dept.parent_id,
-        dept.dept_name as deptName,
+        dept.node_name as nodeName,
         (
         SELECT
         CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
@@ -142,7 +142,7 @@
         dept.id,
         dept.is_link_table,
         dept.parent_id,
-        dept.dept_name as deptName,
+        dept.node_name as nodeName,
         (
         SELECT
         CASE WHEN count(1) > 0 THEN 1 ELSE 0 END

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.xml

@@ -115,7 +115,7 @@
     </select>
 
     <select id="selectWbsTreeTableListByParentId" resultType="org.springblade.manager.dto.WbsFormElementDTO2">
-        SELECT id, dept_name AS "deptName", sort
+        SELECT id, node_name AS "nodeName", sort
         FROM m_wbs_tree
         WHERE parent_id = #{parentId}
           AND status = 1
@@ -126,7 +126,7 @@
 
     <select id="selectDetailById" resultType="org.springblade.manager.vo.WbsFormElementVO">
         SELECT *,
-               (SELECT concat(dept_name, "_", t.e_name) FROM m_wbs_tree WHERE id = t.f_id) AS "tableElementKey"
+               (SELECT concat(node_name, "_", t.e_name) FROM m_wbs_tree WHERE id = t.f_id) AS "tableElementKey"
         FROM m_wbs_form_element t
         WHERE t.id = #{id}
           AND status = 1

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -23,8 +23,8 @@
         <result column="tenant_id" property="tenantId"/>
         <result column="parent_id" property="parentId"/>
         <result column="ancestors" property="ancestors"/>
-        <result column="dept_category" property="deptCategory"/>
-        <result column="dept_name" property="deptName"/>
+        <result column="node_type" property="nodeType"/>
+        <result column="node_name" property="nodeName"/>
         <result column="full_name" property="fullName"/>
         <result column="sort" property="sort"/>
         <result column="remark" property="remark"/>
@@ -62,7 +62,7 @@
         <result column="fullName" property="title"/>
         <result column="has_children" property="hasChildren"/>
         <result column="type" property="type"/>
-        <result column="deptCategory" property="deptCategory"/>
+        <result column="nodeType" property="nodeType"/>
         <result column="wbsType" property="wbsType"/>
         <result column="contractType" property="contractType"/>
         <result column="contractId" property="contractId"/>
@@ -75,7 +75,7 @@
 
     <insert id="insertByCondition">
         INSERT INTO m_wbs_tree_contract(p_key_id, id, wbs_id, wbs_type, project_id, contract_id, contract_type,
-                                        tenant_id, parent_id, ancestors, dept_category, dept_name, full_name, sort,
+                                        tenant_id, parent_id, ancestors, node_type, node_name, full_name, sort,
                                         remark, `type`,
                                         table_type, create_time, create_user, create_dept, update_user, update_time,
                                         `STATUS`, is_deleted,
@@ -83,7 +83,7 @@
                                         major_data_type, init_table_name, is_link_table, excel_id)
         VALUES (#{pKeyId}, #{wbsTree.id}, #{wbsTree.wbsId}, #{wbsType}, #{wbsTree.projectId}, #{contractId}, 1,
                 #{wbsTree.tenantId}, #{wbsTree.parentId}, #{wbsTree.ancestors},
-                #{wbsTree.deptCategory}, #{wbsTree.deptName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
+                #{wbsTree.nodeType}, #{wbsTree.nodeName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
                 #{wbsTree.type},
                 #{wbsTree.tableType}, #{wbsTree.createTime}, #{wbsTree.createUser}, #{wbsTree.createDept},
                 #{wbsTree.updateUser}, #{wbsTree.updateTime},
@@ -119,8 +119,8 @@
 
     <update id="updateByCondition1">
         UPDATE m_wbs_tree_contract
-        SET dept_category   = #{wbsTP.deptCategory},
-            dept_name       = #{wbsTP.deptName},
+        SET node_type   = #{wbsTP.nodeType},
+            node_name       = #{wbsTP.nodeName},
             unique_code     = #{wbsTP.uniqueCode},
             partition_code  = #{wbsTP.partitionCode},
             major_data_type = #{wbsTP.majorDataType}
@@ -182,7 +182,7 @@
     </select>
 
     <select id="selectParent" resultType="org.springblade.manager.entity.WbsTreePrivate">
-        SELECT p_key_id, dept_name, full_name
+        SELECT p_key_id, node_name, full_name
         FROM m_wbs_tree_private
         WHERE project_id = #{projectId}
           AND wbs_id = #{wbsId}
@@ -191,9 +191,9 @@
 
     <select id="queryCurrentContractLogList" resultMap="ResultMap">
         select p_key_id,
-               dept_name,
+               node_name,
                full_name,
-               dept_category,
+               node_type,
                excel_id,
                is_link_table
         from m_wbs_tree_private
@@ -206,7 +206,7 @@
     <select id="selectListByCondition" resultType="org.springblade.manager.vo.WbsTreeContractVO2">
         SELECT p_key_id                                                                   AS "pKeyId",
                id                                                                         AS "id",
-               dept_name                                                                  AS "deptName",
+               node_name                                                                  AS "nodeName",
                full_name                                                                  AS "fullName",
                wbs_type                                                                   AS "wbsType",
                wbs_id                                                                     AS "wbsId",
@@ -241,12 +241,12 @@
         dept.contract_type AS "contractType",
         dept.contract_id AS "contractId",
         dept.p_key_id AS "id",
-        dept.dept_category AS "deptCategory",
+        dept.node_type AS "nodeType",
         dept.id AS "primaryKeyId",
         dept.id AS "value",
         dept.id AS "key" ,
         dept.parent_id,
-        IFNULL(dept.full_name,dept.dept_name) AS "fullName",
+        IFNULL(dept.full_name,dept.node_name) AS "fullName",
         dept.tenant_id AS "tenantId",
         dept.contract_id_relation AS "contractIdRelation",
         (SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END FROM m_wbs_tree_contract WHERE parent_id = dept.id and
@@ -276,14 +276,14 @@
         c.wbs_type AS "wbsType",
         c.contract_type AS "contractType",
         c.contract_id AS "contractId",
-        c.dept_category AS "deptCategory",
+        c.node_type AS "nodeType",
         c.parent_id,
         c.tenant_id AS "tenantId",
         c.id AS "originallyId",
         c.p_key_id AS "originallyPkeyId",
         case
-        when c.full_name is null then c.dept_name
-        when c.full_name = '' then c.dept_name
+        when c.full_name is null then c.node_name
+        when c.full_name = '' then c.node_name
         else c.full_name end AS "title",
         c.contract_id AS "contractIdRelation",
         (SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
@@ -360,7 +360,7 @@
                 #{tableOwnerList}
             </foreach>
         </if>
-        ORDER BY sort,dept_name,create_time
+        ORDER BY sort,node_name,create_time
     </select>
 
     <select id="selectRoleInfo" resultType="org.springblade.manager.entity.SaveUserInfoByProject">
@@ -417,7 +417,7 @@
 
     <select id="selectTableListInfo" resultType="org.springblade.manager.entity.WbsTreeContract">
         SELECT p_key_id AS "pKeyId"
-        ,id,dept_name AS "deptName"
+        ,id,node_name AS "nodeName"
         ,type,parent_id AS "parentId"
         ,is_tab_pdf AS "isTabPdf"
         FROM m_wbs_tree_contract
@@ -448,9 +448,9 @@
 
     <update id="updateBatchByIds">
         UPDATE m_wbs_tree_contract
-        SET dept_name = #{wbsTree.deptName},
-        full_name = #{wbsTree.deptName},
-        dept_category = #{wbsTree.deptCategory},
+        SET node_name = #{wbsTree.nodeName},
+        full_name = #{wbsTree.nodeName},
+        node_type = #{wbsTree.nodeType},
         major_data_type = #{wbsTree.majorDataType},
         unique_code = #{wbsTree.uniqueCode},
         partition_code = #{wbsTree.partitionCode},
@@ -467,9 +467,9 @@
 
     <update id="updateBatchByIds2">
         UPDATE m_wbs_tree_contract
-        SET dept_name = #{wbsTreePrivate.deptName},
-        full_name = #{wbsTreePrivate.deptName},
-        dept_category = #{wbsTreePrivate.deptCategory},
+        SET node_name = #{wbsTreePrivate.nodeName},
+        full_name = #{wbsTreePrivate.nodeName},
+        node_type = #{wbsTreePrivate.nodeType},
         major_data_type = #{wbsTreePrivate.majorDataType},
         unique_code = #{wbsTreePrivate.uniqueCode},
         partition_code = #{wbsTreePrivate.partitionCode},
@@ -486,8 +486,8 @@
 
     <update id="updateContractTablesInfo">
         UPDATE m_wbs_tree_contract
-        SET dept_name = #{wbsTreePrivate.deptName},
-        full_name =#{wbsTreePrivate.deptName},
+        SET node_name = #{wbsTreePrivate.nodeName},
+        full_name =#{wbsTreePrivate.nodeName},
         table_type = #{wbsTreePrivate.tableType},
         table_owner = #{wbsTreePrivate.tableOwner}
         <if test="wbsTreePrivate.sort != null and wbsTreePrivate.sort != ''">
@@ -505,9 +505,9 @@
         <foreach collection="listContract" item="item" index="index" separator=";">
             UPDATE m_wbs_tree_contract
             <set>
-                dept_name = #{item.deptName},
-                full_name = #{item.deptName},
-                dept_category = #{item.deptCategory},
+                node_name = #{item.nodeName},
+                full_name = #{item.nodeName},
+                node_type = #{item.nodeType},
                 major_data_type = #{item.majorDataType},
                 unique_code = #{item.uniqueCode},
                 partition_code = #{item.partitionCode},
@@ -527,7 +527,7 @@
         from m_wbs_tree_contract
         where is_deleted = 0
           and contract_id = #{contractId}
-          and (dept_name like concat('%', #{queryValue}, '%') or full_name like concat('%', #{queryValue}, '%'))
+          and (node_name like concat('%', #{queryValue}, '%') or full_name like concat('%', #{queryValue}, '%'))
           and `type` = '1'
     </select>
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -18,8 +18,8 @@
         <result column="tenant_id" property="tenantId"/>
         <result column="parent_id" property="parentId"/>
         <result column="ancestors" property="ancestors"/>
-        <result column="dept_category" property="deptCategory"/>
-        <result column="dept_name" property="deptName"/>
+        <result column="node_type" property="nodeType"/>
+        <result column="node_name" property="nodeName"/>
         <result column="full_name" property="fullName"/>
         <result column="sort" property="sort"/>
         <result column="remark" property="remark"/>
@@ -42,7 +42,7 @@
         <result column="key" property="key"/>
         <result column="has_children" property="hasChildren"/>
         <result column="type" property="type"/>
-        <result column="deptCategory" property="deptCategory"/>
+        <result column="nodeType" property="nodeType"/>
         <result column="wbsType" property="wbsType"/>
         <result column="isExistForm" property="isExistForm"/>
         <result column="ancestors" property="ancestors"/>
@@ -56,7 +56,7 @@
         <result column="key" property="key"/>
         <result column="has_children" property="hasChildren"/>
         <result column="type" property="type"/>
-        <result column="deptCategory" property="deptCategory"/>
+        <result column="nodeType" property="nodeType"/>
         <result column="wbsType" property="wbsType"/>
         <result column="isExistForm" property="isExistForm"/>
         <result column="ancestors" property="ancestors"/>
@@ -98,24 +98,24 @@
 
     <insert id="insertWbsTreePrivate">
         INSERT INTO m_wbs_tree_private(
-        id,wbs_id,project_id,tenant_id,parent_id,ancestors,dept_category,dept_name,full_name,sort,remark,`type`,
+        id,wbs_id,project_id,tenant_id,parent_id,ancestors,node_type,node_name,full_name,sort,remark,`type`,
         table_type,create_time,create_user,create_dept,update_user,update_time,`STATUS`,is_deleted,
         unique_code,partition_code,is_expernode,is_concrete,table_owner,major_data_type,init_table_name,is_link_table)
         VALUES(
         #{wbsTree.id},#{wbsTree.wbsId},#{projectId},#{wbsTree.tenantId},#{wbsTree.parentId},#{wbsTree.ancestors},
-        #{wbsTree.deptCategory},#{wbsTree.deptName},#{wbsTree.fullName},#{wbsTree.sort},#{wbsTree.remark},#{wbsTree.type},
+        #{wbsTree.nodeType},#{wbsTree.nodeName},#{wbsTree.fullName},#{wbsTree.sort},#{wbsTree.remark},#{wbsTree.type},
         #{wbsTree.tableType},#{wbsTree.createTime},#{wbsTree.createUser},#{wbsTree.createDept},#{wbsTree.updateUser},#{wbsTree.updateTime},
         #{wbsTree.status},#{wbsTree.isDeleted},#{wbsTree.uniqueCode},#{wbsTree.partitionCode},#{wbsTree.isExpernode},#{wbsTree.isConcrete},
         #{wbsTree.tableOwner},#{wbsTree.majorDataType},#{wbsTree.initTableName},#{wbsTree.isLinkTable})
     </insert>
     <insert id="insertWbsTreeContract">
         INSERT INTO m_wbs_tree_contract(
-        id,wbs_id,project_id,contract_id,tenant_id,parent_id,ancestors,dept_category,dept_name,full_name,sort,remark,`type`,
+        id,wbs_id,project_id,contract_id,tenant_id,parent_id,ancestors,node_type,node_name,full_name,sort,remark,`type`,
         table_type,create_time,create_user,create_dept,update_user,update_time,`STATUS`,is_deleted,
         unique_code,partition_code,is_expernode,is_concrete,table_owner,major_data_type,init_table_name,is_link_table)
         VALUES(
         #{wbsTree.id},#{wbsTree.wbsId},#{projectId},#{contractId},#{wbsTree.tenantId},#{wbsTree.parentId},#{wbsTree.ancestors},
-        #{wbsTree.deptCategory},#{wbsTree.deptName},#{wbsTree.fullName},#{wbsTree.sort},#{wbsTree.remark},#{wbsTree.type},
+        #{wbsTree.nodeType},#{wbsTree.nodeName},#{wbsTree.fullName},#{wbsTree.sort},#{wbsTree.remark},#{wbsTree.type},
         #{wbsTree.tableType},#{wbsTree.createTime},#{wbsTree.createUser},#{wbsTree.createDept},#{wbsTree.updateUser},#{wbsTree.updateTime},
         #{wbsTree.status},#{wbsTree.isDeleted},#{wbsTree.uniqueCode},#{wbsTree.partitionCode},#{wbsTree.isExpernode},#{wbsTree.isConcrete},
         #{wbsTree.tableOwner},#{wbsTree.majorDataType},#{wbsTree.initTableName},#{wbsTree.isLinkTable})
@@ -140,7 +140,7 @@
         UPDATE m_wbs_tree
         <trim prefix="set" suffixOverrides=",">
             <if test="wbsName != null and wbsName != '' ">
-                `dept_name` = #{wbsName},
+                `node_name` = #{wbsName},
             </if>
             <if test="status != null and status != '' ">
                 `status` = #{status}
@@ -229,8 +229,8 @@
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">
-        select id, parent_id, dept_name as title,type as "type", id as "value", id as "key", dept_category as
-        "deptCategory",is_exist_form AS "isExistForm",
+        select id, parent_id, node_name as title,type as "type", id as "value", id as "key", node_type as
+        "nodeType",is_exist_form AS "isExistForm",
         (select wbs_type from m_wbs_info where id = #{wbsId}) as "wbsType"
         from m_wbs_tree where
         is_deleted = 0
@@ -251,11 +251,11 @@
         SELECT d.id,
         d.tenant_id AS "tenantId",
         d.parent_id AS "parentId",
-        d.dept_name AS title,
+        d.node_name AS title,
         d.type AS "type",
         d.id AS "value",
         d.id AS "key",
-        d.dept_category AS "deptCategory",
+        d.node_type AS "nodeType",
         d.is_exist_form AS "isExistForm",
         a.wbs_type AS "wbsType"
         FROM m_wbs_tree d INNER JOIN m_wbs_info a ON a.id = #{wbsId}
@@ -278,12 +278,12 @@
     <select id="lazyTree" resultMap="treeNodeResultMap">
         SELECT
         t.type AS "type",
-        t.dept_category AS "deptCategory",
+        t.node_type AS "nodeType",
         t.is_exist_form AS "isExistForm",
         t.table_type,
         t.id,
         t.parent_id,
-        t.dept_name AS title,
+        t.node_name AS title,
         t.id AS "value",
         t.id AS "key",
         t.ancestors AS "ancestors",
@@ -311,7 +311,7 @@
     <select id="selectByNodeTable" resultMap="selectByNodeTableMap">
         SELECT
             wt.id AS id,
-            wt.dept_name AS tableName,
+            wt.node_name AS tableName,
             wt.sort AS sort,
             wt.table_type AS tableType,
             wt.`status` AS isCreateTable ,
@@ -327,14 +327,14 @@
             wt.type = 2
         AND wt.is_deleted = 0
         AND wt.parent_id = #{id}
-        ORDER BY wt.sort,wt.dept_name,wt.create_time
+        ORDER BY wt.sort,wt.node_name,wt.create_time
     </select>
 
     <select id="selectByNodeTableByExcel" resultMap="selectByNodeTableMap">
         SELECT
             wt.p_key_id as pKeyId,
             wt.id AS id,
-            wt.dept_name AS tableName,
+            wt.node_name AS tableName,
             wt.sort AS sort,
             wt.table_type AS tableType,
             wt.`status` AS isCreateTable ,
@@ -432,7 +432,7 @@
     </select>
 
     <select id="selectWbsTreeListByParentId" resultType="org.springblade.manager.dto.WbsTreeDTO2">
-        SELECT id,dept_name AS "deptName",sort
+        SELECT id,node_name AS "nodeName",sort
         FROM m_wbs_tree
         WHERE parent_id = #{parentId}
         AND status = 1
@@ -444,7 +444,7 @@
     <select id="searchNodeTables" resultType="org.springblade.manager.vo.WbsNodeTableVO">
         SELECT
             wt.id AS id,
-            wt.dept_name AS tableName,
+            wt.node_name AS tableName,
             wt.sort AS sort,
             wt.table_type AS tableType,
             wt.`status` AS `status`,

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -20,8 +20,8 @@
         <result column="tenant_id" property="tenantId"/>
         <result column="parent_id" property="parentId"/>
         <result column="ancestors" property="ancestors"/>
-        <result column="dept_category" property="deptCategory"/>
-        <result column="dept_name" property="deptName"/>
+        <result column="node_type" property="nodeType"/>
+        <result column="node_name" property="nodeName"/>
         <result column="full_name" property="fullName"/>
         <result column="sort" property="sort"/>
         <result column="remark" property="remark"/>
@@ -53,19 +53,19 @@
         <result column="type" property="type"/>
         <result column="wbsType" property="wbsType"/>
         <result column="primaryKeyId" property="primaryKeyId"/>
-        <result column="deptCategory" property="deptCategory"/>
+        <result column="nodeType" property="nodeType"/>
         <result column="isExistForm" property="isExistForm"/>
     </resultMap>
     <insert id="insertCombination1">
         INSERT INTO m_wbs_tree_private(p_key_id, id, wbs_id, wbs_type, project_id, tenant_id, parent_id, ancestors,
-                                       dept_category, dept_name, full_name, sort, remark, `type`,
+                                       node_type, node_name, full_name, sort, remark, `type`,
                                        table_type, create_time, create_user, create_dept, update_user, update_time,
                                        `STATUS`, is_deleted,
                                        unique_code, partition_code, is_expernode, is_concrete, table_owner,
                                        major_data_type, init_table_name, is_link_table)
         VALUES (#{snowId}, #{wbsTree.id}, #{wbsTree.wbsId}, #{wbsType}, #{projectId}, #{wbsTree.tenantId},
                 #{wbsTree.parentId}, #{wbsTree.ancestors},
-                #{wbsTree.deptCategory}, #{wbsTree.deptName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
+                #{wbsTree.nodeType}, #{wbsTree.nodeName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
                 #{wbsTree.type},
                 #{wbsTree.tableType}, #{wbsTree.createTime}, #{wbsTree.createUser}, #{wbsTree.createDept},
                 #{wbsTree.updateUser}, #{wbsTree.updateTime},
@@ -76,14 +76,14 @@
 
     <insert id="insertCombination2">
         INSERT INTO m_wbs_tree_private(p_key_id, id, wbs_id, wbs_type, project_id, tenant_id, parent_id, ancestors,
-                                       dept_category, dept_name, full_name, sort, remark, `type`,
+                                       node_type, node_name, full_name, sort, remark, `type`,
                                        table_type, create_time, create_user, create_dept, update_user, update_time,
                                        `STATUS`, is_deleted,
                                        unique_code, partition_code, is_expernode, is_concrete, table_owner,
                                        major_data_type, init_table_name, is_link_table)
         VALUES (#{snowId}, #{wbsTree.id}, #{wbsTree.wbsId}, #{wbsTree.wbsType}, #{projectId}, #{wbsTree.tenantId},
                 #{wbsTree.parentId}, #{wbsTree.ancestors},
-                #{wbsTree.deptCategory}, #{wbsTree.deptName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
+                #{wbsTree.nodeType}, #{wbsTree.nodeName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
                 #{wbsTree.type},
                 #{wbsTree.tableType}, #{wbsTree.createTime}, #{wbsTree.createUser}, #{wbsTree.createDept},
                 #{wbsTree.updateUser}, #{wbsTree.updateTime},
@@ -139,8 +139,8 @@
         update m_wbs_tree_private
         set tenant_id       = #{wbsTP.tenantId},
             parent_id       = #{wbsTP.parentId},
-            dept_category   = #{wbsTP.deptCategory},
-            dept_name       = #{wbsTP.deptName},
+            node_type   = #{wbsTP.nodeType},
+            node_name       = #{wbsTP.nodeName},
             ancestors       = #{wbsTP.ancestors},
             unique_code     = #{wbsTP.uniqueCode},
             partition_code  = #{wbsTP.partitionCode},
@@ -191,8 +191,8 @@
 
     <update id="updateBatchByPid">
         UPDATE m_wbs_tree_private
-        SET dept_name   = #{wbsTreePrivates.deptName},
-            full_name   =#{wbsTreePrivates.deptName},
+        SET node_name   = #{wbsTreePrivates.nodeName},
+            full_name   =#{wbsTreePrivates.nodeName},
             table_type  = #{wbsTreePrivates.tableType},
             table_owner = #{wbsTreePrivates.tableOwner}
         WHERE p_key_id = #{wbsTreePrivates.pKeyId}
@@ -200,9 +200,9 @@
 
     <update id="updateBatchByIds">
         UPDATE m_wbs_tree_private
-        SET dept_name = #{wbsTree.deptName},
-        full_name =#{wbsTree.deptName},
-        dept_category = #{wbsTree.deptCategory},
+        SET node_name = #{wbsTree.nodeName},
+        full_name =#{wbsTree.nodeName},
+        node_type = #{wbsTree.nodeType},
         major_data_type = #{wbsTree.majorDataType},
         unique_code = #{wbsTree.uniqueCode},
         partition_code = #{wbsTree.partitionCode},
@@ -219,9 +219,9 @@
 
     <update id="updateBatchByIds2">
         UPDATE m_wbs_tree_private
-        SET dept_name = #{wbsTreePrivate.deptName},
-        full_name = #{wbsTreePrivate.deptName},
-        dept_category = #{wbsTreePrivate.deptCategory},
+        SET node_name = #{wbsTreePrivate.nodeName},
+        full_name = #{wbsTreePrivate.nodeName},
+        node_type = #{wbsTreePrivate.nodeType},
         major_data_type = #{wbsTreePrivate.majorDataType},
         unique_code = #{wbsTreePrivate.uniqueCode},
         partition_code = #{wbsTreePrivate.partitionCode},
@@ -241,9 +241,9 @@
         <foreach collection="listPrivate" item="item" index="index" separator=";">
             UPDATE m_wbs_tree_private
             <set>
-                dept_name = #{item.deptName},
-                full_name = #{item.deptName},
-                dept_category = #{item.deptCategory},
+                node_name = #{item.nodeName},
+                full_name = #{item.nodeName},
+                node_type = #{item.nodeType},
                 major_data_type = #{item.majorDataType},
                 unique_code = #{item.uniqueCode},
                 partition_code = #{item.partitionCode},
@@ -265,8 +265,8 @@
         dept.table_type,
         dept.id,
         dept.parent_id,
-        dept.dept_name AS title,
-        dept.dept_category AS "deptCategory",
+        dept.node_name AS title,
+        dept.node_type AS "nodeType",
         dept.id AS "value",
         dept.id AS "key",
         dept.is_exist_form AS "isExistForm",
@@ -317,8 +317,8 @@
 
     <select id="tree" resultMap="treeNodeResultMap">
         select p_key_id as "primaryKeyId",
-        id, parent_id, dept_name as title,type as "type", id as "value", id as "key" ,
-        dept_category AS "deptCategory", is_exist_form AS "isExistForm",
+        id, parent_id, node_name as title,type as "type", id as "value", id as "key" ,
+        node_type AS "nodeType", is_exist_form AS "isExistForm",
         wbs_type as "wbsType"
         from m_wbs_tree_private
         where
@@ -376,7 +376,7 @@
     <select id="selectByNodeTable" resultType="org.springblade.manager.vo.WbsNodeTableVO">
         SELECT wt.p_key_id                                                  AS "pKeyId",
                wt.id                                                        AS id,
-               wt.dept_name                                                 AS tableName,
+               wt.node_name                                                 AS tableName,
                wt.table_type                                                AS tableType,
                wt.`status`                                                  AS isCreateTable,
                wt.table_owner                                               as tableOwner,
@@ -392,7 +392,7 @@
           AND wt.parent_id = #{id}
           AND wt.wbs_id = #{wbsId}
           AND wt.project_id = #{projectId}
-        ORDER BY wt.sort, wt.dept_name, wt.create_time
+        ORDER BY wt.sort, wt.node_name, wt.create_time
     </select>
     <select id="getByCondition" resultType="org.springblade.manager.entity.WbsTreePrivate">
         SELECT *
@@ -428,7 +428,7 @@
     </select>
 
     <select id="selectNodeListByCondition" resultType="org.springblade.manager.dto.WbsTreePrivateDTO2">
-        SELECT p_key_id as "pKeyId", dept_name AS "tableName", sort
+        SELECT p_key_id as "pKeyId", node_name AS "tableName", sort
         FROM m_wbs_tree_private
         WHERE project_id = #{projectId}
           AND parent_id = #{parentId}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

@@ -485,7 +485,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                 //查询实体表是否存在
                 Integer obj = baseMapper.showShowTabLike(wbsTree);
                 if (obj != 1) {
-                    throw new ServiceException(StringUtil.format("未获取到 {} 对应实体表信息，关联失败", wbsTree.getDeptName()));
+                    throw new ServiceException(StringUtil.format("未获取到 {} 对应实体表信息，关联失败", wbsTree.getNodeName()));
                 }
 
                 //获取当前元素表与清表关系信息
@@ -567,8 +567,8 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                 throw new ServiceException("请添加至少一个元素信息");
             }
             for (String nodeId : nodeIds) {
-                String deptName = formElementDTO.getDeptName();
-                if (deptName.length() > 100 || deptName.length() < 1) {
+                String nodeName = formElementDTO.getNodeName();
+                if (nodeName.length() > 100 || nodeName.length() < 1) {
                     throw new ServiceException("表名长度错误,输入范围1-100个字符长度");
                 }
                 if (formElementDTO.getElementList().size() <= 0) {
@@ -653,7 +653,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
         dept.setType(2);
         dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
-        dept.setDeptCategory(1);
+        dept.setNodeType(1);
         dept.setStatus(1);
         dept.setIsLinkTable(2);
         dept.setId(SnowFlakeUtil.getId());

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsInfoServiceImpl.java

@@ -56,8 +56,8 @@ public class WbsInfoServiceImpl extends BaseServiceImpl<WbsInfoMapper, WbsInfo>
                 wbsTree.setTenantId(AuthUtil.getTenantId());
                 wbsTree.setParentId(0L);
                 wbsTree.setAncestors("0");
-                wbsTree.setDeptCategory(1);
-                wbsTree.setDeptName(nodeName);
+                wbsTree.setNodeType(1);
+                wbsTree.setNodeName(nodeName);
                 wbsTree.setFullName(nodeName);
                 wbsTree.setType(1);
                 return wbsTreeService.save(wbsTree);

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -156,7 +156,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     });
                 }
 
-                List<String> nodeNames = tableNames.stream().map(WbsTreeContract::getDeptName).collect(Collectors.toList());
+                List<String> nodeNames = tableNames.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList());
 
                 if (nodeNames.size() > 0) {
                     String names = StringUtils.join(nodeNames, " , ");
@@ -194,12 +194,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     wbsTreeContractList.add(wbsTreeContract);
 
                     //台账
-                    if (wbsTreeContract.getDeptCategory() == 6) {
+                    if (wbsTreeContract.getNodeType() == 6) {
                         ConstructionLedger constructionLedger = new ConstructionLedger();
                         constructionLedger.setIsBeton(0);
                         constructionLedger.setWbsId(wbsTreeContract.getPKeyId());
-                        constructionLedger.setSite(wbsTreeContract.getDeptName());
-                        constructionLedger.setStation(wbsTreeContract.getDeptName());
+                        constructionLedger.setSite(wbsTreeContract.getNodeName());
+                        constructionLedger.setStation(wbsTreeContract.getNodeName());
                         constructionLedger.setContractId(Long.parseLong(pawDTO.getContractId()));
                         constructionLedgerList.add(constructionLedger);
                     }
@@ -357,8 +357,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         wbsTreeContract.setTenantId(wbsTree.getTenantId());
         wbsTreeContract.setParentId(wbsTree.getParentId());
         wbsTreeContract.setAncestors(wbsTree.getAncestors());
-        wbsTreeContract.setDeptName(wbsTree.getDeptName());
-        wbsTreeContract.setDeptCategory(wbsTree.getDeptCategory());
+        wbsTreeContract.setNodeName(wbsTree.getNodeName());
+        wbsTreeContract.setNodeType(wbsTree.getNodeType());
         wbsTreeContract.setFullName(wbsTree.getFullName());
         wbsTreeContract.setSort(wbsTree.getSort());
         wbsTreeContract.setRemark(wbsTree.getRemark());

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -307,8 +307,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             for (WbsTreePrivate wbsTreePrivate : wbsTreePrivatesAll) {
                 //判断相同节点基础信息、元素表类型、元素表所属方 是否发生改变
                 if (wbsTree.getId().equals(wbsTreePrivate.getId()) &&
-                        (!wbsTree.getDeptName().equals(wbsTreePrivate.getDeptName())
-                                || (wbsTree.getDeptCategory() != null && !wbsTree.getDeptCategory().equals(wbsTreePrivate.getDeptCategory()))
+                        (!wbsTree.getNodeName().equals(wbsTreePrivate.getNodeName())
+                                || (wbsTree.getNodeType() != null && !wbsTree.getNodeType().equals(wbsTreePrivate.getNodeType()))
                                 || (wbsTree.getPartitionCode() != null && !wbsTree.getPartitionCode().equals(wbsTreePrivate.getPartitionCode()))
                                 || (wbsTree.getUniqueCode() != null && !wbsTree.getUniqueCode().equals(wbsTreePrivate.getUniqueCode()))
                                 || (wbsTree.getMajorDataType() != null && !wbsTree.getMajorDataType().equals(wbsTreePrivate.getMajorDataType()))
@@ -354,8 +354,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             for (WbsTreePrivate treePrivateNow : wbsTreePrivatesAllNow) {
                 //判断相同节点基础信息、元素表类型、元素表所属方 是否发生改变
                 if (wbsTreePrivate.getId().equals(treePrivateNow.getId()) &&
-                        (!wbsTreePrivate.getDeptName().equals(treePrivateNow.getDeptName())
-                                || (wbsTreePrivate.getDeptCategory() != null && !wbsTreePrivate.getDeptCategory().equals(treePrivateNow.getDeptCategory()))
+                        (!wbsTreePrivate.getNodeName().equals(treePrivateNow.getNodeName())
+                                || (wbsTreePrivate.getNodeType() != null && !wbsTreePrivate.getNodeType().equals(treePrivateNow.getNodeType()))
                                 || (wbsTreePrivate.getPartitionCode() != null && !wbsTreePrivate.getPartitionCode().equals(treePrivateNow.getPartitionCode()))
                                 || (wbsTreePrivate.getUniqueCode() != null && !wbsTreePrivate.getUniqueCode().equals(treePrivateNow.getUniqueCode()))
                                 || (wbsTreePrivate.getMajorDataType() != null && !wbsTreePrivate.getMajorDataType().equals(treePrivateNow.getMajorDataType()))

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -195,7 +195,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
             //初始化
             wbsTree.setTenantId(wbsTree.getTenantId());
-            wbsTree.setDeptCategory(1);
+            wbsTree.setNodeType(1);
             wbsTree.setWbsId(wbsTree.getWbsId());
             wbsTree.setParentId(wbsTree.getId());
             String ancestors = wbsTree.getAncestors() + StringPool.COMMA + wbsTree.getId();
@@ -205,8 +205,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             wbsTree.setStatus(1);
 
             maps.forEach(map -> {
-                String deptName = map.get("表名");
-                wbsTree.setDeptName(deptName);
+                String tabName = map.get("表名");
+                wbsTree.setNodeName(tabName);
                 wbsTree.setTableType(WbsElementUtil.getTableType(map.get("表类型")));
                 Long id = SnowFlakeUtil.getId();
                 String initTableName = "m_" + DateUtil.time() + "_" + id;
@@ -222,7 +222,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
                     WbsTreeBatchImportDTO wbsTreeBatchImportDTO = new WbsTreeBatchImportDTO();
                     wbsTreeBatchImportDTO.setId(id);
-                    wbsTreeBatchImportDTO.setTableName(deptName);
+                    wbsTreeBatchImportDTO.setTableName(tabName);
                     wbsTreeBatchImportDTO.setInitTableName(initTableName);
                     list.add(wbsTreeBatchImportDTO);
 
@@ -379,23 +379,23 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     WbsTree wbsTreeZi = new WbsTree();
                     wbsTreeZi.setId(SnowFlakeUtil.getId());
                     wbsTreeZi.setTenantId(AuthUtil.getTenantId());
-                    wbsTreeZi.setDeptName(maps.getValue());
+                    wbsTreeZi.setNodeName(maps.getValue());
                     wbsTreeZi.setFullName(maps.getValue());
-                    wbsTreeZi.setDeptCategory(Integer.valueOf(maps.getKey()));
+                    wbsTreeZi.setNodeType(Integer.valueOf(maps.getKey()));
                     wbsTreeZi.setWbsId(wbsTreeFu.getWbsId());
                     wbsTreeZi.setParentId(wbsTreeFu.getParentId());
                     wbsTreeZi.setAncestors(wbsTreeFu.getAncestors());
                     wbsTreeZi.setProjectNodeId(wbsTree1.getProjectNodeId());
                     wbsTreeZi.setMajorDataType(0);
                     //内页资料
-                    if (wbsTreeZi.getDeptCategory() == 6 && !(("中间交工证书").equals(wbsTreeZi.getDeptName()) || ("分项工程质量检验评定表").equals(wbsTreeZi.getDeptName()) || ("分项工程开工报告").equals(wbsTreeZi.getDeptName()))) {
+                    if (wbsTreeZi.getNodeType() == 6 && !(("中间交工证书").equals(wbsTreeZi.getNodeName()) || ("分项工程质量检验评定表").equals(wbsTreeZi.getNodeName()) || ("分项工程开工报告").equals(wbsTreeZi.getNodeName()))) {
                         wbsTreeZi.setMajorDataType(4);
-                    } else if (wbsTreeZi.getDeptCategory() == 5 || wbsTreeZi.getDeptCategory() == 4 || wbsTreeZi.getDeptCategory() == 3 || wbsTreeZi.getDeptCategory() == 2) {
-                        if (getContains(wbsTreeZi.getDeptName(), "开工报告")) {
+                    } else if (wbsTreeZi.getNodeType() == 5 || wbsTreeZi.getNodeType() == 4 || wbsTreeZi.getNodeType() == 3 || wbsTreeZi.getNodeType() == 2) {
+                        if (getContains(wbsTreeZi.getNodeName(), "开工报告")) {
                             wbsTreeZi.setMajorDataType(1);
-                        } else if (getContains(wbsTreeZi.getDeptName(), "质量评定")) {
+                        } else if (getContains(wbsTreeZi.getNodeName(), "质量评定")) {
                             wbsTreeZi.setMajorDataType(2);
-                        } else if (getContains(wbsTreeZi.getDeptName(), "中间交工")) {
+                        } else if (getContains(wbsTreeZi.getNodeName(), "中间交工")) {
                             wbsTreeZi.setMajorDataType(3);
                         }
                     }
@@ -439,9 +439,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         List<WbsTree> wbsTrees = new ArrayList<>();
         //判重
         for (WbsTree tree : allNodeData) {
-            if (tree.getDeptName().equals(wbsTreeZi.getDeptName())
+            if (tree.getNodeName().equals(wbsTreeZi.getNodeName())
                     && tree.getWbsId().equals(wbsTreeZi.getWbsId())
-                    && tree.getDeptCategory().equals(wbsTreeZi.getDeptCategory())
+                    && tree.getNodeType().equals(wbsTreeZi.getNodeType())
                     && tree.getProjectNodeId().equals(wbsTreeZi.getProjectNodeId())) {
                 //判断上级节点不同,当前节点名相同的tree选择问题
                 //例如：第X跨的上级有上部构造现场浇筑、上部构造预制和安装,导致下方新增重复节点判断时找到的是前一个 TODO
@@ -457,19 +457,19 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         if (wbsTrees.size() <= 0) {
             wbsTreeZi.setStatus(1);
             wbsTreeZi.setType(1);
-            if (wbsTreeZi.getDeptCategory() == 6) {
+            if (wbsTreeZi.getNodeType() == 6) {
                 wbsTreeZi.setIsConcrete(0);
                 wbsTreeZi.setIsExpernode(0);
             }
         } else {
             //重复 判断是否为同一父节点,相同父节点跳过,不同新增
             for (WbsTree tree : wbsTrees) {
-                if (wbsTreeZi.getDeptCategory() == 2 || wbsTreeZi.getDeptCategory() == 3
-                        || wbsTreeZi.getDeptCategory() == 4 || wbsTreeZi.getDeptCategory() == 5 || wbsTreeZi.getDeptCategory() == 6) {
-                    if (!wbsTreeZi.getParentId().equals(tree.getParentId()) && wbsTreeZi.getDeptName().equals(tree.getDeptName())) {
+                if (wbsTreeZi.getNodeType() == 2 || wbsTreeZi.getNodeType() == 3
+                        || wbsTreeZi.getNodeType() == 4 || wbsTreeZi.getNodeType() == 5 || wbsTreeZi.getNodeType() == 6) {
+                    if (!wbsTreeZi.getParentId().equals(tree.getParentId()) && wbsTreeZi.getNodeName().equals(tree.getNodeName())) {
                         wbsTreeZi.setStatus(1);
                         wbsTreeZi.setType(1);
-                        if (wbsTreeZi.getDeptCategory() == 6) {
+                        if (wbsTreeZi.getNodeType() == 6) {
                             wbsTreeZi.setIsConcrete(0);
                             wbsTreeZi.setIsExpernode(0);
                         }
@@ -1085,8 +1085,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         if (StringUtils.isEmpty(filedName) || StringUtils.isEmpty(filedType) || StringUtils.isEmpty(filedLength)) {
             throw new ServiceException("操作失败,请完整填写元素参数");
         }
-        String deptName = formElementDTO.getDeptName();
-        if (deptName.length() > 100 || deptName.length() < 1) {
+        String nodeName = formElementDTO.getNodeName();
+        if (nodeName.length() > 100 || nodeName.length() < 1) {
             throw new ServiceException("表名长度错误,输入范围1-100个字符长度");
         }
 
@@ -1162,8 +1162,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreePrivate.setTenantId(wbsTree.getTenantId());
         wbsTreePrivate.setParentId(wbsTree.getParentId());
         wbsTreePrivate.setAncestors(wbsTree.getAncestors());
-        wbsTreePrivate.setDeptCategory(wbsTree.getDeptCategory());
-        wbsTreePrivate.setDeptName(wbsTree.getDeptName());
+        wbsTreePrivate.setNodeType(wbsTree.getNodeType());
+        wbsTreePrivate.setNodeName(wbsTree.getNodeName());
         wbsTreePrivate.setFullName(wbsTree.getFullName());
         wbsTreePrivate.setSort(wbsTree.getSort());
         wbsTreePrivate.setRemark(wbsTree.getRemark());
@@ -1201,8 +1201,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreePrivate.setTenantId(wbsTree.getTenantId());
         wbsTreePrivate.setParentId(wbsTree.getParentId());
         wbsTreePrivate.setAncestors(wbsTree.getAncestors());
-        wbsTreePrivate.setDeptCategory(wbsTree.getDeptCategory());
-        wbsTreePrivate.setDeptName(wbsTree.getDeptName());
+        wbsTreePrivate.setNodeType(wbsTree.getNodeType());
+        wbsTreePrivate.setNodeName(wbsTree.getNodeName());
         wbsTreePrivate.setFullName(wbsTree.getFullName());
         wbsTreePrivate.setSort(wbsTree.getSort());
         wbsTreePrivate.setRemark(wbsTree.getRemark());
@@ -1244,9 +1244,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreeContract.setTenantId(wbsTree.getTenantId());
         wbsTreeContract.setParentId(wbsTree.getParentId());
         wbsTreeContract.setAncestors(wbsTree.getAncestors());
-        wbsTreeContract.setDeptName(wbsTree.getDeptName());
-        wbsTreeContract.setDeptCategory(wbsTree.getDeptCategory());
-        wbsTreeContract.setFullName(wbsTree.getDeptName());
+        wbsTreeContract.setNodeName(wbsTree.getNodeName());
+        wbsTreeContract.setNodeType(wbsTree.getNodeType());
+        wbsTreeContract.setFullName(wbsTree.getNodeName());
         wbsTreeContract.setSort(wbsTree.getSort());
         wbsTreeContract.setRemark(wbsTree.getRemark());
         wbsTreeContract.setType(wbsTree.getType());

blade-service/blade-manager/src/main/java/sql/m_wbs_tree.sql

@@ -27,8 +27,8 @@ CREATE TABLE `m_wbs_tree`  (
   `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `parent_id` bigint(20) NULL DEFAULT 0 COMMENT '父主键',
   `ancestors` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '祖级列表',
-  `dept_category` int(2) NULL DEFAULT NULL COMMENT '节点类型',
-  `dept_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节点名',
+  `node_type` int(2) NULL DEFAULT NULL COMMENT '节点类型',
+  `node_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节点名',
   `full_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节点全称',
   `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',