Merge branch 'dev'

src/main/java/com/patzn/cloud/service/lims/handler/ItemCollectEntity.java

@@ -17,6 +17,9 @@ public class ItemCollectEntity {
     private Integer statusPlace;
 
 
+    private Integer singleElse;
+
+
     public String getItemName() {
         return itemName;
     }
@@ -64,4 +67,12 @@ public class ItemCollectEntity {
     public void setStatusPlace(Integer statusPlace) {
         this.statusPlace = statusPlace;
     }
+
+    public Integer getSingleElse() {
+        return singleElse;
+    }
+
+    public void setSingleElse(Integer singleElse) {
+        this.singleElse = singleElse;
+    }
 }

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.lims.summary.SoilEntrustSummaryDTO;
 import com.patzn.cloud.service.soil.entity.SoilAloneInOutExport;
 import com.patzn.cloud.service.soil.entity.SoilAloneInOutStock;
+import com.patzn.cloud.service.soil.vo.SoilEntrustVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -101,4 +103,12 @@ public class SoilAloneInOutStockController extends ServiceController {
     public RestResult<SoilAloneInOutExport> saveOutExcelExport(@RequestParam("ids")Long[] ids, @RequestParam("templateId") Long templateId) {
         return success(soilAloneInOutStockService.saveExcelExport(ids,templateId,1,getAccount()));
     }
+
+
+
+    @ApiOperation(value = "获取留存日期", notes = "获取留存日期")
+    @PostMapping("/get_stay_date")
+    public RestResult<SoilAloneInOutStock> getStayDate(@RequestParam("entrustId") Long entrustId) {
+        return success(soilAloneInOutStockService.getStayDate(entrustId));
+    }
 }

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

@@ -265,6 +265,17 @@ public class SoilAloneSampleController extends ServiceController {
 
 
 
+    @ApiOperation("出库撤销")
+    @PostMapping("/out_storage_back")
+    public RestResult<Boolean> outStorageBack(@RequestParam("ids") Long [] ids) {
+        return success(soilAloneSampleService.outStorageBack(ids,getAccount()));
+    }
+
+
+
+
+
+
 
     @ApiOperation("添加")
     @PostMapping("/")

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

@@ -778,4 +778,8 @@ public class SoilEntrustController extends ServiceController  {
     public RestResult<Page<SoilEntrustSummaryDTO>> listSummaryQuery(SoilEntrustVO soilEntrust) {
         return success(soilEntrustService.listSummaryQuery(getPage(),soilEntrust));
     }
+
+
+
+
 }

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

@@ -21,4 +21,6 @@ public interface ISoilAloneInOutStockService extends IBaseService<SoilAloneInOut
     boolean removeByIds(List<Long> ids);
 
     SoilAloneInOutExport saveExcelExport(Long[] ids, Long templateId,Integer type, Account account);
+
+    SoilAloneInOutStock getStayDate(Long entrustId);
 }

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

@@ -42,4 +42,6 @@ public interface ISoilAloneSampleService extends IBaseService<SoilAloneSample> {
     List<SoilAloneSampleVO> listVOByIds(Long[] ids);
 
     SoilAloneSampleVO getInExport(Long id, int i);
+
+    boolean outStorageBack(Long[] ids, Account account);
 }

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

@@ -46,6 +46,9 @@ public class SoilAloneInOutStockServiceImpl extends BaseServiceImpl<SoilAloneInO
     @Autowired
     private OssClient ossClient;
 
+    @Autowired
+    private ISoilEntrustService soilEntrustService;
+
 
     @Autowired
     private ISoilAloneInOutExportService soilAloneInOutExportService;
@@ -185,4 +188,16 @@ public class SoilAloneInOutStockServiceImpl extends BaseServiceImpl<SoilAloneInO
 
         return null;
     }
+
+    @Override
+    public SoilAloneInOutStock getStayDate(Long entrustId) {
+        RestAssert.fail(null == entrustId,"委托ID不能为空");
+        SoilEntrust entrust =  soilEntrustService.getById(entrustId);
+        RestAssert.fail(null == entrust,"委托ID不能为空");
+        SoilAloneInOutStock   stock =    getOne(Condition.create().eq("entrust_code",entrust.getEntrustCode()).last("LIMIT 1"));
+        if (null == stock){
+            return new SoilAloneInOutStock();
+        }
+        return stock;
+    }
 }

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

