土工平台修改

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

@@ -2,9 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.service.hmhj.dto.EntrustDTO;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustStatusEnum;
+import com.patzn.cloud.service.hmhj.enums.*;
 import com.patzn.cloud.service.hmhj.vo.EntrustVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -243,4 +241,50 @@ public class EntrustController extends ServiceController {
         return success(entrustService.pageEntrustByItem(getPage(), entrust));
     }
 
+
+
+
+    @ApiOperation("报告编制委托分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_entrust_report_make")
+    public RestResult<Page<EntrustVO>> getPageReportMake(EntrustVO entrust) {
+        entrust.setSampleStatus(EntrustSampleStatusEnum.REPORT_MAKE);
+        return success(entrustService.pageEntrustBySample(getPage(), entrust));
+    }
+
+
+
+    @ApiOperation("报告审核委托分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_entrust_report_check")
+    public RestResult<Page<EntrustVO>> getPageReportCheck(EntrustVO entrust) {
+        entrust.setReportStatus(EntrustReportStatusEnum.CHECK);
+        return success(entrustService.pageEntrustByReport(getPage(), entrust));
+    }
+
+
+
+    @ApiOperation("报告签发委托分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_entrust_report_issue")
+    public RestResult<Page<EntrustVO>> getPageReportIssue(EntrustVO entrust) {
+        entrust.setReportStatus(EntrustReportStatusEnum.ISSUE);
+        return success(entrustService.pageEntrustByReport(getPage(), entrust));
+    }
+
 }

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReport;
+import com.patzn.cloud.service.hmhj.enums.EntrustReportStatusEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 报告表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+@Api(tags = "报告表")
+@RestController
+@RequestMapping("/v1/report")
+public class EntrustReportController extends ServiceController {
+
+    @Autowired
+    private IEntrustReportService entrustReportService;
+
+    @ApiOperation("报告台账编制中分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<EntrustReport>> getPage(EntrustReport entrustReport) {
+        entrustReport.setStatus(EntrustReportStatusEnum.MAKING);
+        return success(entrustReportService.page(getPage(), entrustReport));
+	}
+
+
+    @ApiOperation("报告台账待审核分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page_report_check")
+    public RestResult<Page<EntrustReport>> getPageCheck(EntrustReport entrustReport) {
+        entrustReport.setStatus(EntrustReportStatusEnum.CHECK);
+        return success(entrustReportService.page(getPage(), entrustReport));
+    }
+
+
+    @ApiOperation("报告台账待签发分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page_report_issue")
+    public RestResult<Page<EntrustReport>> getPageIssue(EntrustReport entrustReport) {
+        entrustReport.setStatus(EntrustReportStatusEnum.ISSUE);
+        return success(entrustReportService.page(getPage(), entrustReport));
+    }
+
+
+
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<EntrustReport> get(@PathVariable("id") Long id) {
+        return success(entrustReportService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+	public RestResult<Boolean> edit(@PathVariable("id") Long id, EntrustReport entrustReport) {
+        entrustReport.setId(id);
+        return success(entrustReportService.updateById(entrustReport));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(EntrustReport entrustReport) {
+        return success(entrustReportService.save(entrustReport));
+	}
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+	@DeleteMapping("/")
+	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(entrustReportService.removeByIds(ids));
+	}
+
+
+
+    @ApiOperation("报告编制提交")
+    @PostMapping("/submit_report_make")
+    public RestResult<Boolean> submitReportMake(@RequestParam("ids") Long[] ids) {
+        return success(entrustReportService.submitReportMake(ids,getAccount()));
+    }
+
+
+    @ApiOperation("报告审核提交")
+    @PostMapping("/submit_report_check")
+    public RestResult<Boolean> submitReportCheck(@RequestParam("ids") Long[] ids) {
+        return success(entrustReportService.submitReportCheck(ids,getAccount()));
+    }
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRecord;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportRecordService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 报告操作日志表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+@Api(tags = "报告操作日志表")
+@RestController
+@RequestMapping("/v1/report_record")
+public class EntrustReportRecordController extends ServiceController {
+
+    @Autowired
+    private IEntrustReportRecordService entrustReportRecordService;
+
+    @ApiOperation("分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<EntrustReportRecord>> getPage(EntrustReportRecord entrustReportRecord) {
+        return success(entrustReportRecordService.page(getPage(), entrustReportRecord));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<EntrustReportRecord> get(@PathVariable("id") Long id) {
+        return success(entrustReportRecordService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+	public RestResult<Boolean> edit(@PathVariable("id") Long id, EntrustReportRecord entrustReportRecord) {
+        entrustReportRecord.setId(id);
+        return success(entrustReportRecordService.updateById(entrustReportRecord));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(EntrustReportRecord entrustReportRecord) {
+        return success(entrustReportRecordService.save(entrustReportRecord));
+	}
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+	@DeleteMapping("/")
+	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(entrustReportRecordService.removeByIds(ids));
+	}
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportRelSampleService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 报告关联样品表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+@Api(tags = "报告关联样品表")
+@RestController
+@RequestMapping("/v1/report_rel_sample")
+public class EntrustReportRelSampleController extends ServiceController {
+
+    @Autowired
+    private IEntrustReportRelSampleService entrustReportRelSampleService;
+
+    @ApiOperation("分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<EntrustReportRelSample>> getPage(EntrustReportRelSample entrustReportRelSample) {
+        return success(entrustReportRelSampleService.page(getPage(), entrustReportRelSample));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<EntrustReportRelSample> get(@PathVariable("id") Long id) {
+        return success(entrustReportRelSampleService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+	public RestResult<Boolean> edit(@PathVariable("id") Long id, EntrustReportRelSample entrustReportRelSample) {
+        entrustReportRelSample.setId(id);
+        return success(entrustReportRelSampleService.updateById(entrustReportRelSample));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(EntrustReportRelSample entrustReportRelSample) {
+        return success(entrustReportRelSampleService.save(entrustReportRelSample));
+	}
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+	@DeleteMapping("/")
+	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(entrustReportRelSampleService.removeByIds(ids));
+	}
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportTemplateService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 报告模板 前端控制器
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+@Api(tags = "报告模板")
+@RestController
+@RequestMapping("/v1/report_template")
+public class EntrustReportTemplateController extends ServiceController {
+
+    @Autowired
+    private IEntrustReportTemplateService entrustReportTemplateService;
+
+    @ApiOperation("分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<EntrustReportTemplate>> getPage(EntrustReportTemplate entrustReportTemplate) {
+        return success(entrustReportTemplateService.page(getPage(), entrustReportTemplate));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<EntrustReportTemplate> get(@PathVariable("id") Long id) {
+        return success(entrustReportTemplateService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+	public RestResult<Boolean> edit(@PathVariable("id") Long id, EntrustReportTemplate entrustReportTemplate) {
+        entrustReportTemplate.setId(id);
+        return success(entrustReportTemplateService.updateById(entrustReportTemplate));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(EntrustReportTemplate entrustReportTemplate) {
+        return success(entrustReportTemplateService.save(entrustReportTemplate));
+	}
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+	@DeleteMapping("/")
+	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(entrustReportTemplateService.removeByIds(ids));
+	}
+
+
+    @ApiOperation(value = "附件上传", notes = "附件上传")
+    @PostMapping("/upload_template/")
+    public RestResult<Boolean> uploadTemplate(@RequestParam("name") String  name,@RequestParam("remark") String  remark, MultipartFile file) {
+        return success(entrustReportTemplateService.uploadTemplate(file,name,remark));
+    }
+}

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
+import com.patzn.cloud.service.hmhj.dto.ReportDTO;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
 import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.api.RestConstants;
@@ -69,6 +63,21 @@ public class EntrustSampleController extends ServiceController {
     }
 
 
+
+    @ApiOperation("报告编制样品分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_report_make")
+    public RestResult<Page<EntrustSample>> getPageReportMake(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.REPORT_MAKE);
+        return success(entrustSampleService.page(getPage(), entrustSample));
+    }
+
+
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
@@ -144,4 +153,14 @@ public class EntrustSampleController extends ServiceController {
 
 
 
+
+
+    @ApiOperation("样品生成报告")
+    @PostMapping("/make_report")
+    public RestResult<Boolean> makeReport(@RequestBody ReportDTO dto) {
+        return success(entrustSampleService.makeReport(dto,getAccount()));
+    }
+
+
+
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustReportMapper.java

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.EntrustReport;
+
+/**
+ * <p>
+ * 报告表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+public interface EntrustReportMapper extends BatchMapper<EntrustReport> {
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustReportRecordMapper.java

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRecord;
+import com.patzn.cloud.commons.mapper.BatchMapper;
+
+/**
+ * <p>
+ * 报告操作日志表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+public interface EntrustReportRecordMapper extends BatchMapper<EntrustReportRecord> {
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustReportRelSampleMapper.java

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
+import com.patzn.cloud.commons.mapper.BatchMapper;
+
+/**
+ * <p>
+ * 报告关联样品表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+public interface EntrustReportRelSampleMapper extends BatchMapper<EntrustReportRelSample> {
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustReportTemplateMapper.java

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplate;
+import com.patzn.cloud.commons.mapper.BatchMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+public interface EntrustReportTemplateMapper extends BatchMapper<EntrustReportTemplate> {
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java

@@ -24,4 +24,6 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
     List<EntrustSampleItemVO> selectByItemLeftRight(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO itemVO);
 
     List<EntrustSampleItemVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO entrustSampleItem);
+
+    List<EntrustSampleItemVO> selectVOListBySampleIds(@Param("ids")Long[] ids);
 }

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

+package com.patzn.cloud.service.lims.hmhj.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRecord;
+
+import java.util.List;
+
+/**
+ * 报告操作日志表 服务类
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+public interface IEntrustReportRecordService extends IBaseService<EntrustReportRecord> {
+
+    Page<EntrustReportRecord> page(Page<EntrustReportRecord> page, EntrustReportRecord entrustReportRecord);
+
+    boolean removeByIds(List<Long> ids);
+}

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

+package com.patzn.cloud.service.lims.hmhj.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
+
+import java.util.List;
+
+/**
+ * 报告关联样品表 服务类
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+public interface IEntrustReportRelSampleService extends IBaseService<EntrustReportRelSample> {
+
+    Page<EntrustReportRelSample> page(Page<EntrustReportRelSample> page, EntrustReportRelSample entrustReportRelSample);
+
+    boolean removeByIds(List<Long> ids);
+}

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

+package com.patzn.cloud.service.lims.hmhj.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.entity.Entrust;
+import com.patzn.cloud.service.hmhj.entity.EntrustReport;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * 报告表 服务类
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+public interface IEntrustReportService extends IBaseService<EntrustReport> {
+
+    Page<EntrustReport> page(Page<EntrustReport> page, EntrustReport entrustReport);
+
+    boolean removeByIds(List<Long> ids);
+
+    void uploadReportGenerateDocx(Entrust entrust, Long[] ids, Account account, String remark, File file);
+
+    boolean submitReportMake(Long[] ids, Account account);
+
+    boolean submitReportCheck(Long[] ids, Account account);
+}

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

+package com.patzn.cloud.service.lims.hmhj.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+public interface IEntrustReportTemplateService extends IBaseService<EntrustReportTemplate> {
+
+    Page<EntrustReportTemplate> page(Page<EntrustReportTemplate> page, EntrustReportTemplate entrustReportTemplate);
+
+    boolean removeByIds(List<Long> ids);
+
+    boolean uploadTemplate(MultipartFile file, String name, String remark);
+}

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

@@ -39,4 +39,6 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
     boolean backCheck(Long[] ids, String reason, Account account);
 
     boolean backAudit(Long[] ids, String reason, Account account);
+
+    List<EntrustSampleItemVO> listBySampleIds(Long[] ids);
 }

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

@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.hmhj.service;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.dto.ReportDTO;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 
@@ -25,4 +26,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     Page<EntrustSampleVO> pageSampleReceive(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
 
     Page<EntrustSampleVO> pageSampleByItem(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
+
+    boolean makeReport(ReportDTO dto, Account account);
 }

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

@@ -38,4 +38,8 @@ public interface IEntrustService extends IBaseService<Entrust> {
     Page<EntrustVO> pageEntrustSampleReceive(Page<EntrustVO> page, EntrustVO entrust);
 
     Page<EntrustVO> pageEntrustByItem(Page<EntrustVO> page, EntrustVO entrust);
+
+    Page<EntrustVO> pageEntrustBySample(Page<EntrustVO> page, EntrustVO entrust);
+
+    Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust);
 }

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRecord;
+import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportRecordMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportRecordService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+
+import java.util.List;
+
+/**
+ * 报告操作日志表 服务实现类
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+@Service
+public class EntrustReportRecordServiceImpl extends BaseServiceImpl<EntrustReportRecordMapper, EntrustReportRecord> implements IEntrustReportRecordService {
+
+    @Override
+    public Page<EntrustReportRecord> page(Page<EntrustReportRecord> page, EntrustReportRecord entrustReportRecord) {
+        Wrapper wrapper = new EntityWrapper<>(entrustReportRecord);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
+import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportRelSampleMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportRelSampleService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+
+import java.util.List;
+
+/**
+ * 报告关联样品表 服务实现类
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+@Service
+public class EntrustReportRelSampleServiceImpl extends BaseServiceImpl<EntrustReportRelSampleMapper, EntrustReportRelSample> implements IEntrustReportRelSampleService {
+
+    @Override
+    public Page<EntrustReportRelSample> page(Page<EntrustReportRelSample> page, EntrustReportRelSample entrustReportRelSample) {
+        Wrapper wrapper = new EntityWrapper<>(entrustReportRelSample);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.toolkit.ArrayUtils;
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.oss.starter.OssClient;
+import com.patzn.cloud.oss.starter.OssFileResult;
+import com.patzn.cloud.service.hmhj.entity.Entrust;
+import com.patzn.cloud.service.hmhj.entity.EntrustReport;
+import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
+import com.patzn.cloud.service.hmhj.enums.EntrustReportStatusEnum;
+import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportRelSampleService;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报告表 服务实现类
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+@Service
+public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMapper, EntrustReport> implements IEntrustReportService {
+
+    @Autowired
+    private OssClient ossClient;
+    @Autowired
+    private IEntrustReportRelSampleService entrustReportRelSampleService;
+
+    @Override
+    public Page<EntrustReport> page(Page<EntrustReport> page, EntrustReport entrustReport) {
+        Wrapper wrapper = new EntityWrapper<>(entrustReport);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public void uploadReportGenerateDocx(Entrust entrust, Long[] ids, Account account, String remark, File file) {
+
+        OssFileResult fileResult = ossClient.upload(file);
+
+        if (null !=fileResult){
+            EntrustReport report = new EntrustReport();
+            report.setEntrustId(entrust.getId());
+            report.setRemark(remark);
+            report.setReportMaker(account.getUserName());
+            report.setReportMakerId(account.getUserId());
+            report.setReportMakeTime(new Date());
+            report.setBucketName(fileResult.getBucketName());
+            report.setObjectKey(fileResult.getObjectKey());
+            report.setVersionId(fileResult.getVersionId());
+            if (save(report)){
+                List<EntrustReportRelSample> saveRel = new ArrayList<>();
+
+                for (Long sampleId:ids) {
+                    EntrustReportRelSample reportRelSample = new EntrustReportRelSample();
+                    reportRelSample.setReportId(report.getId());
+                    reportRelSample.setSampleId(sampleId);
+
+                    saveRel.add(reportRelSample);
+                }
+
+                if (CollectionUtils.isNotEmpty(saveRel)){
+                    entrustReportRelSampleService.saveBatch(saveRel);
+                }
+            }
+        }
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitReportMake(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的报告");
+
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.CHECK);
+        report.setProgress(EntrustReportStatusEnum.CHECK);
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitReportCheck(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的报告");
+
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.ISSUE);
+        report.setProgress(EntrustReportStatusEnum.ISSUE);
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+}

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.oss.starter.OssClient;
+import com.patzn.cloud.oss.starter.OssFileResult;
+import com.patzn.cloud.service.hmhj.entity.EntrustReportTemplate;
+import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportTemplateMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportTemplateService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ *  服务实现类
+ *
+ * @author wwd
+ * @since 2021-02-26
+ */
+@Service
+public class EntrustReportTemplateServiceImpl extends BaseServiceImpl<EntrustReportTemplateMapper, EntrustReportTemplate> implements IEntrustReportTemplateService {
+
+    @Autowired
+    private OssClient ossClient;
+
+    @Override
+    public Page<EntrustReportTemplate> page(Page<EntrustReportTemplate> page, EntrustReportTemplate entrustReportTemplate) {
+        Wrapper wrapper = new EntityWrapper<>(entrustReportTemplate);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public boolean uploadTemplate(MultipartFile file, String name, String remark) {
+        RestAssert.fail(StringUtils.isBlank(name),"模板名称不能为空");
+        RestAssert.fail(StringUtils.isBlank(remark),"模板名称说明不能为空");
+        String fileName = file.getOriginalFilename();
+        RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
+        EntrustReportTemplate attachment = new EntrustReportTemplate();
+        OssFileResult result = ossClient.upload(file);
+        if (null == result) {
+            return false;
+        }
+        attachment.setName(name);
+        attachment.setRemark(remark);
+        attachment.setBucketName(result.getBucketName());
+        attachment.setName(result.getName());
+        attachment.setObjectKey(result.getObjectKey());
+        attachment.setVersionId(result.getVersionId());
+        return super.save(attachment);
+    }
+}

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

@@ -269,5 +269,10 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         return true;
     }
 
+    @Override
+    public List<EntrustSampleItemVO> listBySampleIds(Long[] ids) {
+        return baseMapper.selectVOListBySampleIds(ids);
+    }
+
 
 }

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

@@ -4,21 +4,37 @@ import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
-import com.patzn.cloud.service.hmhj.entity.EntrustSample;
-import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
+import com.patzn.cloud.commons.toolkit.DateUtils;
+import com.patzn.cloud.commons.toolkit.FileUtils;
+import com.patzn.cloud.feign.base.client.SysFileTemplateClient;
+import com.patzn.cloud.oss.starter.OssClient;
+import com.patzn.cloud.service.base.entity.SysFileTemplate;
+import com.patzn.cloud.service.hmhj.dto.ReportDTO;
+import com.patzn.cloud.service.hmhj.entity.*;
+import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.lims.common.StringHandleUtils;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleMapper;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
+import com.patzn.cloud.service.lims.hmhj.service.*;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.poibox.xwpf.PoiUtil2007;
+import com.patzn.poibox.xwpf.XWPFTemplate;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.XWPFTableCell;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -31,10 +47,28 @@ import java.util.stream.Collectors;
 @Service
 public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMapper, EntrustSample> implements IEntrustSampleService {
 
+    @Autowired
+    private SysFileTemplateClient sysFileTemplateClient;
+    @Autowired
+    private OssClient ossClient;
 
     @Autowired
     private IEntrustSampleItemService entrustSampleItemService;
 
+    @Autowired
+    private IEntrustRecordService entrustRecordService;
+
+
+    @Autowired
+    private IEntrustReportService entrustReportService;
+
+
+    @Autowired
+    private IEntrustService entrustService;
+
+    @Autowired
+    private IEntrustReportRelSampleService entrustReportRelSampleService;
+
 
     @Override
     public Page<EntrustSample> page(Page<EntrustSample> page, EntrustSample entrustSample) {
@@ -141,4 +175,221 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
 
         return page.setRecords(baseMapper.selectVOList(page,entrustSample));
     }
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean makeReport(ReportDTO dto, Account account) {
+        Long [] ids =    dto.getSampleIds();
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要生成报告的样品");
+
+        Long templateId  = dto.getTemplateId();
+        RestAssert.fail(null ==templateId,"请选择报告模板！");
+
+        List<EntrustReportRelSample> relSamples =entrustReportRelSampleService.list(Condition.create().in("sample_id",ids));
+        if (CollectionUtils.isNotEmpty(relSamples)){
+            RestAssert.fail("您选择的样品含有已经生成过报告的，请确认");
+        }
+
+        List<EntrustSample> sampleList = super.list(Condition.create().in("id",ids));
+        RestAssert.fail(CollectionUtils.isEmpty(sampleList),"样品不存在请确认！");
+
+       Long entrustId = sampleList.get(0).getEntrustId();
+
+       Entrust entrust = entrustService.getById(entrustId);
+
+        SysFileTemplate sysFileTemplate = sysFileTemplateClient.get(templateId).serviceData();
+        RestAssert.fail(null == sysFileTemplate, "选择的报告模板不存在");
+
+
+
+        Set<String> sampleNameSet = new HashSet<>();
+
+
+        for (EntrustSample sample:sampleList) {
+            sampleNameSet.add(sample.getName());
+        }
+
+        String sampleName = StringHandleUtils.join(sampleNameSet);
+        String sampleShape  =  sampleList.get(0).getSampleShape();
+
+
+        Map<String, Object> contractMap = new HashMap<>();
+        contractMap.put("s", entrust);
+        contractMap.put("sampleName",sampleName);
+        contractMap.put("sampleShape",sampleShape);
+
+        InputStream io = ossClient.download(sysFileTemplate.getObjectKey());
+        XWPFTemplate xwpfTemplate = null;
+        try {
+            xwpfTemplate = XWPFTemplate.compile(io).setDefaultValue("/").render(contractMap);
+        } catch (Exception e) {
+            logger.error("生成报告失败", e);
+            RestAssert.fail("报告生成失败:" + e.getMessage());
+        }
+        XWPFDocument baseDoc = xwpfTemplate.getXWPFDocument();
+
+
+        List<EntrustSampleItemVO> sampleItemVOList = entrustSampleItemService.listBySampleIds(ids);
+
+
+        List<XWPFTable> tableList = baseDoc.getTables();
+        for (XWPFTable xwpfTable : tableList) {
+            String text = xwpfTable.getText();
+            if (com.patzn.cloud.commons.toolkit.StringHandleUtils.containsString(text, "{name}", "{sampleCode}", "{agreedValue}", "{testValue}")) {
+                //检测内容
+                reportMakeTestContent(xwpfTable, sampleItemVOList.size(), 1, sampleItemVOList);
+            }
+        }
+
+        String generated = entrust.getCode();
+        FileOutputStream os = null;
+        File file = null;
+        try {
+            file = File.createTempFile(generated, ".docx");
+            os = new FileOutputStream(file);
+            baseDoc.write(os);
+            os.flush();
+            entrustReportService.uploadReportGenerateDocx(entrust,ids, account, "报告生成", file);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                os.close();
+                baseDoc.close();
+                io.close();
+                FileUtils.deleteFiles(file);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
+        return true;
+    }
+
+
+
+    public void reportMakeTestContent(XWPFTable xwpfTable, int length, int index, List<?> objList) {
+        //检测内容
+        Map<Integer, String> map = PoiUtil2007.getCellsContent(xwpfTable, index);
+        PoiUtil2007.insertTableRowAtIndex(xwpfTable, index, length);
+        fillTableData(xwpfTable, map, objList, index);
+    }
+
+    public void fillTableData(XWPFTable xwpfTable, Map<Integer, String> itemCellMap, List<?> objects, int index) {
+        int rowLength = 0;
+        if (CollectionUtils.isNotEmpty(objects)) {
+            rowLength = objects.size();
+        }
+
+        int mergeIndex = 1;
+        int mergeNum= 1;
+        Map<Integer , Integer> mergeMap = new HashMap<>();
+
+
+
+        int mergeIndexBath = 1;
+        int mergeNumBath= 1;
+        int mergeCodeIndex= index;
+        int mergeCode= index;
+        Map<Integer , Integer> mergeMapBath = new HashMap<>();
+
+        Map<Integer , Integer> mergeCodeMap = new HashMap<>();
+        for (int i = 0; i < rowLength; i++) {
+            fillTableData(xwpfTable, itemCellMap, index + i, objects.get(i));
+            if (i>0){
+                Object pre=  objects.get(i-1);
+                Object now=   objects.get(i);
+                String value=  StringHandleUtils.getFieldValueByFieldName("sampleCode", pre);
+                String preValue=   StringHandleUtils.getFieldValueByFieldName("sampleCode", now);
+                if (value.equals(preValue)){
+                    mergeNum++;
+                }else{
+                    mergeMap.put(mergeIndex,mergeNum);
+                    mergeIndex=mergeNum+1;
+                    mergeNum++;
+                }
+            }
+        }
+        mergeMap.put(mergeIndex,mergeNum);
+        mergeMapBath.put(mergeIndexBath,mergeNumBath);
+        mergeCodeMap.put(mergeCodeIndex,mergeCode);
+        for (Map.Entry<Integer,Integer> e:mergeMap.entrySet()) {
+            mergeCellsVertically(xwpfTable,getKey(itemCellMap,"{sampleCode}"),e.getKey(),e.getValue());
+        }
+    }
+    public static Integer getKey(Map<Integer, String> map, String v) {
+
+        Integer key ;
+        for (Map.Entry<Integer,String> e:map.entrySet()) {
+            if (v.equals(e.getValue())){
+                return e.getKey();
+            }
+        }
+        return null;
+
+    }
+    // word跨行并单元格
+    public void mergeCellsVertically(XWPFTable table, Integer c, int fromRow, int toRow) {
+        if (null == c){
+            return;
+        }
+        int col = c;
+        for (int rowIndex = fromRow; rowIndex <= toRow; rowIndex++) {
+            XWPFTableCell cell = table.getRow(rowIndex).getCell(col);
+            if ( rowIndex == fromRow ) {
+                // The first merged cell is set with RESTART merge value
+                cell.getCTTc().addNewTcPr().addNewVMerge().setVal(STMerge.RESTART);
+            } else {
+                // Cells which join (merge) the first one, are set with CONTINUE
+                cell.getCTTc().addNewTcPr().addNewVMerge().setVal(STMerge.CONTINUE);
+            }
+        }
+    }
+
+
+    public  void mergeCellsHorizontal(XWPFTable table, int row, int fromCell, int toCell) {
+        for (int cellIndex = fromCell; cellIndex <= toCell; cellIndex++) {
+            XWPFTableCell cell = table.getRow(row).getCell(cellIndex);
+            if ( cellIndex == fromCell ) {
+                // The first merged cell is set with RESTART merge value
+                cell.getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.RESTART);
+            } else {
+                // Cells which join (merge) the first one, are set with CONTINUE
+                cell.getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.CONTINUE);
+            }
+        }
+    }
+
+
+    public void fillTableData(XWPFTable xwpfTable, Map<Integer, String> itemCellMap, int rowIndex, Object object) {
+
+        List<XWPFTableCell> cellList = PoiUtil2007.getRowCells(xwpfTable, rowIndex);
+        int cellLength = 0;
+        if (CollectionUtils.isNotEmpty(cellList)) {
+            cellLength = cellList.size();
+        }
+        for (int k = 0; k < cellLength; k++) {
+            XWPFTableCell cell = cellList.get(k);
+            if (cell.getParagraphs().size() > 0) {
+                cell.removeParagraph(0);
+            }
+
+            if (object instanceof String && "${testItemThatIsNotQualified}".equals(itemCellMap.get(k))) {
+                cell.setText(object.toString());
+            } else if (object instanceof Date) {
+                cell.setText(DateUtils.toYearMonthDay((Date) object));
+            } else {
+                if (StringUtils.isNotBlank(itemCellMap.get(k)) && "{sn}".equals(itemCellMap.get(k))) {
+                    cell.setText("" + rowIndex);
+                } else {
+                    cell.setText(StringHandleUtils.getFieldValueByFieldName(StringHandleUtils.getObjectFromMap(itemCellMap, k), object));
+                }
+            }
+
+        }
+
+    }
+
 }

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

@@ -7,10 +7,7 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.toolkit.StringHandleUtils;
 import com.patzn.cloud.service.hmhj.dto.EntrustDTO;
 import com.patzn.cloud.service.hmhj.dto.EntrustSampleDTO;
-import com.patzn.cloud.service.hmhj.entity.Entrust;
-import com.patzn.cloud.service.hmhj.entity.EntrustSample;
-import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
-import com.patzn.cloud.service.hmhj.entity.EntrustSamplePrepare;
+import com.patzn.cloud.service.hmhj.entity.*;
 import com.patzn.cloud.service.hmhj.enums.CodeTypeEnum;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
 import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
@@ -53,6 +50,11 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
     private IEntrustSampleService entrustSampleService;
 
 
+
+    @Autowired
+    private IEntrustReportService entrustReportService;
+
+
     @Autowired
     private IEntrustSamplePrepareService entrustSamplePrepareService;
 
@@ -394,5 +396,44 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         return page.setRecords(baseMapper.selectVOList(page,entrust));
     }
 
+    @Override
+    public Page<EntrustVO> pageEntrustBySample(Page<EntrustVO> page, EntrustVO entrust) {
+        RestAssert.fail(null == entrust.getSampleStatus(),"样品状态不能为空");
+        List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().eq("status",entrust.getSampleStatus()));
+
+        if (CollectionUtils.isEmpty(sampleList)){
+            return page;
+        }
+        List<Long> ids = sampleList.stream().map(s->{
+            return s.getEntrustId();
+        }).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(ids)){
+            return page;
+        }
+
+        entrust.setIdsList(ids);
+        return page.setRecords(baseMapper.selectVOList(page,entrust));
+    }
+
+    @Override
+    public Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust) {
+        RestAssert.fail(null == entrust.getSampleStatus(),"样品状态不能为空");
+        List<EntrustReport> reportList = entrustReportService.list(Condition.create().eq("status",entrust.getReportStatus()));
+
+        if (CollectionUtils.isEmpty(reportList)){
+            return page;
+        }
+        List<Long> ids = reportList.stream().map(s->{
+            return s.getEntrustId();
+        }).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(ids)){
+            return page;
+        }
+
+        entrust.setIdsList(ids);
+        return page.setRecords(baseMapper.selectVOList(page,entrust));
+    }
+
+
 
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportRecordMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportRelSampleMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportTemplateMapper">
+
+</mapper>

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

@@ -106,4 +106,22 @@
     </select>
 
 
+    <select id="selectVOListBySampleIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
+      SELECT i.id,i.name,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode"
+      FROM
+	  entrust_sample_item i
+	  JOIN entrust_sample s ON i.entrust_sample_id = s.ID
+
+	  WHERE i.deleted = 0 AND s.deleted = 0
+	 AND i.entrust_sample_id IN
+        <foreach collection="ids" index="index" item="sampleId" open="(" separator="," close=")">
+            #{sampleId}
+        </foreach>
+
+
+        ORDER BY s.code , i.name
+    </select>
+
+
+
 </mapper>