From 384645ae57796944d0f706c43f9c8b4e44375c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 8 Oct 2024 18:44:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E9=94=AE=E9=9B=B6=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=9E=8B=E5=8F=B7=E5=BA=93=E7=BC=96=E8=BE=91=E4=B8=8E?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessPartTypeApplyRecordController.java | 10 ++++------ .../service/IProcessPartTypeApplyRecordService.java | 4 ++-- .../impl/ProcessPartTypeApplyRecordServiceImpl.java | 7 ++++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyRecordController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyRecordController.java index d2bc1cca..31d8af30 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyRecordController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyRecordController.java @@ -115,9 +115,8 @@ public class ProcessPartTypeApplyRecordController { @ApiOperationSupport(order = 5) @PostMapping(value = "/add") // @RequiresPermissions("keyPartBindingManage:add") - public Result add(@RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) { - String id = processPartTypeApplyRecordService.add(processPartTypeApplyRecord); - return Result.OK(id); + public Result add(@RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) { + return Result.OK(processPartTypeApplyRecordService.add(processPartTypeApplyRecord)); } /** @@ -131,9 +130,8 @@ public class ProcessPartTypeApplyRecordController { @ApiOperationSupport(order = 6) @PostMapping(value = "/edit") // @RequiresPermissions("keyPartBindingManage:import") - public Result edit(@Validated @RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) { - this.processPartTypeApplyRecordService.edit(processPartTypeApplyRecord); - return Result.OK(ResultCommon.OK); + public Result edit(@Validated @RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) { + return Result.OK(this.processPartTypeApplyRecordService.edit(processPartTypeApplyRecord)); } /** * 确认生成 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/IProcessPartTypeApplyRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/IProcessPartTypeApplyRecordService.java index 763c2f0c..f27b07e3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/IProcessPartTypeApplyRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/IProcessPartTypeApplyRecordService.java @@ -21,9 +21,9 @@ public interface IProcessPartTypeApplyRecordService extends IService ids); - String add(ProcessPartTypeApplyRecord processPartTypeApplyRecord); + ProcessPartTypeApplyRecord add(ProcessPartTypeApplyRecord processPartTypeApplyRecord); - void edit(ProcessPartTypeApplyRecord processPartTypeApplyRecord); + ProcessPartTypeApplyRecord edit(ProcessPartTypeApplyRecord processPartTypeApplyRecord); String affirmGenerate(ProcessPartTypeApplyRecord processPartTypeApplyRecord); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java index 8cb3853e..f4579a44 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java @@ -94,13 +94,13 @@ public class ProcessPartTypeApplyRecordServiceImpl extends ServiceImpl Date: Tue, 8 Oct 2024 18:47:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=B3=E9=94=AE=E9=9B=B6=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=9E=8B=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../part/service/impl/ProcessPartTypeApplyServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java index 08dcc94d..941e65d0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java @@ -311,6 +311,7 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl queryProcessPartTypeApplyRecord = new LambdaQueryWrapper<>(); queryProcessPartTypeApplyRecord.eq(ProcessPartTypeApplyRecord::getProcessId,data.getId()); + queryProcessPartTypeApplyRecord.orderByAsc(ProcessPartTypeApplyRecord::getCreateTime); List list = processPartTypeApplyRecordService.list(queryProcessPartTypeApplyRecord); if(!CollectionUtils.isEmpty(list)){ data.setList(list);