土工平台修改

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

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

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

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

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

 package com.patzn.cloud.service.lims.soil.controller;
 
+import com.patzn.cloud.service.soil.entity.SoilAloneInOutExport;
 import com.patzn.cloud.service.soil.entity.SoilAloneInOutStock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -83,4 +84,21 @@ public class SoilAloneInOutStockController extends ServiceController {
 	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(soilAloneInOutStockService.removeByIds(ids));
 	}
+
+
+
+
+    @ApiOperation(value = "生成入库记录单", notes = "生成入库记录单")
+    @PostMapping("/save_excel_exp_report")
+    public RestResult<SoilAloneInOutExport> saveExcelExport(@RequestParam("ids")Long[] ids, @RequestParam("templateId") Long templateId) {
+        return success(soilAloneInOutStockService.saveExcelExport(ids,templateId,0,getAccount()));
+    }
+
+
+
+    @ApiOperation(value = "生成出库记录单", notes = "生成出库记录单")
+    @PostMapping("/save_excel_out_export")
+    public RestResult<SoilAloneInOutExport> saveOutExcelExport(@RequestParam("ids")Long[] ids, @RequestParam("templateId") Long templateId) {
+        return success(soilAloneInOutStockService.saveExcelExport(ids,templateId,1,getAccount()));
+    }
 }

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

@@ -134,7 +134,7 @@ public class SoilAloneSampleController extends ServiceController {
     @PostMapping("/page_wait_delivery_his")
     public RestResult<Page<SoilAloneSampleVO>> getPageWaitDeliveryHis(SoilAloneSampleVO soilAloneSample) {
         soilAloneSample.setStatus(SoilAloneStatusEnum.DELIVERY_OK);
-        return success(soilAloneSampleService.pageVO(getPage(), soilAloneSample));
+        return success(soilAloneSampleService.pageVOOut(getPage(), soilAloneSample));
     }
 
 
@@ -185,6 +185,27 @@ public class SoilAloneSampleController extends ServiceController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
     })
+    @GetMapping("/get_in_export_{id}")
+    public RestResult<SoilAloneSampleVO> getInExport(@PathVariable("id") Long id) {
+        return success(soilAloneSampleService.getInExport(id,0));
+    }
+
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/get_out_export_{id}")
+    public RestResult<SoilAloneSampleVO> getOutExport(@PathVariable("id") Long id) {
+        return success(soilAloneSampleService.getInExport(id,1));
+    }
+
+
+
+    @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));

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

@@ -67,6 +67,21 @@ public class SoilOriginalTemplateController extends ServiceController implements
 
 
 
+    @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_in_out_export_template")
+    public RestResult<Page<SoilOriginalTemplate>> getPageInOutExportTemplate(SoilOriginalTemplate soilOriginalTemplate) {
+        soilOriginalTemplate.setTemplateType(2);
+        return success(soilOriginalTemplateService.page(getPage(), soilOriginalTemplate));
+    }
+
+
+
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
@@ -117,6 +132,13 @@ public class SoilOriginalTemplateController extends ServiceController implements
     }
 
 
+    @ApiOperation(value = "出入库导出模板上传", notes = "出入库导出模板上传")
+    @PostMapping("/upload_in_out_template/")
+    public RestResult<Boolean> uploadInOutTemplate(@RequestParam("classType") String  classType,@RequestParam("name") String  name,@RequestParam("remark") String  remark, MultipartFile file) {
+        return success(soilOriginalTemplateService.uploadTemplate(file, classType,name,remark,2));
+    }
+
+
 
     @Login(action = Action.Skip)
     @ApiOperation(value = "编辑证书模板", notes = "编辑证书模板")
@@ -174,6 +196,15 @@ public class SoilOriginalTemplateController extends ServiceController implements
 
     @Override
     @Login(action = Action.Skip)
