Merge branch 'lvy' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

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

@@ -664,8 +664,8 @@ public class TrialDetectionController extends BladeController {
     @PostMapping("/self/saveBaseInfo")
     @ApiOperationSupport(order = 30)
     @ApiOperation(value = "保存试验自检基础信息")
-    public R<Boolean> saveBaseInfo(@RequestBody TrialSeleInspectionRecordInfoDTO vo) {
-        return R.status(iTrialSelfInspectionRecordService.saveBaseInfo(vo));
+    public R<Long> saveBaseInfo(@RequestBody TrialSeleInspectionRecordInfoDTO vo) {
+        return R.data(iTrialSelfInspectionRecordService.saveBaseInfo(vo));
     }
 
     /**

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

@@ -47,5 +47,5 @@ public interface ITrialSelfInspectionRecordService extends BaseService<TrialSelf
 
     R getSamplePdfUrl(String id,String contrctId);
 
-    Boolean saveBaseInfo(TrialSeleInspectionRecordInfoDTO vo);
+    Long saveBaseInfo(TrialSeleInspectionRecordInfoDTO vo);
 }

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

@@ -2095,7 +2095,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
     }
 
     @Override
-    public Boolean saveBaseInfo(TrialSeleInspectionRecordInfoDTO dto) {
+    public Long saveBaseInfo(TrialSeleInspectionRecordInfoDTO dto) {
         TrialSelfInspectionRecord record = new TrialSelfInspectionRecord();
         BeanUtil.copyProperties(dto, record);
         TrialSeleInspectionRecordBaseInfoDTO baseInfo = new TrialSeleInspectionRecordBaseInfoDTO();
@@ -2128,7 +2128,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             //修改项目节点基础信息
             jdbcTemplate.update("update u_entrust_info set sample_status=4 where id ='"+dto.getEntrustId()+"'");
         }
-        return true;
+        return record.getId();
     }