Skip to content

P
patzn-cloud-service-hmhj
Commit 2e586a72 by wangweidong
Options

霍煤鸿骏铝平台修改

parent f799fae5
Showing with 984 additions and 8 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java
......@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.dto.EntrustDTO;
import com.patzn.cloud.service.hmhj.entity.Entrust;
import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
import com.patzn.cloud.service.hmhj.enums.EntrustStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustVO;
......@@ -183,4 +184,63 @@ public class EntrustController extends ServiceController {
entrust.setPrepareStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
return success(entrustService.pageEntrustSampleReceive(getPage(), entrust));
}
@ApiOperation("任务分配委托分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_entrust_allot")
public RestResult<Page<EntrustVO>> getPageTaskAllot(EntrustVO entrust) {
entrust.setItemStatus(EntrustSampleItemStatusEnum.ALLOT);
return success(entrustService.pageEntrustByItem(getPage(), entrust));
}
@ApiOperation("数据录入委托分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_entrust_test")
public RestResult<Page<EntrustVO>> getPageTaskTest(EntrustVO entrust) {
entrust.setItemStatus(EntrustSampleItemStatusEnum.TEST);
return success(entrustService.pageEntrustByItem(getPage(), entrust));
}
@ApiOperation("数据复核委托分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_entrust_check")
public RestResult<Page<EntrustVO>> getPageTaskCheck(EntrustVO entrust) {
entrust.setItemStatus(EntrustSampleItemStatusEnum.CHECK);
return success(entrustService.pageEntrustByItem(getPage(), entrust));
}
@ApiOperation("数据审核委托分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_entrust_audit")
public RestResult<Page<EntrustVO>> getPageTaskAudit(EntrustVO entrust) {
entrust.setItemStatus(EntrustSampleItemStatusEnum.AUDIT);
return success(entrustService.pageEntrustByItem(getPage(), entrust));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleBackupController.java
......@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleBackup;
import com.patzn.cloud.service.hmhj.enums.EntrustSampleBackupStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -47,11 +48,9 @@ public class EntrustSampleBackupController extends ServiceController {
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page")
public RestResult<Page<EntrustSampleBackup>> getPage(EntrustSampleBackup entrustSampleBackup) {
public RestResult<Page<EntrustSampleBackupVO>> getPage(EntrustSampleBackupVO entrustSampleBackup) {
entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.BACKUP_ING);
return success(entrustSampleBackupService.page(getPage(), entrustSampleBackup));
return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
}
@ApiOperation("查询 id 信息")
......
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleController.java
package com.patzn.cloud.service.lims.hmhj.controller;
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.vo.EntrustSampleVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
......@@ -52,6 +54,21 @@ public class EntrustSampleController extends ServiceController {
return success(entrustSampleService.page(getPage(), entrustSample));
}
@ApiOperation("制备样品分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_make")
public RestResult<Page<EntrustSample>> getPageMake(EntrustSample entrustSample) {
entrustSample.setStatus(EntrustSampleStatusEnum.DRAFT);
return success(entrustSampleService.page(getPage(), entrustSample));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
......@@ -109,4 +126,22 @@ public class EntrustSampleController extends ServiceController {
entrustSample.setPrepareStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
return success(entrustSampleService.pageSampleReceive(getPage(), entrustSample));
}
@ApiOperation("任务分配样品分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_sample_task_allot")
public RestResult<Page<EntrustSampleVO>> getPageSampleTaskAllot(EntrustSampleVO entrustSample) {
entrustSample.setItemStatus(EntrustSampleItemStatusEnum.ALLOT);
return success(entrustSampleService.pageSampleByItem(getPage(), entrustSample));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleItemController.java
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -83,4 +85,129 @@ public class EntrustSampleItemController extends ServiceController {
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(entrustSampleItemService.removeByIds(ids));
}
@ApiOperation("任务分配按照项目分配左侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_allot_by_item_left")
public RestResult<Page<EntrustSampleItemVO>> getPageAllotByItemLeft(EntrustSampleItemVO entrustSampleItem) {
entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.ALLOT);
return success(entrustSampleItemService.pageByItemLeft(getPage(), entrustSampleItem));
}
@ApiOperation("任务分配按照项目分配右侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_allot_by_item_right")
public RestResult<Page<EntrustSampleItemVO>> getPageAllotByItemRight(EntrustSampleItemVO entrustSampleItem) {
entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.ALLOT);
return success(entrustSampleItemService.pageByItemRight(getPage(), entrustSampleItem));
}
@ApiOperation("任务分配按照样品分配右侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_allot_by_sample_right")
public RestResult<Page<EntrustSampleItemVO>> getPageAllotBySampleRight(EntrustSampleItemVO entrustSampleItem) {
entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.ALLOT);
return success(entrustSampleItemService.pageAllotBySampleRight(getPage(), entrustSampleItem));
}
@ApiOperation("手工分配")
@PostMapping("/allot_item")
public RestResult<Boolean> allotItem(@RequestParam("ids")Long []ids,@RequestParam("tester")String tester,@RequestParam("testerId")Long testerId ) {
return success(entrustSampleItemService.allotItem(ids,tester,testerId,getAccount()));
}
@ApiOperation("数据录入按照项目分配左侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_test_by_item_left")
public RestResult<Page<EntrustSampleItemVO>> getPageTestByItemLeft(EntrustSampleItemVO entrustSampleItem) {
entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.TEST);
return success(entrustSampleItemService.pageByItemLeft(getPage(), entrustSampleItem));
}
@ApiOperation("数据录入按照项目分配右侧分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
})
@PostMapping("/page_test_by_item_right")
public RestResult<Page<EntrustSampleItemVO>> getPageTestByItemRight(EntrustSampleItemVO entrustSampleItem) {
entrustSampleItem.setStatus(EntrustSampleItemStatusEnum.TEST);
return success(entrustSampleItemService.pageByItemRight(getPage(), entrustSampleItem));
}
@ApiOperation("数据录入提交")
@PostMapping("/submit_test")
public RestResult<Boolean> submitTest(@RequestParam("ids")Long []ids ) {
return success(entrustSampleItemService.submitTest(ids,getAccount()));
}
@ApiOperation("数据复核提交")
@PostMapping("/submit_check")
public RestResult<Boolean> submitCheck(@RequestParam("ids")Long []ids ) {
return success(entrustSampleItemService.submitCheck(ids,getAccount()));
}
@ApiOperation("数据复核退回")
@PostMapping("/back_check")
public RestResult<Boolean> backCheck(@RequestParam("ids")Long []ids ,@RequestParam("reason")String reason) {
return success(entrustSampleItemService.backCheck(ids, reason, getAccount()));
}
@ApiOperation("数据审核退回")
@PostMapping("/back_audit")
public RestResult<Boolean> backAudit(@RequestParam("ids")Long []ids ,@RequestParam("reason")String reason) {
return success(entrustSampleItemService.backAudit(ids, reason, getAccount()));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleItemRecordController.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.controller;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.commons.api.RestConstants;
import com.patzn.cloud.commons.api.RestResult;
import com.patzn.cloud.commons.controller.ServiceController;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* 检测项目操作日志表 前端控制器
*
* @author wwd
* @since 2021-02-24
*/
@Api(tags = "检测项目操作日志表")
@RestController
@RequestMapping("/v1/sample_item_record")
public class EntrustSampleItemRecordController extends ServiceController {
@Autowired
private IEntrustSampleItemRecordService entrustSampleItemRecordService;
@ApiOperation("分页列表")
@ApiImplicitParams({
@ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
})
@PostMapping("/page")
public RestResult<Page<EntrustSampleItemRecord>> getPage(EntrustSampleItemRecord entrustSampleItemRecord) {
return success(entrustSampleItemRecordService.page(getPage(), entrustSampleItemRecord));
}
@ApiOperation("查询 id 信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@GetMapping("/{id}")
public RestResult<EntrustSampleItemRecord> get(@PathVariable("id") Long id) {
return success(entrustSampleItemRecordService.getById(id));
}
@ApiOperation("根据 id 修改信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
})
@PutMapping("/{id}")
public RestResult<Boolean> edit(@PathVariable("id") Long id, EntrustSampleItemRecord entrustSampleItemRecord) {
entrustSampleItemRecord.setId(id);
return success(entrustSampleItemRecordService.updateById(entrustSampleItemRecord));
}
@ApiOperation("添加")
@PostMapping("/")
public RestResult<Boolean> add(EntrustSampleItemRecord entrustSampleItemRecord) {
return success(entrustSampleItemRecordService.save(entrustSampleItemRecord));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
})
@DeleteMapping("/")
public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
return success(entrustSampleItemRecordService.removeByIds(ids));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSamplePrepareController.java
......@@ -76,6 +76,15 @@ public class EntrustSamplePrepareController extends ServiceController {
}
@ApiOperation("样品接收提交")
@PostMapping("/submit_sample_receive")
public RestResult<Boolean> submitSampleReceive(@RequestParam("ids")Long[] ids) {
return success(entrustSamplePrepareService.submitSampleReceive(ids,getAccount()));
}
@ApiOperation("根据 ids 删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
......
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustMapper.java
......@@ -23,4 +23,6 @@ public interface EntrustMapper extends BatchMapper<Entrust> {
List<EntrustSampleDTO> listByContractId(@Param("entrustId") Long id);
List<EntrustVO> selectEntrustSampleReceive(RowBounds rowBounds, @Param("vo")EntrustVO entrust);
List<EntrustVO> selectVOList(RowBounds rowBounds, @Param("vo")EntrustVO entrust);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleBackupMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleBackup;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import java.util.List;
/**
* <p>
......@@ -13,4 +19,5 @@ import com.patzn.cloud.commons.mapper.BatchMapper;
*/
public interface EntrustSampleBackupMapper extends BatchMapper<EntrustSampleBackup> {
List<EntrustSampleBackupVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleBackupVO entrustSampleBackup);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import java.util.List;
/**
* <p>
......@@ -13,4 +19,9 @@ import com.patzn.cloud.commons.mapper.BatchMapper;
*/
public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem> {
List<EntrustSampleItemVO> selectByItemLeftList(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO itemVO);
List<EntrustSampleItemVO> selectByItemLeftRight(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO itemVO);
List<EntrustSampleItemVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO entrustSampleItem);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemRecordMapper.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.mapper;
import com.patzn.cloud.commons.mapper.BatchMapper;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemRecord;
/**
* <p>
* 检测项目操作日志表 Mapper 接口
* </p>
*
* @author wwd
* @since 2021-02-24
*/
public interface EntrustSampleItemRecordMapper extends BatchMapper<EntrustSampleItemRecord> {
}
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleMapper.java
......@@ -20,4 +20,6 @@ import java.util.List;
public interface EntrustSampleMapper extends BatchMapper<EntrustSample> {
List<EntrustSampleVO> selectSampleReceiveList(RowBounds rowBounds, @Param("vo") EntrustSampleVO entrustSample);
List<EntrustSampleVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleVO entrustSample);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleBackupService.java
......@@ -4,6 +4,7 @@ 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.entity.EntrustSampleBackup;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO;
import java.util.List;
......@@ -20,4 +21,6 @@ public interface IEntrustSampleBackupService extends IBaseService<EntrustSampleB
boolean removeByIds(List<Long> ids);
boolean handleOk(Long[] ids, Account account);
Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemRecordService.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.service;
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.entity.EntrustSampleItemRecord;
import java.util.Collection;
import java.util.List;
/**
* 检测项目操作日志表 服务类
*
* @author wwd
* @since 2021-02-24
*/
public interface IEntrustSampleItemRecordService extends IBaseService<EntrustSampleItemRecord> {
Page<EntrustSampleItemRecord> page(Page<EntrustSampleItemRecord> page, EntrustSampleItemRecord entrustSampleItemRecord);
boolean removeByIds(List<Long> ids);
void record(Long[] ids, String from, String to, int type, String remark, Account account);
void record(Collection<Long> ids, String from, String to, int type, String remark, Account account);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java
package com.patzn.cloud.service.lims.hmhj.service;
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.entity.EntrustSampleItem;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import java.util.List;
/**
......@@ -16,4 +19,22 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
Page<EntrustSampleItem> page(Page<EntrustSampleItem> page, EntrustSampleItem entrustSampleItem);
boolean removeByIds(List<Long> ids);
Page<EntrustSampleItemVO> pageAllotBySampleRight(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
boolean allotItem(Long[] ids, String tester, Long testerId, Account account);
Page<EntrustSampleItemVO> pageByItemLeft(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
Page<EntrustSampleItemVO> pageByItemRight(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
boolean submitTest(Long[] ids, Account account);
boolean submitCheck(Long[] ids, Account account);
boolean backCheck(Long[] ids, String reason, Account account);
boolean backAudit(Long[] ids, String reason, Account account);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSamplePrepareService.java
......@@ -21,4 +21,6 @@ public interface IEntrustSamplePrepareService extends IBaseService<EntrustSample
boolean removeByIds(List<Long> ids);
boolean makeEnd(SamplePrepareDTO dto, Account account);
boolean submitSampleReceive(Long[] ids, Account account);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleService.java
......@@ -23,4 +23,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
List<EntrustSampleVO> obtainMakeInfo(Long[] ids, Account account);
Page<EntrustSampleVO> pageSampleReceive(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
Page<EntrustSampleVO> pageSampleByItem(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustService.java
......@@ -36,4 +36,6 @@ public interface IEntrustService extends IBaseService<Entrust> {
EntrustDTO getDTOById(Long id);
Page<EntrustVO> pageEntrustSampleReceive(Page<EntrustVO> page, EntrustVO entrust);
Page<EntrustVO> pageEntrustByItem(Page<EntrustVO> page, EntrustVO entrust);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleBackupServiceImpl.java
......@@ -5,6 +5,7 @@ import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleBackup;
import com.patzn.cloud.service.hmhj.enums.EntrustSampleBackupStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleBackupMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleBackupService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
......@@ -48,4 +49,9 @@ public class EntrustSampleBackupServiceImpl extends BaseServiceImpl<EntrustSampl
return super.update(backup,Condition.create().in("id",ids));
}
@Override
public Page<EntrustSampleBackupVO> pageVO(Page<EntrustSampleBackupVO> page, EntrustSampleBackupVO entrustSampleBackup) {
return page.setRecords(baseMapper.selectVOList(page,entrustSampleBackup));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemRecordServiceImpl.java 0 → 100644
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemRecord;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemRecordMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemRecordService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
/**
* 检测项目操作日志表 服务实现类
*
* @author wwd
* @since 2021-02-24
*/
@Service
public class EntrustSampleItemRecordServiceImpl extends BaseServiceImpl<EntrustSampleItemRecordMapper, EntrustSampleItemRecord> implements IEntrustSampleItemRecordService {
@Override
public Page<EntrustSampleItemRecord> page(Page<EntrustSampleItemRecord> page, EntrustSampleItemRecord entrustSampleItemRecord) {
Wrapper wrapper = new EntityWrapper<>(entrustSampleItemRecord);
return this.page(page, wrapper);
}
@Override
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public void record(Long[] ids, String from, String to, int type, String remark, Account account) {
record(Arrays.asList(ids),from,to,type,remark,account);
}
@Override
public void record(Collection<Long> ids, String from, String to, int type, String remark, Account account) {
List<EntrustSampleItemRecord> saveRecordList = new ArrayList<>();
for (Long id:ids) {
EntrustSampleItemRecord record = new EntrustSampleItemRecord();
record.setItemId(id);
record.setType(type);
record.setOperator(account.getUserName());
record.setOperatorId(account.getUserId());
record.setOrigin(from);
record.setTarget(to);
record.setRemark(remark);
saveRecordList.add(record);
}
if (CollectionUtils.isNotEmpty(saveRecordList)){
saveBatch(saveRecordList);
}
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
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.entity.EntrustSample;
import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemRecordService;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 服务实现类
......@@ -21,6 +35,12 @@ import java.util.List;
@Service
public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleItemMapper, EntrustSampleItem> implements IEntrustSampleItemService {
@Autowired
private IEntrustSampleService entrustSampleService;
@Autowired
private IEntrustSampleItemRecordService entrustSampleItemRecordService;
@Override
public Page<EntrustSampleItem> page(Page<EntrustSampleItem> page, EntrustSampleItem entrustSampleItem) {
Wrapper wrapper = new EntityWrapper<>(entrustSampleItem);
......@@ -32,4 +52,170 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
public boolean removeByIds(List<Long> ids) {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public Page<EntrustSampleItemVO> pageAllotBySampleRight(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem) {
if (ArrayUtils.isEmpty(entrustSampleItem.getSampleIdsArray())){
RestAssert.fail("请选择样品ID");
}
return page.setRecords(baseMapper.selectVOList(page,entrustSampleItem));
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean allotItem(Long[] ids, String tester, Long testerId, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要分配的检测项目");
RestAssert.fail(StringUtils.isBlank(tester),"请选择检测人员");
RestAssert.fail(null == testerId,"请选择检测人员");
EntrustSampleItem item = new EntrustSampleItem();
item.setTester(tester);
item.setTesterId(testerId);
item.setStatus(EntrustSampleItemStatusEnum.TEST);
item.setProgress(EntrustSampleItemStatusEnum.TEST);
super.update(item,Condition.create().in("id",ids));
entrustSampleItemRecordService.record(ids,EntrustSampleItemStatusEnum.ALLOT.getDisplay(),EntrustSampleItemStatusEnum.TEST.getDisplay(),0,"任务分配",account);
return true;
}
@Override
public Page<EntrustSampleItemVO> pageByItemLeft(Page<EntrustSampleItemVO> page, EntrustSampleItemVO itemVO) {
if (null == itemVO.getEntrustId()){
return page;
}
List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().eq("entrust_id",itemVO.getEntrustId()));
if (CollectionUtils.isEmpty(sampleList)){
return page;
}
List<Long> sampleIds = sampleList.stream().map(s->{
return s.getId();
}).collect(Collectors.toList());
itemVO.setSampleIds(sampleIds);
return page.setRecords(baseMapper.selectByItemLeftList(page,itemVO));
}
@Override
public Page<EntrustSampleItemVO> pageByItemRight(Page<EntrustSampleItemVO> page, EntrustSampleItemVO itemVO) {
if (null == itemVO.getEntrustId()){
return page;
}
if (ArrayUtils.isEmpty(itemVO.getNameArray())){
RestAssert.fail("请选择检测项目");
return page;
}
List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().eq("entrust_id",itemVO.getEntrustId()));
if (CollectionUtils.isEmpty(sampleList)){
return page;
}
List<Long> sampleIds = sampleList.stream().map(s->{
return s.getId();
}).collect(Collectors.toList());
itemVO.setSampleIds(sampleIds);
return page.setRecords(baseMapper.selectByItemLeftRight(page,itemVO));
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean submitTest(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的检测项目");
List<EntrustSampleItem> list = super.list(Condition.create().in("id",ids).eq("status",EntrustSampleItemStatusEnum.TEST));
RestAssert.fail(list.size()!=ids.length,"请选择待检测的检测项目");
for (EntrustSampleItem sampleItem:list) {
RestAssert.fail(StringUtils.isBlank(sampleItem.getTestValue()),"检测项目名称："+sampleItem.getName()+"未填写检测值，请确认！");
}
EntrustSampleItem item = new EntrustSampleItem();
item.setTestTime(new Date());
item.setStatus(EntrustSampleItemStatusEnum.CHECK);
item.setProgress(EntrustSampleItemStatusEnum.CHECK);
super.update(item,Condition.create().in("id",ids));
entrustSampleItemRecordService.record(ids,EntrustSampleItemStatusEnum.TEST.getDisplay(),EntrustSampleItemStatusEnum.CHECK.getDisplay(),0,"数据录入提交",account);
return true;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean submitCheck(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的检测项目");
List<EntrustSampleItem> list = super.list(Condition.create().in("id",ids).eq("status",EntrustSampleItemStatusEnum.CHECK));
RestAssert.fail(list.size()!=ids.length,"请选择待复核的检测项目");
EntrustSampleItem item = new EntrustSampleItem();
item.setStatus(EntrustSampleItemStatusEnum.AUDIT);
item.setProgress(EntrustSampleItemStatusEnum.AUDIT);
item.setChecker(account.getUserName());
item.setCheckerId(account.getUserId());
item.setCheckTime(new Date());
super.update(item,Condition.create().in("id",ids));
entrustSampleItemRecordService.record(ids,EntrustSampleItemStatusEnum.CHECK.getDisplay(),EntrustSampleItemStatusEnum.AUDIT.getDisplay(),0,"数据审核提交",account);
return true;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean backCheck(Long[] ids, String reason, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要退回的检测项目");
RestAssert.fail(StringUtils.isBlank(reason),"请填写退回原因");
EntrustSampleItem item = new EntrustSampleItem();
item.setStatus(EntrustSampleItemStatusEnum.TEST);
item.setProgress(EntrustSampleItemStatusEnum.BACK_CHECK);
super.update(item,Condition.create().in("id",ids));
entrustSampleItemRecordService.record(ids,EntrustSampleItemStatusEnum.CHECK.getDisplay(),EntrustSampleItemStatusEnum.TEST.getDisplay(),1,reason,account);
return true;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean backAudit(Long[] ids, String reason, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要退回的检测项目");
RestAssert.fail(StringUtils.isBlank(reason),"请填写退回原因");
EntrustSampleItem item = new EntrustSampleItem();
item.setStatus(EntrustSampleItemStatusEnum.TEST);
item.setProgress(EntrustSampleItemStatusEnum.BACK_AUDIT);
super.update(item,Condition.create().in("id",ids));
entrustSampleItemRecordService.record(ids,EntrustSampleItemStatusEnum.AUDIT.getDisplay(),EntrustSampleItemStatusEnum.TEST.getDisplay(),1,reason,account);
return true;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSamplePrepareServiceImpl.java
package com.patzn.cloud.service.lims.hmhj.service.impl;
import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.toolkit.ArrayUtils;
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.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.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
......@@ -24,6 +28,7 @@ import com.baomidou.mybatisplus.plugins.Page;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
......@@ -40,6 +45,10 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
@Autowired
private IEntrustSampleService entrustSampleService;
@Autowired
private IEntrustSampleItemService entrustSampleItemService;
@Autowired
private IEntrustSampleBackupService entrustSampleBackupService;
......@@ -70,11 +79,11 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
List<Long> sampleIdsList = new ArrayList<>();
for (EntrustSampleVO vo: sampleVOList) {
EntrustSamplePrepare prepare = new EntrustSamplePrepare();
EntrustSamplePrepare prepare = vo.convert(EntrustSamplePrepare.class);
prepare.setEntrustSampleId(vo.getEntrustSampleId());
prepare.setStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
prepare.setProgress(EntrustSamplePrepareStatusEnum.RECEIVE);
prepare.setId(null);
savePrepare.add(prepare);
sampleIdsList.add(vo.getEntrustSampleId());
}
......@@ -100,11 +109,67 @@ public class EntrustSamplePrepareServiceImpl extends BaseServiceImpl<EntrustSamp
backup.setSampleId(sample.getId());
backup.setStatus(EntrustSampleBackupStatusEnum.BACKUP_ING);
backup.setProgress(EntrustSampleBackupStatusEnum.BACKUP_ING);
backup.setReceiveTime(new Date());
saveBackupList.add(backup);
}
if (CollectionUtils.isNotEmpty(saveBackupList)){
entrustSampleBackupService.saveBatch(saveBackupList);
}
EntrustSample sample = new EntrustSample();
sample.setStatus(EntrustSampleStatusEnum.RECEIVE);
sample.setProgress(EntrustSampleStatusEnum.RECEIVE);
entrustSampleService.update(sample,Condition.create().in("id",sampleIdsList));
return saveBatch(savePrepare);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean submitSampleReceive(Long[] ids, Account account) {
RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择检测样品");
List<EntrustSamplePrepare> prepareList = super.list(Condition.create().in("id",ids));
RestAssert.fail(CollectionUtils.isEmpty(prepareList),"请选择检测样品");
List<Long> sampleIdsList = new ArrayList<>();
for (EntrustSamplePrepare prepare:prepareList) {
if (null != prepare.getEntrustSampleId() && null != prepare.getGroupId() ){
EntrustSampleItem item = new EntrustSampleItem();
item.setStatus(EntrustSampleItemStatusEnum.ALLOT);
item.setProgress(EntrustSampleItemStatusEnum.ALLOT);
entrustSampleItemService.update(item,Condition.create().eq("entrust_sample_id",prepare.getEntrustSampleId()).eq("group_id",prepare.getGroupId()));
}
sampleIdsList.add(prepare.getEntrustSampleId());
}
EntrustSamplePrepare prepare = new EntrustSamplePrepare();
prepare.setStatus(EntrustSamplePrepareStatusEnum.TEST);
prepare.setStatus(EntrustSamplePrepareStatusEnum.TEST);
super.update(prepare,Condition.create().in("id",ids));
List<EntrustSamplePrepareStatusEnum> statusNotOkList = new ArrayList<>();
statusNotOkList.add(EntrustSamplePrepareStatusEnum.RECEIVE);
statusNotOkList.add(EntrustSamplePrepareStatusEnum.RECEIVE_OK);
List<EntrustSamplePrepare> preparesNotOkList =super.list(Condition.create().in("id",sampleIdsList).in("status",statusNotOkList));
List<Long> notOkSampleIds = preparesNotOkList.stream().map(i->{
return i.getEntrustSampleId();
}).collect(Collectors.toList());
List<Long> changeList = new ArrayList<>();
for (Long id:sampleIdsList) {
if (!notOkSampleIds.contains(id)){
changeList.add(id);
}
}
if (CollectionUtils.isNotEmpty(changeList)){
EntrustSample sample = new EntrustSample();
sample.setStatus(EntrustSampleStatusEnum.TEST);
sample.setProgress(EntrustSampleStatusEnum.TEST);
entrustSampleService.update(sample,Condition.create().in("id",changeList));
}
return true;
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
......@@ -89,7 +89,10 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
List<EntrustSampleVO> list=new ArrayList<>();
for (EntrustSample sample:entrustSamples) {
Map<Long,String> groupMap = sampleGroupMap.get(sample);
Map<Long,String> groupMap = sampleGroupMap.get(sample.getId());
if (null == groupMap){
continue;
}
for (Map.Entry<Long,String> g: groupMap.entrySet()) {
EntrustSampleVO sampleVO = sample.convert(EntrustSampleVO.class);
sampleVO.setId(null);
......@@ -114,4 +117,28 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
public Page<EntrustSampleVO> pageSampleReceive(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
return page.setRecords(baseMapper.selectSampleReceiveList(page,entrustSample));
}
@Override
public Page<EntrustSampleVO> pageSampleByItem(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
if (null == entrustSample.getEntrustId()){
return page;
}
if (null == entrustSample.getItemStatus()){
return page;
}
List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("status",entrustSample.getItemStatus()));
if (CollectionUtils.isEmpty(itemList)){
return page;
}
List<Long> sampleIdsList = itemList.stream().map(i->{
return i.getEntrustSampleId();
}).collect(Collectors.toList());
entrustSample.setIds(sampleIdsList);
return page.setRecords(baseMapper.selectVOList(page,entrustSample));
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java
......@@ -16,7 +16,6 @@ import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
import com.patzn.cloud.service.hmhj.enums.EntrustStatusEnum;
import com.patzn.cloud.service.hmhj.vo.EntrustVO;
import com.patzn.cloud.service.lims.base.dto.CodeTypeDTO;
import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
import com.patzn.cloud.service.lims.hmhj.mapper.EntrustMapper;
import com.patzn.cloud.service.lims.hmhj.service.*;
......@@ -363,5 +362,37 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
return page.setRecords(baseMapper.selectEntrustSampleReceive(page,entrust));
}
@Override
public Page<EntrustVO> pageEntrustByItem(Page<EntrustVO> page, EntrustVO entrust) {
if (null == entrust.getItemStatus()){
return page;
}
List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("status",entrust.getItemStatus()));
if (CollectionUtils.isEmpty(itemList)){
return page;
}
List<Long> sampleIdsList = itemList.stream().map(i->{
return i.getEntrustSampleId();
}).collect(Collectors.toList());
if (CollectionUtils.isEmpty(sampleIdsList)){
return page;
}
List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().in("id",sampleIdsList));
if (CollectionUtils.isEmpty(sampleList)){
return page;
}
List<Long> ids = sampleList.stream().map(s->{
return s.getEntrustId();
}).collect(Collectors.toList());
if (CollectionUtils.isEmpty(ids)){
return page;
}
entrust.setIdsList(ids);
return page.setRecords(baseMapper.selectVOList(page,entrust));
}
}
src/main/resources/mapper/hmhj/EntrustMapper.xml
......@@ -17,4 +17,16 @@
</select>
<select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustVO">
SELECT * FROM entrust WHERE deleted = 0
<if test="null!=vo.idsList">
AND id IN
<foreach collection="vo.idsList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</select>
</mapper>
src/main/resources/mapper/hmhj/EntrustSampleBackupMapper.xml
......@@ -2,4 +2,44 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleBackupMapper">
<select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO">
SELECT
b.ID,
b.receive_time,
b.storage_location,
b.storage_method,
b.storage_period,
b.handler,
b.handle_time,
s.NAME AS "sampleName",
s.code AS "sampleCode" ,
e.client ,
e.code AS "entrustCode"
FROM
entrust_sample_backup b
JOIN entrust_sample s ON b.sample_id = s.
ID JOIN entrust e ON s.entrust_id = e.ID
<where>
AND b.deleted = 0 AND s.deleted = 0 AND e.deleted = 0
<if test="null!=vo.sampleCode">
AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
</if>
<if test="null!=vo.sampleName">
AND s.name LIKE CONCAT('%',#{vo.sampleName},'%')
</if>
<if test="null!=vo.client">
AND e.client LIKE CONCAT('%',#{vo.client},'%')
</if>
<if test="null!=vo.entrustCode">
AND e.code LIKE CONCAT('%',#{vo.entrustCode},'%')
</if>
</where>
</select>
</mapper>
src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml
......@@ -2,4 +2,107 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper">
<select id="selectByItemLeftList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
SELECT name FROM entrust_sample_item WHERE deleted = 0 AND status = #{vo.status}
<if test="null!=vo.sampleIds">
AND entrust_sample_id IN
<foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
#{sampleId}
</foreach>
</if>
GROUP BY name
</select>
<select id="selectByItemLeftRight" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
WITH i AS (
SELECT
id,
entrust_sample_id,
name,
status,
standard,
group_name,
group_id
FROM
entrust_sample_item
WHERE
deleted = 0
<if test="null!=vo.status">
AND status = #{vo.status}
</if>
<if test="null!=vo.name">
AND name = #{vo.name}
</if>
<if test="null!=vo.nameArray">
AND name IN
<foreach collection="vo.nameArray" index="index" item="name" open="(" separator="," close=")">
#{name}
</foreach>
</if>
<if test="null!=vo.sampleIds">
AND entrust_sample_id IN
<foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
#{sampleId}
</foreach>
</if>
)
SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode" FROM i JOIN entrust_sample s ON i.entrust_sample_id = s.id
<where>
<if test="null!=vo.sampleCode">
AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
</if>
</where>
</select>
<select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
WITH i AS (
SELECT
id,
entrust_sample_id,
name,
status,
standard,
group_name,
group_id
FROM
entrust_sample_item
WHERE
deleted = 0
<if test="null!=vo.status">
AND status = #{vo.status}
</if>
<if test="null!=vo.sampleIds">
AND entrust_sample_id IN
<foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
#{sampleId}
</foreach>
</if>
<if test="null!=vo.sampleIdsArray">
AND entrust_sample_id IN
<foreach collection="vo.sampleIdsArray" index="index" item="sampleId" open="(" separator="," close=")">
#{sampleId}
</foreach>
</if>
)
SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode" FROM i JOIN entrust_sample s ON i.entrust_sample_id = s.id
<where>
<if test="null!=vo.sampleCode">
AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
</if>
</where>
</select>
</mapper>
src/main/resources/mapper/hmhj/EntrustSampleItemRecordMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemRecordMapper">
</mapper>
src/main/resources/mapper/hmhj/EntrustSampleMapper.xml
......@@ -14,5 +14,32 @@
AND p.entrust_sample_id = #{vo.entrustSampleId}
</if>
<if test="null!=vo.prepareStatus">
AND p.status = #{vo.prepareStatus}
</if>
<if test="null!=vo.entrustId">
AND s.entrust_id = #{vo.entrustId}
</if>
</select>
<select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
SELECT id , name ,code,entrust_id FROM entrust_sample WHERE deleted = 0
<if test="null!=vo.entrustId">
AND entrust_id = #{vo.entrustId}
</if>
<if test="null!=vo.ids">
AND id IN
<foreach collection="vo.ids" index="index" item="sampleId" open="(" separator="," close=")">
#{sampleId}
</foreach>
</if>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment