土工平台修改

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

@@ -515,6 +515,45 @@ public class HSSFWorkbookUtil {
         }
         return wb;
     }
+
+    public static XSSFWorkbook replaceModel(Map item, XSSFWorkbook wb,XSSFSheet sheet) {
+        try {
+            Iterator rows = sheet.rowIterator();
+            while(rows.hasNext()){
+                XSSFRow row = (XSSFRow) rows.next();
+                if(row!=null) {
+                    int num = row.getLastCellNum();
+                    for(int i=0;i<num;i++) {
+                        XSSFCell cell=  row.getCell(i);
+                        if(cell==null || StringUtils.isBlank(getJavaValue(cell).toString())) {
+                            continue;
+                        }
+                        String value= getJavaValue(cell).toString();
+                        if(!"".equals(value)) {
+                            Set<String> keySet = item.keySet();
+                            Iterator<String> it = keySet.iterator();
+                            while (it.hasNext()) {
+                                String text = it.next();
+                                if(value.contains(text)) {
+                                    String txt = value.replace(text,(String)item.get(text));
+                                    cell.setCellValue(txt);
+                                    break;
+                                }
+                            }
+                        } else {
+                            cell.setCellValue("");
+                        }
+                    }
+                }
+            }
+            // 输出文件
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return wb;
+    }
+
+
     public static XSSFWorkbook getWorkbookByIO(InputStream io) {
         try {
             XSSFWorkbook   xssfWorkbook=   new XSSFWorkbook(io);

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

@@ -22,6 +22,19 @@ import java.util.regex.Pattern;
  */
 public class StringHandleUtils {
 
+    public static boolean validateNumber(String str) {
+
+        if(StringUtils.isBlank(str)) {
+
+            return false;
+
+        }
+
+        // 说明一下的是该正则只能识别4位小数；如果不限制小数位数的话，写成[+-]?[0-9]+(\\.[0-9]+)?就可以了
+
+        return str.matches("[+-]?[0-9]+(\\.[0-9]+)?");
+
+    }
 
     public static String getContinuousStringData(String[] intString, String stringPre) {
 

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

@@ -775,7 +775,7 @@ public class SoilEntrustController extends ServiceController  {
 
     @ApiOperation(value = "查询列表", notes = "查询数据列表")
     @PostMapping("/list_summary_query")
-    public RestResult<List<SoilEntrustSummaryDTO>> listSummaryQuery(SoilEntrustVO soilEntrust) {
-        return success(soilEntrustService.listSummaryQuery(soilEntrust));
+    public RestResult<Page<SoilEntrustSummaryDTO>> listSummaryQuery(SoilEntrustVO soilEntrust) {
+        return success(soilEntrustService.listSummaryQuery(getPage(),soilEntrust));
     }
 }

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

@@ -57,5 +57,5 @@ public interface SoilEntrustMapper extends BaseMapper<SoilEntrust> {
     List<SoilEntrustVO> selectReportBySummaryReportList(RowBounds rowBounds,  @Param("vo")SoilEntrustVO soilEntrust);
 
     @SqlParser(filter = true)
-    List<SoilEntrustVO> selectListForSummaryQuery(@Param("vo")SoilEntrustVO soilEntrust);
+    List<SoilEntrustVO> selectListForSummaryQuery(RowBounds rowBounds,@Param("vo")SoilEntrustVO soilEntrust);
 }

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

@@ -101,5 +101,5 @@ public interface ISoilEntrustService extends IBaseService<SoilEntrust> {
 
     Page<SoilEntrustVO> pageReportBySummaryReport(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust);
 
-    List<SoilEntrustSummaryDTO> listSummaryQuery(SoilEntrustVO soilEntrust);
+    Page<SoilEntrustSummaryDTO> listSummaryQuery(Page<SoilEntrustSummaryDTO> page,SoilEntrustVO soilEntrust);
 }

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

@@ -1172,10 +1172,10 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
 
 
     @Override
-    public List<SoilEntrustSummaryDTO> listSummaryQuery(SoilEntrustVO soilEntrust) {
-        List<SoilEntrustVO> voList =  baseMapper.selectListForSummaryQuery(soilEntrust);
+    public Page<SoilEntrustSummaryDTO> listSummaryQuery(Page<SoilEntrustSummaryDTO> page,SoilEntrustVO soilEntrust) {
+        List<SoilEntrustVO> voList =  baseMapper.selectListForSummaryQuery(page,soilEntrust);
         if (CollectionUtils.isEmpty(voList)){
-            return Lists.newArrayList();
+            return page;
         }
 
         List<Long> entrustIdList = new ArrayList<>();
@@ -1432,8 +1432,8 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
                 continue;
             }
         }
-
-        return dtoList;
+         page.setRecords(dtoList);
+        return page;
     }
 
 

src/test/java/com/patzn/cloud/service/lims/test/Ytest.java

 package com.patzn.cloud.service.lims.test;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class Ytest {
     public static void main(String[] args) {
-        Double a = Double.parseDouble("0");
-        Double b = Double.parseDouble("0");
-        System.out.println(a/b);
+      boolean d =  validateNumber("325.312122");
+      System.out.println(d);
+    }
+
+    private static boolean validateNumber(String str) {
+
+        if(StringUtils.isBlank(str)) {
+
+            return false;
+
+        }
+
+        // 说明一下的是该正则只能识别4位小数；如果不限制小数位数的话，写成[+-]?[0-9]+(\\.[0-9]+)?就可以了
+
+        return str.matches("[+-]?[0-9]+(\\.[0-9]+)?");
+
     }
 }