Merge remote-tracking branch 'origin/SecondStage' into SecondStage

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<T> add(@RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) {
-        String id = processPartTypeApplyRecordService.add(processPartTypeApplyRecord);
-        return Result.OK(id);
+    public Result<ProcessPartTypeApplyRecord> 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<T> edit(@Validated @RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) {
-        this.processPartTypeApplyRecordService.edit(processPartTypeApplyRecord);
-        return Result.OK(ResultCommon.OK);
+    public Result<ProcessPartTypeApplyRecord> edit(@Validated @RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) {
+        return Result.OK(this.processPartTypeApplyRecordService.edit(processPartTypeApplyRecord));
     }
     /**
      * 确认生成

laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/IProcessPartTypeApplyRecordService.java

@@ -21,9 +21,9 @@ public interface IProcessPartTypeApplyRecordService extends IService<ProcessPart
 
     void deleteByIds(List<String> ids);
 
-    String add(ProcessPartTypeApplyRecord processPartTypeApplyRecord);
+    ProcessPartTypeApplyRecord add(ProcessPartTypeApplyRecord processPartTypeApplyRecord);
 
-    void edit(ProcessPartTypeApplyRecord processPartTypeApplyRecord);
+    ProcessPartTypeApplyRecord edit(ProcessPartTypeApplyRecord processPartTypeApplyRecord);
 
     String affirmGenerate(ProcessPartTypeApplyRecord processPartTypeApplyRecord);
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java

@@ -94,13 +94,13 @@ public class ProcessPartTypeApplyRecordServiceImpl extends ServiceImpl<ProcessPa
     }
 
     @Override
-    public String add(ProcessPartTypeApplyRecord processPartTypeApplyRecord) {
+    public ProcessPartTypeApplyRecord add(ProcessPartTypeApplyRecord processPartTypeApplyRecord) {
         save(processPartTypeApplyRecord);
-        return processPartTypeApplyRecord.getId();
+        return processPartTypeApplyRecord;
     }
 
     @Override
-    public void edit(ProcessPartTypeApplyRecord processPartTypeApplyRecord) {
+    public ProcessPartTypeApplyRecord edit(ProcessPartTypeApplyRecord processPartTypeApplyRecord) {
         ProcessPartTypeApplyRecord processPartTypeApplyRecordOld = getById(processPartTypeApplyRecord.getId());
         if(Objects.isNull(processPartTypeApplyRecordOld)){
             throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
@@ -110,6 +110,7 @@ public class ProcessPartTypeApplyRecordServiceImpl extends ServiceImpl<ProcessPa
             throw new JeroBootException(ResultCommon.NO_PERMISSION);
         }
         updateById(processPartTypeApplyRecord);
+        return processPartTypeApplyRecord;
     }
 
     @Override

laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java

@@ -311,6 +311,7 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl<ProcessPartType
         if(!Objects.isNull(data)){
             LambdaQueryWrapper<ProcessPartTypeApplyRecord> queryProcessPartTypeApplyRecord = new LambdaQueryWrapper<>();
             queryProcessPartTypeApplyRecord.eq(ProcessPartTypeApplyRecord::getProcessId,data.getId());
+            queryProcessPartTypeApplyRecord.orderByAsc(ProcessPartTypeApplyRecord::getCreateTime);
             List<ProcessPartTypeApplyRecord> list = processPartTypeApplyRecordService.list(queryProcessPartTypeApplyRecord);
             if(!CollectionUtils.isEmpty(list)){
                 data.setList(list);