From bdef23946e420ba538870d6314034fbd42f00a66 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 77 ++++++++++----------------------------
1 files changed, 20 insertions(+), 57 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index e109539..31d6031 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1,6 +1,8 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.domain.entity.ProjectProcess;
import com.ycl.mapper.ProjectProcessMapper;
import com.ycl.service.ProjectProcessService;
@@ -16,6 +18,7 @@
import org.springframework.util.Assert;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -29,56 +32,6 @@
public class ProjectProcessServiceImpl extends ServiceImpl<ProjectProcessMapper, ProjectProcess> implements ProjectProcessService {
private final ProjectProcessMapper projectProcessMapper;
-
- /**
- * 娣诲姞
- * @param form
- * @return
- */
- @Override
- public Result add(ProjectProcessForm form) {
- ProjectProcess entity = ProjectProcessForm.getEntityByForm(form, null);
- baseMapper.insert(entity);
- return Result.ok("娣诲姞鎴愬姛");
- }
-
- /**
- * 淇敼
- * @param form
- * @return
- */
- @Override
- public Result update(ProjectProcessForm form) {
- ProjectProcess entity = baseMapper.selectById(form.getId());
-
- // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- baseMapper.updateById(entity);
- return Result.ok("淇敼鎴愬姛");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
- */
- @Override
- public Result remove(List<String> ids) {
- baseMapper.deleteBatchIds(ids);
- return Result.ok("鍒犻櫎鎴愬姛");
- }
-
- /**
- * id鍒犻櫎
- * @param id
- * @return
- */
- @Override
- public Result removeById(String id) {
- baseMapper.deleteById(id);
- return Result.ok("鍒犻櫎鎴愬姛");
- }
/**
* 鍒嗛〉鏌ヨ
@@ -104,13 +57,23 @@
return Result.ok().data(vo);
}
- /**
- * 鍒楄〃
- * @return
- */
+
@Override
- public Result all() {
- List<ProjectProcess> entities = baseMapper.selectList(null);
- return Result.ok().data(entities);
+ public Result projectSetProcess(ProjectProcessForm form) {
+ // 鏌ヨ璇ラ」鐩槸鍚﹀凡缁忕粦瀹氳繃娴佺▼浜嗭紝妫�鏌ョ粦瀹氱殑娴佺▼鏄惁鍦ㄨ繍琛岋紝鍦ㄨ繍琛屽氨鍒犱簡
+ ProjectProcess pp = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProjectProcess::getProjectId, form.getProjectId())
+ .one();
+ if (Objects.nonNull(pp)) {
+ // TODO 澶勭悊涔嬪墠缁戝畾杩囩殑娴佺▼鏁版嵁
+ new LambdaUpdateChainWrapper<>(baseMapper)
+ .eq(ProjectProcess::getProjectId, form.getProjectId())
+ .set(ProjectProcess::getFlowableProcessId, form.getFlowableProcessId())
+ .update();
+ } else {
+ ProjectProcess entity = ProjectProcessForm.getEntityByForm(form, null);
+ baseMapper.insert(entity);
+ }
+ return Result.ok("娴佺▼鍙樻洿鎴愬姛");
}
}
--
Gitblit v1.8.0