+    @ApiOperation(value = "编辑开土制备记录", notes = "编辑证书模板")
+    @PostMapping("/edit_in_out_stock_record_{someParam}")
+    public RestResult<Boolean> editInOutExportRecord(String someParam, OssFileResult obsFileResult) {
+        return success(soilOriginalTemplateService.editInOutExportRecord(someParam, obsFileResult));
+    }
+
+
+    @Override
+    @Login(action = Action.Skip)
     @ApiOperation(value = "在线编辑保存报告信息", notes = "在线编辑保存报告信息")
     @PostMapping("/get_key_by_businessid{someParam}")
     public RestResult<String> getKeyByBusinessId(String businessId) {

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

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

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

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

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

@@ -22,4 +22,6 @@ public interface SoilAloneSampleMapper extends BatchMapper<SoilAloneSample> {
     List<SoilAloneSampleVO> selectVOList(RowBounds rowBounds, @Param("vo") SoilAloneSampleVO soilAloneSample);
 
     List<SoilAloneSampleVO> selectVOSampleOfStorehouseList(RowBounds rowBounds, @Param("vo")SoilAloneSampleVO soilAloneSample);
+
+    List<SoilAloneSampleVO> selectVOListByIds( @Param("ids")Long[] ids);
 }

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

+package com.patzn.cloud.service.lims.soil.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.soil.entity.SoilAloneInOutExportRel;
+
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2021-02-05
+ */
+public interface ISoilAloneInOutExportRelService extends IBaseService<SoilAloneInOutExportRel> {
+
+    Page<SoilAloneInOutExportRel> page(Page<SoilAloneInOutExportRel> page, SoilAloneInOutExportRel soilAloneInOutExportRel);
+
+    boolean removeByIds(List<Long> ids);
+}

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

+package com.patzn.cloud.service.lims.soil.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.soil.entity.SoilAloneInOutExport;
+
+import java.util.List;
+
+/**
+ *  服务类
+ *
+ * @author wwd
+ * @since 2021-02-05
+ */
+public interface ISoilAloneInOutExportService extends IBaseService<SoilAloneInOutExport> {
+
+    Page<SoilAloneInOutExport> page(Page<SoilAloneInOutExport> page, SoilAloneInOutExport soilAloneInOutExport);
+
+    boolean removeByIds(List<Long> ids);
+}

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilAloneInOutStockService.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.SoilAloneInOutExport;
 import com.patzn.cloud.service.soil.entity.SoilAloneInOutStock;
 
 import java.util.List;
@@ -17,4 +19,6 @@ public interface ISoilAloneInOutStockService extends IBaseService<SoilAloneInOut
     Page<SoilAloneInOutStock> page(Page<SoilAloneInOutStock> page, SoilAloneInOutStock soilAloneInOutStock);
 
     boolean removeByIds(List<Long> ids);
+
+    SoilAloneInOutExport saveExcelExport(Long[] ids, Long templateId,Integer type, Account account);
 }

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

@@ -29,6 +29,8 @@ public interface ISoilAloneSampleService extends IBaseService<SoilAloneSample> {
 
     Page<SoilAloneSampleVO> pageVO(Page<SoilAloneSampleVO> page, SoilAloneSampleVO soilAloneSample);
 
+    Page<SoilAloneSampleVO> pageVOOut(Page<SoilAloneSampleVO> page, SoilAloneSampleVO soilAloneSample);
+
     boolean bathChangeStorehouse(Long[] ids, SoilAloneInOutStock aloneInOutStock, Account account);
 
     Page<SoilAloneSampleVO> pageVOSampleOfStorehouse(Page<SoilAloneSampleVO> page, SoilAloneSampleVO soilAloneSample);
@@ -36,4 +38,8 @@ public interface ISoilAloneSampleService extends IBaseService<SoilAloneSample> {
     boolean storageSampleSubmit(Long[] ids, Account account);
 
     SoilAloneSampleVO getVOById(Long id);
+
+    List<SoilAloneSampleVO> listVOByIds(Long[] ids);
+
+    SoilAloneSampleVO getInExport(Long id, int i);
 }

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

@@ -38,4 +38,6 @@ public interface ISoilOriginalTemplateService extends IBaseService<SoilOriginalT
     boolean editExpReport(String someParam, OssFileResult obsFileResult);
 
     boolean editOpenSoilRecord(String someParam, OssFileResult obsFileResult);
+
+    boolean editInOutExportRecord(String someParam, OssFileResult obsFileResult);
 }

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

