土工平台修改

src/main/java/com/patzn/cloud/service/lims/excel/controller/ExcelController.java

 package com.patzn.cloud.service.lims.excel.controller;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.commons.toolkit.IoUtils;
 import com.patzn.poibox.excel.ExcelHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Map;
 /**
@@ -35,6 +43,21 @@ public class ExcelController extends ServiceController {
         ExcelController.TPL.put("MeterSendSampleImport", "出检样品导入模板");
         ExcelController.TPL.put("SoilEntrustImport", "试验委托单导入模板");
         ExcelController.TPL.put("SoilAptExpImport", "试样项目导入模板");
+
+
+        ExcelController.TPL.put("TenderContractSupplement.docx", "标书合同（协议）补充单.docx");
+        ExcelController.TPL.put("TenderContractEvaluationForm.docx", "标书合同(协议)评审表.docx");
+        ExcelController.TPL.put("TestEntrustBook.docx", "检测委托书.docx");
+        ExcelController.TPL.put("AnnualTrainingSchedule.doc", "年度培训计划表.doc");
+        ExcelController.TPL.put("EquipAll.docx", "仪器设备总览表.docx");
+        ExcelController.TPL.put("ChixuGaiJinJILu.docx", "持续改进记录.docx");
+        ExcelController.TPL.put("GaiJinPlan.docx", "改进计划.docx");
+        ExcelController.TPL.put("JinceWuPinDengJI.docx", "检测物品登记表.docx");
+        ExcelController.TPL.put("KehuTouShuDengJI.docx", "客户投诉登记表.docx");
+        ExcelController.TPL.put("LiuYangDengJI.docx", "留样登记表.docx");
+        ExcelController.TPL.put("QuYang.docx", "取（采）样记录.docx");
+        ExcelController.TPL.put("YangPinBiaoShiKa.docx", "样品标识卡.docx");
+        ExcelController.TPL.put("YangPinChouYangDan.docx", "样品抽样单.docx");
     }
 
     @ApiOperation(value = "根据模板名称下载模板", notes = "根据模板名称下载导入模板")
@@ -54,4 +77,55 @@ public class ExcelController extends ServiceController {
         }
     }
 
+    @ApiOperation(value = "根据模板名称下载模板", notes = "根据模板名称下载导入模板")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "模板名称", required = true, paramType = "path", dataType = "String"),
+    })
+    @GetMapping("/template_soil/{name}")
+    public void templateSoil(@PathVariable("name") String name) {
+        RestAssert.fail(null == ExcelController.TPL.get(name), "导入模板不存请联系管理员");
+        try {
+            // 文件路径
+            String filePath = String.format("templates/soil/%s", name);
+            // 兼容打包 JAR 压缩情况处理
+            templateDownload(response, ExcelController.TPL.get(name),
+                    new ClassPathResource(filePath).getInputStream());
+
+        } catch (Throwable t) {
+            RestAssert.fail("该模板不存在");
+        }
+    }
+
+
+    public static void templateDownload(HttpServletResponse response, String templateName, InputStream in) {
+        if (null != in || StringUtils.isNotEmpty(templateName)) {
+            BufferedInputStream bis = null;
+            BufferedOutputStream bos = null;
+
+            try {
+                setExcelHeader(response, templateName);
+                ServletOutputStream out = response.getOutputStream();
+                bis = new BufferedInputStream(in);
+                bos = new BufferedOutputStream(out);
+                byte[] buff = new byte[2048];
+
+                int bytesRead;
+                while(-1 != (bytesRead = bis.read(buff, 0, buff.length))) {
+                    bos.write(buff, 0, bytesRead);
+                }
+            } catch (Exception var11) {
+
+            } finally {
+                IoUtils.close(new Closeable[]{bis, bos, in});
+            }
+        }
+
+    }
+
+    public static void setExcelHeader(HttpServletResponse response, String templateName) throws UnsupportedEncodingException {
+        response.reset();
+        response.setContentType("application/msword;charset=utf-8");
+        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(templateName, "UTF-8"));
+    }
+
 }

src/main/java/com/patzn/cloud/service/lims/handler/ItemCollectEntity.java

@@ -14,6 +14,9 @@ public class ItemCollectEntity {
     private String attribute;
 
 
+    private Integer statusPlace;
+
+
     public String getItemName() {
         return itemName;
     }
@@ -53,4 +56,12 @@ public class ItemCollectEntity {
     public void setAttribute(String attribute) {
         this.attribute = attribute;
     }
+
+    public Integer getStatusPlace() {
+        return statusPlace;
+    }
+
+    public void setStatusPlace(Integer statusPlace) {
+        this.statusPlace = statusPlace;
+    }
 }

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilAloneSampleController.java

@@ -99,12 +99,12 @@ public class SoilAloneSampleController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page_wait_storage_his")
-    public RestResult<Page<SoilAloneSample>> getPageWaitStorageHis(SoilAloneSampleVO soilAloneSample) {
+    public RestResult<Page<SoilAloneSampleVO>> getPageWaitStorageHis(SoilAloneSampleVO soilAloneSample) {
         List<SoilAloneStatusEnum> statusList = new ArrayList<>();
         statusList.add(SoilAloneStatusEnum.WAIT_DELIVERY);
         statusList.add(SoilAloneStatusEnum.DELIVERY_OK);
         soilAloneSample.setStatusList(statusList);
-        return success(soilAloneSampleService.page(getPage(), soilAloneSample));
+        return success(soilAloneSampleService.pageVO(getPage(), soilAloneSample));
     }
 
 
@@ -118,9 +118,9 @@ public class SoilAloneSampleController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page_wait_delivery")
-    public RestResult<Page<SoilAloneSample>> getPageWaitDelivery(SoilAloneSampleVO soilAloneSample) {
+    public RestResult<Page<SoilAloneSampleVO>> getPageWaitDelivery(SoilAloneSampleVO soilAloneSample) {
         soilAloneSample.setStatus(SoilAloneStatusEnum.WAIT_DELIVERY);
-        return success(soilAloneSampleService.page(getPage(), soilAloneSample));
+        return success(soilAloneSampleService.pageVO(getPage(), soilAloneSample));
     }
 
 
@@ -132,9 +132,9 @@ public class SoilAloneSampleController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page_wait_delivery_his")
-    public RestResult<Page<SoilAloneSample>> getPageWaitDeliveryHis(SoilAloneSampleVO soilAloneSample) {
+    public RestResult<Page<SoilAloneSampleVO>> getPageWaitDeliveryHis(SoilAloneSampleVO soilAloneSample) {
         soilAloneSample.setStatus(SoilAloneStatusEnum.DELIVERY_OK);
-        return success(soilAloneSampleService.page(getPage(), soilAloneSample));
+        return success(soilAloneSampleService.pageVO(getPage(), soilAloneSample));
     }
 
 
@@ -180,6 +180,16 @@ public class SoilAloneSampleController extends ServiceController {
         return success(soilAloneSampleService.getById(id));
     }
 
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/vo/{id}")
+    public RestResult<SoilAloneSampleVO> getVOById(@PathVariable("id") Long id) {
+        return success(soilAloneSampleService.getVOById(id));
+    }
+
     @ApiOperation("根据 id 修改信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilExperimentController.java

@@ -11,6 +11,7 @@ import com.patzn.cloud.service.lims.base.entity.LmsUserRelGroup;
 import com.patzn.cloud.service.lims.base.vo.LmsUserRelGroupVO;
 import com.patzn.cloud.service.soil.dto.SoilExperimentQueryDTO;
 import com.patzn.cloud.service.soil.entity.SoilExpReport;
+import com.patzn.cloud.service.soil.entity.SoilOpenSoilRecord;
 import com.patzn.cloud.service.soil.entity.SoilOriginalRecord;
 import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
@@ -415,6 +416,21 @@ public class SoilExperimentController extends ServiceController  {
     }
 
 
+
+    @ApiOperation(value = "试验项目按照试验项目检测(右侧数据)复核分页列表", notes = "分页查询数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_exp_check_bath")
+    public RestResult<Page<SoilExperimentVO>> getPageExpCheckBath(@RequestBody SoilExperimentQueryDTO vo) {
+        vo.setStatus(SoilExpStatusEnum.CHECK);
+        return success(soilExperimentService.pageExpRightBath(getPage(),vo));
+    }
+
+
     @ApiOperation(value = "试验项目按照试验项目检测(右侧数据)审核分页列表", notes = "分页查询数据列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
@@ -430,6 +446,21 @@ public class SoilExperimentController extends ServiceController  {
 
 
 
+    @ApiOperation(value = "试验项目按照试验项目检测(右侧数据)审核分页列表", notes = "分页查询数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_exp_audit_bath")
+    public RestResult<Page<SoilExperimentVO>> getPageExpAuditBath(@RequestBody SoilExperimentQueryDTO vo) {
+        vo.setStatus(SoilExpStatusEnum.AUDIT);
+        return success(soilExperimentService.pageExpRightBath(getPage(),vo));
+    }
+
+
+
     @ApiOperation(value = "按照试验项目分配分页列表", notes = "按照试验项目分配分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
@@ -626,6 +657,15 @@ public class SoilExperimentController extends ServiceController  {
         return success(soilExperimentService.saveExcelOriginalRecord(ids,templateId,getAccount()));
     }
 
+
+    @ApiOperation(value = "填写开土制备记录", notes = "填写开土制备记录")
+    @PostMapping("/save_excel_open_soil_record")
+    public RestResult<SoilOpenSoilRecord> saveExcelOpenSoilRecord(@RequestParam("entrustId")Long entrustId, @RequestParam("templateId") Long templateId) {
+        return success(soilExperimentService.saveExcelOpenSoilRecord(entrustId,templateId,getAccount()));
+    }
+
+
+
     @ApiOperation(value = "生成试验项目报告", notes = "填写原始记录")
     @PostMapping("/save_excel_exp_report")
     public RestResult<SoilExpReport> saveExcelExpReport(@RequestParam("expName")String expName, @RequestParam("entrustId")Long entrustId, @RequestParam("ids")Long[] ids, @RequestParam("templateId") Long templateId) {

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilOpenSoilRecordController.java

+package com.patzn.cloud.service.lims.soil.controller;
+
+import com.patzn.cloud.service.soil.entity.SoilOpenSoilRecord;
+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.soil.service.ISoilOpenSoilRecordService;
+
+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-01-19
+ */
+@Api(tags = "${table.comment}")
+@RestController
+@RequestMapping("/v1/open_soil_record")
+public class SoilOpenSoilRecordController extends ServiceController {
+
+    @Autowired
+    private ISoilOpenSoilRecordService soilOpenSoilRecordService;
+
+    @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")
+	public RestResult<Page<SoilOpenSoilRecord>> getPage(SoilOpenSoilRecord soilOpenSoilRecord) {
+        return success(soilOpenSoilRecordService.page(getPage(), soilOpenSoilRecord));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<SoilOpenSoilRecord> get(@PathVariable("id") Long id) {
+        return success(soilOpenSoilRecordService.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, SoilOpenSoilRecord soilOpenSoilRecord) {
+        soilOpenSoilRecord.setId(id);
+        return success(soilOpenSoilRecordService.updateById(soilOpenSoilRecord));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(SoilOpenSoilRecord soilOpenSoilRecord) {
+        return success(soilOpenSoilRecordService.save(soilOpenSoilRecord));
+	}
+
+    @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(soilOpenSoilRecordService.removeByIds(ids));
+	}
+}

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilOriginalTemplateController.java

@@ -105,7 +105,15 @@ public class SoilOriginalTemplateController extends ServiceController implements
     @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(soilOriginalTemplateService.uploadTemplate(file, classType,name,remark));
+        return success(soilOriginalTemplateService.uploadTemplate(file, classType,name,remark,0));
+    }
+
+
+
+    @ApiOperation(value = "开土制备记录模板上传", notes = "开土制备记录模板上传")
+    @PostMapping("/upload_open_soil_template/")
+    public RestResult<Boolean> uploadOpenSoilTemplate(@RequestParam("classType") String  classType,@RequestParam("name") String  name,@RequestParam("remark") String  remark, MultipartFile file) {
+        return success(soilOriginalTemplateService.uploadTemplate(file, classType,name,remark,1));
     }
 
 

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilSampleController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.google.common.collect.Lists;
 import com.patzn.cloud.service.soil.dto.SoilPrepareDTO;
+import com.patzn.cloud.service.soil.entity.SoilSampleOperation;
 import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilSampleStatusEnum;
@@ -582,4 +583,11 @@ public class SoilSampleController extends ServiceController  {
     }
 
 
+
+
+    @ApiOperation(value = "从存储位置移除试样", notes = "从存储位置移除试样")
+    @PostMapping("/edit_senior_sample")
+    public RestResult<Boolean> editSeniorSample(@RequestParam("ids")Long [] ids, SoilSampleOperation operation) {
+        return success(soilSampleService.editSeniorSample(ids,operation,getAccount()));
+    }
 }

