20250108 更新

1.删除弃用的实体类以及对应的业务类
2.新增模板信息模块

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;
 

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<List<EnumResponse>> allTemplateType() {
+        List<EnumResponse> 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<IPage<EntrustTemplateInfo>> pageEntrustTemplateInfo(@RequestBody EntrustTemplateInfoQuery query) {
+        return R.ok(
+                entrustTemplateInfoService.page(
+                        new Page<>(query.getCurrent(), query.getSize()),
+                        Wrappers.<EntrustTemplateInfo>lambdaQuery()
+                                .eq(query.getType() != null, EntrustTemplateInfo::getTemplateType, query.getType())
+                                .orderByDesc(EntrustTemplateInfo::getCreateTime)
+                )
+        );
+    }
+
+    @ApiOperation("录入模板信息")
+    @PostMapping("/save")
+    public R<EntrustTemplateInfo> addEntrustTemplateInfo(@RequestBody @Valid EntrustTemplateInfo info) {
+        EntrustTemplateInfo isExist = entrustTemplateInfoService.getOne(
+                Wrappers.<EntrustTemplateInfo>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<EntrustTemplateInfo> 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<Boolean> delete(@RequestBody List<String> ids) {
+        return R.ok(entrustTemplateInfoService.removeBatchByIds(ids));
+    }
+}

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;
 
 //	/**

src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreChangeDutyLogController.java

@@ -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));
-    }
-
-}

src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreController.java

@@ -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));
-    }
-
-}

src/main/java/digital/laboratory/platform/entrustment/controller/SampleStoreLogController.java

@@ -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<IPage<SampleStoreLog>> 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));
-    }
-
-}

src/main/java/digital/laboratory/platform/entrustment/controller/StorageCabinetController.java

@@ -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<StorageCabinet> 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<IPage<StorageCabinet>> getStorageCabinetPage(Page<StorageCabinet> 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));
-    }
-
-}

src/main/java/digital/laboratory/platform/entrustment/controller/StorageCellController.java

@@ -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));
-    }
-
-}

src/main/java/digital/laboratory/platform/entrustment/controller/StorageCellLogController.java

@@ -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));
-    }
-
-}

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;
+}

src/main/java/digital/laboratory/platform/entrustment/entity/SampleStore.java

@@ -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;
-
-
-}

src/main/java/digital/laboratory/platform/entrustment/entity/SampleStoreChangeDutyLog.java

@@ -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;
-
-
-}

src/main/java/digital/laboratory/platform/entrustment/entity/SampleStoreLog.java

@@ -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;
-
-
-}

src/main/java/digital/laboratory/platform/entrustment/entity/StorageCabinet.java

@@ -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;
-
-
-}

src/main/java/digital/laboratory/platform/entrustment/entity/StorageCell.java

@@ -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;
-
-
-}

src/main/java/digital/laboratory/platform/entrustment/entity/StorageCellLog.java

