土工系统优化

src/main/java/com/patzn/cloud/service/lims/common/HSSFWorkbookUtil.java

@@ -270,6 +270,48 @@ public class HSSFWorkbookUtil {
         return doubleStr;
     }
 
+
+    /**
+     * 图片插入到excel固定的cell
+     * @throws IOException
+     * @throws FileNotFoundException
+     */
+    public static XSSFWorkbook insertImageSelf( XSSFWorkbook wb,Map<String,File> imageFileMap,int dx1, int dy1, int dx2, int dy2, int col1, int row1, int col2, int row2) throws FileNotFoundException, IOException {
+
+        XSSFSheet sheet = wb.getSheetAt(0);
+
+        //数据行数
+        int n = sheet.getLastRowNum();
+        Map<String, Integer> nameIndex = addPicture2Workbook(wb,imageFileMap);
+        Drawing drawing = sheet.createDrawingPatriarch();
+        ClientAnchor anchor = drawing.createAnchor(dx1,dy1,dx2,dy2,col1,row1,col2,row2);
+
+        for (int i = 0; i < n; i++) {
+            XSSFRow xssfRow=sheet.getRow(i);
+            if (null!=xssfRow){
+                int column0=xssfRow.getFirstCellNum();
+                int column1=xssfRow.getLastCellNum();
+                for (int j=column0 ;j<column1;j++) {
+                    XSSFCell cell=  xssfRow.getCell(j);
+                    if (null!=cell){
+                        String qrcodeName=cell.getStringCellValue();
+                        if (nameIndex.containsKey(qrcodeName)) {
+                            anchor.setCol1(j);
+                            anchor.setRow1(i);
+                            System.out.println("setCol1:"+j);
+                            System.out.println("setRow1:"+i);
+                            Picture pict = drawing.createPicture(anchor, nameIndex.get(qrcodeName));
+//                            // 计算单元格的长宽
+//                            pict.resize();
+                        }
+                    }
+                }
+            }
+        }
+        return  wb;
+    }
+
+
     /**
      * 图片插入到excel固定的cell
      * @throws IOException

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

@@ -47,8 +47,8 @@ public class SoilAppendixController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page")
-	public RestResult<Page<SoilAppendix>> getPage(SoilAppendix soilAppendix) {
-        return success(soilAppendixService.page(getPage(), soilAppendix));
+	public RestResult<Page<SoilAppendixVO>> getPage(SoilAppendixVO soilAppendix) {
+        return success(soilAppendixService.pageVO(getPage(), soilAppendix));
 	}
 
 

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

@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.soil.controller;
 import com.patzn.cloud.service.soil.entity.SoilExpReport;
 import com.patzn.cloud.service.soil.entity.SoilReport;
 import com.patzn.cloud.service.soil.enums.SoilExpReportStatusEnum;
+import com.patzn.cloud.service.soil.vo.SoilExpReportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,11 +48,26 @@ public class SoilExpReportController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
-    @PostMapping("/page")
+    @PostMapping("/page1")
 	public RestResult<Page<SoilExpReport>> getPage(SoilExpReport soilExpReport) {
         return success(soilExpReportService.page(getPage(), soilExpReport));
 	}
 
+
+    @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<SoilExpReportVO>> getPageVO(SoilExpReportVO soilExpReport) {
+        return success(soilExpReportService.pageVO(getPage(), soilExpReport));
+    }
+
+
+
     @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

@@ -379,6 +379,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_document_test_bath")
+    public RestResult<Page<SoilExperimentVO>> getPageDocumentTestBath(@RequestBody SoilExperimentQueryDTO vo) {
+        vo.setStatus(SoilExpStatusEnum.END);
+        return success(soilExperimentService.pageExpRightBath(getPage(),vo));
+    }
+
+
+
 
     @ApiOperation(value = "试验项目按照试验项目开土制备(右侧数据)检测分页列表", notes = "分页查询数据列表")
     @ApiImplicitParams({
@@ -540,6 +555,22 @@ 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_document_by_exp")
+    public RestResult<Page<SoilExperimentVO>> getDocumentTestByExp(SoilExperimentVO vo) {
+        RestAssert.fail(null == vo.getEntrustId(),"试验委托单ID不能为空");
+        vo.setStatus(SoilExpStatusEnum.END);
+        return success(soilExperimentService.pageTestByExp(getPage(),vo));
+    }
+
+
+
 
     @ApiOperation(value = "按照试验项目（样品制备填写原始记录按照试验项目左侧）分页列表", notes = "样品制备填写原始记录按照试验项目左侧")
     @ApiImplicitParams({
@@ -748,4 +779,11 @@ public class SoilExperimentController extends ServiceController  {
         return success(soilExperimentService.uploadDynamicsCollect(httpServletRequest, entrustId,getAccount()));
     }
 
+
+    @ApiOperation(value = "物性图片采集文件批量上传", notes = "附件批量上传")
+    @PostMapping("/upload_wuxing_img_collect/{entrustId}")
+    public RestResult<Boolean> uploadWuxingImgCollect(@PathVariable("entrustId") Long entrustId, MultipartHttpServletRequest httpServletRequest) {
+        return success(soilExperimentService.uploadWuxingImgCollect(httpServletRequest, entrustId,getAccount()));
+    }
+
 }

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

 package com.patzn.cloud.service.lims.soil.mapper;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.mapper.BatchMapper;
 import com.patzn.cloud.service.soil.entity.SoilAppendix;
+import com.patzn.cloud.service.soil.vo.SoilAppendixVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,5 @@ import com.patzn.cloud.service.soil.entity.SoilAppendix;
  */
 public interface SoilAppendixMapper extends BatchMapper<SoilAppendix> {
 
+    List<SoilAppendixVO> selectVOList(RowBounds rowBounds, @Param("vo") SoilAppendixVO soilAppendix);
 }

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

 package com.patzn.cloud.service.lims.soil.mapper;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.mapper.BatchMapper;
 import com.patzn.cloud.service.soil.entity.SoilExpReport;
