diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java index fb62fca..b203f9d 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java @@ -9,8 +9,6 @@ import digital.laboratory.platform.entrustment.service.EntrustMaterialCheckoutRe import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -30,7 +28,6 @@ import java.util.List; @Api(tags = "017-委托检材--检出定性定量结果信息相关接口") public class EntrustMaterialCheckoutResultController { - private static final Logger log = LoggerFactory.getLogger(EntrustMaterialCheckoutResultController.class); @Resource private EntrustMaterialCheckoutResultService entrustMaterialCheckoutResultService; diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustTemplateInfoController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustTemplateInfoController.java new file mode 100644 index 0000000..9a31e32 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustTemplateInfoController.java @@ -0,0 +1,109 @@ +package digital.laboratory.platform.entrustment.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import digital.laboratory.platform.common.core.util.R; +import digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo; +import digital.laboratory.platform.entrustment.enums.TemplateTypeEnums; +import digital.laboratory.platform.entrustment.query.EntrustTemplateInfoQuery; +import digital.laboratory.platform.entrustment.service.EntrustTemplateInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 委托检材--检出定性定量结果信息 + * + * @author chenjiangbao + * @describe 委托检材--检出定性定量结果信息相关接口 前端控制器 + */ +@RestController +@RequestMapping("/papp/entrustTemplateInfo") +@Api(tags = "019-委托送检中案情简要等内容的模板信息相关接口") +public class EntrustTemplateInfoController { + + @Resource + private EntrustTemplateInfoService entrustTemplateInfoService; + + // 内部静态类，用于封装枚举数据 + private static class EnumResponse { + private final int code; + private final String desc; + + public EnumResponse(int code, String desc) { + this.code = code; + this.desc = desc; + } + + public int getCode() { + return code; + } + + public String getDesc() { + return desc; + } + } + + @ApiOperation("获取所有模板的类型值") + @GetMapping("/allTemplateType") + public R> allTemplateType() { + List enumResponseList = Arrays.stream(TemplateTypeEnums.values()) + .map(value -> new EnumResponse(value.getCode(), value.getDesc())) + .collect(Collectors.toList()); + return R.ok(enumResponseList); + } + + @ApiOperation("获取模板的分页接口") + @PostMapping("/page") + public R> pageEntrustTemplateInfo(@RequestBody EntrustTemplateInfoQuery query) { + return R.ok( + entrustTemplateInfoService.page( + new Page<>(query.getCurrent(), query.getSize()), + Wrappers.lambdaQuery() + .eq(query.getType() != null, EntrustTemplateInfo::getTemplateType, query.getType()) + .orderByDesc(EntrustTemplateInfo::getCreateTime) + ) + ); + } + + @ApiOperation("录入模板信息") + @PostMapping("/save") + public R addEntrustTemplateInfo(@RequestBody @Valid EntrustTemplateInfo info) { + EntrustTemplateInfo isExist = entrustTemplateInfoService.getOne( + Wrappers.lambdaQuery() + .eq(EntrustTemplateInfo::getTemplateName, info.getTemplateName()) + .eq(EntrustTemplateInfo::getTemplateType, info.getTemplateType()) + ); + if (isExist != null) { + return R.failed(String.format("在模板类型为 [%s] 中已经存在模板名称为 [%s] 的模板！", + TemplateTypeEnums.fromCode(info.getTemplateType()).getDesc(), + info.getTemplateName())); + } + entrustTemplateInfoService.save(info); + return R.ok(info); + } + + @ApiOperation("更新模板信息") + @PutMapping("/update") + public R update(@RequestBody EntrustTemplateInfo info) { + EntrustTemplateInfo isExist = entrustTemplateInfoService.getById(info.getId()); + if (isExist == null) { + return R.failed("数据在系统中不存在！"); + } + entrustTemplateInfoService.updateById(info); + return R.ok(info); + } + + @ApiOperation("删除模板信息") + @PostMapping("/delete") + public R delete(@RequestBody List ids) { + return R.ok(entrustTemplateInfoService.removeBatchByIds(ids)); + } +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java index 71c07b9..d537975 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java @@ -1,19 +1,11 @@ package digital.laboratory.platform.entrustment.controller; -import cn.hutool.core.lang.Assert; -import com.amazonaws.services.s3.model.AmazonS3Exception; -import digital.laboratory.platform.common.feign.RemoteGenerateWordService; -import digital.laboratory.platform.common.feign.RemoteWord2PDFService; -import digital.laboratory.platform.sys.dto.entrustment.CommonIdDto; -import digital.laboratory.platform.entrustment.dto.EntrustmentDTO; -import digital.laboratory.platform.entrustment.entity.*; -import digital.laboratory.platform.entrustment.service.*; -import digital.laboratory.platform.sys.feign.*; -import digital.laboratory.platform.sys.vo.entrustment.MarkersVO; import cn.hutool.core.io.file.FileNameUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.amazonaws.services.s3.model.AmazonS3Exception; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -24,17 +16,25 @@ import digital.laboratory.platform.common.log.annotation.SysLog; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; import digital.laboratory.platform.common.oss.service.OssFile; import digital.laboratory.platform.common.security.util.SecurityUtils; +import digital.laboratory.platform.entrustment.dto.EntrustmentDTO; +import digital.laboratory.platform.entrustment.entity.CaseEvent; +import digital.laboratory.platform.entrustment.entity.Entrustment; import digital.laboratory.platform.entrustment.enums.EntrustmentStatusConstants; +import digital.laboratory.platform.entrustment.service.CaseEventService; +import digital.laboratory.platform.entrustment.service.EntrustmentService; import digital.laboratory.platform.entrustment.vo.CaseEventVO; import digital.laboratory.platform.entrustment.vo.EntrustmentVO; +import digital.laboratory.platform.sys.dto.entrustment.CommonIdDto; import digital.laboratory.platform.sys.entity.SysUser; +import digital.laboratory.platform.sys.feign.RemoteOrgService; +import digital.laboratory.platform.sys.vo.entrustment.MarkersVO; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.commons.lang.StringUtils; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -44,8 +44,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.security.Principal; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -70,21 +72,13 @@ import java.util.List; public class EntrustmentController { private final CaseEventService caseEventService; + private final EntrustmentService entrustmentService; - private final EntrustmentIdentificationMaterialService entrustmentIdentificationMaterialService; + private final OssFile ossFile; - private final IdentificationService identificationService; - private final SampleService sampleService; - private final RemoteDeliverService remoteDeliverService; - private final RemoteUserService remoteUserService; - private final RemoteOrgService remoteOrgService; - private final RemoteWord2PDFService remoteWord2PDFService; - private final RemoteSampleService remoteSampleService;//流转系统的feign 接口 - private final RemoteDictionaryService remoteDictionaryService;//字典接口 - private final SynchronizeDataService synchronizeDataService;//同步数据服务接口 + private final RemoteOrgService remoteOrgService; - private final RemoteGenerateWordService remoteGenerateWordService; //private final RestTemplate restTemplate; // /** diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreChangeDutyLogController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreChangeDutyLogController.java deleted file mode 100644 index 2feb528..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreChangeDutyLogController.java +++ /dev/null @@ -1,97 +0,0 @@ -package digital.laboratory.platform.entrustment.controller; - -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.common.log.annotation.SysLog; -import digital.laboratory.platform.entrustment.entity.SampleStoreChangeDutyLog; -import digital.laboratory.platform.entrustment.service.SampleStoreChangeDutyLogService; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - - -/** - * 样品库管理员换班日志 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库管理员换班日志 前端控制器 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/papp/entrustment/sample_store_change_duty_log" ) -@Api(value = "sample_store_change_duty_log", tags = "样品库管理员换班日志管理") -public class SampleStoreChangeDutyLogController { - - private final SampleStoreChangeDutyLogService sampleStoreChangeDutyLogService; - - /** - * 通过id查询样品库管理员换班日志 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") - @GetMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_change_duty_log_get')" ) - public R getById(@PathVariable("id" ) String id) { - return R.ok(sampleStoreChangeDutyLogService.getById(id)); - } - - /** - * 分页查询 - * @param page 分页对象 - * @param sampleStoreChangeDutyLog 样品库管理员换班日志 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/page" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_change_duty_log_get')" ) - public R getSampleStoreChangeDutyLogPage(Page page, SampleStoreChangeDutyLog sampleStoreChangeDutyLog) { - return R.ok(sampleStoreChangeDutyLogService.page(page, Wrappers.query(sampleStoreChangeDutyLog))); - } - - - /** - * 新增样品库管理员换班日志 - * @param sampleStoreChangeDutyLog 样品库管理员换班日志 - * @return R - */ - @ApiOperation(value = "新增样品库管理员换班日志", notes = "新增样品库管理员换班日志") - @SysLog("新增样品库管理员换班日志" ) - @PostMapping - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_change_duty_log_add')" ) - public R postAddObject(@RequestBody SampleStoreChangeDutyLog sampleStoreChangeDutyLog) { - sampleStoreChangeDutyLog.setId(IdWorker.get32UUID().toUpperCase()); - return R.ok(sampleStoreChangeDutyLogService.save(sampleStoreChangeDutyLog)); - } - - /** - * 修改样品库管理员换班日志 - * @param sampleStoreChangeDutyLog 样品库管理员换班日志 - * @return R - */ - @ApiOperation(value = "修改样品库管理员换班日志", notes = "修改样品库管理员换班日志") - @SysLog("修改样品库管理员换班日志" ) - @PutMapping - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_change_duty_log_edit')" ) - public R putUpdateById(@RequestBody SampleStoreChangeDutyLog sampleStoreChangeDutyLog) { - return R.ok(sampleStoreChangeDutyLogService.updateById(sampleStoreChangeDutyLog)); - } - - /** - * 通过id删除样品库管理员换班日志 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id删除样品库管理员换班日志", notes = "通过id删除样品库管理员换班日志") - @SysLog("通过id删除样品库管理员换班日志" ) - @DeleteMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_change_duty_log_del')" ) - public R deleteById(@PathVariable String id) { - return R.ok(sampleStoreChangeDutyLogService.removeById(id)); - } - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreController.java deleted file mode 100644 index 691ca6c..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreController.java +++ /dev/null @@ -1,97 +0,0 @@ -package digital.laboratory.platform.entrustment.controller; - -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.common.log.annotation.SysLog; -import digital.laboratory.platform.entrustment.entity.SampleStore; -import digital.laboratory.platform.entrustment.service.SampleStoreService; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - - -/** - * 样品库 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库 前端控制器 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/papp/entrustment/sample_store" ) -@Api(value = "sample_store", tags = "样品库管理") -public class SampleStoreController { - - private final SampleStoreService sampleStoreService; - - /** - * 通过id查询样品库 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") - @GetMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_get')" ) - public R getById(@PathVariable("id" ) String id) { - return R.ok(sampleStoreService.getById(id)); - } - - /** - * 分页查询 - * @param page 分页对象 - * @param sampleStore 样品库 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/page" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_get')" ) - public R getSampleStorePage(Page page, SampleStore sampleStore) { - return R.ok(sampleStoreService.page(page, Wrappers.query(sampleStore))); - } - - - /** - * 新增样品库 - * @param sampleStore 样品库 - * @return R - */ - @ApiOperation(value = "新增样品库", notes = "新增样品库") - @SysLog("新增样品库" ) - @PostMapping - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_add')" ) - public R postAddObject(@RequestBody SampleStore sampleStore) { - sampleStore.setId(IdWorker.get32UUID().toUpperCase()); - return R.ok(sampleStoreService.save(sampleStore)); - } - - /** - * 修改样品库 - * @param sampleStore 样品库 - * @return R - */ - @ApiOperation(value = "修改样品库", notes = "修改样品库") - @SysLog("修改样品库" ) - @PutMapping - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_edit')" ) - public R putUpdateById(@RequestBody SampleStore sampleStore) { - return R.ok(sampleStoreService.updateById(sampleStore)); - } - - /** - * 通过id删除样品库 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id删除样品库", notes = "通过id删除样品库") - @SysLog("通过id删除样品库" ) - @DeleteMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_del')" ) - public R deleteById(@PathVariable String id) { - return R.ok(sampleStoreService.removeById(id)); - } - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreLogController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreLogController.java deleted file mode 100644 index 0a1d8f5..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreLogController.java +++ /dev/null @@ -1,99 +0,0 @@ -package digital.laboratory.platform.entrustment.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.common.log.annotation.SysLog; -import digital.laboratory.platform.entrustment.entity.SampleStoreLog; -import digital.laboratory.platform.entrustment.service.SampleStoreLogService; -import digital.laboratory.platform.entrustment.vo.CaseEventVO; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - - -/** - * 样品库入库出库日志 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库入库出库日志 前端控制器 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/papp/entrustment/sample_store_log" ) -@Api(value = "sample_store_log", tags = "样品库入库出库日志管理") -public class SampleStoreLogController { - - private final SampleStoreLogService sampleStoreLogService; - - /** - * 通过id查询样品库入库出库日志 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") - @GetMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_log_get')" ) - public R getById(@PathVariable("id" ) String id) { - return R.ok(sampleStoreLogService.getById(id)); - } - - /** - * 分页查询 - * @param page 分页对象 - * @param sampleStoreLog 样品库入库出库日志 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/page" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_log_get')" ) - public R> getSampleStoreLogPage(Page page, SampleStoreLog sampleStoreLog) { - return R.ok(sampleStoreLogService.page(page, Wrappers.query(sampleStoreLog))); - } - - - /** - * 新增样品库入库出库日志 - * @param sampleStoreLog 样品库入库出库日志 - * @return R - */ - @ApiOperation(value = "新增样品库入库出库日志", notes = "新增样品库入库出库日志") - @SysLog("新增样品库入库出库日志" ) - @PostMapping - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_log_add')" ) - public R postAddObject(@RequestBody SampleStoreLog sampleStoreLog) { - sampleStoreLog.setId(IdWorker.get32UUID().toUpperCase()); - return R.ok(sampleStoreLogService.save(sampleStoreLog)); - } - - /** - * 修改样品库入库出库日志 - * @param sampleStoreLog 样品库入库出库日志 - * @return R - */ - @ApiOperation(value = "修改样品库入库出库日志", notes = "修改样品库入库出库日志") - @SysLog("修改样品库入库出库日志" ) - @PutMapping - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_log_edit')" ) - public R putUpdateById(@RequestBody SampleStoreLog sampleStoreLog) { - return R.ok(sampleStoreLogService.updateById(sampleStoreLog)); - } - - /** - * 通过id删除样品库入库出库日志 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id删除样品库入库出库日志", notes = "通过id删除样品库入库出库日志") - @SysLog("通过id删除样品库入库出库日志" ) - @DeleteMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('entrustment_sample_store_log_del')" ) - public R deleteById(@PathVariable String id) { - return R.ok(sampleStoreLogService.removeById(id)); - } - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCabinetController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCabinetController.java deleted file mode 100644 index 1471c49..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCabinetController.java +++ /dev/null @@ -1,100 +0,0 @@ -package digital.laboratory.platform.entrustment.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.common.log.annotation.SysLog; -import digital.laboratory.platform.entrustment.entity.Entrustment; -import digital.laboratory.platform.entrustment.entity.StorageCabinet; -import digital.laboratory.platform.entrustment.service.StorageCabinetService; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - - -/** - * 暂存柜 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜 前端控制器 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/papp/entrustment/storage_cabinet" ) -@Api( tags = "306-暂存柜管理") -public class StorageCabinetController { - - private final StorageCabinetService storageCabinetService; - - /** - * 通过id查询暂存柜 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") - @GetMapping("/{id}" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cabinet_get')" ) - public R getById(@PathVariable("id" ) String id) { - return R.ok(storageCabinetService.getById(id)); - } - - /** - * 分页查询 - * @param page 分页对象 - * @param storageCabinet 暂存柜 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/page" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cabinet_get')" ) - public R> getStorageCabinetPage(Page page, StorageCabinet storageCabinet) { - return R.ok(storageCabinetService.page(page, Wrappers.query(storageCabinet))); - } - - - - /** - * 新增暂存柜 - * @param storageCabinet 暂存柜 - * @return R - */ - @ApiOperation(value = "新增暂存柜", notes = "新增暂存柜") - @SysLog("新增暂存柜" ) - @PostMapping -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cabinet_add')" ) - public R postAddObject(@RequestBody StorageCabinet storageCabinet) { - storageCabinet.setId(IdWorker.get32UUID().toUpperCase()); - return R.ok(storageCabinetService.save(storageCabinet)); - } - - /** - * 修改暂存柜 - * @param storageCabinet 暂存柜 - * @return R - */ - @ApiOperation(value = "修改暂存柜", notes = "修改暂存柜") - @SysLog("修改暂存柜" ) - @PutMapping -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cabinet_edit')" ) - public R putUpdateById(@RequestBody StorageCabinet storageCabinet) { - return R.ok(storageCabinetService.updateById(storageCabinet)); - } - - /** - * 通过id删除暂存柜 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id删除暂存柜", notes = "通过id删除暂存柜") - @SysLog("通过id删除暂存柜" ) - @DeleteMapping("/{id}" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cabinet_del')" ) - public R deleteById(@PathVariable String id) { - return R.ok(storageCabinetService.removeById(id)); - } - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCellController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCellController.java deleted file mode 100644 index 8e66a72..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCellController.java +++ /dev/null @@ -1,97 +0,0 @@ -package digital.laboratory.platform.entrustment.controller; - -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.common.log.annotation.SysLog; -import digital.laboratory.platform.entrustment.entity.StorageCell; -import digital.laboratory.platform.entrustment.service.StorageCellService; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - - -/** - * 暂存柜,每行一个单元格 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜,每行一个单元格 前端控制器 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/papp/entrustment/storage_cell" ) -@Api( tags = "307-暂存柜,每行一个单元格管理") -public class StorageCellController { - - private final StorageCellService storageCellService; - - /** - * 通过id查询暂存柜,每行一个单元格 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") - @GetMapping("/{id}" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_get')" ) - public R getById(@PathVariable("id" ) String id) { - return R.ok(storageCellService.getById(id)); - } - - /** - * 分页查询 - * @param page 分页对象 - * @param storageCell 暂存柜,每行一个单元格 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/page" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_get')" ) - public R getStorageCellPage(Page page, StorageCell storageCell) { - return R.ok(storageCellService.page(page, Wrappers.query(storageCell))); - } - - - /** - * 新增暂存柜,每行一个单元格 - * @param storageCell 暂存柜,每行一个单元格 - * @return R - */ - @ApiOperation(value = "新增暂存柜,每行一个单元格", notes = "新增暂存柜,每行一个单元格") - @SysLog("新增暂存柜,每行一个单元格" ) - @PostMapping -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_add')" ) - public R postAddObject(@RequestBody StorageCell storageCell) { - storageCell.setId(IdWorker.get32UUID().toUpperCase()); - return R.ok(storageCellService.save(storageCell)); - } - - /** - * 修改暂存柜,每行一个单元格 - * @param storageCell 暂存柜,每行一个单元格 - * @return R - */ - @ApiOperation(value = "修改暂存柜,每行一个单元格", notes = "修改暂存柜,每行一个单元格") - @SysLog("修改暂存柜,每行一个单元格" ) - @PutMapping -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_edit')" ) - public R putUpdateById(@RequestBody StorageCell storageCell) { - return R.ok(storageCellService.updateById(storageCell)); - } - - /** - * 通过id删除暂存柜,每行一个单元格 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id删除暂存柜,每行一个单元格", notes = "通过id删除暂存柜,每行一个单元格") - @SysLog("通过id删除暂存柜,每行一个单元格" ) - @DeleteMapping("/{id}" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_del')" ) - public R deleteById(@PathVariable String id) { - return R.ok(storageCellService.removeById(id)); - } - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCellLogController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCellLogController.java deleted file mode 100644 index c03212f..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/StorageCellLogController.java +++ /dev/null @@ -1,97 +0,0 @@ -package digital.laboratory.platform.entrustment.controller; - -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import digital.laboratory.platform.common.core.util.R; -import digital.laboratory.platform.common.log.annotation.SysLog; -import digital.laboratory.platform.entrustment.entity.StorageCellLog; -import digital.laboratory.platform.entrustment.service.StorageCellLogService; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - - -/** - * 暂存柜记录 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜记录 前端控制器 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/papp/entrustment/storage_cell_log" ) -@Api( tags = "308-暂存柜记录管理") -public class StorageCellLogController { - - private final StorageCellLogService storageCellLogService; - - /** - * 通过id查询暂存柜记录 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id查询", notes = "通过id查询") - @GetMapping("/{id}" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_log_get')" ) - public R getById(@PathVariable("id" ) String id) { - return R.ok(storageCellLogService.getById(id)); - } - - /** - * 分页查询 - * @param page 分页对象 - * @param storageCellLog 暂存柜记录 - * @return - */ - @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/page" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_log_get')" ) - public R getStorageCellLogPage(Page page, StorageCellLog storageCellLog) { - return R.ok(storageCellLogService.page(page, Wrappers.query(storageCellLog))); - } - - - /** - * 新增暂存柜记录 - * @param storageCellLog 暂存柜记录 - * @return R - */ - @ApiOperation(value = "新增暂存柜记录", notes = "新增暂存柜记录") - @SysLog("新增暂存柜记录" ) - @PostMapping -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_log_add')" ) - public R postAddObject(@RequestBody StorageCellLog storageCellLog) { - storageCellLog.setId(IdWorker.get32UUID().toUpperCase()); - return R.ok(storageCellLogService.save(storageCellLog)); - } - - /** - * 修改暂存柜记录 - * @param storageCellLog 暂存柜记录 - * @return R - */ - @ApiOperation(value = "修改暂存柜记录", notes = "修改暂存柜记录") - @SysLog("修改暂存柜记录" ) - @PutMapping -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_log_edit')" ) - public R putUpdateById(@RequestBody StorageCellLog storageCellLog) { - return R.ok(storageCellLogService.updateById(storageCellLog)); - } - - /** - * 通过id删除暂存柜记录 - * @param id id - * @return R - */ - @ApiOperation(value = "通过id删除暂存柜记录", notes = "通过id删除暂存柜记录") - @SysLog("通过id删除暂存柜记录" ) - @DeleteMapping("/{id}" ) -// @PreAuthorize("@pms.hasPermission('entrustment_storage_cell_log_del')" ) - public R deleteById(@PathVariable String id) { - return R.ok(storageCellLogService.removeById(id)); - } - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustTemplateInfo.java b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustTemplateInfo.java new file mode 100644 index 0000000..3f11d89 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/EntrustTemplateInfo.java @@ -0,0 +1,55 @@ +package digital.laboratory.platform.entrustment.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import digital.laboratory.platform.common.mybatis.base.BaseEntity; +import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 委托送检中案情简要等内容的模板信息表 + * @TableName b_entrust_template_info + */ +@Data +@TableName(value ="b_entrust_template_info") +@ApiModel(value = "EntrustTemplateInfo", description = "委托送检中案情简要等内容的模板信息表") +public class EntrustTemplateInfo extends BaseEntity { + /** + * 主键id + */ + @ApiModelProperty("id主键") + @TableId(value = "ID", type = IdType.ASSIGN_ID) + private String id; + + /** + * 模板名称 + */ + @ApiModelProperty("模板名称") + @NotBlank(message = "模板名称不能为空！") + private String templateName; + + /** + * 模板内容 + */ + @ApiModelProperty("模板内容") + @NotBlank(message = "模板内容不能为空！") + private String templateContent; + + /** + * 模板类型，比如：0 - 案情简要 + */ + @ApiModelProperty("模板类型，比如：0 - 案情简要") + @NotNull(message = "模板类型不能为空！") + private Integer templateType; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStore.java b/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStore.java deleted file mode 100644 index 24e1091..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStore.java +++ /dev/null @@ -1,59 +0,0 @@ -package digital.laboratory.platform.entrustment.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 样品库 - * - * @author Zhang Xiaolong created at 2022-07-15 - * @describe 样品库 实体类 - */ -@Data -@TableName(value = "b_sample_store", autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "样品库") -public class SampleStore extends BaseEntity { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_UUID) - @ApiModelProperty(value="id") - private String id; - - /** - * 样品库类型: 0=样品库 1=暂存库 - */ - @ApiModelProperty(value="样品库类型: 0=样品库 1=暂存库") - private String type; - - /** - * 样品库管理员1 - */ - @ApiModelProperty(value="样品库管理员1") - private String keeper1; - - /** - * 样品库管理员2 - */ - @ApiModelProperty(value="样品库管理员2") - private String keeper2; - - /** - * comments - */ - @ApiModelProperty(value="comments") - private String comments; - - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStoreChangeDutyLog.java b/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStoreChangeDutyLog.java deleted file mode 100644 index 245b374..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStoreChangeDutyLog.java +++ /dev/null @@ -1,65 +0,0 @@ -package digital.laboratory.platform.entrustment.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 样品库管理员换班日志 - * - * @author Zhang Xiaolong created at 2022-07-15 - * @describe 样品库管理员换班日志 实体类 - */ -@Data -@TableName(value = "b_sample_store_change_duty_log", autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "样品库管理员换班日志") -public class SampleStoreChangeDutyLog extends BaseEntity { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_UUID) - @ApiModelProperty(value="id") - private String id; - - /** - * 老的样品库管理员1 - */ - @ApiModelProperty(value="老的样品库管理员1") - private String oldKeeper1; - - /** - * 老的样品库管理员2 - */ - @ApiModelProperty(value="老的样品库管理员2") - private String oldKeeper2; - - /** - * 新的样品库管理员1 - */ - @ApiModelProperty(value="新的样品库管理员1") - private String newKeeper1; - - /** - * 新的样品库管理员2 - */ - @ApiModelProperty(value="新的样品库管理员2") - private String newKeeper2; - - /** - * comments - */ - @ApiModelProperty(value="comments") - private String comments; - - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStoreLog.java b/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStoreLog.java deleted file mode 100644 index 95b6f03..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/SampleStoreLog.java +++ /dev/null @@ -1,83 +0,0 @@ -package digital.laboratory.platform.entrustment.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 样品库入库出库日志 - * - * @author Zhang Xiaolong created at 2022-07-15 - * @describe 样品库入库出库日志 实体类 - */ -@Data -@TableName(value = "b_sample_store_log", autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "样品库入库出库日志") -public class SampleStoreLog extends BaseEntity { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_UUID) - @ApiModelProperty(value="id") - private String id; - - /** - * 样品id - */ - @ApiModelProperty(value="样品id") - private String boxId; - - /** - * 是否入库 - */ - @ApiModelProperty(value="是否入库") - private Boolean isIn; - - /** - * 入库出库原因编码 - */ - @ApiModelProperty(value="入库出库原因编码") - private Integer reason; - - /** - * 出入库当事人 - */ - @ApiModelProperty(value="出入库当事人") - private String personId; - - /** - * 分包的来源盒子id - */ - @ApiModelProperty(value="分包的来源盒子id") - private String fromBox; - - /** - * 合包的去向盒子id - */ - @ApiModelProperty(value="合包的去向盒子id") - private String toBox; - - /** - * 检材仓库管理员1 - */ - @ApiModelProperty(value="检材仓库管理员1") - private String storeKeeper1; - - /** - * 检材仓库管理员2 - */ - @ApiModelProperty(value="检材仓库管理员2") - private String storeKeeper2; - - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCabinet.java b/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCabinet.java deleted file mode 100644 index e10e5b5..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCabinet.java +++ /dev/null @@ -1,53 +0,0 @@ -package digital.laboratory.platform.entrustment.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 暂存柜 - * - * @author Zhang Xiaolong created at 2022-07-15 - * @describe 检材柜 实体类 - */ -@Data -@TableName(value = "b_storage_cabinet", autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "检材柜") -public class StorageCabinet extends BaseEntity { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_UUID) - @ApiModelProperty(value="id") - private String id; - - /** - * 柜子编号,用于柜子控制API - */ - @ApiModelProperty(value="柜子编号,用于柜子控制API") - private String cabinetNo; - - /** - * 暂存柜类型:待检, 已检待返, 已检待销毁, 长期存放待 - */ - @ApiModelProperty(value="暂存柜类型:待检, 已检待返, 已检待销毁, 长期存放待") - private String type; - - /** - * comments - */ - @ApiModelProperty(value="comments") - private String comments; - - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCell.java b/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCell.java deleted file mode 100644 index ad574a3..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCell.java +++ /dev/null @@ -1,77 +0,0 @@ -package digital.laboratory.platform.entrustment.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 暂存柜,每行一个单元格 - * - * @author Zhang Xiaolong created at 2022-07-15 - * @describe 暂存柜,每行一个单元格 实体类 - */ -@Data -@TableName(value = "b_storage_cell", autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "暂存柜,每行一个单元格") -public class StorageCell extends BaseEntity { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_UUID) - @ApiModelProperty(value="id") - private String id; - - /** - * 柜号,大柜子的编号 - */ - @ApiModelProperty(value="柜号,大柜子的编号") - private String cabinetNo; - - /** - * 单元格号 - */ - @ApiModelProperty(value="单元格号") - private Integer cellNo; - - /** - * 取件码 - */ - @ApiModelProperty(value="取件码") - private Integer openCode; - - /** - * 取件码过期时间 - */ - @ApiModelProperty(value="取件码过期时间") - private LocalDateTime openCodeExpiration; - - /** - * 单元格可能性: 0=不可用(保留), 1=可用 - */ - @ApiModelProperty(value="单元格可能性: 0=不可用(保留), 1=可用") - private Boolean available; - - /** - * 单元格状态: 0=空, 1=已有物品 - */ - @ApiModelProperty(value="单元格状态: 0=空, 1=已有物品") - private Boolean status; - - /** - * boxId - */ - @ApiModelProperty(value="boxId") - private String boxId; - - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCellLog.java b/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCellLog.java deleted file mode 100644 index fe27b81..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/StorageCellLog.java +++ /dev/null @@ -1,53 +0,0 @@ -package digital.laboratory.platform.entrustment.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import digital.laboratory.platform.common.mybatis.base.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 暂存柜记录 - * - * @author Zhang Xiaolong created at 2022-07-15 - * @describe 暂存柜记录 实体类 - */ -@Data -@TableName(value = "b_storage_cell_log", autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "暂存柜记录") -public class StorageCellLog extends BaseEntity { - - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_UUID) - @ApiModelProperty(value="id") - private String id; - - /** - * 单元格标识 - */ - @ApiModelProperty(value="单元格标识") - private String cellId; - - /** - * 操作: 存放/取出 - */ - @ApiModelProperty(value="操作: 存放/取出") - private Boolean operate; - - /** - * 存放或取出的盒子 - */ - @ApiModelProperty(value="存放或取出的盒子") - private String boxId; - - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/enums/TemplateTypeEnums.java b/src/main/java/digital/laboratory/platform/entrustment/enums/TemplateTypeEnums.java new file mode 100644 index 0000000..ddb5a44 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/enums/TemplateTypeEnums.java @@ -0,0 +1,30 @@ +package digital.laboratory.platform.entrustment.enums; + +import lombok.Getter; + +@Getter +public enum TemplateTypeEnums { + + TEMPLATE_CASE_BRIEF(0, "案情简要模板"), + ; + + + private final Integer code; + + private final String desc; + + TemplateTypeEnums(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + // 根据名称获取状态值 + public static TemplateTypeEnums fromCode(Integer code) { + for (TemplateTypeEnums entrustAlterApplyStatus : values()) { + if (entrustAlterApplyStatus.getCode().equals(code)) { + return entrustAlterApplyStatus; + } + } + throw new IllegalArgumentException("No enum constant with code: " + code); + } +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java index 9f83ed1..d53dcd2 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustMaterialCheckoutResultMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * @author ChenJiangBao * @description 针对表【b_entrust_material_checkout_result(委托检材--检出定性定量结果信息)】的数据库操作Mapper * @createDate 2024-12-30 16:16:25 -* @Entity generator.entity.EntrustMaterialCheckoutResult +* @Entity digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult */ @Mapper public interface EntrustMaterialCheckoutResultMapper extends BaseMapper { diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustTemplateInfoMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustTemplateInfoMapper.java new file mode 100644 index 0000000..30c692c --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/mapper/EntrustTemplateInfoMapper.java @@ -0,0 +1,20 @@ +package digital.laboratory.platform.entrustment.mapper; + +import digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* @author ChenJiangBao +* @description 针对表【b_entrust_template_info(委托送检中案情简要等内容的模板信息表)】的数据库操作Mapper +* @createDate 2025-01-08 14:12:41 +* @Entity digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo +*/ +@Mapper +public interface EntrustTemplateInfoMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreChangeDutyLogMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreChangeDutyLogMapper.java deleted file mode 100644 index 1f780df..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreChangeDutyLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package digital.laboratory.platform.entrustment.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import digital.laboratory.platform.entrustment.entity.SampleStoreChangeDutyLog; -import org.apache.ibatis.annotations.Mapper; - -/** - * 样品库管理员换班日志 Mapper 接口 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库管理员换班日志 Mapper 类 - */ -@Mapper -public interface SampleStoreChangeDutyLogMapper extends BaseMapper { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreLogMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreLogMapper.java deleted file mode 100644 index 66f4907..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package digital.laboratory.platform.entrustment.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import digital.laboratory.platform.entrustment.entity.SampleStoreLog; -import org.apache.ibatis.annotations.Mapper; - -/** - * 样品库入库出库日志 Mapper 接口 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库入库出库日志 Mapper 类 - */ -@Mapper -public interface SampleStoreLogMapper extends BaseMapper { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreMapper.java deleted file mode 100644 index cdc381a..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package digital.laboratory.platform.entrustment.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import digital.laboratory.platform.entrustment.entity.SampleStore; -import org.apache.ibatis.annotations.Mapper; - -/** - * 样品库 Mapper 接口 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库 Mapper 类 - */ -@Mapper -public interface SampleStoreMapper extends BaseMapper { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCabinetMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCabinetMapper.java deleted file mode 100644 index 58e0131..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCabinetMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package digital.laboratory.platform.entrustment.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import digital.laboratory.platform.entrustment.entity.StorageCabinet; -import org.apache.ibatis.annotations.Mapper; - -/** - * 暂存柜 Mapper 接口 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜 Mapper 类 - */ -@Mapper -public interface StorageCabinetMapper extends BaseMapper { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCellLogMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCellLogMapper.java deleted file mode 100644 index 8fcf879..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCellLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package digital.laboratory.platform.entrustment.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import digital.laboratory.platform.entrustment.entity.StorageCellLog; -import org.apache.ibatis.annotations.Mapper; - -/** - * 暂存柜记录 Mapper 接口 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜记录 Mapper 类 - */ -@Mapper -public interface StorageCellLogMapper extends BaseMapper { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCellMapper.java b/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCellMapper.java deleted file mode 100644 index 9b6df94..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCellMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package digital.laboratory.platform.entrustment.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import digital.laboratory.platform.entrustment.entity.StorageCell; -import org.apache.ibatis.annotations.Mapper; - -/** - * 暂存柜,每行一个单元格 Mapper 接口 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜,每行一个单元格 Mapper 类 - */ -@Mapper -public interface StorageCellMapper extends BaseMapper { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/query/BaseQuery.java b/src/main/java/digital/laboratory/platform/entrustment/query/BaseQuery.java new file mode 100644 index 0000000..51f3b7f --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/query/BaseQuery.java @@ -0,0 +1,30 @@ +package digital.laboratory.platform.entrustment.query; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; + +@Data +@ApiModel(value = "BaseQuery", description = "基础查询对象") +public class BaseQuery { + + @ApiModelProperty(value = "分页参数，每页多少条, 默认10") + private Long size = 10L; + + @ApiModelProperty(value = "分页参数， 当前页， 默认1") + private Long current = 1L; + + @ApiModelProperty(value = "关键字，支持 案件名称查询") + private String keywords; + + @ApiModelProperty(value = "开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @ApiModelProperty(value = "结束日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/query/EntrustAlterApplyQuery.java b/src/main/java/digital/laboratory/platform/entrustment/query/EntrustAlterApplyQuery.java index b65f6fa..39e9fe7 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/query/EntrustAlterApplyQuery.java +++ b/src/main/java/digital/laboratory/platform/entrustment/query/EntrustAlterApplyQuery.java @@ -1,13 +1,9 @@ package digital.laboratory.platform.entrustment.query; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.time.LocalDate; - /** * 申请修改委托消息 查询对象（分页查询、列表查询） * @@ -16,28 +12,11 @@ import java.time.LocalDate; */ @Data @ApiModel(description = "申请修改委托消息 查询对象（分页查询、列表查询）") -public class EntrustAlterApplyQuery { - - @ApiModelProperty(value = "分页参数，每页多少条, 默认10") - private Long size = 10L; - - @ApiModelProperty(value = "分页参数， 当前页， 默认1") - private Long current = 1L; - - @ApiModelProperty(value = "关键字，支持 案件名称查询") - private String keywords; +public class EntrustAlterApplyQuery extends BaseQuery{ @ApiModelProperty(value = "申请人id查询") private String applicant; - @ApiModelProperty(value = "开始日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate startDate; - - @ApiModelProperty(value = "结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate endDate; - @ApiModelProperty(value = "状态") private Integer status; diff --git a/src/main/java/digital/laboratory/platform/entrustment/query/EntrustTemplateInfoQuery.java b/src/main/java/digital/laboratory/platform/entrustment/query/EntrustTemplateInfoQuery.java new file mode 100644 index 0000000..6d8907c --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/query/EntrustTemplateInfoQuery.java @@ -0,0 +1,19 @@ +package digital.laboratory.platform.entrustment.query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 申请修改委托消息 查询对象（分页查询、列表查询） + * + * @author Chen + * @since 1.0.0 2024-08-14 + */ +@Data +@ApiModel(description = "申请修改委托消息 查询对象（分页查询、列表查询）") +public class EntrustTemplateInfoQuery extends BaseQuery { + + @ApiModelProperty(value = "模板类型") + private Integer type; +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/EntrustTemplateInfoService.java b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustTemplateInfoService.java new file mode 100644 index 0000000..b984893 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/service/EntrustTemplateInfoService.java @@ -0,0 +1,13 @@ +package digital.laboratory.platform.entrustment.service; + +import digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ChenJiangBao +* @description 针对表【b_entrust_template_info(委托送检中案情简要等内容的模板信息表)】的数据库操作Service +* @createDate 2025-01-08 14:12:41 +*/ +public interface EntrustTemplateInfoService extends IService { + +} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreChangeDutyLogService.java b/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreChangeDutyLogService.java deleted file mode 100644 index c45321b..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreChangeDutyLogService.java +++ /dev/null @@ -1,14 +0,0 @@ -package digital.laboratory.platform.entrustment.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.entrustment.entity.SampleStoreChangeDutyLog; - -/** - * 样品库管理员换班日志服务类 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库管理员换班日志服务类 - */ -public interface SampleStoreChangeDutyLogService extends IService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreLogService.java b/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreLogService.java deleted file mode 100644 index 687cdf6..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreLogService.java +++ /dev/null @@ -1,14 +0,0 @@ -package digital.laboratory.platform.entrustment.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.entrustment.entity.SampleStoreLog; - -/** - * 样品库入库出库日志服务类 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库入库出库日志服务类 - */ -public interface SampleStoreLogService extends IService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreService.java b/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreService.java deleted file mode 100644 index e125230..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreService.java +++ /dev/null @@ -1,14 +0,0 @@ -package digital.laboratory.platform.entrustment.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.entrustment.entity.SampleStore; - -/** - * 样品库服务类 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库服务类 - */ -public interface SampleStoreService extends IService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/StorageCabinetService.java b/src/main/java/digital/laboratory/platform/entrustment/service/StorageCabinetService.java deleted file mode 100644 index 349e6ba..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/StorageCabinetService.java +++ /dev/null @@ -1,14 +0,0 @@ -package digital.laboratory.platform.entrustment.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.entrustment.entity.StorageCabinet; - -/** - * 暂存柜服务类 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜服务类 - */ -public interface StorageCabinetService extends IService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/StorageCellLogService.java b/src/main/java/digital/laboratory/platform/entrustment/service/StorageCellLogService.java deleted file mode 100644 index 4774a93..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/StorageCellLogService.java +++ /dev/null @@ -1,14 +0,0 @@ -package digital.laboratory.platform.entrustment.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.entrustment.entity.StorageCellLog; - -/** - * 暂存柜记录服务类 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜记录服务类 - */ -public interface StorageCellLogService extends IService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/StorageCellService.java b/src/main/java/digital/laboratory/platform/entrustment/service/StorageCellService.java deleted file mode 100644 index b200786..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/StorageCellService.java +++ /dev/null @@ -1,14 +0,0 @@ -package digital.laboratory.platform.entrustment.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import digital.laboratory.platform.entrustment.entity.StorageCell; - -/** - * 暂存柜,每行一个单元格服务类 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜,每行一个单元格服务类 - */ -public interface StorageCellService extends IService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustTemplateInfoServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustTemplateInfoServiceImpl.java new file mode 100644 index 0000000..b68578c --- /dev/null +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustTemplateInfoServiceImpl.java @@ -0,0 +1,22 @@ +package digital.laboratory.platform.entrustment.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo; +import digital.laboratory.platform.entrustment.service.EntrustTemplateInfoService; +import digital.laboratory.platform.entrustment.mapper.EntrustTemplateInfoMapper; +import org.springframework.stereotype.Service; + +/** +* @author ChenJiangBao +* @description 针对表【b_entrust_template_info(委托送检中案情简要等内容的模板信息表)】的数据库操作Service实现 +* @createDate 2025-01-08 14:12:41 +*/ +@Service +public class EntrustTemplateInfoServiceImpl extends ServiceImpl + implements EntrustTemplateInfoService{ + +} + + + + diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java index fed305f..ce619d2 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleServiceImpl.java @@ -32,8 +32,6 @@ import java.util.List; @Service @RequiredArgsConstructor public class SampleServiceImpl extends ServiceImpl implements SampleService { -// private final SampleBoxService sampleBoxService; - private final SampleBoxMapper sampleBoxMapper; @Override public String getNewProvidedSampleNo(String IdentificationMaterialNo, int sampleSerialNumber) { diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreChangeDutyLogServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreChangeDutyLogServiceImpl.java deleted file mode 100644 index 81519bd..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreChangeDutyLogServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package digital.laboratory.platform.entrustment.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import digital.laboratory.platform.entrustment.entity.SampleStoreChangeDutyLog; -import digital.laboratory.platform.entrustment.mapper.SampleStoreChangeDutyLogMapper; -import digital.laboratory.platform.entrustment.service.SampleStoreChangeDutyLogService; -import org.springframework.stereotype.Service; - -/** - * 样品库管理员换班日志服务实现类 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库管理员换班日志服务实现类 - */ -@Service -public class SampleStoreChangeDutyLogServiceImpl extends ServiceImpl implements SampleStoreChangeDutyLogService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreLogServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreLogServiceImpl.java deleted file mode 100644 index b37a2df..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreLogServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package digital.laboratory.platform.entrustment.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import digital.laboratory.platform.entrustment.entity.SampleStoreLog; -import digital.laboratory.platform.entrustment.mapper.SampleStoreLogMapper; -import digital.laboratory.platform.entrustment.service.SampleStoreLogService; -import org.springframework.stereotype.Service; - -/** - * 样品库入库出库日志服务实现类 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库入库出库日志服务实现类 - */ -@Service -public class SampleStoreLogServiceImpl extends ServiceImpl implements SampleStoreLogService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreServiceImpl.java deleted file mode 100644 index 274b12e..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package digital.laboratory.platform.entrustment.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import digital.laboratory.platform.entrustment.entity.SampleStore; -import digital.laboratory.platform.entrustment.mapper.SampleStoreMapper; -import digital.laboratory.platform.entrustment.service.SampleStoreService; -import org.springframework.stereotype.Service; - -/** - * 样品库服务实现类 - * - * @author Zhang Xiaolong created at 2022-07-06 - * @describe 样品库服务实现类 - */ -@Service -public class SampleStoreServiceImpl extends ServiceImpl implements SampleStoreService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCabinetServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCabinetServiceImpl.java deleted file mode 100644 index 7e8c216..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCabinetServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package digital.laboratory.platform.entrustment.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import digital.laboratory.platform.entrustment.entity.StorageCabinet; -import digital.laboratory.platform.entrustment.mapper.StorageCabinetMapper; -import digital.laboratory.platform.entrustment.service.StorageCabinetService; -import org.springframework.stereotype.Service; - -/** - * 暂存柜服务实现类 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜服务实现类 - */ -@Service -public class StorageCabinetServiceImpl extends ServiceImpl implements StorageCabinetService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCellLogServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCellLogServiceImpl.java deleted file mode 100644 index 1dd9733..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCellLogServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package digital.laboratory.platform.entrustment.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import digital.laboratory.platform.entrustment.entity.StorageCellLog; -import digital.laboratory.platform.entrustment.mapper.StorageCellLogMapper; -import digital.laboratory.platform.entrustment.service.StorageCellLogService; -import org.springframework.stereotype.Service; - -/** - * 暂存柜记录服务实现类 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜记录服务实现类 - */ -@Service -public class StorageCellLogServiceImpl extends ServiceImpl implements StorageCellLogService { - -} diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCellServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCellServiceImpl.java deleted file mode 100644 index dd0130e..0000000 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCellServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package digital.laboratory.platform.entrustment.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import digital.laboratory.platform.entrustment.entity.StorageCell; -import digital.laboratory.platform.entrustment.mapper.StorageCellMapper; -import digital.laboratory.platform.entrustment.service.StorageCellService; -import org.springframework.stereotype.Service; - -/** - * 暂存柜,每行一个单元格服务实现类 - * - * @author Zhang Xiaolong created at 2022-04-25 - * @describe 暂存柜,每行一个单元格服务实现类 - */ -@Service -public class StorageCellServiceImpl extends ServiceImpl implements StorageCellService { - -} diff --git a/src/main/resources/mapper/EntrustTemplateInfoMapper.xml b/src/main/resources/mapper/EntrustTemplateInfoMapper.xml new file mode 100644 index 0000000..cee79f0 --- /dev/null +++ b/src/main/resources/mapper/EntrustTemplateInfoMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + id,template_name,template_content, + template_type,create_time,create_by, + update_time,update_by + + diff --git a/src/main/resources/mapper/SampleStoreChangeDutyLogMapper.xml b/src/main/resources/mapper/SampleStoreChangeDutyLogMapper.xml deleted file mode 100644 index 1e428e1..0000000 --- a/src/main/resources/mapper/SampleStoreChangeDutyLogMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/SampleStoreLogMapper.xml b/src/main/resources/mapper/SampleStoreLogMapper.xml deleted file mode 100644 index 24b3136..0000000 --- a/src/main/resources/mapper/SampleStoreLogMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/SampleStoreMapper.xml b/src/main/resources/mapper/SampleStoreMapper.xml deleted file mode 100644 index 950a181..0000000 --- a/src/main/resources/mapper/SampleStoreMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/StorageCabinetMapper.xml b/src/main/resources/mapper/StorageCabinetMapper.xml deleted file mode 100644 index 7b52c6c..0000000 --- a/src/main/resources/mapper/StorageCabinetMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/StorageCellLogMapper.xml b/src/main/resources/mapper/StorageCellLogMapper.xml deleted file mode 100644 index 0383c76..0000000 --- a/src/main/resources/mapper/StorageCellLogMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/StorageCellMapper.xml b/src/main/resources/mapper/StorageCellMapper.xml deleted file mode 100644 index d3d1bca..0000000 --- a/src/main/resources/mapper/StorageCellMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -