土工平台修改

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

@@ -730,11 +730,65 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                             if (null == config.getItemed()||0==config.getItemed()){
                                 continue;
                             }
+                        List<SoilExperiment>  listE =     experimentMap.get(sampleCode);
+                        if (CollectionUtils.isEmpty(listE)){
+                            continue;
+                        }
+                        SoilExperiment exp = listE.get(0);
+                        if (null == exp){
+                            continue;
+                        }
+
+                        if (null ==config.getColumnPlace()){
+                            if (null != config.getItemed() && config.getItemed() ==1 && null !=config.getMergeBegin() && null !=config.getMergeRowNum()){
+                                ItemCollectEntity collectEntity = new ItemCollectEntity();
+                                collectEntity.setItemName(config.getAttributeName());
+                                collectEntity.setColumnPlace(config.getMergeBegin());
+                                collectEntity.setUnit(config.getUnit());
+                                collectEntity.setItemMegerRow(config.getMergeRowNum());
+                                collectEntity.setAttribute(config.getDataAttribute());
+
+                                collectEntity.setSingleElse(1);
 
+
+                                XSSFRow valueNRow  = xssfSheet.getRow(config.getMergeRowNum());
+                                XSSFCell cellN =   valueNRow.getCell(config.getMergeBegin());
+                                String valueN = formatter.formatCellValue(cellN, evaluator);
+
+                                if (StringUtils.isNotBlank(valueN)){
+                                    String keyN= sampleCode+exp.getId()+config.getAttributeName();
+
+                                    if (!stringMap.containsKey(keyN)){
+                                        SoilItem item = new SoilItem();
+                                        item.setCompanyId(companyId);
+                                        item.setExperimentId(exp.getId());
+                                        item.setUnit(config.getUnit());
+                                        item.setTestValue(valueN);
+                                        item.setName(config.getAttributeName());
+                                        saveItemList.add(item);
+                                    }else{
+                                        SoilItem soilItem = new SoilItem();
+                                        soilItem.setTestValue(valueN);
+                                        soilItem.setCompanyId(companyId);
+                                        soilItem.setUnit(config.getUnit());
+                                        soilItem.setId(stringMap.get(keyN));
+                                        updateItemList.add(soilItem);
+                                    }
+                                }
+
+
+
+                            }
+                            continue;
+                        }
                             Integer row = config.getMergeRowNum();
                             Integer col = config.getColumnPlace();
 
 
+
+
+
+
                             Integer sampleCodeRow = config.getMergeBegin();
                             Integer sampleCodeCol = config.getMergeEnd();
 
@@ -770,16 +824,14 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                                 continue;
                             }
 
-                           List<SoilExperiment>  listE =     experimentMap.get(sampleCode);
-                            if (CollectionUtils.isEmpty(listE)){
-                                continue;
-                            }
-                           SoilExperiment exp = listE.get(0);
-                           if (null == exp){
-                               continue;
-                           }
+
                         String key= sampleCode+exp.getId()+config.getAttributeName();
 
+
+
+
+
+
                         if (!stringMap.containsKey(key)){
                             SoilItem item = new SoilItem();
                             item.setCompanyId(companyId);