Merge branch 'master' into dev

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

@@ -119,6 +119,52 @@ public class ContractSampleController 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_out_reg")
+    public RestResult<Page<ContractSample>> getPageOutReg(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.OUT_DRIFT);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
+    @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_out_data_input")
+    public RestResult<Page<ContractSample>> getPageOutDataInput(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.OUT_INPUT);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
+
+    @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_reg")
+    public RestResult<Page<ContractSample>> getPageEntrustReg(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.ENTRUST_REG);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
+
     @ApiOperation("生技部审核历史分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -183,6 +229,34 @@ public class ContractSampleController 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_check_accept_org_his")
+    public RestResult<Page<ContractSampleVO>> getPageCheckAcceptOrgHis(ContractSampleVO contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        return success(contractSampleService.pageCheckAcceptOrgHis(getPage(), contractSample));
+    }
+
+
+    @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_expert_review_his")
+    public RestResult<Page<ContractSampleVO>> getPageExpertReviewHis(ContractSampleVO contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.EXPERT_REVIEW);
+        return success(contractSampleService.pageCheckAcceptOrgHis(getPage(), contractSample));
+    }
+
+
     @ApiOperation("专家会审分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -287,6 +361,31 @@ public class ContractSampleController extends ServiceController {
     }
 
 