@@ -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;
-
-
-}

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);
+    }
+}

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<EntrustMaterialCheckoutResult> {

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<EntrustTemplateInfo> {
+
+}
+
+
+
+

src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreChangeDutyLogMapper.java

@@ -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<SampleStoreChangeDutyLog> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreLogMapper.java

@@ -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<SampleStoreLog> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/mapper/SampleStoreMapper.java

@@ -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<SampleStore> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCabinetMapper.java

@@ -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<StorageCabinet> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCellLogMapper.java

@@ -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<StorageCellLog> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/mapper/StorageCellMapper.java

@@ -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<StorageCell> {
-
-}

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;
+}

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 {
+public class EntrustAlterApplyQuery extends BaseQuery{
-
-    @ApiModelProperty(value = "分页参数，每页多少条, 默认10")
-    private Long size = 10L;
-
-    @ApiModelProperty(value = "分页参数， 当前页， 默认1")
-    private Long current = 1L;
-
-    @ApiModelProperty(value = "关键字，支持 案件名称查询")
-    private String keywords;
 
     @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;
 

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;
+}

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<EntrustTemplateInfo> {
+
+}

src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreChangeDutyLogService.java

@@ -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<SampleStoreChangeDutyLog> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreLogService.java

@@ -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<SampleStoreLog> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/SampleStoreService.java

@@ -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<SampleStore> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/StorageCabinetService.java

@@ -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<StorageCabinet> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/StorageCellLogService.java

@@ -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<StorageCellLog> {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/StorageCellService.java

@@ -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<StorageCell> {
-
-}

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<EntrustTemplateInfoMapper, EntrustTemplateInfo>
+    implements EntrustTemplateInfoService{
+
+}
+
+
+
+

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<SampleMapper, Sample> implements SampleService {
-//	private final SampleBoxService sampleBoxService;
-	private final SampleBoxMapper sampleBoxMapper;
 
 	@Override
 	public String getNewProvidedSampleNo(String IdentificationMaterialNo, int sampleSerialNumber) {

src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreChangeDutyLogServiceImpl.java

@@ -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<SampleStoreChangeDutyLogMapper, SampleStoreChangeDutyLog> implements SampleStoreChangeDutyLogService {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreLogServiceImpl.java

@@ -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<SampleStoreLogMapper, SampleStoreLog> implements SampleStoreLogService {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/impl/SampleStoreServiceImpl.java

@@ -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<SampleStoreMapper, SampleStore> implements SampleStoreService {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCabinetServiceImpl.java

@@ -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<StorageCabinetMapper, StorageCabinet> implements StorageCabinetService {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCellLogServiceImpl.java

@@ -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<StorageCellLogMapper, StorageCellLog> implements StorageCellLogService {
-
-}

src/main/java/digital/laboratory/platform/entrustment/service/impl/StorageCellServiceImpl.java

@@ -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<StorageCellMapper, StorageCell> implements StorageCellService {
-
-}

src/main/resources/mapper/EntrustTemplateInfoMapper.xml

@@ -0,0 +1,23 @@
+<?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="digital.laboratory.platform.entrustment.mapper.EntrustTemplateInfoMapper">
+
+    <resultMap id="BaseResultMap" type="digital.laboratory.platform.entrustment.entity.EntrustTemplateInfo">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="templateName" column="template_name" jdbcType="VARCHAR"/>
+            <result property="templateContent" column="template_content" jdbcType="VARCHAR"/>
+            <result property="templateType" column="template_type" jdbcType="TINYINT"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,template_name,template_content,
+        template_type,create_time,create_by,
+        update_time,update_by
+    </sql>
+</mapper>

src/main/resources/mapper/SampleStoreChangeDutyLogMapper.xml

@@ -1,19 +0,0 @@
-<?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="digital.laboratory.platform.entrustment.mapper.SampleStoreChangeDutyLogMapper">
-
-  <resultMap id="sampleStoreChangeDutyLogMap" type="digital.laboratory.platform.entrustment.entity.SampleStoreChangeDutyLog">
-    <id property="id" column="id"/>
-    <result property="oldKeeper1" column="old_keeper1"/>
-    <result property="oldKeeper2" column="old_keeper2"/>
-    <result property="newKeeper1" column="new_keeper1"/>
-    <result property="newKeeper2" column="new_keeper2"/>
-    <result property="comments" column="comments"/>
-    <result property="createTime" column="create_time"/>
-    <result property="createBy" column="create_by"/>
-    <result property="updateTime" column="update_time"/>
-    <result property="updateBy" column="update_by"/>
-  </resultMap>
-</mapper>

src/main/resources/mapper/SampleStoreLogMapper.xml

@@ -1,22 +0,0 @@
-<?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="digital.laboratory.platform.entrustment.mapper.SampleStoreLogMapper">
-
-  <resultMap id="sampleStoreLogMap" type="digital.laboratory.platform.entrustment.entity.SampleStoreLog">
-    <id property="id" column="id"/>
-    <result property="boxId" column="box_id"/>
-    <result property="isIn" column="is_in"/>
-    <result property="reason" column="reason"/>
-    <result property="personId" column="person_id"/>
-    <result property="fromBox" column="from_box"/>
-    <result property="toBox" column="to_box"/>
-    <result property="storeKeeper1" column="store_keeper1"/>
-    <result property="storeKeeper2" column="store_keeper2"/>
-    <result property="createTime" column="create_time"/>
-    <result property="createBy" column="create_by"/>
-    <result property="updateTime" column="update_time"/>
-    <result property="updateBy" column="update_by"/>
-  </resultMap>
-</mapper>

src/main/resources/mapper/SampleStoreMapper.xml

@@ -1,18 +0,0 @@
-<?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="digital.laboratory.platform.entrustment.mapper.SampleStoreMapper">
-
-  <resultMap id="sampleStoreMap" type="digital.laboratory.platform.entrustment.entity.SampleStore">
-    <id property="id" column="id"/>
-    <result property="type" column="type"/>
-    <result property="keeper1" column="keeper1"/>
-    <result property="keeper2" column="keeper2"/>
-    <result property="comments" column="comments"/>
-    <result property="createTime" column="create_time"/>
-    <result property="createBy" column="create_by"/>
-    <result property="updateTime" column="update_time"/>
-    <result property="updateBy" column="update_by"/>
-  </resultMap>
-</mapper>

src/main/resources/mapper/StorageCabinetMapper.xml

@@ -1,17 +0,0 @@
-<?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="digital.laboratory.platform.entrustment.mapper.StorageCabinetMapper">
-
-  <resultMap id="storageCabinetMap" type="digital.laboratory.platform.entrustment.entity.StorageCabinet">
-    <id property="id" column="id"/>
-    <result property="cabinetNo" column="cabinet_no"/>
-    <result property="type" column="type"/>
-    <result property="comments" column="comments"/>
-    <result property="createTime" column="create_time"/>
-    <result property="createBy" column="create_by"/>
-    <result property="updateTime" column="update_time"/>
-    <result property="updateBy" column="update_by"/>
-  </resultMap>
-</mapper>

src/main/resources/mapper/StorageCellLogMapper.xml

@@ -1,15 +0,0 @@
-<?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="digital.laboratory.platform.entrustment.mapper.StorageCellLogMapper">
-
-  <resultMap id="storageCellLogMap" type="digital.laboratory.platform.entrustment.entity.StorageCellLog">
-    <id property="id" column="id"/>
-    <result property="cellId" column="cell_id"/>
-    <result property="operate" column="operate"/>
-    <result property="boxId" column="box_id"/>
-    <result property="createTime" column="create_time"/>
-    <result property="createBy" column="create_by"/>
-  </resultMap>
-</mapper>

src/main/resources/mapper/StorageCellMapper.xml

@@ -1,21 +0,0 @@
-<?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="digital.laboratory.platform.entrustment.mapper.StorageCellMapper">
-
-  <resultMap id="storageCellMap" type="digital.laboratory.platform.entrustment.entity.StorageCell">
-    <id property="id" column="id"/>
-    <result property="cabinetNo" column="cabinet_no"/>
-    <result property="cellNo" column="cell_no"/>
-    <result property="openCode" column="open_code"/>
-    <result property="openCodeExpiration" column="open_code_expiration"/>
-    <result property="available" column="available"/>
-    <result property="status" column="status"/>
-    <result property="boxId" column="box_id"/>
-    <result property="createTime" column="create_time"/>
-    <result property="createBy" column="create_by"/>
-    <result property="updateTime" column="update_time"/>
-    <result property="updateBy" column="update_by"/>
-  </resultMap>
-</mapper>