+import com.patzn.cloud.service.soil.vo.SoilExpReportVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,5 @@ import com.patzn.cloud.service.soil.entity.SoilExpReport;
  */
 public interface SoilExpReportMapper extends BatchMapper<SoilExpReport> {
 
+    List<SoilExpReportVO> selectVOList(RowBounds rowBounds, @Param("vo") SoilExpReportVO soilExpReport);
 }

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

@@ -3,6 +3,7 @@ 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.SoilAppendix;
+import com.patzn.cloud.service.soil.vo.SoilAppendixVO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -26,4 +27,6 @@ public interface ISoilAppendixService extends IBaseService<SoilAppendix> {
     void downloadFile(Long id, HttpServletResponse response);
 
     List<SoilAppendix> getByExpIds(List<Long> ids);
+
+    Page<SoilAppendixVO> pageVO(Page<SoilAppendixVO> page, SoilAppendixVO soilAppendix);
 }

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

@@ -7,6 +7,7 @@ import com.patzn.cloud.service.soil.entity.SoilEntrust;
 import com.patzn.cloud.service.soil.entity.SoilExpReport;
 import com.patzn.cloud.service.soil.entity.SoilExpReportTemplate;
 import com.patzn.cloud.service.soil.entity.SoilReport;
+import com.patzn.cloud.service.soil.vo.SoilExpReportVO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -47,4 +48,6 @@ public interface ISoilExpReportService extends IBaseService<SoilExpReport> {
     boolean backExpReportIssue(Long[] ids, String remark, Account account);
 
     boolean backExpReportCheck(Long[] ids, String remark, Account account);
+
+    Page<SoilExpReportVO> pageVO(Page<SoilExpReportVO> page, SoilExpReportVO soilExpReport);
 }

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

