土工平台修改

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

@@ -125,4 +125,28 @@ public class EntrustReportController extends ServiceController {
     public RestResult<Boolean> submitReportCheck(@RequestParam("ids") Long[] ids) {
         return success(entrustReportService.submitReportCheck(ids,getAccount()));
     }
+
+
+
+    @ApiOperation("报告签发提交")
+    @PostMapping("/submit_report_issue")
+    public RestResult<Boolean> submitReportIssue(@RequestParam("ids") Long[] ids) {
+        return success(entrustReportService.submitReportIssue(ids,getAccount()));
+    }
+
+
+
+    @ApiOperation("报告审核退回")
+    @PostMapping("/back_report_check")
+    public RestResult<Boolean> backReportCheck(@RequestParam("ids") Long[] ids,@RequestParam("reason") String reason) {
+        return success(entrustReportService.backReportCheck(ids,reason,getAccount()));
+    }
+
+
+
+    @ApiOperation("报告签发退回")
+    @PostMapping("/back_report_issue")
+    public RestResult<Boolean> backReportIssue(@RequestParam("ids") Long[] ids,@RequestParam("reason") String reason) {
+        return success(entrustReportService.backReportIssue(ids,reason,getAccount()));
+    }
 }

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

@@ -21,9 +21,15 @@ public interface IEntrustReportService extends IBaseService<EntrustReport> {
 
     boolean removeByIds(List<Long> ids);
 
-    void uploadReportGenerateDocx(Entrust entrust, Long[] ids, Account account, String remark, File file);
+    void uploadReportGenerateDocx(Entrust entrust, Long[] ids, Account account, String name, String remark, File file);
 
     boolean submitReportMake(Long[] ids, Account account);
 
     boolean submitReportCheck(Long[] ids, Account account);
+
+    boolean submitReportIssue(Long[] ids, Account account);
+
+    boolean backReportCheck(Long[] ids, String reason, Account account);
+
+    boolean backReportIssue(Long[] ids, String reason, Account account);
 }

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

@@ -54,7 +54,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
     @Override
-    public void uploadReportGenerateDocx(Entrust entrust, Long[] ids, Account account, String remark, File file) {
+    public void uploadReportGenerateDocx(Entrust entrust, Long[] ids, Account account, String name,String remark, File file) {
 
         OssFileResult fileResult = ossClient.upload(file);
 
@@ -68,6 +68,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
             report.setBucketName(fileResult.getBucketName());
             report.setObjectKey(fileResult.getObjectKey());
             report.setVersionId(fileResult.getVersionId());
+            report.setSampleName(name);
             if (save(report)){
                 List<EntrustReportRelSample> saveRel = new ArrayList<>();
 
@@ -110,4 +111,36 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         return super.update(report, Condition.create().in("id",ids));
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitReportIssue(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的报告");
+
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.END);
+        report.setProgress(EntrustReportStatusEnum.END);
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+    @Override
+    public boolean backReportCheck(Long[] ids, String reason, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要退回的报告");
+
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.MAKING);
+        report.setProgress(EntrustReportStatusEnum.BACK_CHECK);
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+    @Override
+    public boolean backReportIssue(Long[] ids, String reason, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要退回的报告");
+
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.MAKING);
+        report.setProgress(EntrustReportStatusEnum.BACK_ISSUE);
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+
 }

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

@@ -49,6 +49,12 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
 
     @Autowired
     private SysFileTemplateClient sysFileTemplateClient;
+
+
+    @Autowired
+    private IEntrustReportTemplateService entrustReportTemplateService;
+
+
     @Autowired
     private OssClient ossClient;
 
@@ -199,7 +205,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
 
        Entrust entrust = entrustService.getById(entrustId);
 
-        SysFileTemplate sysFileTemplate = sysFileTemplateClient.get(templateId).serviceData();
+        EntrustReportTemplate sysFileTemplate = entrustReportTemplateService.getById(templateId);
         RestAssert.fail(null == sysFileTemplate, "选择的报告模板不存在");
 
 
@@ -251,7 +257,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
             os = new FileOutputStream(file);
             baseDoc.write(os);
             os.flush();
-            entrustReportService.uploadReportGenerateDocx(entrust,ids, account, "报告生成", file);
+            entrustReportService.uploadReportGenerateDocx(entrust,ids, account, StringHandleUtils.join(sampleNameSet),"报告生成", file);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

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

@@ -417,7 +417,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
     @Override
     public Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust) {
-        RestAssert.fail(null == entrust.getSampleStatus(),"样品状态不能为空");
+        RestAssert.fail(null == entrust.getReportStatus(),"报告状态不能为空");
         List<EntrustReport> reportList = entrustReportService.list(Condition.create().eq("status",entrust.getReportStatus()));
 
         if (CollectionUtils.isEmpty(reportList)){

src/main/resources/application.yml

 server:
-  port: 8038
+  port: 8039
   exception:
     to: 1781849245@qq.com
     subject: hmhj 服务异常