+
+    @ApiOperation("验收任务登记提交至委托登记")
+    @PostMapping("/submit_to_entrust_org")
+    public RestResult<Boolean> submitToEntrustOrg(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToEntrustOrg(ids,getAccount()));
+    }
+
+
+
+    @ApiOperation("验收任务登记提交至外委登记")
+    @PostMapping("/submit_to_out_reg")
+    public RestResult<Boolean> submitToOutReg(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToOutReg(ids,getAccount()));
+    }
+
+
+
+    @ApiOperation("外委登记提交至外委数据录入")
+    @PostMapping("/submit_to_out_data_input")
+    public RestResult<Boolean> submitToOutDataInput(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToOutDataInput(ids,getAccount()));
+    }
+
+
+
     @ApiOperation("验收组织提交至专家会审")
     @PostMapping("/submit_to_expert_review")
     public RestResult<Boolean> submitToExpertReviewFromOrg(@RequestParam("ids") Long [] ids) {

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.baomidou.kisso.annotation.Action;
+import com.baomidou.kisso.annotation.Login;
+import com.patzn.cloud.service.hmhj.entity.EntrustAnnex;
+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.IEntrustAnnexService;
+
+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 org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import java.util.List;
+
+/**
+ * 委托附件表 前端控制器
+ *
+ * @author wwd
+ * @since 2021-03-10
+ */
+@Api(tags = "委托附件表")
+@RestController
+@RequestMapping("/v1/annex")
+public class EntrustAnnexController extends ServiceController {
+
+    @Autowired
+    private IEntrustAnnexService entrustAnnexService;
+
+    @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<EntrustAnnex>> getPage(EntrustAnnex entrustAnnex) {
+        return success(entrustAnnexService.page(getPage(), entrustAnnex));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<EntrustAnnex> get(@PathVariable("id") Long id) {
+        return success(entrustAnnexService.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, EntrustAnnex entrustAnnex) {
+        entrustAnnex.setId(id);
+        return success(entrustAnnexService.updateById(entrustAnnex));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(EntrustAnnex entrustAnnex) {
+        return success(entrustAnnexService.save(entrustAnnex));
+	}
+
+    @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(entrustAnnexService.removeByIds(ids));
+	}
+
+
+    @ApiOperation(value = "附件上传", notes = "附件上传")
+    @PostMapping("/upload/{entrustId}")
+    public RestResult<Boolean> upload(@PathVariable("entrustId") Long entrustId, MultipartFile file) {
+        return success(entrustAnnexService.upload(file, entrustId));
+    }
+
+
+    @ApiOperation(value = "附件批量上传", notes = "附件批量上传")
+    @PostMapping("/upload_bath/{entrustId}")
+    public RestResult<Boolean> uploadBath(@PathVariable("entrustId") Long entrustId, MultipartHttpServletRequest httpServletRequest) {
+        return success(entrustAnnexService.uploadBath(httpServletRequest, entrustId,getAccount()));
+    }
+
+
+
+    @ApiOperation(value = "下载附件", notes = "下载指定附件")
+    @GetMapping("/download/{id}")
+    public void downloadFile(@PathVariable("id")Long id) {
+        entrustAnnexService.downloadFile(id, response);
+    }
+
+
+    @ApiOperation(value = "预览图片", notes = "预览图片")
+    @Login(action = Action.Skip)
+    @GetMapping("/view")
+    public void view(String objectKey) {
+        entrustAnnexService.view(response, objectKey);
+    }
+}

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

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -51,6 +52,22 @@ public class EntrustReportController 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),
+    })
+    @PostMapping("/page_report_make_his")
+    public RestResult<Page<EntrustReport>> getPageReportMakeHis(EntrustReport entrustReport) {
+        List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
+        reportStatusList.add(EntrustReportStatusEnum.CHECK);
+        reportStatusList.add(EntrustReportStatusEnum.ISSUE);
+        reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
+        reportStatusList.add(EntrustReportStatusEnum.END);
+        return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));
+    }
+
+
     @ApiOperation("报告台账待审核分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -63,6 +80,21 @@ public class EntrustReportController 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),
+    })
+    @PostMapping("/page_report_check_his")
+    public RestResult<Page<EntrustReport>> getPageCheckHis(EntrustReport entrustReport) {
+        List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
+        reportStatusList.add(EntrustReportStatusEnum.ISSUE);
+        reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
+        reportStatusList.add(EntrustReportStatusEnum.END);
+        return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));
+    }
+
+
     @ApiOperation("报告台账待签发分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -75,6 +107,33 @@ public class EntrustReportController 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),
+    })
+    @PostMapping("/page_report_issue_his")
+    public RestResult<Page<EntrustReport>> getPageIssueHis(EntrustReport entrustReport) {
+        List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
+        reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
+        reportStatusList.add(EntrustReportStatusEnum.END);
+        return success(entrustReportService.pageStatus(getPage(),reportStatusList, 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_e_book")
+    public RestResult<Page<EntrustReport>> getPageReportEBook(EntrustReport entrustReport) {
+        entrustReport.setStatus(EntrustReportStatusEnum.END);
+        return success(entrustReportService.page(getPage(), entrustReport));
+    }
+
+
 
 
     @ApiOperation("查询 id 信息")

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

@@ -53,6 +53,50 @@ public class EntrustSampleBackupController extends ServiceController {
         return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
 	}
 
+
+    @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_back_up_his")
+    public RestResult<Page<EntrustSampleBackupVO>> getPageBackupHis(EntrustSampleBackupVO entrustSampleBackup) {
+        entrustSampleBackup.setNotStatus(EntrustSampleBackupStatusEnum.BACKUP_ING);
+        return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
+    }
+
+
+
+    @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_handle")
+    public RestResult<Page<EntrustSampleBackupVO>> getPageHandle(EntrustSampleBackupVO entrustSampleBackup) {
+        entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.HANDLE);
+        return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
+    }
+
+
+    @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_handle_his")
+    public RestResult<Page<EntrustSampleBackupVO>> getPageHandleHis(EntrustSampleBackupVO entrustSampleBackup) {
+        entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.HANDLE_OK);
+        return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
+    }
+
+
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
@@ -87,6 +131,14 @@ public class EntrustSampleBackupController extends ServiceController {
     }
 
 
+
+    @ApiOperation("提交处置")
+    @PostMapping("/submit_to_handle")
+    public RestResult<Boolean> submitToHandle(@RequestParam("ids") Long [] ids) {
+        return success(entrustSampleBackupService.submitToHandle(ids,getAccount()));
+    }
+
+
     @ApiOperation("根据 ids 删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.ItemRelOriginalRecord;
+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.IItemRelOriginalRecordService;
+
+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-03-15
+ */
+@Api(tags = "土工试验项目关联原始记录表")
+@RestController
+@RequestMapping("/v1/rel_original_record")
+public class ItemRelOriginalRecordController extends ServiceController {
+
+    @Autowired
+    private IItemRelOriginalRecordService itemRelOriginalRecordService;
+
+    @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<ItemRelOriginalRecord>> getPage(ItemRelOriginalRecord itemRelOriginalRecord) {
+        return success(itemRelOriginalRecordService.page(getPage(), itemRelOriginalRecord));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ItemRelOriginalRecord> get(@PathVariable("id") Long id) {
+        return success(itemRelOriginalRecordService.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, ItemRelOriginalRecord itemRelOriginalRecord) {
+        itemRelOriginalRecord.setId(id);
+        return success(itemRelOriginalRecordService.updateById(itemRelOriginalRecord));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(ItemRelOriginalRecord itemRelOriginalRecord) {
+        return success(itemRelOriginalRecordService.save(itemRelOriginalRecord));
+	}
+
+    @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(itemRelOriginalRecordService.removeByIds(ids));
+	}
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
+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.IOriginalRecordService;
+
+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-03-15
+ */
+@Api(tags = "土工原始记录表")
+@RestController
+@RequestMapping("/v1/original_record")
+public class OriginalRecordController extends ServiceController {
+
+    @Autowired
+    private IOriginalRecordService originalRecordService;
+
+    @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<OriginalRecord>> getPage(OriginalRecord originalRecord) {
+        return success(originalRecordService.page(getPage(), originalRecord));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<OriginalRecord> get(@PathVariable("id") Long id) {
+        return success(originalRecordService.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, OriginalRecord originalRecord) {
+        originalRecord.setId(id);
+        return success(originalRecordService.updateById(originalRecord));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(OriginalRecord originalRecord) {
+        return success(originalRecordService.save(originalRecord));
+	}
+
+    @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(originalRecordService.removeByIds(ids));
+	}
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
+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.IOriginalTemplateConfigService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * ${table.comment} 前端控制器
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+@Api(tags = "原始记录模板配置")
+@RestController
+@RequestMapping("/v1/template_config")
+public class OriginalTemplateConfigController extends ServiceController {
+
+    @Autowired
+    private IOriginalTemplateConfigService originalTemplateConfigService;
+
+    @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<OriginalTemplateConfig>> getPage(OriginalTemplateConfig originalTemplateConfig) {
+        return success(originalTemplateConfigService.page(getPage(), originalTemplateConfig));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<OriginalTemplateConfig> get(@PathVariable("id") Long id) {
+        return success(originalTemplateConfigService.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, OriginalTemplateConfig originalTemplateConfig) {
+        originalTemplateConfig.setId(id);
+        return success(originalTemplateConfigService.updateById(originalTemplateConfig));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(OriginalTemplateConfig originalTemplateConfig) {
+        return success(originalTemplateConfigService.save(originalTemplateConfig));
+	}
+
+    @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(originalTemplateConfigService.removeByIds(ids));
+	}
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
+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.IOriginalTemplateService;
+
+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-03-15
+ */
+@Api(tags = "模板文件表")
+@RestController
+@RequestMapping("/v1/original_template")
+public class OriginalTemplateController extends ServiceController {
+
+    @Autowired
+    private IOriginalTemplateService originalTemplateService;
+
+    @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<OriginalTemplate>> getPage(OriginalTemplate originalTemplate) {
+        return success(originalTemplateService.page(getPage(), originalTemplate));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<OriginalTemplate> get(@PathVariable("id") Long id) {
+        return success(originalTemplateService.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, OriginalTemplate originalTemplate) {
+        originalTemplate.setId(id);
+        return success(originalTemplateService.updateById(originalTemplate));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(OriginalTemplate originalTemplate) {
+        return success(originalTemplateService.save(originalTemplate));
+	}
+
+    @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(originalTemplateService.removeByIds(ids));
+	}
+
+
+
+
+    @ApiOperation(value = "附件上传", notes = "附件上传")
+    @PostMapping("/upload_template/")
+    public RestResult<Boolean> uploadTemplate(@RequestParam("classType") String  classType,@RequestParam("name") String  name,@RequestParam("remark") String  remark, MultipartFile file) {
+        return success(originalTemplateService.uploadTemplate(file, classType,name,remark,0));
+    }
+}

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplateVersion;
+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.IOriginalTemplateVersionService;
+
+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-03-15
+ */
+@Api(tags = "模板文件历史表")
+@RestController
+@RequestMapping("/v1/template_version")
+public class OriginalTemplateVersionController extends ServiceController {
+
+    @Autowired
+    private IOriginalTemplateVersionService originalTemplateVersionService;
+
+    @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<OriginalTemplateVersion>> getPage(OriginalTemplateVersion originalTemplateVersion) {
+        return success(originalTemplateVersionService.page(getPage(), originalTemplateVersion));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<OriginalTemplateVersion> get(@PathVariable("id") Long id) {
+        return success(originalTemplateVersionService.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, OriginalTemplateVersion originalTemplateVersion) {
+        originalTemplateVersion.setId(id);
+        return success(originalTemplateVersionService.updateById(originalTemplateVersion));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(OriginalTemplateVersion originalTemplateVersion) {
+        return success(originalTemplateVersionService.save(originalTemplateVersion));
+	}
+
+    @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(originalTemplateVersionService.removeByIds(ids));
+	}
+}

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

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

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

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

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

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.service.hmhj.entity.ItemRelOriginalRecord;
+import com.patzn.cloud.commons.mapper.BatchMapper;
+
+/**
+ * <p>
+ * 土工试验项目关联原始记录表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface ItemRelOriginalRecordMapper extends BatchMapper<ItemRelOriginalRecord> {
+
+}

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

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
+import com.patzn.cloud.commons.mapper.BatchMapper;
+
+/**
+ * <p>
+ * 土工原始记录表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface OriginalRecordMapper extends BatchMapper<OriginalRecord> {
+
+}

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

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

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

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
+import com.patzn.cloud.commons.mapper.BatchMapper;
+
+/**
+ * <p>
+ * 模板文件表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface OriginalTemplateMapper extends BatchMapper<OriginalTemplate> {
+
+}

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

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplateVersion;
+
+/**
+ * <p>
+ * 模板文件历史表 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface OriginalTemplateVersionMapper extends BatchMapper<OriginalTemplateVersion> {
+
+}

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

@@ -33,6 +33,12 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
 
     boolean submitToCheckAcceptOrg(Long[] ids, Account account);
 
+    boolean submitToEntrustOrg(Long[] ids, Account account);
+
+    boolean submitToOutReg(Long[] ids, Account account);
+
+    boolean submitToOutDataInput(Long[] ids, Account account);
+
     boolean submitToExpertReviewFromOrg(Long[] ids, Account account);
 
     boolean submitCheckResultInput(Long[] ids, Account account);
@@ -40,4 +46,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     Page<ContractSampleVO> pageVO(Page<ContractSampleVO> page, ContractSampleVO contractSample);
 
     boolean addDTO(ContractSampleDTO dto);
+
+    Page<ContractSampleVO> pageCheckAcceptOrgHis(Page<ContractSampleVO> page, ContractSampleVO contractSample);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustAnnexService.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.EntrustAnnex;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2021-03-10
+ */
+public interface IEntrustAnnexService extends IBaseService<EntrustAnnex> {
+
+    Page<EntrustAnnex> page(Page<EntrustAnnex> page, EntrustAnnex entrustAnnex);
+
+    boolean removeByIds(List<Long> ids);
+
+    boolean upload(MultipartFile file, Long contractSampleId);
+
+    void downloadFile(Long id, HttpServletResponse response);
+
+    void view(HttpServletResponse response, String objectKey);
+
+    boolean uploadBath(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
+}

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

@@ -5,6 +5,7 @@ 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 com.patzn.cloud.service.hmhj.enums.EntrustReportStatusEnum;
 
 import java.io.File;
 import java.util.List;
@@ -32,4 +33,6 @@ public interface IEntrustReportService extends IBaseService<EntrustReport> {
     boolean backReportCheck(Long[] ids, String reason, Account account);
 
     boolean backReportIssue(Long[] ids, String reason, Account account);
+
+    Page<EntrustReport> pageStatus(Page<EntrustReport> page, List<EntrustReportStatusEnum> reportStatusList, EntrustReport entrustReport);
 }

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

@@ -23,4 +23,6 @@ public interface IEntrustSampleBackupService extends IBaseService<EntrustSampleB
     boolean handleOk(Long[] ids, Account account);
 
     Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup);
+
+    boolean submitToHandle(Long[] ids, Account account);
 }

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

@@ -4,6 +4,7 @@ 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.EntrustSampleItem;
+import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
 
 import java.util.List;
@@ -28,6 +29,7 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
 
     Page<EntrustSampleItemVO> pageByItemLeft(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
 
+
     Page<EntrustSampleItemVO> pageByItemRight(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
 
     boolean submitTest(Long[] ids, Account account);
@@ -41,4 +43,7 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
     boolean backAudit(Long[] ids, String reason, Account account);
 
     List<EntrustSampleItemVO> listBySampleIds(Long[] ids);
+
+
+    OriginalRecord saveExcelOriginalRecord(Long[] ids, Long templateId, Account account);
 }

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

@@ -27,6 +27,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
 
     Page<EntrustSampleVO> pageSampleByItem(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
 
+    Page<EntrustSampleVO> pageSampleByItemHis(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
+
     boolean makeReport(ReportDTO dto, Account account);
 
     boolean submitJudgeRegister(Long[] ids, Account account);
@@ -34,4 +36,10 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     boolean submitJudgeCheck(Long[] ids, Account account);
 
     boolean backJudgeCheck(Long[] ids, String remark, Account account);
+
+    Page<EntrustSampleVO> pageBySampleLeft(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO);
+
+    Page<EntrustSampleVO> pageBySampleLeftHis(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO);
+
+    Page<EntrustSampleVO> pageVO(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
 }

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

@@ -25,6 +25,8 @@ public interface IEntrustService extends IBaseService<Entrust> {
 
     boolean submitToCheck(Long[] ids, Account account);
 
+    boolean submitToOutInput(Long[] ids, Account account);
+
     boolean backFromCheck(Long[] ids, Account account, String reason);
 
     boolean submitToMake(Long[] ids, Account account);
@@ -37,11 +39,25 @@ public interface IEntrustService extends IBaseService<Entrust> {
 
     Page<EntrustVO> pageEntrustSampleReceive(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustSampleReceiveHis(Page<EntrustVO> page, EntrustVO entrust);
+
     Page<EntrustVO> pageEntrustByItem(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustByItemHis(Page<EntrustVO> page, EntrustVO entrust);
+
     Page<EntrustVO> pageEntrustBySample(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustByNotSample(Page<EntrustVO> page, EntrustVO entrust);
+
     Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustByReportNotHis(Page<EntrustVO> page, EntrustVO entrust);
+
+    Page<EntrustVO> pageEntrustByReportHis(Page<EntrustVO> page, EntrustVO entrust);
+
     Page<EntrustVO> pageEntrustJudge(Page<EntrustVO> page, EntrustVO entrust);
+
+    boolean outInputSubmitToQualityCheck(Long[] ids, Account account);
+
+    Page<EntrustVO> pageVO(Page<EntrustVO> page, EntrustVO entrust);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IItemRelOriginalRecordService.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.ItemRelOriginalRecord;
+
+import java.util.List;
+
+/**
+ * 土工试验项目关联原始记录表 服务类
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface IItemRelOriginalRecordService extends IBaseService<ItemRelOriginalRecord> {
+
+    Page<ItemRelOriginalRecord> page(Page<ItemRelOriginalRecord> page, ItemRelOriginalRecord itemRelOriginalRecord);
+
+    boolean removeByIds(List<Long> ids);
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalRecordService.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.OriginalRecord;
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * 土工原始记录表 服务类
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface IOriginalRecordService extends IBaseService<OriginalRecord> {
+
+    Page<OriginalRecord> page(Page<OriginalRecord> page, OriginalRecord originalRecord);
+
+    boolean removeByIds(List<Long> ids);
+
+    OriginalRecord uploadExpGenerate(Long[] ids, OriginalTemplate template, Entrust entrust, Account account, String remark, File file);
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateConfigService.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.OriginalTemplateConfig;
+
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface IOriginalTemplateConfigService extends IBaseService<OriginalTemplateConfig> {
+
+    Page<OriginalTemplateConfig> page(Page<OriginalTemplateConfig> page, OriginalTemplateConfig originalTemplateConfig);
+
+    boolean removeByIds(List<Long> ids);
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateService.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.OriginalTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 模板文件表 服务类
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface IOriginalTemplateService extends IBaseService<OriginalTemplate> {
+
+    Page<OriginalTemplate> page(Page<OriginalTemplate> page, OriginalTemplate originalTemplate);
+
+    boolean removeByIds(List<Long> ids);
+
+    boolean uploadTemplate(MultipartFile file, String classType, String name, String remark, int i);
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateVersionService.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.OriginalTemplateVersion;
+
+import java.util.List;
+
+/**
+ * 模板文件历史表 服务类
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+public interface IOriginalTemplateVersionService extends IBaseService<OriginalTemplateVersion> {
+
+    Page<OriginalTemplateVersion> page(Page<OriginalTemplateVersion> page, OriginalTemplateVersion originalTemplateVersion);
+
+    boolean removeByIds(List<Long> ids);
+}

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

@@ -7,6 +7,7 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.entity.ContractSampleItem;
+import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
@@ -25,6 +26,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  *  服务实现类
@@ -132,6 +134,49 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
 
     @Transactional(rollbackFor = Exception.class)
     @Override
+    public boolean submitToEntrustOrg(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.ENTRUST_REG);
+        contractSample.setProgress(ContractSampleStatusEnum.ENTRUST_REG);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.CHECK_ACCEPT_REG,ContractSampleStatusEnum.ENTRUST_REG,0,"验收任务登记提交至委托登记",account);
+        lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register","委托登记由验收任务登记提交过来，请及时处理","新的委托登记任务！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitToOutReg(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.OUT_DRIFT);
+        contractSample.setProgress(ContractSampleStatusEnum.OUT_DRIFT);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.CHECK_ACCEPT_REG,ContractSampleStatusEnum.OUT_DRIFT,0,"验收任务登记提交外委登记",account);
+        lmsMsgService.sendMsg("/hmhj/accept_manage/sub_register","验收任务登记提交至外委登记，请及时处理","新的外委登记任务！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitToOutDataInput(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.OUT_INPUT);
+        contractSample.setProgress(ContractSampleStatusEnum.OUT_INPUT);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.OUT_DRIFT,ContractSampleStatusEnum.OUT_INPUT,0,"验收任务登记提交外委登记",account);
+        lmsMsgService.sendMsg("/hmhj/accept_manage/sub_input","外委登记提交至外委数据录入，请及时处理","新的外委数据录入！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
     public boolean submitToExpertReviewFromOrg(Long[] ids, Account account) {
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
         ContractSample contractSample = new ContractSample();
@@ -179,4 +224,26 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     }
 
 
+
+    @Override
+    public Page<ContractSampleVO> pageCheckAcceptOrgHis(Page<ContractSampleVO> page, ContractSampleVO contractSample) {
+
+      List<ContractSampleRecord> recordList =  contractSampleRecordService.list(Condition.create().setSqlSelect("contract_sample_id").eq("origin",contractSample.getStatus().getDisplay()).groupBy("contract_sample_id"));
+
+      if (CollectionUtils.isEmpty(recordList)){
+          return page;
+      }
+      List<Long> sampleIds = recordList.stream().map(r->{
+          return r.getContractSampleId();
+      }).collect(Collectors.toList());
+
+      if (CollectionUtils.isEmpty(sampleIds)){
+          return page;
+      }
+        contractSample.setIdList(sampleIds);
+        contractSample.setStatus(null);
+       return page.setRecords(baseMapper.selectVOList(page,contractSample));
+    }
+
+
 }

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+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.EntrustAnnex;
+import com.patzn.cloud.service.lims.hmhj.mapper.EntrustAnnexMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustAnnexService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustService;
+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.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ *  服务实现类
+ *
+ * @author wwd
+ * @since 2021-03-10
+ */
+@Service
+public class EntrustAnnexServiceImpl extends BaseServiceImpl<EntrustAnnexMapper, EntrustAnnex> implements IEntrustAnnexService {
+
+    @Autowired
+    private OssClient ossClient;
+
+    @Autowired
+    private IEntrustService entrustService;
+
+    @Override
+    public Page<EntrustAnnex> page(Page<EntrustAnnex> page, EntrustAnnex entrustAnnex) {
+        Wrapper wrapper = new EntityWrapper<>(entrustAnnex);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean upload(MultipartFile file, Long entrustId) {
+        RestAssert.fail(null == entrustId,"请选择委托");
+        String fileName = file.getOriginalFilename();
+        RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
+        if (null==entrustService.getById(entrustId)){
+            RestAssert.fail("委托不存在");
+        }
+        OssFileResult result = ossClient.upload(file);
+        if (null == result) {
+            return false;
+        }
+        EntrustAnnex sampleAnnex = new EntrustAnnex();
+
+        sampleAnnex.setType(result.getType());
+        sampleAnnex.setFileName(result.getName());
+        sampleAnnex.setObjectKey(result.getObjectKey());
+        sampleAnnex.setEntrustId(entrustId);
+        return save(sampleAnnex);
+    }
+
+    @Override
+    public void downloadFile(Long id, HttpServletResponse response) {
+        EntrustAnnex attachment = super.getById(id);
+        if (null == attachment) {
+            RestAssert.fail("抱歉！该照片不存在");
+        }
+        ossClient.download(attachment.getObjectKey(), attachment.getFileName() + "." + attachment.getType(), response);
+    }
+
+    @Override
+    public void view(HttpServletResponse response, String objectKey) {
+        ossClient.download(objectKey, response);
+    }
+
+    @Override
+    public boolean uploadBath(MultipartHttpServletRequest multipartHttpServletRequest, Long contractSampleId, Account account) {
+
+        // 先拿到文件名称的迭代器
+        Iterator<String> fileNamesIt = multipartHttpServletRequest.getFileNames();
+        List<String> failedNameList = new ArrayList<>();
+        while (fileNamesIt.hasNext()) {
+            String fileName = fileNamesIt.next();
+            // 获取文件
+            MultipartFile multipartFile = multipartHttpServletRequest.getFile(fileName);
+            upload(multipartFile,contractSampleId);
+            failedNameList.add(fileName);
+        }
+
+        return true;
+    }
+}

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

@@ -56,6 +56,15 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
     @Override
+    public Page<EntrustReport> pageStatus(Page<EntrustReport> page, List<EntrustReportStatusEnum> reportStatusList, EntrustReport entrustReport) {
+        Wrapper wrapper = new EntityWrapper<>(entrustReport);
+        if (CollectionUtils.isNotEmpty(reportStatusList)){
+            wrapper.in("status",reportStatusList);
+        }
+        return this.page(page, wrapper);
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
@@ -200,4 +209,6 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
 
+
+
 }

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

@@ -54,4 +54,14 @@ public class EntrustSampleBackupServiceImpl extends BaseServiceImpl<EntrustSampl
     public Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup) {
         return page.setRecords(baseMapper.selectVOList(page,entrustSampleBackup));
     }
+
+    @Override
+    public boolean submitToHandle(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择提交处置的样品！");
+        EntrustSampleBackup backup = new EntrustSampleBackup();
+        backup.setStatus(EntrustSampleBackupStatusEnum.HANDLE);
+        backup.setProgress(EntrustSampleBackupStatusEnum.HANDLE);
+
+        return super.update(backup,Condition.create().in("id",ids));
+    }
 }

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

@@ -5,21 +5,12 @@ 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.dto.SamplePrepareDTO;
-import com.patzn.cloud.service.hmhj.entity.EntrustSample;
-import com.patzn.cloud.service.hmhj.entity.EntrustSampleBackup;
-import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
-import com.patzn.cloud.service.hmhj.entity.EntrustSamplePrepare;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleBackupStatusEnum;
-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.entity.*;
+import com.patzn.cloud.service.hmhj.enums.*;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSamplePrepareMapper;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleBackupService;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSamplePrepareService;
+import com.patzn.cloud.service.lims.hmhj.service.*;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -52,7 +43,8 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
     @Autowired
     private IEntrustSampleBackupService entrustSampleBackupService;
 
-
+    @Autowired
+    private IEntrustService entrustService;
 
     @Override
     public Page<EntrustSamplePrepare> page(Page<EntrustSamplePrepare> page, EntrustSamplePrepare entrustSamplePrepare) {
@@ -91,6 +83,8 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
 
         List<EntrustSample> sampleList = entrustSampleService.getBatchIds(sampleIdsList);
 
+        Entrust entrust = entrustService.getById(sampleList.get(0).getEntrustId());
+
 
 
         List<EntrustSampleBackup> backupList = entrustSampleBackupService.list(Condition.create().in("sample_id",sampleIdsList));
@@ -119,7 +113,22 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
         sample.setStatus(EntrustSampleStatusEnum.RECEIVE);
         sample.setProgress(EntrustSampleStatusEnum.RECEIVE);
         entrustSampleService.update(sample,Condition.create().in("id",sampleIdsList));
-        return saveBatch(savePrepare);
+
+
+        saveBatch(savePrepare);
+
+
+        List<EntrustSample> checkMakeList = entrustSampleService.list(Condition.create().eq("entrust_id",entrust.getId()).eq("status",EntrustSampleStatusEnum.DRAFT));
+        if (CollectionUtils.isEmpty(checkMakeList)){
+            Entrust updateEntrust = new Entrust();
+            updateEntrust.setStatus(EntrustStatusEnum.TEST);
+            updateEntrust.setProgress(EntrustStatusEnum.TEST);
+            updateEntrust.setId(entrust.getId());
+            entrustService.updateById(updateEntrust);
+        }
+
+
+        return true;
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -84,6 +84,12 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     }
 
     @Override
+    public Page<EntrustSampleVO> pageVO(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
+
+        return page.setRecords(baseMapper.selectVOList(page,entrustSample));
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
@@ -183,6 +189,30 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     }
 
 
+    @Override
+    public Page<EntrustSampleVO> pageSampleByItemHis(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
+        if (null == entrustSample.getEntrustId()){
+            return page;
+        }
+        if (CollectionUtils.isEmpty(entrustSample.getItemStatusList()) ){
+            return page;
+        }
+        List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().in("status",entrustSample.getItemStatusList()));
+        if (CollectionUtils.isEmpty(itemList)){
+            return page;
+        }
+
+        List<Long> sampleIdsList = itemList.stream().map(i->{
+            return i.getEntrustSampleId();
+        }).collect(Collectors.toList());
+
+
+        entrustSample.setIds(sampleIdsList);
+
+        return page.setRecords(baseMapper.selectVOList(page,entrustSample));
+    }
+
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -310,6 +340,46 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         return super.update(sample,Condition.create().in("id",ids));
     }
 
+    @Override
+    public Page<EntrustSampleVO> pageBySampleLeft(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO) {
+        if (null == sampleVO.getEntrustId()){
+            return page;
+        }
+        List<EntrustSampleItem> itemList =  entrustSampleItemService.list(Condition.create().eq("status",sampleVO.getItemStatus()));
+        if (CollectionUtils.isEmpty(itemList)){
+            return page;
+        }
+        List<Long> sampleIds =  new ArrayList<>();
+        for (EntrustSampleItem item : itemList) {
+            sampleIds.add(item.getEntrustSampleId());
+        }
+
+
+        sampleVO.setIds(sampleIds);
+        return page.setRecords(baseMapper.selectVOList(page,sampleVO));
+    }
+
+
+
+    @Override
+    public Page<EntrustSampleVO> pageBySampleLeftHis(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO) {
+        if (null == sampleVO.getEntrustId()){
+            return page;
+        }
+        List<EntrustSampleItem> itemList =  entrustSampleItemService.list(Condition.create().in("status",sampleVO.getItemStatusList()));
+        if (CollectionUtils.isEmpty(itemList)){
+            return page;
+        }
+        List<Long> sampleIds =  new ArrayList<>();
+        for (EntrustSampleItem item : itemList) {
+            sampleIds.add(item.getEntrustSampleId());
+        }
+
+
+        sampleVO.setIds(sampleIds);
+        return page.setRecords(baseMapper.selectVOList(page,sampleVO));
+    }
+
 
     public void reportMakeTestContent(XWPFTable xwpfTable, int length, int index, List<?> objList) {
         //检测内容

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.patzn.cloud.service.hmhj.entity.ItemRelOriginalRecord;
+import com.patzn.cloud.service.lims.hmhj.mapper.ItemRelOriginalRecordMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IItemRelOriginalRecordService;
+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-03-15
+ */
+@Service
+public class ItemRelOriginalRecordServiceImpl extends BaseServiceImpl<ItemRelOriginalRecordMapper, ItemRelOriginalRecord> implements IItemRelOriginalRecordService {
+
+    @Override
+    public Page<ItemRelOriginalRecord> page(Page<ItemRelOriginalRecord> page, ItemRelOriginalRecord itemRelOriginalRecord) {
+        Wrapper wrapper = new EntityWrapper<>(itemRelOriginalRecord);
+
+        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/OriginalRecordServiceImpl.java

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+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.*;
+import com.patzn.cloud.service.lims.hmhj.mapper.OriginalRecordMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
+import com.patzn.cloud.service.lims.hmhj.service.IItemRelOriginalRecordService;
+import com.patzn.cloud.service.lims.hmhj.service.IOriginalRecordService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.apache.commons.lang3.ArrayUtils;
+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.List;
+
+/**
+ * 土工原始记录表 服务实现类
+ *
+ * @author wwd
+ * @since 2021-03-15
+ */
+@Service
+public class OriginalRecordServiceImpl extends BaseServiceImpl<OriginalRecordMapper, OriginalRecord> implements IOriginalRecordService {
+
+
+    @Autowired
+    private IItemRelOriginalRecordService itemRelOriginalRecordService;
+
+    @Autowired
+    private OssClient ossClient;
+
+    @Override
+    public Page<OriginalRecord> page(Page<OriginalRecord> page, OriginalRecord originalRecord) {
+        Wrapper wrapper = new EntityWrapper<>(originalRecord);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public OriginalRecord uploadExpGenerate(Long[] ids, OriginalTemplate template, Entrust entrust, Account account, String remark, File file) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择试验项目");
+        RestAssert.fail(null == entrust.getId(), "试验委托单ID不能为空");
+
+
+        OriginalRecord soilOriginalRecord = new OriginalRecord();
+        soilOriginalRecord.setEntrustId(entrust.getId());
+        soilOriginalRecord.setTemplateId(template.getId());
+        soilOriginalRecord.setTitle(template.getName());
+        soilOriginalRecord.setRemark(remark);
+        soilOriginalRecord.setUname(account.getUserName());
+        OssFileResult obsFileResult = ossClient.upload(file);
+        if (null == obsFileResult) {
+            return null;
+        }
+        soilOriginalRecord.setObjectKey(obsFileResult.getObjectKey());
+        if (save(soilOriginalRecord)){
+            List<ItemRelOriginalRecord> saveList = new ArrayList<>();
+            for (Long id:ids) {
+                ItemRelOriginalRecord relOriginalRecord = new ItemRelOriginalRecord();
+                relOriginalRecord.setItemId(id);
+                relOriginalRecord.setRecordId(soilOriginalRecord.getId());
+                saveList.add(relOriginalRecord);
+            }
+            if (CollectionUtils.isNotEmpty(saveList)){
+                itemRelOriginalRecordService.saveBatch(saveList);
+            }
+        }
+        return soilOriginalRecord;
+
+    }
+}

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplateConfig;
+import com.patzn.cloud.service.lims.hmhj.mapper.OriginalTemplateConfigMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IOriginalTemplateConfigService;
+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-03-15
+ */
+@Service
+public class OriginalTemplateConfigServiceImpl extends BaseServiceImpl<OriginalTemplateConfigMapper, OriginalTemplateConfig> implements IOriginalTemplateConfigService {
+
+    @Override
+    public Page<OriginalTemplateConfig> page(Page<OriginalTemplateConfig> page, OriginalTemplateConfig originalTemplateConfig) {
+        Wrapper wrapper = new EntityWrapper<>(originalTemplateConfig);
+
+        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/OriginalTemplateServiceImpl.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.OriginalTemplate;
+import com.patzn.cloud.service.lims.hmhj.mapper.OriginalTemplateMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IOriginalTemplateService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilOriginalTemplate;
+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-03-15
+ */
+@Service
+public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplateMapper, OriginalTemplate> implements IOriginalTemplateService {
+
+
+    @Autowired
+    private OssClient ossClient;
+
+    @Override
+    public Page<OriginalTemplate> page(Page<OriginalTemplate> page, OriginalTemplate originalTemplate) {
+        Wrapper wrapper = new EntityWrapper<>(originalTemplate);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public boolean uploadTemplate(MultipartFile file, String classType, String name, String remark, int templateType) {
+        RestAssert.fail(StringUtils.isBlank(classType),"模板类别不能为空");
+        RestAssert.fail(StringUtils.isBlank(name),"请填写原始记录名称");
+        String fileName = file.getOriginalFilename();
+        RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
+        OriginalTemplate attachment = new OriginalTemplate();
+        OssFileResult result = ossClient.upload(file);
+        if (null == result) {
+            return false;
+        }
+        attachment.setAlias(name);
+        attachment.setRemark(remark);
+        attachment.setClassType(classType);
+        attachment.setBucketName(result.getBucketName());
+        attachment.setType(result.getType());
+        attachment.setName(result.getName());
+        attachment.setObjectKey(result.getObjectKey());
+        attachment.setVersionId(result.getVersionId());
+        attachment.setTemplateType(templateType);
+        return save(attachment);
+    }
+
+
+}

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.patzn.cloud.service.hmhj.entity.OriginalTemplateVersion;
+import com.patzn.cloud.service.lims.hmhj.mapper.OriginalTemplateVersionMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IOriginalTemplateVersionService;
+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-03-15
+ */
+@Service
+public class OriginalTemplateVersionServiceImpl extends BaseServiceImpl<OriginalTemplateVersionMapper, OriginalTemplateVersion> implements IOriginalTemplateVersionService {
+
+    @Override
+    public Page<OriginalTemplateVersion> page(Page<OriginalTemplateVersion> page, OriginalTemplateVersion originalTemplateVersion) {
+        Wrapper wrapper = new EntityWrapper<>(originalTemplateVersion);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

@@ -13,6 +13,13 @@
                         #{status}
                     </foreach>
                 </if>
+
+        <if test="null!=vo.idList">
+            AND s.id IN
+            <foreach collection="vo.idList" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
     </sql>
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSampleVO">

src/main/resources/mapper/hmhj/EntrustAnnexMapper.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.EntrustAnnexMapper">
+
+</mapper>

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

@@ -26,6 +26,13 @@
                 #{id}
             </foreach>
         </if>
+
+        <if test="null!=vo.statusList">
+            AND status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
     </select>
 
 

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

@@ -11,6 +11,7 @@
 	b.storage_location,
 	b.storage_method,
 	b.storage_period,
+	b.sample_id,
 	b.handler,
 	b.handle_time,
 
@@ -28,6 +29,16 @@ FROM
         <if test="null!=vo.sampleCode">
             AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
         </if>
+
+        <if test="null!=vo.status">
+            AND b.status =#{vo.status}
+        </if>
+
+
+        <if test="null!=vo.notStatus">
+            AND b.status !=#{vo.notStatus}
+        </if>
+
         <if test="null!=vo.sampleName">
             AND s.name LIKE CONCAT('%',#{vo.sampleName},'%')
         </if>

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

@@ -3,7 +3,21 @@
 <mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper">
 
     <select id="selectByItemLeftList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-        SELECT name FROM entrust_sample_item WHERE deleted = 0  AND status = #{vo.status}
+        SELECT name FROM entrust_sample_item WHERE deleted = 0
+
+
+
+        <if test="null!=vo.status">
+            AND status = #{vo.status}
+        </if>
+
+        <if test="null!=vo.statusList">
+            AND  status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+
 
           <if test="null!=vo.sampleIds">
               AND  entrust_sample_id IN
@@ -34,6 +48,14 @@
             <if test="null!=vo.status">
                 AND status = #{vo.status}
             </if>
+
+        <if test="null!=vo.statusList">
+            AND  status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+
             <if test="null!=vo.name">
                 AND name = #{vo.name}
             </if>
@@ -70,6 +92,7 @@
         name,
         status,
         standard,
+        test_value,
         group_name,
         group_id
         FROM
@@ -81,6 +104,15 @@
             AND status = #{vo.status}
         </if>
 
+        <if test="null!=vo.statusList">
+            AND status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+
+
+
         <if test="null!=vo.sampleIds">
             AND  entrust_sample_id IN
             <foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
@@ -123,5 +155,21 @@
     </select>
 
 
+    <select id="selectVOListByIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
+        SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,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.id IN
+        <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        ORDER BY s.code , i.name
+    </select>
+
+
 
 </mapper>

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

@@ -19,6 +19,10 @@
             AND p.status = #{vo.prepareStatus}
         </if>
 
+        <if test="null!=vo.prepareNotStatus">
+            AND p.status != #{vo.prepareNotStatus}
+        </if>
+
         <if test="null!=vo.entrustId">
             AND s.entrust_id = #{vo.entrustId}
         </if>
@@ -29,11 +33,19 @@
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
 
-        SELECT id , name ,code,entrust_id  FROM entrust_sample WHERE deleted = 0
+        SELECT *  FROM entrust_sample WHERE deleted = 0
         <if test="null!=vo.entrustId">
             AND  entrust_id = #{vo.entrustId}
         </if>
 
+        <if test="null!=vo.status">
+            AND  status = #{vo.status}
+        </if>
+
+        <if test="null!=vo.notStatus">
+            AND  status != #{vo.notStatus}
+        </if>
+
         <if test="null!=vo.ids">
             AND  id IN
             <foreach collection="vo.ids" index="index" item="sampleId" open="(" separator="," close=")">

src/main/resources/mapper/hmhj/ItemRelOriginalRecordMapper.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.ItemRelOriginalRecordMapper">
+
+</mapper>

src/main/resources/mapper/hmhj/OriginalRecordMapper.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.OriginalRecordMapper">
+
+</mapper>

src/main/resources/mapper/hmhj/OriginalTemplateConfigMapper.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.OriginalTemplateConfigMapper">
+
+</mapper>

src/main/resources/mapper/hmhj/OriginalTemplateMapper.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.OriginalTemplateMapper">
+
+</mapper>

src/main/resources/mapper/hmhj/OriginalTemplateVersionMapper.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.OriginalTemplateVersionMapper">
+
+</mapper>