hmhj增加标样

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleController.java

@@ -3,13 +3,12 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.google.common.collect.Lists;
-import com.patzn.cloud.service.hmhj.dto.QueryDTO;
-import com.patzn.cloud.service.hmhj.dto.ReportDTO;
-import com.patzn.cloud.service.hmhj.dto.StatsQueryDTO;
+import com.patzn.cloud.service.hmhj.dto.*;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 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.enums.EntrustStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.AlTasteStatsVO;
 import com.patzn.cloud.service.hmhj.vo.ElectrolyteRatioStatsVO;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
@@ -139,6 +138,18 @@ public class EntrustSampleController extends ServiceController {
 
 
 
+
+    @ApiOperation(value = "增加标样", notes = "增加标样")
+    @PostMapping("/add_standard_sample")
+    public RestResult<Boolean> addStandardSample(@RequestBody EntrustSampleDTO dto) {
+        dto.setStatus(EntrustSampleStatusEnum.TEST);
+        dto.setProgress(EntrustSampleStatusEnum.TEST);
+        return success(entrustSampleService.addStandardSampleDTO(dto, getAccount()));
+    }
+
+
+
+
     @ApiOperation("获取制备信息")
     @PostMapping("/obtain_make_info")
     public RestResult<List<EntrustSampleVO>> obtainMakeInfo(@RequestParam("ids") Long [] ids) {

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.dto.EntrustSampleDTO;
 import com.patzn.cloud.service.hmhj.dto.QueryDTO;
 import com.patzn.cloud.service.hmhj.dto.ReportDTO;
 import com.patzn.cloud.service.hmhj.dto.StatsQueryDTO;
@@ -71,4 +72,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     boolean updateSampleNextFlowInfo(Entrust entrust, EntrustFlowEnum nextFlowStatus, Account account);
 
     boolean updateSamplePrevFlowInfo(Entrust entrust, EntrustFlowEnum prevFlowStatus, Account account);
+
+    boolean addStandardSampleDTO(EntrustSampleDTO dto, Account account);
 }

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

@@ -10,6 +10,7 @@ import com.patzn.cloud.commons.toolkit.FileUtils;
 import com.patzn.cloud.feign.base.client.SysFileTemplateClient;
 import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.service.base.entity.SysFileTemplate;
+import com.patzn.cloud.service.hmhj.dto.EntrustSampleDTO;
 import com.patzn.cloud.service.hmhj.dto.QueryDTO;
 import com.patzn.cloud.service.hmhj.dto.ReportDTO;
 import com.patzn.cloud.service.hmhj.dto.StatsQueryDTO;
@@ -425,6 +426,28 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     }
 
     @Override
+    public boolean addStandardSampleDTO(EntrustSampleDTO dto, Account account) {
+        if (null == dto){
+            return false;
+        }
+        EntrustSample sample =   dto.convert(EntrustSample.class);
+        //标样
+        sample.setType(1);
+       if (save(sample)){
+           List<EntrustSampleItem> itemList = dto.getItemList();
+           if (CollectionUtils.isNotEmpty(itemList)){
+               for (EntrustSampleItem item : itemList) {
+                   item.setEntrustSampleId(sample.getId());
+                   item.setStatus(EntrustSampleItemStatusEnum.TEST);
+                   item.setStatus(EntrustSampleItemStatusEnum.TEST);
+               }
+             entrustSampleItemService.saveBatch(itemList);
+           }
+       }
+        return false;
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }

src/test/java/resources/db_sql/hmhj/v144/20210705新增样品字段.sql

+ALTER TABLE "public"."entrust_sample"
+ALTER TABLE "public"."entrust_sample"
+  ADD COLUMN "type" int2 DEFAULT 0;
+
+COMMENT ON COLUMN "public"."entrust_sample"."type" IS '样品类别（0，正常 1标样）';
+
+
+ALTER TABLE "public"."entrust_sample"
+  ADD COLUMN "order_by" int2 DEFAULT 0;
+
+COMMENT ON COLUMN "public"."entrust_sample"."order_by" IS '排序';
\ No newline at end of file