From 5ac38442b65142e86977d076d7a3aa30c252be37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= Date: Sat, 2 Apr 2022 16:53:55 +0800 Subject: [PATCH 1/2] Update deployment-sim.yaml --- deployment-sim.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment-sim.yaml b/deployment-sim.yaml index 7eeab29..36dde90 100644 --- a/deployment-sim.yaml +++ b/deployment-sim.yaml @@ -7,7 +7,7 @@ metadata: app: biz-service-ebtp-project spec: - replicas: 3 + replicas: 1 strategy: rollingUpdate: maxSurge: 1 From eb5363ec1b53c6eaa091e567442b7f1fe953d1fb Mon Sep 17 00:00:00 2001 From: liuh Date: Fri, 13 May 2022 20:52:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=A7=94=E6=89=98id?= =?UTF-8?q?=E6=95=B0=E7=BB=84=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=A7=94=E6=89=98?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectEntrustController.java | 16 +++++++++++++++- .../service/IProjectEntrustService.java | 10 ++++++++++ .../service/impl/ProjectEntrustServiceImpl.java | 11 +++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java index 85391c9..e91f18c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.List; /** * 项目委托信息controller @@ -281,5 +282,18 @@ public class ProjectEntrustController{ return BaseResponse.success(projectEntrustService.deleteProjectEntrust(ebpProjectId,reason)); } - + + /** + * 根据委托id数组，查询委托表数据 + * + * @param ids 委托单ids + * + * @return 返回结果 + */ + @ApiOperation("根据委托id数组，查询委托表数据") + @PostMapping("/getEntrustList") + public BaseResponse> getEntrustList(@ApiParam(value = "委托单id数组", required = true) @RequestBody List ids){ + return BaseResponse.success(projectEntrustService.getEntrustList(ids)); + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java index 2c891a0..ed4b031 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java @@ -7,6 +7,8 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrust; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpImplementSendVO; +import java.util.List; + /** * 对数据表 biz_project_entrust 操作的 service * @author daixc @@ -100,4 +102,12 @@ public interface IProjectEntrustService extends IBaseService{ * @return 返回结果 */ boolean deleteProjectEntrust(Long ebpProjectId,String reason); + + + /** + * 根据委托单ids，批量查询委托单数据 + * @param ids 委托单ids + * @return 返回结果 + */ + List getEntrustList(List ids); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java index 9cd715d..9138142 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java @@ -45,6 +45,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -547,6 +548,16 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl getEntrustList(List ids) { + List list = this.list(new LambdaQueryWrapper().in(ProjectEntrust::getId, ids)); + List returnList = new ArrayList<>(); + list.forEach(p -> returnList.add(BeanUtil.toBean(p, ProjectEntrustVO.class))); + return returnList; + } + + /** * 出始化项目辅助相关信息 * @param projectEntrustVO 插入信息