@@ -300,4 +300,14 @@ public class SoilAloneSampleServiceImpl extends BaseServiceImpl<SoilAloneSampleM
         }
         return vo;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean outStorageBack(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请填写要撤销的样品！");
+        SoilAloneSample sample = new SoilAloneSample();
+        sample.setStatus(SoilAloneStatusEnum.IN_STORAGE);
+        sample.setProgress(SoilAloneStatusEnum.IN_STORAGE);
+        return super.update(sample,Condition.create().in("id",ids));
+    }
 }

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

@@ -1513,6 +1513,26 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         mapReplace.put("#{client}",entrust.getClient());
         mapReplace.put("#{boreholeName}",entrust.getBoreholeName());
         mapReplace.put("#{projectNo}",entrust.getProjectNo());
+
+        mapReplace.put("#{testDate}","");
+        mapReplace.put("#{testEnvironment}","");
+        if (CollectionUtils.isNotEmpty(soilItemList)){
+            for (SoilItem item : soilItemList) {
+                if (null!=item.getName()&&"检测日期".equals(item.getName())){
+                    mapReplace.put("#{testDate}",item.getTestValue());
+                    break;
+                }
+            }
+
+            for (SoilItem item : soilItemList) {
+                if (null!=item.getName()&&"检测环境".equals(item.getName())){
+                    mapReplace.put("#{testEnvironment}",item.getTestValue());
+                    break;
+                }
+            }
+        }
+
+
         SysFileSignature signature = sysUserClient.signature(account.getUserId()).serviceData();
 
 
@@ -1523,6 +1543,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             sheetOne.setForceFormulaRecalculation(true);
             Integer beginRow =  template.getSampleBeginRow();
             Integer sampleMergerNumOri =  template.getSampleMergerNum();
+            RestAssert.fail(null == template.getTemplateSampleNum(),"模板样品数不能为空");
             int templateSampleNum = template.getTemplateSampleNum();
             if (null != beginRow
                     && null!=sampleMergerNumOri
@@ -2704,6 +2725,14 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                 }else if (expname.contains("三轴压缩")&&(expname.contains("三轴压缩"))){
                     expname="三轴压缩重塑";
                 }
+
+                String nouKuoZhanName =    name.replace(".bmp","");
+                String lastName = nouKuoZhanName.substring(nouKuoZhanName.length()-1,nouKuoZhanName.length());
+                if ("r".equals(lastName)){
+                    if (name.contains("三轴压缩")){
+                        name=name.replace("三轴压缩","三轴压缩重塑");
+                    }
+                }
                 if (name.contains(expname)){
                     SoilSample sample = soilSampleService.getBySampleCode(type.getSampleCode());
                     if (null !=sample){
@@ -2772,6 +2801,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
                     }
 
+                }else{
+
                 }
 
 

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

@@ -371,6 +371,17 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                     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);
+                        collectEntitiesList.add(collectEntity);
+                    }
                     continue;
                 }
                 if (null != config.getItemed() && config.getItemed() ==1){
@@ -418,6 +429,31 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
 
 
                 for (ItemCollectEntity collectEntity:collectEntitiesList) {
+                    if (null!=collectEntity.getSingleElse()){
+                        XSSFRow row = sheet.getRow(collectEntity.getItemMegerRow());
+                        if (null == row){
+                            continue;
+                        }
+                        XSSFCell cell = row.getCell(collectEntity.getColumnPlace());
+                        if (null == cell){
+                            continue;
+                        }
+
+                       String  valueElse = formatter.formatCellValue(cell, evaluator);
+
+                        if (StringUtils.isNotBlank(valueElse)){
+                            SoilItemCollectData soilItemCollectData = new SoilItemCollectData();
+                            soilItemCollectData.setTestValue(valueElse);
+                            soilItemCollectData.setSampleCode(sampleCode);
+                            soilItemCollectData.setUnit(collectEntity.getUnit());
+                            soilItemCollectData.setShortName(shortNames);
+                            soilItemCollectData.setItemName(collectEntity.getItemName());
+                            soilItemCollectData.setStatus(sampleOfStatus);
+                            soilItemList.add(soilItemCollectData);
+                        }
+                        continue;
+
+                    }
                     Integer itemValueIndex = collectEntity.getItemMegerRow();
                     if (null == itemValueIndex || itemValueIndex ==sampleMergerNum){
                         XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace());
@@ -539,6 +575,9 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                 }
 
             }
+
+
+
             if (CollectionUtils.isEmpty(soilItemList)){
                 return true;
             }
