在线开发管理

src/main/java/com/patzn/lims/drug/service/impl/DrugSampleServiceImpl.java

@@ -13,10 +13,7 @@ import com.patzn.lims.core.web.Account;
 import com.patzn.lims.drug.dto.DrugSampleDTO;
 import com.patzn.lims.drug.dto.DrugSampleReportDTO;
 import com.patzn.lims.drug.entity.*;
-import com.patzn.lims.drug.eunms.ItemStatusEnum;
-import com.patzn.lims.drug.eunms.OosStatusEnum;
-import com.patzn.lims.drug.eunms.SampleStatusEnum;
-import com.patzn.lims.drug.eunms.SingleJudgeEnum;
+import com.patzn.lims.drug.eunms.*;
 import com.patzn.lims.drug.mapper.DrugSampleMapper;
 import com.patzn.lims.drug.service.*;
 import com.patzn.lims.core.web.BaseServiceImpl;
@@ -72,6 +69,8 @@ public class DrugSampleServiceImpl extends BaseServiceImpl<DrugSampleMapper, Dru
     @Autowired
     private IDrugItemService drugItemService;
 
+    @Autowired
+    private IDrugSampleKeepService drugSampleKeepService;
 
     @Autowired
     private IDrugItemRelEquipService drugItemRelEquipService;
@@ -314,15 +313,24 @@ public class DrugSampleServiceImpl extends BaseServiceImpl<DrugSampleMapper, Dru
                Wrappers.<DrugSample>query().in("id",ids))){
            drugSampleOperationService.updateRegisterToMake(account,ids);
            drugSampleRecordService.record(account,SampleStatusEnum.DRAFT,SampleStatusEnum.RECEIVE,ids);
-//           sysMessageService.sendMsg("/drug/sample/make","请检任务下发","新的样品制备任务",account,null);
+           List<DrugSampleKeep> saveKeepList = new ArrayList<>();
+           for (Long id:ids) {
+               DrugSampleKeep keep = new DrugSampleKeep();
+               keep.setStatus(KeepStatusEnum.KEEPING);
+               keep.setProgress(KeepStatusEnum.KEEPING);
+               keep.setType("留样");
+               keep.setSampleId(id);
+               saveKeepList.add(keep);
+           }
+           if (CollectionUtils.isNotEmpty(saveKeepList)){
+               return drugSampleKeepService.saveBatch(saveKeepList);
+           }
            return  true;
        }
 
         return false;
     }
 
-
-
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean submitOosExecute(Long[] ids, Account account) {
@@ -423,7 +431,7 @@ public class DrugSampleServiceImpl extends BaseServiceImpl<DrugSampleMapper, Dru
                 Wrappers.<DrugSample>query().in("id",ids))){
             drugSampleOperationService.updateReceiveToTest(account,ids);
             drugSampleRecordService.record(account,SampleStatusEnum.RECEIVE,SampleStatusEnum.TEST,ids,"样品接收提交");
-            return   drugItemService.updateByCondition(ids,ItemStatusEnum.ALLOCATE);
+            return   drugItemService.updateByCondition(ids,ItemStatusEnum.INPUT);
         }
         return false;
     }

src/main/java/com/patzn/lims/drug/vo/DrugSampleKeepVO.java

@@ -19,4 +19,12 @@ public class DrugSampleKeepVO extends DrugSampleKeep {
     @ApiModelProperty(value = "业务类型")
     private String category;
 
+
+    @ApiModelProperty(value = "标准")
+    private String standard;
+    @ApiModelProperty(value = "班别")
+    private String classBan;
+    @ApiModelProperty(value = "机台")
+    private String samplePoint;
+
 }

src/main/resources/mapper/drug/DrugSampleKeepMapper.xml

@@ -21,8 +21,12 @@
         k.handler,
         k.handler_id,
         k.handle_time,
+        k.ctime,
         s.name,
         s.sample_code,
+        s.standard,
+        s.sample_point,
+        s.class_ban,
         s.code,
         s.category
         FROM