土工平台修改

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

@@ -4,14 +4,24 @@ import com.patzn.cloud.service.lims.collect.statics.StaticsData;
 import com.patzn.cloud.service.soil.entity.SoilExperimentCollectData;
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
 public class CollectUtil {
 
+    public static void main(String[] args) {
+        File file = new File("D://直接剪切YP202102003.txt");
+        try {
+            FileInputStream io = new FileInputStream(file);
+            txt2String(io);
+        }catch (Exception e){
+
+        }
+
+    }
+
+
     public static List<SoilExperimentCollectData> txt2String(InputStream io){
         StringBuilder result = new StringBuilder();
         List<SoilExperimentCollectData> dataList = new ArrayList<>();
@@ -26,6 +36,7 @@ public class CollectUtil {
 
                 content = content.replace("凝 聚 力","凝聚力");
                 content = content.replace("灵 敏 度","灵敏度");
+                content = content.replace("粘 聚 力","凝聚力");
                 String[] dataArray = content.split(" ");
                 for (String handleS:dataArray) {
                      handleS=handleS.trim();

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

@@ -598,4 +598,13 @@ public class SoilSampleController extends ServiceController  {
     public RestResult<Boolean> sampleSplitSave(@RequestParam("id")Long  id, SoilSample soilSample) {
         return success(soilSampleService.sampleSplitSave(id,soilSample,getAccount()));
     }
+
+
+    @ApiOperation(value = "导出抽样单", notes = "导出抽样单")
+    @GetMapping("/export_sampling_list")
+    public void exportSamplingList(@RequestParam("ids")Long [] ids) {
+        soilSampleService.exportSamplingList(ids,response,getAccount());
+    }
+
+
 }

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

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

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

@@ -15,6 +15,8 @@ import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
 import com.patzn.cloud.service.soil.vo.SoilSampleVO;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
  * 土工试验试样表 服务类
@@ -96,4 +98,6 @@ public interface ISoilSampleService extends IBaseService<SoilSample> {
     List<SoilSampleVO> listVOByIds(List<Long> sampleIdList);
 
     boolean sampleSplitSave(Long id, SoilSample soilSample, Account account);
+
+    void exportSamplingList(Long[] ids, HttpServletResponse response, Account account);
 }

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

@@ -12,6 +12,8 @@ import com.patzn.cloud.commons.toolkit.DateUtils;
 import com.patzn.cloud.commons.toolkit.StringHandleUtils;
 import com.patzn.cloud.feign.lims.base.client.LmsUserGroupClient;
 import com.patzn.cloud.service.lims.base.entity.LmsUserGroup;
+import com.patzn.cloud.service.lims.common.HSSFWorkbookUtil;
+import com.patzn.cloud.service.lims.common.service.IExportService;
 import com.patzn.cloud.service.lims.soil.service.*;
 import com.patzn.cloud.service.soil.dto.SoilPrepareDTO;
 import com.patzn.cloud.service.soil.entity.*;
@@ -26,6 +28,12 @@ import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
 import com.patzn.cloud.service.soil.vo.SoilSampleVO;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -34,6 +42,9 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
  * 土工试验试样表 服务实现类
@@ -60,6 +71,10 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
     @Autowired
     private ISoilEntrustService soilEntrustService;
 
+
+    @Autowired
+    private IExportService exportService;
+
     @Autowired
     private ISoilExperimentService soilExperimentService;
 
@@ -908,6 +923,51 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
         return false;
     }
 
+    @Override
+    public void exportSamplingList(Long[] ids, HttpServletResponse response, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要导出的样品");
+        List<SoilSampleVO> voList = baseMapper.selectVOListByIds(ids);
+        RestAssert.fail(CollectionUtils.isEmpty(voList),"请选择要导出的样品");
+
+        SoilEntrust entrust = soilEntrustService.getById(voList.get(0).getEntrustId());
+
+        XSSFWorkbook xssfWorkbook= exportService.getXSSFWorkbook("SamplingList.xlsx");
+
+        XSSFSheet sheet=   xssfWorkbook.getSheetAt(0);
+
+        Map<String,String> map=new HashMap<>();
+
+        map.put("#{boreholeName}",StringHandleUtils.getString(entrust.getBoreholeName()));
+        map.put("#{client}",StringHandleUtils.getString(entrust.getClient()));
+        HSSFWorkbookUtil.replaceModel(map,xssfWorkbook);
+        if (voList.size()<=16){
+            int beg = 12;
+            for (SoilSampleVO vo:voList) {
+               XSSFRow row = sheet.getRow(beg);
+                row.getCell(1).setCellValue(vo.getSampleCode());
+            }
+        }else {
+            int createNum = voList.size()-16;
+            XSSFCellStyle cellStyle =   sheet.getRow(12).getCell(0).getCellStyle();
+            for (int i = 0; i < createNum; i++) {
+                sheet.shiftRows(12+i, sheet.getLastRowNum(),1,true,false);
+                XSSFRow  row=sheet.createRow(16+i);
+                row.setHeight(sheet.getRow(12).getHeight());
+                for (int j = 0; j < 4; j++) {
+                    XSSFCell cell=   row.createCell(j);
+                    cell.setCellStyle(cellStyle);
+                }
+            }
+            int beg = 12;
+            for (SoilSampleVO vo:voList) {
+                XSSFRow row = sheet.getRow(beg);
+                row.getCell(1).setCellValue(vo.getSampleCode());
+            }
+        }
+
+        exportService.downloadXlsx(response,entrust.getBoreholeName()+"sampling"+".xlsx",xssfWorkbook);
+    }
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override

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

@@ -13,6 +13,7 @@
     <sql id="sColumn">
         s.id,
         s.site_no,
+        s.entrust_id,
         s.sample_code,
         s.sample_depth,
         s.keep_limit_time,