土工平台修改

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSamplePrepareServiceImpl.java

@@ -5,21 +5,12 @@ import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.hmhj.dto.SamplePrepareDTO;
-import com.patzn.cloud.service.hmhj.entity.EntrustSample;
-import com.patzn.cloud.service.hmhj.entity.EntrustSampleBackup;
-import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
-import com.patzn.cloud.service.hmhj.entity.EntrustSamplePrepare;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleBackupStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
+import com.patzn.cloud.service.hmhj.entity.*;
+import com.patzn.cloud.service.hmhj.enums.*;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSamplePrepareMapper;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleBackupService;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSamplePrepareService;
+import com.patzn.cloud.service.lims.hmhj.service.*;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
-import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -52,7 +43,8 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
     @Autowired
     private IEntrustSampleBackupService entrustSampleBackupService;
 
-
+    @Autowired
+    private IEntrustService entrustService;
 
     @Override
     public Page<EntrustSamplePrepare> page(Page<EntrustSamplePrepare> page, EntrustSamplePrepare entrustSamplePrepare) {
@@ -91,6 +83,8 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
 
         List<EntrustSample> sampleList = entrustSampleService.getBatchIds(sampleIdsList);
 
+        Entrust entrust = entrustService.getById(sampleList.get(0).getEntrustId());
+
 
 
         List<EntrustSampleBackup> backupList = entrustSampleBackupService.list(Condition.create().in("sample_id",sampleIdsList));
@@ -119,7 +113,22 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
         sample.setStatus(EntrustSampleStatusEnum.RECEIVE);
         sample.setProgress(EntrustSampleStatusEnum.RECEIVE);
         entrustSampleService.update(sample,Condition.create().in("id",sampleIdsList));
-        return saveBatch(savePrepare);
+
+
+        saveBatch(savePrepare);
+
+
+        List<EntrustSample> checkMakeList = entrustSampleService.list(Condition.create().eq("entrust_id",entrust.getId()).eq("status",EntrustSampleStatusEnum.DRAFT));
+        if (CollectionUtils.isEmpty(checkMakeList)){
+            Entrust updateEntrust = new Entrust();
+            updateEntrust.setStatus(EntrustStatusEnum.TEST);
+            updateEntrust.setProgress(EntrustStatusEnum.TEST);
+            updateEntrust.setId(entrust.getId());
+            entrustService.updateById(updateEntrust);
+        }
+
+
+        return true;
     }
 
     @Transactional(rollbackFor = Exception.class)