+package com.patzn.cloud.service.lims.soil.service.impl;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.patzn.cloud.service.lims.soil.mapper.SoilAloneInOutExportRelMapper;
+import com.patzn.cloud.service.lims.soil.service.ISoilAloneInOutExportRelService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilAloneInOutExportRel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+
+import java.util.List;
+
+/**
+ *  服务实现类
+ *
+ * @author wwd
+ * @since 2021-02-05
+ */
+@Service
+public class SoilAloneInOutExportRelServiceImpl extends BaseServiceImpl<SoilAloneInOutExportRelMapper, SoilAloneInOutExportRel> implements ISoilAloneInOutExportRelService {
+
+    @Override
+    public Page<SoilAloneInOutExportRel> page(Page<SoilAloneInOutExportRel> page, SoilAloneInOutExportRel soilAloneInOutExportRel) {
+        Wrapper wrapper = new EntityWrapper<>(soilAloneInOutExportRel);
+
+        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/soil/service/impl/SoilAloneInOutExportServiceImpl.java

+package com.patzn.cloud.service.lims.soil.service.impl;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.patzn.cloud.service.lims.soil.mapper.SoilAloneInOutExportMapper;
+import com.patzn.cloud.service.lims.soil.service.ISoilAloneInOutExportService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilAloneInOutExport;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+
+import java.util.List;
+
+/**
+ *  服务实现类
+ *
+ * @author wwd
+ * @since 2021-02-05
+ */
+@Service
+public class SoilAloneInOutExportServiceImpl extends BaseServiceImpl<SoilAloneInOutExportMapper, SoilAloneInOutExport> implements ISoilAloneInOutExportService {
+
+    @Override
+    public Page<SoilAloneInOutExport> page(Page<SoilAloneInOutExport> page, SoilAloneInOutExport soilAloneInOutExport) {
+        Wrapper wrapper = new EntityWrapper<>(soilAloneInOutExport);
+
+        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/soil/service/impl/SoilAloneInOutStockServiceImpl.java

 package com.patzn.cloud.service.lims.soil.service.impl;
 import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.commons.toolkit.DateUtils;
+import com.patzn.cloud.commons.toolkit.FileUtils;
+import com.patzn.cloud.oss.starter.OssClient;
+import com.patzn.cloud.oss.starter.OssFileResult;
+import com.patzn.cloud.service.lims.common.HSSFWorkbookUtil;
 import com.patzn.cloud.service.lims.soil.mapper.SoilAloneInOutStockMapper;
-import com.patzn.cloud.service.lims.soil.service.ISoilAloneInOutStockService;
+import com.patzn.cloud.service.lims.soil.service.*;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
-import com.patzn.cloud.service.soil.entity.SoilAloneInOutStock;
+import com.patzn.cloud.service.soil.entity.*;
+import com.patzn.cloud.service.soil.vo.SoilAloneSampleVO;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+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.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  *  服务实现类
@@ -20,6 +39,20 @@ import java.util.List;
 @Service
 public class SoilAloneInOutStockServiceImpl extends BaseServiceImpl<SoilAloneInOutStockMapper, SoilAloneInOutStock> implements ISoilAloneInOutStockService {
 
+    @Autowired
+    private ISoilOriginalTemplateService soilOriginalTemplateService;
+    @Autowired
+    private ISoilAloneSampleService soilAloneSampleService;
+    @Autowired
+    private OssClient ossClient;
+
+
+    @Autowired
+    private ISoilAloneInOutExportService soilAloneInOutExportService;
+
+    @Autowired
+    private ISoilAloneInOutExportRelService soilAloneInOutExportRelService;
+
     @Override
     public Page<SoilAloneInOutStock> page(Page<SoilAloneInOutStock> page, SoilAloneInOutStock soilAloneInOutStock) {
         Wrapper wrapper = new EntityWrapper<>(soilAloneInOutStock);
@@ -31,4 +64,125 @@ public class SoilAloneInOutStockServiceImpl extends BaseServiceImpl<SoilAloneInO
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public SoilAloneInOutExport saveExcelExport(Long[] ids, Long templateId,Integer type, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要导出的数据");
+        RestAssert.fail(null == templateId,"请选择d导出模板");
+        SoilOriginalTemplate template = soilOriginalTemplateService.getById(templateId);
+        if (null == template){
+            logger.error("------------saveExcelExport----------0");
+            RestAssert.fail("模板不存在");
+        }
+       List<SoilAloneSampleVO> aloneSampleVOList = soilAloneSampleService.listVOByIds(ids);
+        if (CollectionUtils.isEmpty(aloneSampleVOList)){
+            return null;
+        }
+
+        logger.error("saveExcelOriginalRecord entrust");
+        InputStream io = ossClient.download(template.getObjectKey());
+        if (null == io){
+            logger.error("----------------------2");
+            RestAssert.fail("模板不存在");
+        }
+
+        logger.error(" InputStream io 存在");
+        SoilAloneInOutStock objectKey=null;
+        XSSFWorkbook xssfWorkbook= null;
+        try {
+            xssfWorkbook=   new XSSFWorkbook(io);
+        }catch (Exception e){
+            logger.error("获取证书模板错误"+e.getMessage());
+            e.printStackTrace();
+        }
+
+        boolean begin =false;
+        for (SoilAloneSampleVO vo:aloneSampleVOList) {
+            if (begin){
+                XSSFSheet sheet = xssfWorkbook.cloneSheet(0);
+            }else{
+                begin=true;
+            }
+        }
+
+        int length = aloneSampleVOList.size();
+
+        for (int i = 0; i < length; i++) {
+            SoilAloneSampleVO soilAloneSampleVO = aloneSampleVOList.get(i);
+            Map<String, String> mapReplace = new HashMap<>();
+            mapReplace.put("#{shelfCode}",soilAloneSampleVO.getShelfCode());
+            mapReplace.put("#{outStockReceiver}",soilAloneSampleVO.getOutStockReceiver());
+            mapReplace.put("#{storehouse}",soilAloneSampleVO.getStorehouse());
+            mapReplace.put("#{inStocker}",soilAloneSampleVO.getInStocker());
+            mapReplace.put("#{outStocker}",soilAloneSampleVO.getOutStocker());
+            mapReplace.put("#{boreholeName}",soilAloneSampleVO.getBoreholeName());
+            mapReplace.put("#{projectLeader}",soilAloneSampleVO.getProjectLeader());
+            mapReplace.put("#{projectName}",soilAloneSampleVO.getProjectName());
+            mapReplace.put("#{receiver}",soilAloneSampleVO.getReceiver());
+            mapReplace.put("#{registrant}",soilAloneSampleVO.getRegistrant());
+            mapReplace.put("#{boreholeNumber}",soilAloneSampleVO.getBoreholeNumber());
+            mapReplace.put("#{casesNum}",soilAloneSampleVO.getCasesNum());
+            mapReplace.put("#{instockTime}", DateUtils.toYearMonthHourMiniDay(soilAloneSampleVO.getInstockTime()));
+            mapReplace.put("#{keepLimitTime}",DateUtils.toYearMonthHourMiniDay(soilAloneSampleVO.getKeepLimitTime()));
+            mapReplace.put("#{receiveTime}",DateUtils.toYearMonthHourMiniDay(soilAloneSampleVO.getReceiveTime()));
+            mapReplace.put("#{registTime}",DateUtils.toYearMonthHourMiniDay(soilAloneSampleVO.getRegistTime()));
+            mapReplace.put("#{outStock}",DateUtils.toYearMonthHourMiniDay(soilAloneSampleVO.getOutStock()));
+            HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,i);
+        }
+
+        FileOutputStream os = null;
+        File file = null;
+        String generated="原始记录";
+
+        try {
+            file = File.createTempFile(generated, ".xlsx");
+            os = new FileOutputStream(file);
+            xssfWorkbook.write(os);
+            os.flush();
+            OssFileResult result = ossClient.upload(file);
+
+            SoilAloneInOutExport inOutExport = new SoilAloneInOutExport();
+
+            inOutExport.setObjectKey(result.getObjectKey());
+            inOutExport.setTemplateId(templateId);
+            inOutExport.setUname(account.getUserName());
+            inOutExport.setTitle(template.getName());
+            soilAloneInOutExportService.save(inOutExport);
+
+            List<SoilAloneInOutExportRel> saveRel = new ArrayList<>();
+
+            for (Long id:ids) {
+                SoilAloneInOutExportRel outExportRel = new SoilAloneInOutExportRel();
+                outExportRel.setAloneSampleId(id);
+                outExportRel.setInOutExportId(inOutExport.getId());
+                outExportRel.setType(type);
+                saveRel.add(outExportRel);
+            }
+            if (CollectionUtils.isNotEmpty(saveRel)){
+                soilAloneInOutExportRelService.saveBatch(saveRel);
+            }
+            logger.error("----------------------17");
+            return inOutExport;
+        } catch (Exception e) {
+
+            logger.error("Exception 报错"+e.getMessage());
+            e.printStackTrace();
+        } finally {
+            try {
+                os.close();
+                xssfWorkbook.close();
+                io.close();
+                FileUtils.deleteFiles(file);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
+
+
+
+
+
+        return null;
+    }
 }

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

@@ -5,9 +5,13 @@ 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.lims.soil.mapper.SoilAloneSampleMapper;
+import com.patzn.cloud.service.lims.soil.service.ISoilAloneInOutExportRelService;
+import com.patzn.cloud.service.lims.soil.service.ISoilAloneInOutExportService;
 import com.patzn.cloud.service.lims.soil.service.ISoilAloneInOutStockService;
 import com.patzn.cloud.service.lims.soil.service.ISoilAloneSampleService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.soil.entity.SoilAloneInOutExport;
+import com.patzn.cloud.service.soil.entity.SoilAloneInOutExportRel;
 import com.patzn.cloud.service.soil.entity.SoilAloneInOutStock;
 import com.patzn.cloud.service.soil.entity.SoilAloneSample;
 import com.patzn.cloud.service.soil.enums.SoilAloneStatusEnum;
@@ -23,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 收样登记表 服务实现类
@@ -37,6 +42,11 @@ public class SoilAloneSampleServiceImpl extends BaseServiceImpl<SoilAloneSampleM
     @Autowired
     private ISoilAloneInOutStockService soilAloneInOutStockService;
 
+    @Autowired
+    private ISoilAloneInOutExportRelService soilAloneInOutExportRelService;
+
+    @Autowired
+    private ISoilAloneInOutExportService soilAloneInOutExportService;
 
     @Override
     public Page<SoilAloneSample> page(Page<SoilAloneSample> page, SoilAloneSampleVO soilAloneSample) {
@@ -142,9 +152,81 @@ public class SoilAloneSampleServiceImpl extends BaseServiceImpl<SoilAloneSampleM
 
     @Override
     public Page<SoilAloneSampleVO> pageVO(Page<SoilAloneSampleVO> page, SoilAloneSampleVO soilAloneSample) {
-        return page.setRecords(baseMapper.selectVOList(page,soilAloneSample));
+       List<SoilAloneSampleVO> soilAloneSampleVOS = baseMapper.selectVOList(page,soilAloneSample);
+       if (CollectionUtils.isEmpty(soilAloneSampleVOS)){
+           return page;
+       }
+       List<Long> sampleIds = soilAloneSampleVOS.stream().map(s->{
+           return s.getId();
+       }).collect(Collectors.toList());
+
+        List<SoilAloneInOutExportRel> relList = soilAloneInOutExportRelService.list(Condition.create().in("alone_sample_id",sampleIds).eq("type",0));
+        List<SoilAloneInOutExport> exportList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(relList)){
+            List<Long> exportIdsList = relList.stream().map(s->{
+                return s.getInOutExportId();
+            }).collect(Collectors.toList());
+
+
+            exportList  =soilAloneInOutExportService.list(Condition.create().in("id",exportIdsList));
+        }
+
+        for (SoilAloneInOutExportRel rel:relList) {
+            for (SoilAloneSampleVO sampleVO:soilAloneSampleVOS) {
+                  if (rel.getAloneSampleId().equals(sampleVO.getId())){
+                      sampleVO.setExportId(rel.getInOutExportId());
+                      for (SoilAloneInOutExport soilAloneInOutExport:exportList) {
+                          if (rel.getInOutExportId().equals(soilAloneInOutExport.getId())){
+                              sampleVO.setInstoreObjectKey(soilAloneInOutExport.getObjectKey());
+                              break;
+                          }
+                      }
+                      break;
+                  }
+            }
+        }
+        return page.setRecords(soilAloneSampleVOS);
+    }
+
+    @Override
+    public Page<SoilAloneSampleVO> pageVOOut(Page<SoilAloneSampleVO> page, SoilAloneSampleVO soilAloneSample) {
+        List<SoilAloneSampleVO> soilAloneSampleVOS = baseMapper.selectVOList(page,soilAloneSample);
+        if (CollectionUtils.isEmpty(soilAloneSampleVOS)){
+            return page;
+        }
+        List<Long> sampleIds = soilAloneSampleVOS.stream().map(s->{
+            return s.getId();
+        }).collect(Collectors.toList());
+
+        List<SoilAloneInOutExportRel> relList = soilAloneInOutExportRelService.list(Condition.create().in("alone_sample_id",sampleIds).eq("type",1));
+        List<SoilAloneInOutExport> exportList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(relList)){
+            List<Long> exportIdsList = relList.stream().map(s->{
+                return s.getInOutExportId();
+            }).collect(Collectors.toList());
+
+
+            exportList  =soilAloneInOutExportService.list(Condition.create().in("id",exportIdsList));
         }
 
+        for (SoilAloneInOutExportRel rel:relList) {
+            for (SoilAloneSampleVO sampleVO:soilAloneSampleVOS) {
+                if (rel.getAloneSampleId().equals(sampleVO.getId())){
+                    sampleVO.setExportId(rel.getInOutExportId());
+                    for (SoilAloneInOutExport soilAloneInOutExport:exportList) {
+                        if (rel.getInOutExportId().equals(soilAloneInOutExport.getId())){
+                            sampleVO.setInstoreObjectKey(soilAloneInOutExport.getObjectKey());
+                            break;
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        return page.setRecords(soilAloneSampleVOS);
+    }
+
+
     @Override
     public boolean bathChangeStorehouse(Long[] ids, SoilAloneInOutStock aloneInOutStock, Account account) {
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要修改存放架位的样品");
@@ -193,4 +275,27 @@ public class SoilAloneSampleServiceImpl extends BaseServiceImpl<SoilAloneSampleM
         vo.setOutStockReceiver(stock.getOutStockReceiver());
         return vo;
     }
+
+    @Override
+    public List<SoilAloneSampleVO> listVOByIds(Long[] ids) {
+        return baseMapper.selectVOListByIds(ids);
+    }
+
+
+
+    @Override
+    public SoilAloneSampleVO getInExport(Long id, int i) {
+        RestAssert.fail(null == id,"数据不存在");
+        SoilAloneSample sample = getById(id);
+        List<SoilAloneInOutExportRel> relList = soilAloneInOutExportRelService.list(Condition.create().eq("alone_sample_id",id).eq("type",i).last("LIMIT 1"));
+
+        SoilAloneSampleVO vo = sample.convert(SoilAloneSampleVO.class);
+        if (CollectionUtils.isNotEmpty(relList)){
+            SoilAloneInOutExportRel rel = relList.get(0);
+            vo.setExportId(rel.getInOutExportId());
+            SoilAloneInOutExport export = soilAloneInOutExportService.getById(rel.getInOutExportId());
+            vo.setInstoreObjectKey(export.getObjectKey());
+        }
+        return vo;
+    }
 }

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

@@ -71,6 +71,10 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
     @Autowired
     private ISoilOpenSoilRecordService soilOpenSoilRecordService;
 
+
+    @Autowired
+    private ISoilAloneInOutExportService soilAloneInOutExportService;
+
     @Autowired
     private ISoilOriginalTemplateService soilOriginalTemplateService;
 
@@ -743,4 +747,26 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
     }
 
 
+    @Override
+    public boolean editInOutExportRecord(String someParam, OssFileResult obsFileResult) {
+        RestAssert.fail(StringUtils.isBlank(someParam),"业务ID不能为空");
+        RestAssert.fail(null==obsFileResult,"OssFileResult不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getObjectKey()),"ObjectKey不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getVersionId()),"VersionId不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getType()),"Type不能为空");
+        RestAssert.fail(StringUtils.isBlank(someParam) || 4 != someParam.split("&").length, "参数传递有误");
+        String[] arr = someParam.split("&");
+        Long businessId = Long.parseLong(arr[0]);
+        SoilAloneInOutExport inOutExport = soilAloneInOutExportService.getById(businessId);
+        if (null == inOutExport){
+            RestAssert.fail("数据有误");
+        }
+        SoilAloneInOutExport export = new SoilAloneInOutExport();
+        export.setId(businessId);
+        export.setObjectKey(obsFileResult.getObjectKey());
+        soilAloneInOutExportService.updateById(export);
+        return true;
+    }
+
+
 }

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

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

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.in_stocker
+        o.instore_object_key,o.outstock_object_key,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
@@ -28,6 +28,26 @@
     </select>
 
 
+
+    <select id="selectVOListByIds" 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.instore_object_key,o.outstock_object_key,o.storehouse,o.shelf_code,o.instock_time,o.keep_limit_time,o.in_stocker,
+        o.out_stock_receiver,o.out_stock,o.out_stocker
+        FROM
+        soil_alone_sample s
+        JOIN soil_alone_in_out_stock o ON s.ID = o.alone_sample_id
+
+        WHERE s.deleted = 0
+
+        AND s.id IN
+        <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+
+        ORDER BY s.ctime DESC
+    </select>
+
     <select id="selectVOSampleOfStorehouseList" 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,