hmhj报告保存回调

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalTemplateController.java

@@ -111,6 +111,14 @@ public class OriginalTemplateController extends ServiceController implements Ori
         return success(originalTemplateService.editReportTemplate(someParam, obsFileResult));
     }
 
+    @Login(action = Action.Skip)
+    @ApiOperation(value = "编辑报告模板记录", notes = "编辑证书模板")
+    @PostMapping({"/edit_entrust_report_{someParam}"})
+    @Override
+    public RestResult<Boolean> editEntrustReport(String someParam, OssFileResult obsFileResult) {
+        return success(originalTemplateService.editEntrustReport(someParam, obsFileResult));
+    }
+
     @Override
     public RestResult<String> getKeyByBusinessId(String s) {
         return null;

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateService.java

@@ -29,4 +29,6 @@ public interface IOriginalTemplateService extends IBaseService<OriginalTemplate>
     boolean editTemplate(String someParam, OssFileResult obsFileResult);
 
     boolean editReportTemplate(String someParam, OssFileResult obsFileResult);
+
+    boolean editEntrustReport(String someParam, OssFileResult obsFileResult);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateServiceImpl.java

@@ -66,6 +66,10 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
     @Autowired
     private IEntrustReportTemplateService entrustReportTemplateService;
 
+
+    @Autowired
+    private IEntrustReportService entrustReportService;
+
     @Autowired
     private IItemRelOriginalRecordService itemRelOriginalRecordService;
 
@@ -580,6 +584,25 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
         return entrustReportTemplateService.updateById(originalRecord);
     }
 
+    @Override
+    public boolean editEntrustReport(String someParam, OssFileResult obsFileResult) {
+        RestAssert.fail(StringUtils.isBlank(someParam), "业务ID不能为空");
+        RestAssert.fail(null == obsFileResult, "OssFileResult不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getObjectKey()), "ObjectKey不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getVersionId()), "VersionId不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getType()), "Type不能为空");
+        RestAssert.fail(StringUtils.isBlank(someParam) || 4 != someParam.split("&").length, "参数传递有误");
+        String[] arr = someParam.split("&");
+        Long businessId = Long.parseLong(arr[0]);
+        EntrustReport report = entrustReportService.getById(businessId);
+        if (null == report) {
+            RestAssert.fail("数据有误");
+        }
+        EntrustReport originalRecord = new EntrustReport();
+        originalRecord.setId(businessId);
+        originalRecord.setObjectKey(obsFileResult.getObjectKey());
+        return entrustReportService.updateById(originalRecord);
+    }
 
 
     private void fillTestValue(String sampleCode, String testValue, Long userId, String userName, List<EntrustSampleItemVO> sampleItemVOList) {

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -139,10 +139,12 @@
         </if>
         )
 
-        SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",e.test_side "testSide"
+        SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",e.test_side "testSide",l.record_id,r.object_key AS "recordObjectKey"
         FROM i
         JOIN entrust_sample s ON i.entrust_sample_id = s.id
         JOIN (select t.id,t.code,t.test_side from entrust t where t.deleted = 0 ) e on s.entrust_id = e.id
+        LEFT JOIN ( SELECT id,item_id,record_id FROM item_rel_original_record WHERE deleted = 0 ) l ON i.id = l.item_id
+        LEFT JOIN ( SELECT id,object_key FROM original_record WHERE deleted = 0 ) r ON l.record_id = r.id
         <where>
             <if test="null != vo.sampleCode">
                 AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')