@@ -550,6 +589,16 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
             List<SoilItem> saveList = new ArrayList<>();
             List<SoilItem> updateList = new ArrayList<>();
             for (SoilItemCollectData soilItemCollectData:soilItemList) {
+                if (StringUtils.isBlank(soilItemCollectData.getTestValue())){
+                    continue;
+                }
+                if (StringUtils.isBlank(soilItemCollectData.getSampleCode())){
+                    continue;
+                }
+                if ("#VALUE!".equals(soilItemCollectData.getTestValue())){
+                    continue;
+                }
+
                 List<SoilExperiment> expList = experimentMap.get(soilItemCollectData.getSampleCode());
                 SoilExperiment exp = null ;
 

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

@@ -431,12 +431,13 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
         List<Long> sampleIds  = sampleVOList.stream().map(s->{
             return s.getId();
         }).collect(Collectors.toList());
-        List<SoilExperiment> experimentList = soilExperimentService.list(Condition.create().setSqlSelect("sample_id","name","short_name").in("sample_id",sampleIds).orderBy("sample_id").orderBy("order_by"));
+        List<SoilExperiment> experimentList = soilExperimentService.list(Condition.create().setSqlSelect("sample_id","name","short_name","group_id","group_name").in("sample_id",sampleIds).orderBy("sample_id").orderBy("order_by"));
         if (CollectionUtils.isEmpty(experimentList)){
             return sampleVOList;
         }
         Map<Long, Set<String>> nameMap = new HashMap<>();
         Map<Long, Set<String>> shortNameMap = new HashMap<>();
+        Map<Long, Set<String>> groupNameMap = new HashMap<>();
         for (SoilExperiment experiment:experimentList) {
             if (!nameMap.containsKey(experiment.getSampleId())){
                 Set<String> set = new LinkedHashSet<>();
@@ -461,6 +462,25 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
                 shortNameMap.put(experiment.getSampleId(),set);
             }
 
+            if (null == experiment.getGroupId() || StringUtils.isBlank(experiment.getGroupName())){
+                continue;
+            }
+
+
+
+
+            if (!groupNameMap.containsKey(experiment.getSampleId())){
+                Set<String> set = new LinkedHashSet<>();
+                set.add(experiment.getGroupName());
+                groupNameMap.put(experiment.getSampleId(),set);
+            }else{
+                Set<String> set = groupNameMap.get(experiment.getSampleId());
+                set.add(experiment.getGroupName());
+                groupNameMap.put(experiment.getSampleId(),set);
+            }
+
+
+
         }
 
         Date date = new Date();
@@ -468,6 +488,7 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
         for (SoilSampleVO soilSampleVO:sampleVOList) {
             Set<String> nameSet = nameMap.get(soilSampleVO.getId());
             Set<String> shortNameSet = shortNameMap.get(soilSampleVO.getId());
+            Set<String> groupNameSet = groupNameMap.get(soilSampleVO.getId());
             if (null != nameSet){
                 soilSampleVO.setExperimentNames(StringHandleUtils.join(nameSet,"、"));
             }
@@ -476,6 +497,11 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
             if (null != shortNameSet){
                 soilSampleVO.setExperimentShortNames(StringHandleUtils.join(shortNameSet," "));
             }
+
+
+            if (null != groupNameSet){
+                soilSampleVO.setGroupNames(StringHandleUtils.join(groupNameSet,"、"));
+            }
         }
 
 

src/test/java/resources/db_sql/v2.0.1/新增sql.sql

+ALTER TABLE "public"."soil_alone_in_out_stock" 
+ALTER TABLE "public"."soil_alone_in_out_stock" 
+  ADD COLUMN "out_go" varchar(200) COLLATE "pg_catalog"."default" DEFAULT NULL;
+
+COMMENT ON COLUMN "public"."soil_alone_in_out_stock"."out_go" IS '出库去向';
+
+ALTER TABLE "public"."soil_alone_sample"
+  ADD COLUMN "project_type" varchar(150),
+  ADD COLUMN "item_type" varchar(150),
+  ADD COLUMN "receive_depth" varchar(150),
+  ADD COLUMN "receive_status" varchar(150);
+
+COMMENT ON COLUMN "public"."soil_alone_sample"."project_type" IS '工程类型';
+
+COMMENT ON COLUMN "public"."soil_alone_sample"."item_type" IS '项目类型';
+
+COMMENT ON COLUMN "public"."soil_alone_sample"."receive_depth" IS '深度';
+
+COMMENT ON COLUMN "public"."soil_alone_sample"."receive_status" IS '接收状态';
\ No newline at end of file