@@ -110,6 +110,8 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
 
     boolean uploadDynamicsCollect(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
 
+    boolean uploadWuxingImgCollect(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
+
 
     boolean uploadWaterJieXianCollect(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
 

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

@@ -7,6 +7,7 @@ import com.patzn.cloud.service.lims.soil.mapper.SoilAppendixMapper;
 import com.patzn.cloud.service.lims.soil.service.ISoilAppendixService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.SoilAppendix;
+import com.patzn.cloud.service.soil.vo.SoilAppendixVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -80,4 +81,9 @@ public class SoilAppendixServiceImpl extends BaseServiceImpl<SoilAppendixMapper,
     public List<SoilAppendix> getByExpIds(List<Long> ids) {
         return super.list(Condition.create().in("exp_id",ids));
     }
+
+    @Override
+    public Page<SoilAppendixVO> pageVO(Page<SoilAppendixVO> page, SoilAppendixVO soilAppendix) {
+        return page.setRecords(baseMapper.selectVOList(page,soilAppendix));
+    }
 }

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

@@ -21,6 +21,7 @@ import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.*;
 import com.patzn.cloud.service.soil.enums.SoilExpReportStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilReportStatusEnum;
+import com.patzn.cloud.service.soil.vo.SoilExpReportVO;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import com.patzn.cloud.service.soil.vo.SoilSampleVO;
 import org.apache.commons.lang3.ArrayUtils;
@@ -826,6 +827,11 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
         return updateBatchById(updateList);
     }
 
+    @Override
+    public Page<SoilExpReportVO> pageVO(Page<SoilExpReportVO> page, SoilExpReportVO soilExpReport) {
+        return page.setRecords(baseMapper.selectVOList(page,soilExpReport));
+    }
+
 
     public InputStream exportToExcelInputStream(XSSFWorkbook workbook)  {
 

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

@@ -2,4 +2,45 @@
 <!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.SoilAppendixMapper">
 
+    <select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilAppendixVO">
+        SELECT
+        a.id,
+        a.title,
+        a.name,
+        a.type,
+        a.sample_code,
+        a.uname,
+        a.ctime,
+        a.remark,
+        e.borehole_name,
+        e.entrust_code
+    FROM
+        soil_appendix
+        A JOIN soil_entrust e ON a.entrust_id = e.ID
+    WHERE
+        a.deleted = 0
+        AND e.deleted = 0
+
+        <if test="null!=vo.title">
+            AND a.title LIKE CONCAT('%',#{vo.title},'%')
+        </if>
+
+        <if test="null!=vo.entrustId">
+            AND a.entrust_id =#{vo.entrustId}
+        </if>
+
+
+        <if test="null!=vo.remark">
+            AND a.remark LIKE CONCAT('%',#{vo.remark},'%')
+        </if>
+
+        <if test="null!=vo.sampleCode">
+            AND a.sample_code LIKE CONCAT('%',#{vo.sampleCode},'%')
+        </if>
+
+        <if test="null!=vo.boreholeName">
+            AND e.borehole_name LIKE CONCAT('%',#{vo.boreholeName},'%')
+        </if>
+
+    </select>
 </mapper>

src/main/resources/mapper/soil/SoilExpReportMapper.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.SoilExpReportMapper">
+    <select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilExpReportVO">
+          SELECT r.id,r.exp_name,r.remark,r.uname,r.ctime,e.borehole_name,e.entrust_code
+          FROM soil_exp_report r JOIN soil_entrust e ON r.entrust_id = e.id
 
+          WHERE r.deleted = 0
+
+          AND e.deleted = 0
+          <if test="null!=vo.expName">
+              AND r.exp_name LIKE CONCAT('%',#{vo.expName},'%')
+          </if>
+
+        <if test="null!=vo.entrustId">
+            AND r.entrust_id = #{vo.entrustId}
+        </if>
+
+    </select>
 </mapper>

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

@@ -2,7 +2,7 @@
 <!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.SoilOriginalRecordMapper">
   <select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilOriginalRecordVO">
-      SELECT r.id,r.original_record_id,r.title,r.ctime,r.uname,r.remark,e.entrust_code,r.object_key FROM soil_original_record r
+      SELECT r.id,r.original_record_id,r.title,r.ctime,r.uname,r.remark,e.borehole_name,e.entrust_code,r.object_key FROM soil_original_record r
       JOIN soil_entrust e ON r.entrust_id = e.id
       WHERE r.deleted = 0 AND e.deleted = 0
       <if test="vo.entrustId!=null">