Merge branch 'master' of git.patzn.com:wangweidong/patzn-cloud-service-hmhj

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

@@ -95,9 +95,9 @@ public class EntrustSampleController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page_report_make")
-    public RestResult<Page<EntrustSample>> getPageReportMake(EntrustSample entrustSample) {
+    public RestResult<Page<EntrustSampleVO>> getPageReportMake(EntrustSampleVO entrustSample) {
         entrustSample.setStatus(EntrustSampleStatusEnum.REPORT_MAKE);
-        return success(entrustSampleService.page(getPage(), entrustSample));
+        return success(entrustSampleService.pageVOForMake(getPage(), entrustSample));
     }
 
     @ApiOperation("报告审核样品分页列表")
@@ -207,6 +207,16 @@ public class EntrustSampleController extends ServiceController {
 
 
 
+    @ApiOperation(value = "数据录入添加检测项目", notes = "数据录入添加检测项目")
+    @PostMapping("/add_test_item_in_input")
+    public RestResult<Boolean> addTestItemInInput(@RequestBody EntrustSampleADDDTO dto) {
+        return success(entrustSampleService.addTestItemInInput(dto, getAccount()));
+    }
+
+
+
+
+
 
     @ApiOperation("获取制备信息")
     @PostMapping("/obtain_make_info")

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

@@ -4,10 +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;
+import com.patzn.cloud.service.hmhj.dto.*;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.EntrustFlowEnum;
@@ -55,6 +52,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
 
     Page<EntrustSampleVO> pageVO(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
 
+    Page<EntrustSampleVO> pageVOForMake(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
+
     boolean submitToAcceptanceResultInput(Long[] ids, Account account);
 
     List<EntrustSampleVO> listMinStatusByEntrustIds(List<Long> entrustIds);
@@ -80,4 +79,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     List<Long> getIdsByEntrustId(Long entrustId);
 
     boolean updateSample(EntrustSample entrustSample, String source, Account account);
+
+    boolean addTestItemInInput(EntrustSampleADDDTO dto, Account account);
 }

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

@@ -13,10 +13,7 @@ import com.patzn.cloud.commons.toolkit.DateUtils;
 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.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;
+import com.patzn.cloud.service.hmhj.dto.*;
 import com.patzn.cloud.service.hmhj.entity.*;
 import com.patzn.cloud.service.hmhj.enums.*;
 import com.patzn.cloud.service.hmhj.vo.*;
@@ -115,6 +112,37 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         return page.setRecords(baseMapper.selectVOList(page, entrustSample));
     }
 
+    @Override
+    public Page<EntrustSampleVO> pageVOForMake(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
+
+        List<EntrustSampleVO> sampleVOList = baseMapper.selectVOList(page, entrustSample);
+
+        if (CollectionUtils.isEmpty(sampleVOList))return page;
+
+        List<Long> sampleIdsList=  sampleVOList.stream().map(s->{
+            return s.getId();
+        }).collect(Collectors.toList());
+        List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().setSqlSelect("id","entrust_sample_id","name").isNotNull("name").in("entrust_sample_id",sampleIdsList));
+        Map<Long,Set<String>> itemMap = new HashMap<>();
+        for (EntrustSampleItem item : itemList) {
+            if (itemMap.containsKey(item.getEntrustSampleId())){
+                Set<String> set = itemMap.get(item.getEntrustSampleId());
+                set.add(item.getName());
+                itemMap.put(item.getEntrustSampleId(),set);
+            }else {
+                Set<String> set = new HashSet<>();
+                set.add(item.getName());
+                itemMap.put(item.getEntrustSampleId(),set);
+            }
+        }
+        for (EntrustSampleVO vo : sampleVOList) {
+            vo.setItemNames(StringHandleUtils.join(itemMap.get(vo.getId())));
+        }
+        return page.setRecords(sampleVOList);
+    }
+
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean submitToAcceptanceResultInput(Long[] ids, Account account) {
@@ -1164,4 +1192,33 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         entrustSampleRecordService.record(new Long[]{entrustSample.getId()}, flowStatus.getDisplay(), flowStatus.getDisplay(), 2, account, remark);
         return true;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean addTestItemInInput(EntrustSampleADDDTO dto, Account account) {
+        if (null == dto) return false;
+        List<Long> sampleIdsList = dto.getSampleIdsList();
+        if (CollectionUtils.isEmpty(sampleIdsList))return false;
+        List<EntrustSampleItem> itemList = dto.getItemList();
+        if (CollectionUtils.isEmpty(itemList))return false;
+
+
+        List<EntrustSampleItem> saveItemList = new ArrayList<>();
+        for (Long sampleId : sampleIdsList) {
+            for (EntrustSampleItem item : itemList) {
+                EntrustSampleItem add = item.convert(EntrustSampleItem.class);
+                add.setEntrustSampleId(sampleId);
+                add.setTesterId(account.getUserId());
+                add.setTester(account.getUserName());
+                add.setStatus(EntrustSampleItemStatusEnum.TEST);
+                add.setProgress(EntrustSampleItemStatusEnum.TEST);
+                saveItemList.add(add);
+            }
+        }
+        
+        if (CollectionUtils.isNotEmpty(saveItemList)){
+          return   entrustSampleItemService.saveBatch(saveItemList);
+        }
+        return false;
+    }
 }
\ No newline at end of file

src/main/resources/mapper/hmhj/EntrustSampleMapper.xml

@@ -57,7 +57,7 @@
                 #{sampleId}
             </foreach>
         </if>
-        order by order_by asc,ctime desc
+        order by order_by asc, code ,ctime desc
     </select>