src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilOpenSoilRecordMapper.java

+package com.patzn.cloud.service.lims.soil.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.soil.entity.SoilOpenSoilRecord;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-01-19
+ */
+public interface SoilOpenSoilRecordMapper extends BatchMapper<SoilOpenSoilRecord> {
+
+}

src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilSampleMapper.java

@@ -29,4 +29,6 @@ public interface SoilSampleMapper extends BaseMapper<SoilSample> {
     List<SoilSampleVO> selectLocationSample(Page<SoilSampleVO> page, @Param("vo")SoilSampleVO soilSample);
 
     List<SoilSampleVO> selectWarehouseLocationSample(Page<SoilSampleVO> page, @Param("vo")SoilSampleVO soilSample);
+
+    List<SoilSampleVO> selectVOListByIds(@Param("ids")List<Long> sampleIdList);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilAloneSampleService.java

@@ -34,4 +34,6 @@ public interface ISoilAloneSampleService extends IBaseService<SoilAloneSample> {
     Page<SoilAloneSampleVO> pageVOSampleOfStorehouse(Page<SoilAloneSampleVO> page, SoilAloneSampleVO soilAloneSample);
 
     boolean storageSampleSubmit(Long[] ids, Account account);
+
+    SoilAloneSampleVO getVOById(Long id);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilExperimentService.java

@@ -9,6 +9,7 @@ import com.patzn.cloud.service.lims.collect.core.CollectDataType;
 import com.patzn.cloud.service.soil.dto.SoilExperimentQueryDTO;
 import com.patzn.cloud.service.soil.entity.SoilExpReport;
 import com.patzn.cloud.service.soil.entity.SoilExperiment;
+import com.patzn.cloud.service.soil.entity.SoilOpenSoilRecord;
 import com.patzn.cloud.service.soil.entity.SoilOriginalRecord;
 import com.patzn.cloud.service.soil.statistics.SoilEntrustItemNumVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
@@ -94,4 +95,6 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
     Page<SoilExperimentVO> pageExpRightBath(Page<SoilExperimentVO> page, SoilExperimentQueryDTO dto);
 
     List<SoilExperimentVO> listGroupVOListByEntrustIds(List<Long> entrustIdList);
+
+    SoilOpenSoilRecord saveExcelOpenSoilRecord(Long entrustId, Long templateId, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilOpenSoilRecordService.java

+package com.patzn.cloud.service.lims.soil.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.soil.entity.SoilEntrust;
+import com.patzn.cloud.service.soil.entity.SoilOpenSoilRecord;
+import com.patzn.cloud.service.soil.entity.SoilOriginalTemplate;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2021-01-19
+ */
+public interface ISoilOpenSoilRecordService extends IBaseService<SoilOpenSoilRecord> {
+
+    Page<SoilOpenSoilRecord> page(Page<SoilOpenSoilRecord> page, SoilOpenSoilRecord soilOpenSoilRecord);
+
+    boolean removeByIds(List<Long> ids);
+
+    SoilOpenSoilRecord uploadOpenSoilGenerate(Long entrustId, SoilOriginalTemplate template, SoilEntrust entrust, Account account, String remark, File file);
+}

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilOriginalTemplateService.java

@@ -23,7 +23,7 @@ public interface ISoilOriginalTemplateService extends IBaseService<SoilOriginalT
 
     String getKeyByBusinessId(String businessId);
 
-    boolean uploadTemplate(MultipartFile file, String classType, String name, String remark);
+    boolean uploadTemplate(MultipartFile file, String classType, String name, String remark,Integer templateType);
 
     boolean editTemplate(String someParam, OssFileResult obsFileResult);
 

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilSampleService.java

@@ -10,6 +10,7 @@ import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.soil.dto.SoilPrepareDTO;
 import com.patzn.cloud.service.soil.entity.SoilPrepare;
 import com.patzn.cloud.service.soil.entity.SoilSample;
+import com.patzn.cloud.service.soil.entity.SoilSampleOperation;
 import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
 import com.patzn.cloud.service.soil.vo.SoilSampleVO;
 import org.springframework.web.multipart.MultipartFile;
@@ -89,4 +90,8 @@ public interface ISoilSampleService extends IBaseService<SoilSample> {
     boolean callOutAloneKeepSample(Long[] ids, Account account);
 
     Page<SoilSampleVO> pageWarehouseLocationSample(Page<SoilSampleVO> page, SoilSampleVO soilSample);
+
+    boolean editSeniorSample(Long[] ids, SoilSampleOperation operation, Account account);
+
+    List<SoilSampleVO> listVOByIds(List<Long> sampleIdList);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilAloneSampleServiceImpl.java

@@ -172,4 +172,25 @@ public class SoilAloneSampleServiceImpl extends BaseServiceImpl<SoilAloneSampleM
         sample.setProgress(SoilAloneStatusEnum.WAIT_DELIVERY);
         return super.update(sample,Condition.create().in("id",ids));
     }
+
+    @Override
+    public SoilAloneSampleVO getVOById(Long id) {
+        SoilAloneSample sample = getById(id);
+        List<SoilAloneInOutStock> stockList = soilAloneInOutStockService.list(Condition.create().eq("alone_sample_id",id).last("LIMIT 1"));
+        if (CollectionUtils.isEmpty(stockList)){
+            return sample.convert(SoilAloneSampleVO.class);
+        }
+        SoilAloneInOutStock stock = stockList.get(0);
+        SoilAloneSampleVO vo = sample.convert(SoilAloneSampleVO.class);
+        vo.setStorehouse(stock.getStorehouse());
+        vo.setInStocker(stock.getInStocker());
+        vo.setInstockTime(stock.getInstockTime());
+        vo.setKeepLimitTime(stock.getKeepLimitTime());
+        vo.setShelfCode(stock.getShelfCode());
+
+        vo.setOutStocker(stock.getOutStocker());
+        vo.setOutStock(stock.getOutStock());
+        vo.setOutStockReceiver(stock.getOutStockReceiver());
+        return vo;
+    }
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilOpenSoilRecordServiceImpl.java

+package com.patzn.cloud.service.lims.soil.service.impl;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+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.lims.soil.mapper.SoilOpenSoilRecordMapper;
+import com.patzn.cloud.service.lims.soil.service.ISoilOpenSoilRecordService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilEntrust;
+import com.patzn.cloud.service.soil.entity.SoilOpenSoilRecord;
+import com.patzn.cloud.service.soil.entity.SoilOriginalTemplate;
+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 java.io.File;
+import java.util.List;
+
+/**
+ *  服务实现类
+ *
+ * @author wwd
+ * @since 2021-01-19
+ */
+@Service
+public class SoilOpenSoilRecordServiceImpl extends BaseServiceImpl<SoilOpenSoilRecordMapper, SoilOpenSoilRecord> implements ISoilOpenSoilRecordService {
+
+    @Autowired
+    private OssClient ossClient;
+
+    @Override
+    public Page<SoilOpenSoilRecord> page(Page<SoilOpenSoilRecord> page, SoilOpenSoilRecord soilOpenSoilRecord) {
+        Wrapper wrapper = new EntityWrapper<>(soilOpenSoilRecord);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public SoilOpenSoilRecord uploadOpenSoilGenerate(Long entrustId, SoilOriginalTemplate template, SoilEntrust entrust, Account account, String remark, File file) {
+        OssFileResult ossFileResult = ossClient.upload(file);
+        if (null!= ossFileResult){
+            SoilOpenSoilRecord openSoilRecord = new SoilOpenSoilRecord();
+            openSoilRecord.setEntrustId(entrustId);
+            openSoilRecord.setBucketName(ossFileResult.getBucketName());
+            openSoilRecord.setObjectKey(ossFileResult.getObjectKey());
+            openSoilRecord.setRemark(remark);
+            openSoilRecord.setVersionId(ossFileResult.getVersionId());
+            int count =  count(Condition.create().eq("entrust_id",entrustId));
+            count = count+1;
+            openSoilRecord.setVersion(count);
+            save(openSoilRecord);
+            return  openSoilRecord;
+        }
+
+        return null;
+    }
+}

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilOriginalTemplateServiceImpl.java

@@ -112,7 +112,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
     }
 
     @Override
-    public boolean uploadTemplate(MultipartFile file, String classType, String name, String remark) {
+    public boolean uploadTemplate(MultipartFile file, String classType, String name, String remark,Integer templateType) {
         RestAssert.fail(StringUtils.isBlank(classType),"模板类别不能为空");
         RestAssert.fail(StringUtils.isBlank(name),"请填写原始记录名称");
         String fileName = file.getOriginalFilename();
@@ -130,6 +130,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
         attachment.setName(result.getName());
         attachment.setObjectKey(result.getObjectKey());
         attachment.setVersionId(result.getVersionId());
+        attachment.setTemplateType(templateType);
         return super.save(attachment);
     }
 

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleServiceImpl.java

@@ -831,6 +831,18 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
         return page.setRecords(baseMapper.selectWarehouseLocationSample(page,soilSample));
     }
 
+    @Override
+    public boolean editSeniorSample(Long[] ids, SoilSampleOperation operation, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择高级样品");
+        RestAssert.fail(StringUtils.isBlank(operation.getReceiveLocation()),"请填写高级样品位置");
+        return soilSampleOperationService.update(operation,Condition.create().in("sample_id",ids));
+    }
+
+    @Override
+    public List<SoilSampleVO> listVOByIds(List<Long> sampleIdList) {
+        return baseMapper.selectVOListByIds(sampleIdList);
+    }
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override

src/main/resources/mapper/soil/SoilAloneSampleMapper.xml

@@ -5,7 +5,7 @@
     <select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilAloneSampleVO">
         SELECT
             s.id,s.receiver,s.receive_time,s.project_name,s.project_leader,s.borehole_name,s.cases_num,s.registrant,s.regist_time,
-            o.storehouse,o.shelf_code,o.instock_time,o.keep_limit_time
+            o.storehouse,o.shelf_code,o.instock_time,o.keep_limit_time,o.in_stocker
         FROM
             soil_alone_sample s
             JOIN soil_alone_in_out_stock o ON s.ID = o.alone_sample_id
@@ -24,7 +24,7 @@
                 AND o.storehouse LIKE CONCAT('%',#{vo.storehouse},'%')
             </if>
 
-
+               ORDER BY s.ctime DESC
     </select>
 
 

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

src/main/resources/mapper/soil/SoilSampleMapper.xml

@@ -79,7 +79,7 @@
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilSampleVO">
         SELECT <include refid="sColumn"/>,<include refid="eColumn"/>,
-        o.receive_location,o.receiver,o.receive_time,o.sender,o.send_time,o.make_time,o.maker
+        o.receive_location,o.receiver,o.receive_time,o.sender,o.send_time,o.make_time,o.maker,o.senior_type
          FROM soil_sample s
         JOIN soil_sample_operation o ON s.id = o.sample_id
         JOIN soil_entrust e ON s.entrust_id = e.id
@@ -119,6 +119,23 @@
 
 
 
+    <select id="selectVOListByIds" resultType="com.patzn.cloud.service.soil.vo.SoilSampleVO">
+        SELECT <include refid="sColumn"/>,<include refid="eColumn"/>,
+        o.receive_location,o.receiver,o.receive_time,o.sender,o.send_time,o.make_time,o.maker,o.senior_type
+        FROM soil_sample s
+        JOIN soil_sample_operation o ON s.id = o.sample_id
+        JOIN soil_entrust e ON s.entrust_id = e.id
+        WHERE s.deleted = 0 AND e.deleted = 0
+        AND s.id IN
+        <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        ORDER BY s.sample_code
+
+    </select>
+
+
+
 
     <select id="selectLocationSample" resultType="com.patzn.cloud.service.soil.vo.SoilSampleVO">
        WITH o AS ( SELECT sample_id,receive_location,receiver,receive_time,sender,send_time,make_time,maker,company_id FROM soil_sample_operation WHERE receive_location = #{vo.receiveLocation} )

src/test/java/resources/db_base_sql/v1.1.7/菜单修改.sql

+UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样样品管理', "type" = 0, "code" = 'sample_keep', "uri" = '/soil/sample/keep', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 55, "ctime" = '2020-12-02 18:08:09.19', "ename" = NULL WHERE "id" = 1334076881641627650;
+UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样样品管理', "type" = 0, "code" = 'sample_keep', "uri" = '/soil/sample/keep', "icon" = 'pt-config', "remark" = NULL, "status" = 1, "sort" = 55, "ctime" = '2020-12-02 18:08:09.19', "ename" = NULL WHERE "id" = 1334076881641627650;
+UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样管理', "type" = 0, "code" = 'sample_backups', "uri" = '/soil/sample/backups', "icon" = 'pt-config', "remark" = NULL, "status" = 0, "sort" = 70, "ctime" = '2020-09-11 10:43:28.608', "ename" = NULL WHERE "id" = 1304249170190643201;
+UPDATE "public"."sys_resource" SET "system_id" = 1304006677087891457, "pid" = 1343358970677411841, "name" = '备样样品处理', "type" = 0, "code" = 'sample_dispose', "uri" = '/soil/sample/dispose', "icon" = 'pt-config', "remark" = NULL, "status" = 0, "sort" = 50, "ctime" = '2020-09-11 10:46:42.391', "ename" = NULL WHERE "id" = 1304249982975455234;
+
+

src/test/java/resources/db_sql/v1.1.7/新增sql.sql

-ALTER TABLE "public"."soil_exp_report_template" 
+ALTER TABLE "public"."soil_exp_report_template" 
@@ -16,4 +16,58 @@ COMMENT ON COLUMN "public"."soil_original_template"."deleted" IS '是否删除0
 ALTER TABLE "public"."soil_original_template"
   ADD COLUMN "template_type" int2 DEFAULT 0;
 
-COMMENT ON COLUMN "public"."soil_original_template"."template_type" IS '模板类型（0原始记录 1开土制备记录）';
+COMMENT ON COLUMN "public"."soil_original_template"."template_type" IS '模板类型（0原始记录 1开土制备记录）';
\ No newline at end of file
+
+
+
+
+CREATE TABLE "public"."soil_open_soil_record" (
+  "id" int8 NOT NULL DEFAULT NULL,
+  "company_id" int8 DEFAULT NULL,
+  "deleted" int2 DEFAULT 0,
+  "uid" int8 DEFAULT NULL,
+  "ctime" timestamp(6) DEFAULT NULL::timestamp without time zone,
+  "lid" int8 DEFAULT NULL,
+  "ltime" timestamp(6) DEFAULT NULL::timestamp without time zone,
+  "entrust_id" int8 DEFAULT NULL,
+  "version" int2 DEFAULT NULL,
+  "uri" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "remark" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "bucket_name" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "object_key" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "version_id" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "pdf_object_key" varchar(255) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "uname" varchar(100) COLLATE "pg_catalog"."default" DEFAULT NULL::character varying,
+  "status" int2 DEFAULT 0,
+  "progress" int2 DEFAULT 0
+)
+;
+COMMENT ON COLUMN "public"."soil_open_soil_record"."id" IS '主键';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."company_id" IS '企业ID';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."deleted" IS '是否删除0否1是';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."uid" IS '创建人ID';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."ctime" IS '创建时间';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."lid" IS '最后修改人ID';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."ltime" IS '最后修改时间';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."entrust_id" IS '样品id';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."version" IS '版本';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."uri" IS '证书地址';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."remark" IS '备注';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."bucket_name" IS '桶名称';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."object_key" IS '对象key';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."version_id" IS '版本';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."pdf_object_key" IS 'pdf对象key';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."uname" IS '修改人';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."status" IS '状态';
+COMMENT ON COLUMN "public"."soil_open_soil_record"."progress" IS '进度';
+
+-- ----------------------------
+-- Primary Key structure for table soil_open_soil_record
+-- ----------------------------
+ALTER TABLE "public"."soil_open_soil_record" ADD CONSTRAINT "soil_open_soil_record_pkey" PRIMARY KEY ("id");
+
+
+ALTER TABLE "public"."soil_sample_operation"
+  ADD COLUMN "senior_type" varchar(120);
+
+COMMENT ON COLUMN "public"."soil_sample_operation"."senior_type" IS '高级样品分类';
\ No newline at end of file