土工平台修改

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

@@ -98,7 +98,7 @@ public class SoilOriginalRecordController extends ServiceController {
     })
 	@DeleteMapping("/")
 	public RestResult<Boolean> delete(@RequestParam("ids") Long[] ids) {
-        return success(soilOriginalRecordService.remove(Condition.create().in("id", ids)));
+        return success(soilOriginalRecordService.removeOriginal(ids));
 	}
 
 

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

@@ -29,4 +29,6 @@ public interface ISoilOriginalRecordService extends IBaseService<SoilOriginalRec
     boolean updateOriginalRecord(Long formId, Account account);
 
     Page<SoilOriginalRecordVO> pageVO(Page<SoilOriginalRecordVO> page, SoilOriginalRecordVO soilOriginalRecord);
+
+    boolean removeOriginal(Long[] ids);
 }

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

@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.soil.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
@@ -79,9 +80,6 @@ public class SoilOriginalRecordServiceImpl extends BaseServiceImpl<SoilOriginalR
         RestAssert.fail(null == template, "原始记录对应的模板不存在");
         RestAssert.fail(StringUtils.isEmpty(template.getAlias()), "原始记录模板别名为空");
 
-
-
-
         SoilOriginalRecord soilOriginalRecord = new SoilOriginalRecord();
         soilOriginalRecord.setOriginalRecordId(formId);
         soilOriginalRecord.setEntrustId(entrustId);
@@ -119,4 +117,20 @@ public class SoilOriginalRecordServiceImpl extends BaseServiceImpl<SoilOriginalR
     public Page<SoilOriginalRecordVO> pageVO(Page<SoilOriginalRecordVO> page, SoilOriginalRecordVO soilOriginalRecord) {
         return page.setRecords(baseMapper.selectVOList(page,soilOriginalRecord));
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean removeOriginal(Long[] ids) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要删除的原始记录");
+        if (super.remove(Condition.create().in("id",ids))){
+            List<SoilExpRelOriginalRecord> relOriginalRecords = soilExpRelOriginalRecordService.list(Condition.create().in("record_id",ids));
+            if (CollectionUtils.isNotEmpty(relOriginalRecords)){
+                List<Long> relIds = relOriginalRecords.stream().map(r->{
+                    return r.getId();
+                }).collect(Collectors.toList());
+                soilExpRelOriginalRecordService.remove(Condition.create().in("id",relIds));
+            }
+        }
+        return true;
+    }
 }

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

@@ -149,7 +149,7 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
             }
         }
 
-
+        map.put("sample",experimentVOList);
 
         int length = experimentVOList.size();
         for (int i = 0; i < length; i++) {