首件相关

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

@@ -16,6 +16,8 @@
  */
 package org.springblade.business.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -125,13 +127,13 @@ public class TreeContractFirstController extends BladeController {
 			@ApiImplicitParam(name = "primaryKeyId", value = "标记为首件的节点primaryKeyId或pKeyId", required = true),
 			@ApiImplicitParam(name = "saveOrDeleted", value = "新增为0，删除为1", required = true)
 	})
-	public R<Boolean> saveOrDelete(@RequestParam String primaryKeyId, @RequestParam Integer saveOrDeleted) {
+	public R<List<String>> saveOrDelete(@RequestParam String primaryKeyId, @RequestParam Integer saveOrDeleted) {
 		//获取当前操作用户
 		BladeUser user = AuthUtil.getUser();
 		//获取当前节点的信息
 		WbsTreeContract nodeData = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(Long.valueOf(primaryKeyId));
 		if(nodeData == null){
-			return R.data(-1, false, "未找到当前节点");
+			return R.data(-1, null, "未找到当前节点");
 		}
 		//获取当前节点的所有父节点和子节点
 		StringBuilder parentIds = new StringBuilder(), childIds = new StringBuilder();
@@ -140,8 +142,16 @@ public class TreeContractFirstController extends BladeController {
 		//获取子节点
 		this.currentNodeAllChild(childIds, nodeData);
 
+		boolean resultBol;
+
 		//判断是新增还是删除
 		if(new Integer("0").equals(saveOrDeleted)){
+			//检查当前请求的节点是否已经被关联
+			TreeContractFirst firstData = this.treeContractFirstService.getOne(Wrappers.<TreeContractFirst>lambdaQuery().eq(TreeContractFirst::getIsDeleted, 0).eq(TreeContractFirst::getWbsNodeId, primaryKeyId));
+			if(firstData != null){
+				return R.data(JSONArray.parseArray(JSONObject.toJSONString(primaryKeyId), String.class));
+			}
+
 			//新增集合
 			List<TreeContractFirst> save = new ArrayList<>();
 			//新增当前节点
@@ -171,10 +181,10 @@ public class TreeContractFirstController extends BladeController {
 				}
 			}
 			//最后操作落库
-			return R.data(this.treeContractFirstService.saveBatch(save));
+			resultBol = this.treeContractFirstService.saveBatch(save);
 		} else {
 			//删除自身
-			boolean resultBol = this.treeContractFirstService.update(Wrappers.<TreeContractFirst>lambdaUpdate().set(TreeContractFirst::getIsDeleted, 1).eq(TreeContractFirst::getWbsNodeId, primaryKeyId));
+			resultBol = this.treeContractFirstService.update(Wrappers.<TreeContractFirst>lambdaUpdate().set(TreeContractFirst::getIsDeleted, 1).eq(TreeContractFirst::getWbsNodeId, primaryKeyId));
 			//删除子节点
 			if(StringUtils.isNotEmpty(childIds.toString()) && !",".equals(childIds.toString())){
 				//存在子节点，均更改为删除状态
@@ -184,13 +194,11 @@ public class TreeContractFirstController extends BladeController {
 			if(StringUtils.isNotEmpty(parentIds.toString()) && !",".equals(parentIds.toString())){
 				//删除父节点情况相对复杂，需要判断对应节点下的是否还存在子节点处于首件状态，如果存在那么当前父节点就不能被删除掉
 				String[] parentIdArray = parentIds.toString().split(",");
-				//判断需要删除的节点集合
-				List<String> deleted = new ArrayList<>();
 				for(String parentId : parentIdArray){
 					if(StringUtils.isNotEmpty(parentId)){
 						//首先获取当前父节点的下一级子节点
 						WbsTreeContract parentNode = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(parentId);
-						List<WbsTreeContractTreeVOS> oneChild = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(nodeData.getContractId(), nodeData.getDeptCategory(), String.valueOf(parentNode.getId()));
+						List<WbsTreeContractTreeVOS> oneChild = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(nodeData.getContractId(), nodeData.getWbsType(), String.valueOf(parentNode.getId()));
 						List<String> ids = new ArrayList<>();
 						oneChild.forEach(child -> ids.add(child.getPrimaryKeyId()));
 						//判断是否存在首件标记
@@ -200,18 +208,18 @@ public class TreeContractFirstController extends BladeController {
 							break;
 						} else {
 							//反之，说明当前节点下的子节点已经不存在处理首件标记的有效记录，则当前节点可以被取消首件标记
-							deleted.add(parentId);
+							resultBol = this.treeContractFirstService.update(Wrappers.<TreeContractFirst>lambdaUpdate().set(TreeContractFirst::getIsDeleted, 1).eq(TreeContractFirst::getWbsNodeId, parentId));
 							//之后对当前节点的上一级做相同判断
 						}
 					}
 				}
-				//最后执行父节点删除
-				if(deleted.size() != 0){
-					resultBol = this.treeContractFirstService.update(Wrappers.<TreeContractFirst>lambdaUpdate().set(TreeContractFirst::getIsDeleted, 1).in(TreeContractFirst::getWbsNodeId, deleted));
-				}
 			}
-			return R.data(resultBol);
 		}
+
+		if(resultBol){
+			return R.data(this.treeContractFirstService.queryTreeFirstAllByContractId(nodeData.getContractId()));
+		}
+		return R.data(null);
 	}
 
 	/**

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.business.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.business.entity.TreeContractFirst;
 import org.springblade.business.vo.TreeContractFirstVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -30,4 +31,6 @@ import java.util.List;
  */
 public interface TreeContractFirstMapper extends BaseMapper<TreeContractFirst> {
 
+    List<String> queryTreeFirstAllByContractId(@Param("contractId") String contractId);
+
 }

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

@@ -17,4 +17,8 @@
         <result column="wbs_node_id" property="wbsNodeId"/>
     </resultMap>
 
+    <select id="queryTreeFirstAllByContractId" resultType="java.lang.String">
+        select wbs_node_id from u_tree_contract_first where is_deleted = 0 and contract_id = #{contractId}
+    </select>
+
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/ITreeContractFirstService.java

@@ -19,6 +19,8 @@ package org.springblade.business.service;
 import org.springblade.business.entity.TreeContractFirst;
 import org.springblade.core.mp.base.BaseService;
 
+import java.util.List;
+
 /**
  * 合同段划分树首件关联表 服务类
  *
@@ -27,4 +29,6 @@ import org.springblade.core.mp.base.BaseService;
  */
 public interface ITreeContractFirstService extends BaseService<TreeContractFirst> {
 
+    List<String> queryTreeFirstAllByContractId(String contractId);
+
 }

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

@@ -22,6 +22,8 @@ import org.springblade.business.service.ITreeContractFirstService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 合同段划分树首件关联表 服务实现类
  *
@@ -31,4 +33,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TreeContractFirstServiceImpl extends BaseServiceImpl<TreeContractFirstMapper, TreeContractFirst> implements ITreeContractFirstService {
 
+    @Override
+    public List<String> queryTreeFirstAllByContractId(String contractId) {
+        return this.baseMapper.queryTreeFirstAllByContractId(contractId);
+    }
 }