Dlp-Gyjd/dlp-reagent-managment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.13

Browse Source
This commit is contained in:
杨海航
2023-04-13 23:10:19 +08:00
parent 3098c09e81
commit 6beb9c4eaa
324 changed files with 103895 additions and 122417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/digital/laboratory/platform/reagent/controller/AcceptanceRecordFormController.java
+147 -79
View File
@@ -7,8 +7,11 @@ 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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AcceptanceRecordFormDTO;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.entity.AcceptanceRecordForm;
import digital.laboratory.platform.reagent.service.AcceptanceRecordFormService;
import digital.laboratory.platform.reagent.vo.AcceptanceRecordFormVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,126 +29,191 @@ import java.security.Principal;
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe (验收记录表) 前端控制器
*
* <p>
* 这是与表示层的接口, 不应该接业务逻辑写在这里, 业务逻辑应该写在 service 中
* 这里写什么:
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 数据层在 mapper 中, 数据层不涉及业务, 只管技术上的 对象<->表 之间的转换
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/acceptance_record_form" )
@RequestMapping("/acceptance_record_form")
@Api(value = "acceptance_record_form", tags = "(验收记录表)管理")
public class AcceptanceRecordFormController {
private final AcceptanceRecordFormService acceptanceRecordFormService;
private final AcceptanceRecordFormService acceptanceRecordFormService;
/**
* 通过id查询(验收记录表)
* @param acceptanceRecordFormId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{acceptanceRecordFormId}" )
@PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_get')" )
public R<AcceptanceRecordForm> getById(@PathVariable("acceptanceRecordFormId" ) String acceptanceRecordFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
/**
* 通过id查询(验收记录表)
*
* @param acceptanceRecordFormId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{acceptanceRecordFormId}")
// @PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_get')" )
public R<AcceptanceRecordFormVO> getById(@PathVariable("acceptanceRecordFormId") String acceptanceRecordFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
AcceptanceRecordForm acceptanceRecordForm = acceptanceRecordFormService.getById(acceptanceRecordFormId);
return R.ok(acceptanceRecordForm);
//return R.ok(acceptanceRecordFormService.getById(acceptanceRecordFormId));
}
AcceptanceRecordFormVO acceptanceRecordFormVO = acceptanceRecordFormService.getAcceptanceRecordFormVO(acceptanceRecordFormId);
return R.ok(acceptanceRecordFormVO);
//return R.ok(acceptanceRecordFormService.getById(acceptanceRecordFormId));
}
/**
/**
* 分页查询
* @param page 分页对象
*
* @param page 分页对象
* @param acceptanceRecordForm (验收记录表)
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_get')" )
public R<IPage<AcceptanceRecordForm>> getAcceptanceRecordFormPage(Page<AcceptanceRecordForm> page, AcceptanceRecordForm acceptanceRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@GetMapping("/page")
// @PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_get')" )
public R<IPage<AcceptanceRecordFormVO>> getAcceptanceRecordFormPage(Page<AcceptanceRecordForm> page, AcceptanceRecordForm acceptanceRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<AcceptanceRecordForm> acceptanceRecordFormSList = acceptanceRecordFormService.page(page, Wrappers.<AcceptanceRecordForm>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(acceptanceRecordFormSList);
IPage<AcceptanceRecordFormVO> acceptanceRecordFormVOPage = acceptanceRecordFormService.getAcceptanceRecordFormVOPage(page, Wrappers.<AcceptanceRecordForm>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(acceptanceRecordFormVOPage);
// return R.ok(acceptanceRecordFormService.page(page, Wrappers.query(acceptanceRecordForm)));
}
/**
* 新增(验收记录表)
* @param acceptanceRecordForm (验收记录表)
* 录入(验收记录表)
*
* @param acceptanceRecordFormDTO (验收记录表)
* @return R
*/
@ApiOperation(value = "新增(验收记录表)", notes = "新增(验收记录表)")
@SysLog("新增(验收记录表)" )
@ApiOperation(value = "录入(验收记录表)", notes = "录入(验收记录表)")
@SysLog("录入(验收记录表)")
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_add')" )
public R<AcceptanceRecordForm> postAddObject(@RequestBody AcceptanceRecordForm acceptanceRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
// @PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_add')" )
public R<AcceptanceRecordForm> postAddObject(@RequestBody AcceptanceRecordFormDTO acceptanceRecordFormDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
AcceptanceRecordForm acceptanceRecordForm = acceptanceRecordFormService.editFrom(acceptanceRecordFormDTO);
if (acceptanceRecordForm != null) {
return R.ok(acceptanceRecordForm, "保存成功");
} else return R.failed("保存失败");
acceptanceRecordForm.setAcceptanceRecordFormId(IdWorker.get32UUID().toUpperCase());
if (acceptanceRecordFormService.save(acceptanceRecordForm)) {
return R.ok(acceptanceRecordForm, "对象创建成功");
}
else {
return R.failed(acceptanceRecordForm, "对象创建失败");
}
}
/**
* 修改(验收记录表)
* @param acceptanceRecordForm (验收记录表)
* 提交(验收记录表)
*
* @param acceptanceRecordFormDTO (验收记录表)
* @return R
*/
@ApiOperation(value = "修改(验收记录表)", notes = "修改(验收记录表)")
@SysLog("修改(验收记录表)" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_edit')" )
public R<AcceptanceRecordForm> putUpdateById(@RequestBody AcceptanceRecordForm acceptanceRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@ApiOperation(value = "提交(验收记录表)", notes = "提交(验收记录表)")
@SysLog("提交(验收记录表)")
@PostMapping("/commit")
// @PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_edit')")
public R<AcceptanceRecordForm> putUpdateById(@RequestBody AcceptanceRecordFormDTO acceptanceRecordFormDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (acceptanceRecordFormService.updateById(acceptanceRecordForm)) {
return R.ok(acceptanceRecordForm, "保存对象成功");
}
else {
return R.failed(acceptanceRecordForm, "保存对象失败");
}
AcceptanceRecordForm acceptanceRecordForm = acceptanceRecordFormService.commitForm(acceptanceRecordFormDTO);
if (acceptanceRecordForm!=null){
return R.ok(acceptanceRecordForm,"提交成功");
}else return R.failed("提交失败");
}
// /**
// * 通过id删除(验收记录表)
// *
// * @param acceptanceRecordFormId id
// * @return R
// */
// @ApiOperation(value = "通过id删除(验收记录表)", notes = "通过id删除(验收记录表)")
// @SysLog("通过id删除(验收记录表)")
// @DeleteMapping("/{acceptanceRecordFormId}")
// @PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_del')")
// public R<AcceptanceRecordForm> deleteById(@PathVariable String acceptanceRecordFormId, HttpServletRequest theHttpServletRequest) {
// Principal principal = theHttpServletRequest.getUserPrincipal();
// DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
//
// AcceptanceRecordForm oldAcceptanceRecordForm = acceptanceRecordFormService.getById(acceptanceRecordFormId);
//
// if (acceptanceRecordFormService.removeById(acceptanceRecordFormId)) {
// return R.ok(oldAcceptanceRecordForm, "对象删除成功");
// } else {
// return R.failed(oldAcceptanceRecordForm, "对象删除失败");
// }
//
// }
/**
* 一级审核(验收记录表)
*
* @param auditAndApproveDTO (验收记录表)
* @return R
*/
@ApiOperation(value = "一级审核(验收记录表)", notes = "一级审核(验收记录表)")
@SysLog("一级审核(验收记录表)")
@PutMapping("/primary")
// @PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_edit')")
public R<AcceptanceRecordForm> primaryAudit(@RequestBody AuditAndApproveDTO auditAndApproveDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
AcceptanceRecordForm acceptanceRecordForm = acceptanceRecordFormService.primaryAudit(auditAndApproveDTO,dlpUser);
if (acceptanceRecordForm!=null){
return R.ok(acceptanceRecordForm,"审核成功");
}else return R.failed("审核失败");
}
/**
* 通过id删除(验收记录表)
* @param acceptanceRecordFormId id
* 二级审核(验收记录表)
*
* @param auditAndApproveDTO (验收记录表)
* @return R
*/
@ApiOperation(value = "通过id删除(验收记录表)", notes = "通过id删除(验收记录表)")
@SysLog("通过id删除(验收记录表)" )
@DeleteMapping("/{acceptanceRecordFormId}" )
@PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_del')" )
public R<AcceptanceRecordForm> deleteById(@PathVariable String acceptanceRecordFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@ApiOperation(value = "二级审核(验收记录表)", notes = "二级审核(验收记录表)")
@SysLog("二级审核(验收记录表)")
@PutMapping("/secondary")
// @PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_edit')")
public R<AcceptanceRecordForm> secondaryAudit(@RequestBody AuditAndApproveDTO auditAndApproveDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
AcceptanceRecordForm oldAcceptanceRecordForm = acceptanceRecordFormService.getById(acceptanceRecordFormId);
AcceptanceRecordForm acceptanceRecordForm = acceptanceRecordFormService.secondaryAudit(auditAndApproveDTO,dlpUser);
if (acceptanceRecordFormService.removeById(acceptanceRecordFormId)) {
return R.ok(oldAcceptanceRecordForm, "对象删除成功");
}
else {
return R.failed(oldAcceptanceRecordForm, "对象删除失败");
}
if (acceptanceRecordForm!=null){
return R.ok(acceptanceRecordForm,"审核成功");
}else return R.failed("审核失败");
}
/**
* 三级审核(验收记录表)
*
* @param auditAndApproveDTO (验收记录表)
* @return R
*/
@ApiOperation(value = "三级审核(验收记录表)", notes = "三级审核(验收记录表)")
@SysLog("三级审核(验收记录表)")
@PutMapping("/threeLevel")
// @PreAuthorize("@pms.hasPermission('reagent_acceptance_record_form_edit')")
public R<AcceptanceRecordForm> threeLevelAudit(@RequestBody AuditAndApproveDTO auditAndApproveDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
AcceptanceRecordForm acceptanceRecordForm = acceptanceRecordFormService.threeLevelAudit(auditAndApproveDTO,dlpUser);
if (acceptanceRecordForm!=null){
return R.ok(acceptanceRecordForm,"审核成功");
}else return R.failed("审核失败");
}
}
src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java
+102 -72
View File
@@ -7,8 +7,10 @@ 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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.ApplicationForUseDTO;
import digital.laboratory.platform.reagent.entity.ApplicationForUse;
import digital.laboratory.platform.reagent.service.ApplicationForUseService;
import digital.laboratory.platform.reagent.vo.ApplicationForUseVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,132 +22,160 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
import java.util.List;
/**
* (试剂耗材领用申请表)
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe (试剂耗材领用申请表) 前端控制器
*
* <p>
* 这是与表示层的接口, 不应该接业务逻辑写在这里, 业务逻辑应该写在 service 中
* 这里写什么:
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 数据层在 mapper 中, 数据层不涉及业务, 只管技术上的 对象<->表 之间的转换
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/application_for_use" )
@RequestMapping("/application_for_use")
@Api(value = "application_for_use", tags = "(试剂耗材领用申请表)管理")
public class ApplicationForUseController {
private final ApplicationForUseService applicationForUseService;
private final ApplicationForUseService applicationForUseService;
/**
* 通过id查询(试剂耗材领用申请表)
* @param applicationForUseId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{applicationForUseId}" )
@PreAuthorize("@pms.hasPermission('reagent_application_for_use_get')" )
public R<ApplicationForUse> getById(@PathVariable("applicationForUseId" ) String applicationForUseId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
/**
* 通过id查询(试剂耗材领用申请表)
*
* @param applicationForUseId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{applicationForUseId}")
// @PreAuthorize("@pms.hasPermission('reagent_application_for_use_get')")
public R<ApplicationForUseVO> getById(@PathVariable("applicationForUseId") String applicationForUseId, HttpServletRequest theHttpServletRequest) {
ApplicationForUse applicationForUse = applicationForUseService.getById(applicationForUseId);
return R.ok(applicationForUse);
//return R.ok(applicationForUseService.getById(applicationForUseId));
}
Principal principal = theHttpServletRequest.getUserPrincipal();
/**
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ApplicationForUseVO applicationForUseVO = applicationForUseService.getApplicationForUseVO(applicationForUseId);
return R.ok(applicationForUseVO);
}
/**
* 分页查询
* @param page 分页对象
*
* @param page 分页对象
* @param applicationForUse (试剂耗材领用申请表)
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_application_for_use_get')" )
public R<IPage<ApplicationForUse>> getApplicationForUsePage(Page<ApplicationForUse> page, ApplicationForUse applicationForUse, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@GetMapping("/page")
// @PreAuthorize("@pms.hasPermission('reagent_application_for_use_get')")
public R<IPage<ApplicationForUseVO>> getApplicationForUsePage(Page<ApplicationForUse> page, ApplicationForUse applicationForUse, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<ApplicationForUseVO> applicationForUseVOList = applicationForUseService.getApplicationForUseVOPage(page, Wrappers.<ApplicationForUse>query().eq("create_by", dlpUser.getId()).orderByDesc("create_time"));
return R.ok(applicationForUseVOList);
IPage<ApplicationForUse> applicationForUseSList = applicationForUseService.page(page, Wrappers.<ApplicationForUse>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(applicationForUseSList);
// return R.ok(applicationForUseService.page(page, Wrappers.query(applicationForUse)));
}
/**
* 新增(试剂耗材领用申请表)
* @param applicationForUse (试剂耗材领用申请表)
*
* @param applicationForUseDTOList (试剂耗材领用申请表)
* @return R
*/
@ApiOperation(value = "新增(试剂耗材领用申请表)", notes = "新增(试剂耗材领用申请表)")
@SysLog("新增(试剂耗材领用申请表)" )
@SysLog("新增(试剂耗材领用申请表)")
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_application_for_use_add')" )
public R<ApplicationForUse> postAddObject(@RequestBody ApplicationForUse applicationForUse, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
// @PreAuthorize("@pms.hasPermission('reagent_application_for_use_add')")
public R<ApplicationForUse> postAddObject(@RequestBody List<ApplicationForUseDTO> applicationForUseDTOList, HttpServletRequest theHttpServletRequest) {
applicationForUse.setApplicationForUseId(IdWorker.get32UUID().toUpperCase());
if (applicationForUseService.save(applicationForUse)) {
return R.ok(applicationForUse, "对象创建成功");
}
else {
return R.failed(applicationForUse, "对象创建失败");
}
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ApplicationForUse applicationForUse = applicationForUseService.addApplication(applicationForUseDTOList, dlpUser);
if (applicationForUse != null) {
return R.ok(applicationForUse, "保存成功");
} else return R.failed("保存失败");
}
/**
* 修改(试剂耗材领用申请表)
* @param applicationForUse (试剂耗材领用申请表)
*
* @param applicationForUseDTOList (试剂耗材领用申请表)
* @return R
*/
@ApiOperation(value = "修改(试剂耗材领用申请表)", notes = "修改(试剂耗材领用申请表)")
@SysLog("修改(试剂耗材领用申请表)" )
@SysLog("修改(试剂耗材领用申请表)")
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_application_for_use_edit')" )
public R<ApplicationForUse> putUpdateById(@RequestBody ApplicationForUse applicationForUse, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
// @PreAuthorize("@pms.hasPermission('reagent_application_for_use_edit')")
public R<ApplicationForUse> putUpdateById(@RequestBody List<ApplicationForUseDTO> applicationForUseDTOList, HttpServletRequest theHttpServletRequest) {
if (applicationForUseService.updateById(applicationForUse)) {
return R.ok(applicationForUse, "保存对象成功");
}
else {
return R.failed(applicationForUse, "保存对象失败");
}
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ApplicationForUse applicationForUse = applicationForUseService.editApplication(applicationForUseDTOList, dlpUser);
if (applicationForUse != null) {
return R.ok(applicationForUse, "修改成功");
} else return R.failed("修改失败");
}
/**
* 通过id删除(试剂耗材领用申请表)
*
* @param applicationForUseId id
* @return R
*/
@ApiOperation(value = "通过id删除(试剂耗材领用申请表)", notes = "通过id删除(试剂耗材领用申请表)")
@SysLog("通过id删除(试剂耗材领用申请表)" )
@DeleteMapping("/{applicationForUseId}" )
@PreAuthorize("@pms.hasPermission('reagent_application_for_use_del')" )
public R<ApplicationForUse> deleteById(@PathVariable String applicationForUseId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@SysLog("通过id删除(试剂耗材领用申请表)")
@DeleteMapping("/{applicationForUseId}")
// @PreAuthorize("@pms.hasPermission('reagent_application_for_use_del')")
public R<String> deleteById(@PathVariable String applicationForUseId, HttpServletRequest theHttpServletRequest) {
ApplicationForUse oldApplicationForUse = applicationForUseService.getById(applicationForUseId);
Principal principal = theHttpServletRequest.getUserPrincipal();
if (applicationForUseService.removeById(applicationForUseId)) {
return R.ok(oldApplicationForUse, "对象删除成功");
}
else {
return R.failed(oldApplicationForUse, "对象删除失败");
}
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (applicationForUseService.delApplication(applicationForUseId)) {
return R.ok("删除成功");
} else return R.failed("删除失败");
}
/**
* 提交试剂耗材领用申请表
*
* @param applicationForUseDTOList (试剂耗材领用申请表)
* @return R
*/
@ApiOperation(value = "提交试剂耗材领用申请表", notes = "提交试剂耗材领用申请表")
@SysLog("修改试剂耗材领用申请表")
@PostMapping("/commit")
// @PreAuthorize("@pms.hasPermission('reagent_application_for_use_edit')")
public R<ApplicationForUse> commitById(@RequestBody List<ApplicationForUseDTO> applicationForUseDTOList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ApplicationForUse applicationForUse = applicationForUseService.commitApplication(applicationForUseDTOList, dlpUser);
if (applicationForUse != null) {
return R.ok(applicationForUse, "提交成功");
} else return R.failed("提交失败");
}
}
src/main/java/digital/laboratory/platform/reagent/controller/CentralizedRequestController.java
+81 -81
View File
@@ -1,5 +1,6 @@
package digital.laboratory.platform.reagent.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,10 +57,10 @@ public class CentralizedRequestController {
* @param centralizedRequestId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@ApiOperation(value = "通过id查询集中采购申请", notes = "通过id查询集中采购申请")
@GetMapping("/{centralizedRequestId}")
@PreAuthorize("@pms.hasPermission('reagent_centralized_request_get')")
public R<CentralizedRequest> getById(@PathVariable("centralizedRequestId") String centralizedRequestId, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_centralized_request_get')")
public R<CentralizedRequestVO> getById(@PathVariable("centralizedRequestId") String centralizedRequestId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -67,12 +68,12 @@ public class CentralizedRequestController {
CentralizedRequestVO vo = centralizedRequestService.getCentralizedRequestVO(centralizedRequestId);
if (vo!=null){
if (vo != null) {
return R.ok(vo);
}else {
} else {
return R.failed("未查询到该数据");
}
}
}
/**
* 分页查询
@@ -83,22 +84,61 @@ public class CentralizedRequestController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('CentralizedPurchaseRequestList')")
public R<IPage<CentralizedRequestVO>> getCentralizedRequestPage(Page<CentralizedRequest> page, CentralizedRequest centralizedRequest, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('CentralizedPurchaseRequestList')")
public R<IPage<CentralizedRequestVO>> getCentralizedRequestPage(Page<CentralizedRequest> page,String orgName, CentralizedRequest centralizedRequest, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (orgName!=null){
IPage<CentralizedRequestVO> centralizedRequestVOPage = centralizedRequestService.getCentralizedRequestVOPage(page, Wrappers.<CentralizedRequest>query()
.eq("create_by", dlpUser.getId()).orderByDesc("create_time")
.eq("orgName",orgName));
return R.ok(centralizedRequestVOPage);
}
IPage<CentralizedRequestVO> centralizedRequestVOPage = centralizedRequestService.getCentralizedRequestVOPage(page, Wrappers.<CentralizedRequest>query()
.eq("create_by", dlpUser.getId()).orderByDesc("create_time"));
return R.ok(centralizedRequestVOPage);
}
/**
* 分页查询
*
* @param orgName 分页对象
* @param orgName 集中采购申请
* @return
*/
@ApiOperation(value = "采购计划整合集中采购申请分页查询", notes = "采购计划整合集中采购申请分页查询")
@GetMapping("/list")
// @PreAuthorize("@pms.hasPermission('CentralizedPurchaseRequestList')")
public R<List<CentralizedRequestVO>> getCentralizedRequestVOPage(String orgName,HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (orgName!=null){
List<CentralizedRequestVO> centralizedRequestVOList = centralizedRequestService.getOrgVOList(Wrappers.<CentralizedRequest>query().orderByDesc("create_time"),orgName);
return R.ok(centralizedRequestVOList);
}
List<CentralizedRequestVO> centralizedRequestVOList = centralizedRequestService.getCentralizedRequestVOList(Wrappers.<CentralizedRequest>query()
.orderByDesc("create_time"));
return R.ok(centralizedRequestVOList);
}
/**
* 新增(集中采购申请)
@@ -106,21 +146,19 @@ public class CentralizedRequestController {
* @param centralizedRequestDTOList 集中采购申请
* @return R
*/
@ApiOperation(value = "新增集中采购申请", notes = "新增集中采购申请")
@ApiOperation(value = "保存集中采购申请", notes = "保存集中采购申请")
@SysLog("新增集中采购申请")
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_centralized_request_add')")
// @PreAuthorize("@pms.hasPermission('reagent_centralized_request_add')")
public R<CentralizedRequest> postAddObject(@RequestBody List<CentralizedRequestDTO> centralizedRequestDTOList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
CentralizedRequest centralizedRequest = new CentralizedRequest();
CentralizedRequest centralizedRequest = centralizedRequestService.addRequest(centralizedRequestDTOList, dlpUser);
List<DetailsOfCentralized> detailsOfCentralizedList= centralizedRequestService.saveRequestById(centralizedRequest, centralizedRequestDTOList, dlpUser);
if (centralizedRequestService.save(centralizedRequest) & detailsOfCentralizedService.saveBatch(detailsOfCentralizedList)) {
if (centralizedRequest != null) {
return R.ok(centralizedRequest, "保存成功");
} else {
return R.failed(centralizedRequest, "保存失败");
@@ -136,12 +174,12 @@ public class CentralizedRequestController {
@ApiOperation(value = "新增集中采购申请明细", notes = "新增集中采购申请明细")
@SysLog("新增集中采购申请明细")
@PostMapping("/details")
@PreAuthorize("@pms.hasPermission('reagent_details_of_centralized_add')")
// @PreAuthorize("@pms.hasPermission('reagent_details_of_centralized_add')")
public R<DetailsOfCentralized> postAddDetails(@RequestBody CentralizedRequestDTO centralizedRequestDto, HttpServletRequest theHttpServletRequest) {
DetailsOfCentralized detailsOfCentralized = centralizedRequestService.addDetails(centralizedRequestDto);
DetailsOfCentralized detailsOfCentralized = centralizedRequestService.addDetailsById(centralizedRequestDto);
if (detailsOfCentralizedService.save(detailsOfCentralized)) {
if (detailsOfCentralized!=null) {
return R.ok(detailsOfCentralized, "添加成功");
} else {
return R.failed(detailsOfCentralized, "添加失败");
@@ -151,21 +189,25 @@ public class CentralizedRequestController {
/**
* 提交(集中采购申请)
*
* @param centralizedRequestId 集中采购申请
* @param centralizedRequestDTOList 集中采购申请
* @return R
*/
@ApiOperation(value = "提交集中采购申请", notes = "提交集中采购申请")
@SysLog("提交集中采购申请")
@PutMapping("/commit/{centralizedRequestId}")
@PreAuthorize("@pms.hasPermission('reagent_centralized_request_commit')")
public R<CentralizedRequest> postCommitObject(@PathVariable String centralizedRequestId, HttpServletRequest theHttpServletRequest) {
@PostMapping("/commit")
// @PreAuthorize("@pms.hasPermission('reagent_centralized_request_commit')")
public R<CentralizedRequest> postCommitObject(@RequestBody List<CentralizedRequestDTO> centralizedRequestDTOList, HttpServletRequest theHttpServletRequest) {
CentralizedRequest centralizedRequest = centralizedRequestService.commit(centralizedRequestId);
Principal principal = theHttpServletRequest.getUserPrincipal();
if (centralizedRequest!=null&centralizedRequestService.updateById(centralizedRequest)){
return R.ok(centralizedRequest,"提交成功");
}else {
return R.failed("填写信息有误，请完善填写内容");
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
CentralizedRequest centralizedRequest = centralizedRequestService.commitRequest(centralizedRequestDTOList, dlpUser);
if (centralizedRequest != null) {
return R.ok(centralizedRequest, "提交成功");
} else {
return R.failed("提交失败，请检查内容是否有误");
}
}
@@ -179,19 +221,19 @@ public class CentralizedRequestController {
@ApiOperation(value = "修改集中采购申请明细", notes = "修改集中采购申请明细")
@SysLog("修改(集中采购申请)")
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_centralized_request_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_centralized_request_edit')")
public R<DetailsOfCentralized> putUpdateById(@RequestBody CentralizedRequestDTO centralizedRequestDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
DetailsOfCentralized detailsOfCentralized = centralizedRequestService.editDetails(centralizedRequestDto);
DetailsOfCentralized detailsOfCentralized = centralizedRequestService.editDetailsById(centralizedRequestDto);
if (detailsOfCentralizedService.updateById(detailsOfCentralized)) {
return R.ok(detailsOfCentralized, "保存成功");
if (detailsOfCentralized != null) {
return R.ok(detailsOfCentralized, "修改成功");
} else {
return R.failed(detailsOfCentralized, "保存失败");
return R.failed("修改失败");
}
}
@@ -204,31 +246,17 @@ public class CentralizedRequestController {
@ApiOperation(value = "通过id删除集中采购申请", notes = "通过id删除集中采购申请")
@SysLog("通过id删除集中采购申请")
@DeleteMapping("/{centralizedRequestId}")
@PreAuthorize("@pms.hasPermission('reagent_centralized_request_del')")
public R<CentralizedRequest> deleteById(@PathVariable String centralizedRequestId, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_centralized_request_del')")
public R<String> deleteById(@PathVariable String centralizedRequestId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
List<DetailsOfCentralized> list = centralizedRequestService.delRequestById(centralizedRequestId);
if (centralizedRequestService.delRequestById(centralizedRequestId)) {
return R.ok("删除成功");
} else return R.failed("删除失败");
CentralizedRequest oldcentralizedRequest = centralizedRequestService.getById(centralizedRequestId);
if (oldcentralizedRequest==null){
return R.failed("未能查询到对应信息");
}
if (list!=null){
if (oldcentralizedRequest.getStatus()==0&detailsOfCentralizedService.removeBatchByIds(list)&centralizedRequestService.removeById(oldcentralizedRequest)){
return R.ok(oldcentralizedRequest, "删除成功");
}else return R.failed("删除失败");
}else {
if (oldcentralizedRequest.getStatus()==0&centralizedRequestService.removeById(oldcentralizedRequest)){
return R.ok(oldcentralizedRequest, "删除成功");
}else return R.failed("删除失败");
}
}
/**
@@ -240,7 +268,7 @@ public class CentralizedRequestController {
@ApiOperation(value = "通过id删除集中采购申请明细", notes = "通过id删除集中采购申请明细")
@SysLog("通过id删除(集中采购申请)")
@DeleteMapping("/details/{detailsOfCentralizedId}")
@PreAuthorize("@pms.hasPermission('reagent_details_of_centralized_del')")
// @PreAuthorize("@pms.hasPermission('reagent_details_of_centralized_del')")
public R<DetailsOfCentralized> deleteDetailsById(@PathVariable String detailsOfCentralizedId, HttpServletRequest theHttpServletRequest) {
DetailsOfCentralized oldDetailsOfCentralized = detailsOfCentralizedService.getById(detailsOfCentralizedId);
@@ -251,36 +279,8 @@ public class CentralizedRequestController {
return R.failed(oldDetailsOfCentralized, "删除失败");
}
}
/**
* 通过id删除集中采购申请明细
*
* @param auditAndApproveDto
* @return R
*/
@ApiOperation(value = "审核集中采购申请明细", notes = "审核集中采购申请明细")
@SysLog("审核集中采购申请明细")
@PutMapping("/check")
@PreAuthorize("@pms.hasPermission('reagent_centralized_request_check')")
public R<CentralizedRequest> checkRequest(@RequestBody AuditAndApproveDTO auditAndApproveDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
CentralizedRequest centralizedRequest = centralizedRequestService.checkRequest(auditAndApproveDto, dlpUser);
if (centralizedRequest!=null&centralizedRequestService.updateById(centralizedRequest)) {
return R.ok(centralizedRequest, "审核成功");
} else {
return R.failed(centralizedRequest, "审核失败");
}
}
}
}
src/main/java/digital/laboratory/platform/reagent/controller/ComplianceCheckController.java
+204 -77
View File
@@ -7,8 +7,11 @@ 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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.ComplianceCheckDTO;
import digital.laboratory.platform.reagent.entity.ComplianceCheck;
import digital.laboratory.platform.reagent.service.ComplianceCheckService;
import digital.laboratory.platform.reagent.vo.ComplianceCheckVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,131 +23,255 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
import java.util.List;
/**
* (符合性检查记录表)
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe (符合性检查记录表) 前端控制器
*
* <p>
* 这是与表示层的接口, 不应该接业务逻辑写在这里, 业务逻辑应该写在 service 中
* 这里写什么:
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 数据层在 mapper 中, 数据层不涉及业务, 只管技术上的 对象<->表 之间的转换
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/compliance_check" )
@RequestMapping("/compliance_check")
@Api(value = "compliance_check", tags = "(符合性检查记录表)管理")
@SuppressWarnings("all")
public class ComplianceCheckController {
private final ComplianceCheckService complianceCheckService;
private final ComplianceCheckService complianceCheckService;
/**
* 通过id查询(符合性检查记录表)
* @param complianceCheckId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{complianceCheckId}" )
@PreAuthorize("@pms.hasPermission('reagent_compliance_check_get')" )
public R<ComplianceCheck> getById(@PathVariable("complianceCheckId" ) String complianceCheckId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
/**
* 通过id查询(符合性检查记录表)
*
* @param complianceCheckId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{complianceCheckId}")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_get')" )
public R<ComplianceCheckVO> getById(@PathVariable("complianceCheckId") String complianceCheckId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ComplianceCheck complianceCheck = complianceCheckService.getById(complianceCheckId);
return R.ok(complianceCheck);
//return R.ok(complianceCheckService.getById(complianceCheckId));
}
ComplianceCheckVO complianceCheckVO = complianceCheckService.getComplianceCheckVO(complianceCheckId);
/**
return R.ok(complianceCheckVO);
}
/**
* 分页查询
* @param page 分页对象
*
* @param page 分页对象
* @param complianceCheck (符合性检查记录表)
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_compliance_check_get')" )
public R<IPage<ComplianceCheck>> getComplianceCheckPage(Page<ComplianceCheck> page, ComplianceCheck complianceCheck, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@GetMapping("/page")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_get')")
public R<IPage<ComplianceCheckVO>> getComplianceCheckPage(Page<ComplianceCheck> page, ComplianceCheck complianceCheck, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<ComplianceCheck> complianceCheckSList = complianceCheckService.page(page, Wrappers.<ComplianceCheck>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(complianceCheckSList);
IPage<ComplianceCheckVO> complianceCheckSList = complianceCheckService.getComplianceCheckVOPage(page, Wrappers.<ComplianceCheck>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(complianceCheckSList);
// return R.ok(complianceCheckService.page(page, Wrappers.query(complianceCheck)));
}
/**
* 新增(符合性检查记录表)
* @param complianceCheck (符合性检查记录表)
* 新增符合性检查记录表(试剂耗材)
*
* @param complianceCheckDTO (符合性检查记录表)
* @return R
*/
@ApiOperation(value = "新增(符合性检查记录表)", notes = "新增(符合性检查记录表)")
@SysLog("新增(符合性检查记录表)" )
@ApiOperation(value = "新增符合性检查记录表(试剂耗材)", notes = "新增符合性检查记录表(试剂耗材)")
@SysLog("新增(符合性检查记录表)")
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_compliance_check_add')" )
public R<ComplianceCheck> postAddObject(@RequestBody ComplianceCheck complianceCheck, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_add')")
public R<ComplianceCheck> postAddObject(@RequestBody ComplianceCheckDTO complianceCheckDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
complianceCheck.setComplianceCheckId(IdWorker.get32UUID().toUpperCase());
if (complianceCheckService.save(complianceCheck)) {
return R.ok(complianceCheck, "对象创建成功");
}
else {
return R.failed(complianceCheck, "对象创建失败");
}
ComplianceCheck complianceCheck = complianceCheckService.addCheck(complianceCheckDTO, dlpUser);
if (complianceCheck != null) {
return R.ok(complianceCheck, "保存成功");
} else {
return R.failed(complianceCheck, "保存失败");
}
}
/**
* 修改(符合性检查记录表)
* @param complianceCheck (符合性检查记录表)
* 手动新增符合性检查记录表(试剂耗材)
*
* @param complianceCheckDTO (手动新增符合性检查记录表)
* @return R
*/
@ApiOperation(value = "修改(符合性检查记录表)", notes = "修改(符合性检查记录表)")
@SysLog("修改(符合性检查记录表)" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_compliance_check_edit')" )
public R<ComplianceCheck> putUpdateById(@RequestBody ComplianceCheck complianceCheck, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@ApiOperation(value = "手动新增符合性检查记录表(试剂耗材)", notes = "手动新增符合性检查记录表(试剂耗材)")
@SysLog("新增(符合性检查记录表)")
@PostMapping("/addList")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_add')")
public R<List<ComplianceCheck>> addCheckList(@RequestBody List<ComplianceCheckDTO> complianceCheckDTOList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (complianceCheckService.updateById(complianceCheck)) {
return R.ok(complianceCheck, "保存对象成功");
}
else {
return R.failed(complianceCheck, "保存对象失败");
}
List<ComplianceCheck> complianceCheckList = complianceCheckService.addCheckList(complianceCheckDTOList, dlpUser);
if (complianceCheckList != null) {
return R.ok(complianceCheckList, "保存成功");
} else {
return R.failed(complianceCheckList, "保存失败");
}
}
/**
* 通过id删除(符合性检查记录表)
*
* @param complianceCheckId id
* @return R
*/
@ApiOperation(value = "通过id删除(符合性检查记录表)", notes = "通过id删除(符合性检查记录表)")
@SysLog("通过id删除(符合性检查记录表)" )
@DeleteMapping("/{complianceCheckId}" )
@PreAuthorize("@pms.hasPermission('reagent_compliance_check_del')" )
public R<ComplianceCheck> deleteById(@PathVariable String complianceCheckId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@SysLog("通过id删除(符合性检查记录表)")
@DeleteMapping("/{complianceCheckId}")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_del')" )
public R<String> deleteById(@PathVariable String complianceCheckId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ComplianceCheck oldComplianceCheck = complianceCheckService.getById(complianceCheckId);
;
if (complianceCheckService.removeById(complianceCheckId)) {
return R.ok(oldComplianceCheck, "对象删除成功");
}
else {
return R.failed(oldComplianceCheck, "对象删除失败");
}
if (complianceCheckService.delCheckById(complianceCheckId)) {
return R.ok("删除成功");
} else {
return R.failed("删除失败");
}
}
/**
* 编辑符合性检查记录表（录入结果）
*
* @param complianceCheckId id
* @return R
*/
@ApiOperation(value = "编辑符合性检查记录表", notes = "编辑符合性检查记录表")
@SysLog("编辑符合性检查记录表")
@PutMapping("/edit")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_del')" )
public R<String> editCheckById(@RequestBody ComplianceCheckDTO complianceCheckDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ComplianceCheck complianceCheck = complianceCheckService.editCheckById(complianceCheckDTO);
if (complianceCheck != null) {
return R.ok("保存成功");
} else {
return R.failed("保存失败");
}
}
/**
* 录入符合性检查方案
*
* @param complianceCheckId id
* @return R
*/
@ApiOperation(value = "录入符合性检查方案", notes = "录入符合性检查方案")
@SysLog("编辑符合性检查记录表")
@PutMapping("/addScheme")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_del')" )
public R<String> addScheme(@RequestBody ComplianceCheckDTO complianceCheckDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ComplianceCheck complianceCheck = complianceCheckService.addScheme(complianceCheckDTO);
if (complianceCheck != null) {
return R.ok("保存成功");
} else {
return R.failed("保存失败");
}
}
/**
* 提交符合性检查记录表
*
* @param complianceCheckId id
* @return R
*/
@ApiOperation(value = "提交符合性检查记录表", notes = "提交符合性检查记录表")
@SysLog("提交符合性检查记录表")
@PutMapping("/commit/{complianceCheckId}")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_del')" )
public R<String> commitCheck(@RequestBody ComplianceCheckDTO complianceCheckDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ComplianceCheck complianceCheck = complianceCheckService.commitCheck(complianceCheckDTO,dlpUser);
if (complianceCheck != null) {
return R.ok("提交成功");
} else {
return R.failed("提交失败");
}
}
/**
* 一级审核符合性检查记录表
*
* @param complianceCheckId id
* @return R
*/
@ApiOperation(value = "一级审核符合性检查记录表", notes = "一级审核符合性检查记录表")
@SysLog("一级审核符合性检查记录表")
@PutMapping("/primaryAudit")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_del')" )
public R<String> primaryAuditCheck(@RequestBody AuditAndApproveDTO auditAndApproveDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ComplianceCheck complianceCheck = complianceCheckService.primaryAuditCheck(auditAndApproveDTO, dlpUser);
if (complianceCheck != null) {
return R.ok("审核成功");
} else {
return R.failed("审核失败");
}
}
/**
* 二级审核符合性检查记录表
*
* @param complianceCheckId id
* @return R
*/
@ApiOperation(value = "二级审核符合性检查记录表", notes = "二级审核符合性检查记录表")
@SysLog("二级审核符合性检查记录表")
@PutMapping("/secondaryAudit")
// @PreAuthorize("@pms.hasPermission('reagent_compliance_check_del')" )
public R<String> secondaryAuditCheck(@RequestBody AuditAndApproveDTO auditAndApproveDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ComplianceCheck complianceCheck = complianceCheckService.secondaryAuditCheck(auditAndApproveDTO, dlpUser);
if (complianceCheck != null) {
return R.ok("审核成功");
} else {
return R.failed("审核失败");
}
}
src/main/java/digital/laboratory/platform/reagent/controller/DecentralizedRequestController.java
+64 -54
View File
@@ -7,6 +7,7 @@ import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.AuditDecentralizedRequestDTO;
import digital.laboratory.platform.reagent.dto.DecentralizedRequestDTO;
import digital.laboratory.platform.reagent.entity.DecentralizeDetails;
import digital.laboratory.platform.reagent.entity.DecentralizedRequest;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.web.bind.annotation.*;
@@ -54,7 +56,7 @@ public class DecentralizedRequestController {
* @param decentralizedRequestId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@ApiOperation(value = "通过id查询分散采购申请", notes = "通过id查询分散采购申请")
@GetMapping("/{decentralizedRequestId}")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_get')")
public R<DecentralizedRequest> getById(@PathVariable("decentralizedRequestId") String decentralizedRequestId, HttpServletRequest theHttpServletRequest) {
@@ -95,7 +97,7 @@ public class DecentralizedRequestController {
* @param decentralizedRequestDTOList (分散采购申请)
* @return R
*/
@ApiOperation(value = "新增分散采购申请", notes = "新增分散采购申请")
@ApiOperation(value = "保存分散采购申请", notes = "保存分散采购申请")
@SysLog("新增分散采购申请")
@PostMapping
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_add')")
@@ -105,11 +107,9 @@ public class DecentralizedRequestController {
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
DecentralizedRequest decentralizedRequest = new DecentralizedRequest();
DecentralizedRequest decentralizedRequest = decentralizedRequestService.addRequest(decentralizedRequestDTOList, dlpUser);
List<DecentralizeDetails> list = decentralizedRequestService.addRequest(decentralizedRequestDTOList, dlpUser, decentralizedRequest);
if (decentralizedRequestService.save(decentralizedRequest) & decentralizeDetailsService.saveBatch(list)) {
if (decentralizedRequest != null) {
return R.ok(decentralizedRequest, "保存成功");
} else {
@@ -117,6 +117,34 @@ public class DecentralizedRequestController {
}
}
/**
* 新增分散采购申请明细
*
* @param decentralizedRequestDTO (新增分散采购申请明细)
* @return R
*/
@ApiOperation(value = "新增分散采购申请明细", notes = "新增分散采购申请明细")
@SysLog("新增分散采购申请明细")
@PostMapping("/addDetails")
// @PreAuthorize("@pms.hasPermission('reagent_decentralize_details_add')")
public R<DecentralizeDetails> addDetails(@RequestBody DecentralizedRequestDTO decentralizedRequestDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
DecentralizeDetails decentralizeDetails = decentralizedRequestService.addDetails(decentralizedRequestDTO);
if (decentralizeDetails != null) {
return R.ok(decentralizeDetails, "保存成功");
} else {
return R.failed("保存失败");
}
}
/**
@@ -125,20 +153,20 @@ public class DecentralizedRequestController {
* @param decentralizedRequestDTO (分散采购申请)
* @return R
*/
@ApiOperation(value = "修改(分散采购申请)", notes = "修改(分散采购申请)")
@ApiOperation(value = "修改分散采购申请明细", notes = "修改分散采购申请明细")
@SysLog("修改(分散采购申请)")
@PutMapping
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_decentralize_details_edit')")
public R<DecentralizeDetails> putUpdateById(@RequestBody DecentralizedRequestDTO decentralizedRequestDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
DecentralizeDetails decentralizeDetails = decentralizedRequestService.editRequest(decentralizedRequestDTO);
if (decentralizeDetailsService.updateById(decentralizeDetails)) {
if (decentralizeDetails != null) {
return R.ok(decentralizeDetails, "修改成功");
} else {
return R.failed(decentralizeDetails, "修改失败");
return R.failed("修改失败");
}
}
@@ -152,33 +180,15 @@ public class DecentralizedRequestController {
@SysLog("通过id删除(分散采购申请)")
@DeleteMapping("/{decentralizedRequestId}")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_del')")
public R<DecentralizedRequest> deleteById(@PathVariable String decentralizedRequestId, HttpServletRequest theHttpServletRequest) {
public R<String> deleteById(@PathVariable String decentralizedRequestId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
DecentralizedRequest oldDecentralizedRequest = decentralizedRequestService.getById(decentralizedRequestId);
if (decentralizedRequestService.delRequestById(decentralizedRequestId)) {
return R.ok("删除成功");
} else return R.failed("删除失败");
List<DecentralizeDetails> list = decentralizedRequestService.delRequestById(decentralizedRequestId);
if (oldDecentralizedRequest == null) {
return R.failed("未能查询到当前信息");
}
if (list != null) {
if (decentralizeDetailsService.removeBatchByIds(list) &
decentralizedRequestService.removeById(oldDecentralizedRequest)) {
return R.ok(oldDecentralizedRequest, "删除成功");
} else {
return R.failed("删除失败");
}
} else {
if (decentralizedRequestService.removeById(oldDecentralizedRequest)) {
return R.ok(oldDecentralizedRequest, "删除成功");
} else {
return R.failed("删除失败");
}
}
}
/**
@@ -190,7 +200,7 @@ public class DecentralizedRequestController {
@ApiOperation(value = "通过id删除分散采购申请明细", notes = "通过id删除分散采购申请明细")
@SysLog("通过id删除分散采购申请明细")
@DeleteMapping("details/{decentralizeDetailsId}")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_del')")
// @PreAuthorize("@pms.hasPermission('reagent_decentralize_details_del')")
public R<DecentralizeDetails> deleteDetailsById(@PathVariable String decentralizeDetailsId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -209,22 +219,22 @@ public class DecentralizedRequestController {
/**
* 提交分散采购申请明细
*
* @param decentralizedRequestId
* @param decentralizedRequestDTOList
* @return R
*/
@ApiOperation(value = "提交分散采购申请明细", notes = "提交分散采购申请明细")
@ApiOperation(value = "提交分散采购申请", notes = "提交分散采购申请")
@SysLog("提交分散采购申请明细")
@PutMapping("commit/{decentralizedRequestId}")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_edit')")
public R<DecentralizedRequest> commitById(@PathVariable String decentralizedRequestId, HttpServletRequest theHttpServletRequest) {
@PutMapping("/commit")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_commit')")
public R<DecentralizedRequest> commitById(@RequestBody List<DecentralizedRequestDTO> decentralizedRequestDTOList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
DecentralizedRequest decentralizedRequest = decentralizedRequestService.commitRequest(decentralizedRequestId);
DecentralizedRequest decentralizedRequest = decentralizedRequestService.commitRequest(decentralizedRequestDTOList, dlpUser);
if (decentralizedRequestService.updateById(decentralizedRequest)) {
if (decentralizedRequest != null) {
return R.ok(decentralizedRequest, "提交成功");
} else return R.failed("提交失败");
}
@@ -235,10 +245,10 @@ public class DecentralizedRequestController {
* @param auditAndApproveDto
* @return R
*/
@ApiOperation(value = "审核分散采购申请", notes = "审核分散采购申请")
@ApiOperation(value = "一级审核分散采购申请", notes = "一级审核分散采购申请")
@SysLog("审核分散采购申请明细")
@PutMapping("/primary/audit")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_primary')")
public R<DecentralizedRequest> primaryAuditRequest(@RequestBody AuditAndApproveDTO auditAndApproveDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -247,7 +257,7 @@ public class DecentralizedRequestController {
DecentralizedRequest decentralizedRequest = decentralizedRequestService.primaryAuditRequest(dlpUser, auditAndApproveDto);
if (decentralizedRequestService.updateById(decentralizedRequest)) {
if (decentralizedRequest != null) {
return R.ok(decentralizedRequest, "审核成功");
} else return R.failed("审核失败");
}
@@ -258,10 +268,10 @@ public class DecentralizedRequestController {
* @param auditAndApproveDto
* @return R
*/
@ApiOperation(value = "审核分散采购申请", notes = "审核分散采购申请")
@ApiOperation(value = "二级审核分散采购申请", notes = "二级审核分散采购申请")
@SysLog("审核分散采购申请明细")
@PutMapping("/secondary/audit")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_secondary')")
public R<DecentralizedRequest> secondaryAuditRequest(@RequestBody AuditAndApproveDTO auditAndApproveDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -270,7 +280,7 @@ public class DecentralizedRequestController {
DecentralizedRequest decentralizedRequest = decentralizedRequestService.secondaryAuditRequest(dlpUser, auditAndApproveDto);
if (decentralizedRequestService.updateById(decentralizedRequest)) {
if (decentralizedRequest != null) {
return R.ok(decentralizedRequest, "审核成功");
} else return R.failed("审核失败");
}
@@ -278,22 +288,22 @@ public class DecentralizedRequestController {
/**
* 三级审核分散采购申请
*
* @param auditAndApproveDto
* @param auditDecentralizedRequestDTO
* @return R
*/
@ApiOperation(value = "审核分散采购申请", notes = "审核分散采购申请")
@ApiOperation(value = "三级审核分散采购申请", notes = "三级审核分散采购申请")
@SysLog("审核分散采购申请明细")
@PutMapping("/threeLevel/audit")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_edit')")
public R<DecentralizedRequest> threeLevelAuditRequest(@RequestBody AuditAndApproveDTO auditAndApproveDto, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_threeLevel')")
public R<DecentralizedRequest> threeLevelAuditRequest(@RequestBody AuditDecentralizedRequestDTO auditDecentralizedRequestDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
DecentralizedRequest decentralizedRequest = decentralizedRequestService.threeLevelAuditRequest(dlpUser, auditAndApproveDto);
DecentralizedRequest decentralizedRequest = decentralizedRequestService.threeLevelAuditRequest(dlpUser, auditDecentralizedRequestDTO);
if (decentralizedRequestService.updateById(decentralizedRequest)) {
if (decentralizedRequest != null) {
return R.ok(decentralizedRequest, "审核成功");
} else return R.failed("审核失败");
}
@@ -307,7 +317,7 @@ public class DecentralizedRequestController {
@ApiOperation(value = "审批分散采购申请", notes = "审批分散采购申请")
@SysLog("审批分散采购申请明细")
@PutMapping("/approve")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_decentralized_request_approve')")
public R<DecentralizedRequest> approveRequest(@RequestBody AuditAndApproveDTO auditAndApproveDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -316,7 +326,7 @@ public class DecentralizedRequestController {
DecentralizedRequest decentralizedRequest = decentralizedRequestService.approveRequest(dlpUser, auditAndApproveDto);
if (decentralizedRequestService.updateById(decentralizedRequest)) {
if (decentralizedRequest != null) {
return R.ok(decentralizedRequest, "审批成功");
} else return R.failed("审批失败");
}
src/main/java/digital/laboratory/platform/reagent/controller/DeliveryRegistrationFormController.java
+15 -60
View File
@@ -7,6 +7,7 @@ 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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.OutgoingContentsDTO;
import digital.laboratory.platform.reagent.entity.DeliveryRegistrationForm;
import digital.laboratory.platform.reagent.service.DeliveryRegistrationFormService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
import java.util.List;
/**
* (试剂耗材出库登记表)
@@ -49,7 +51,7 @@ public class DeliveryRegistrationFormController {
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{deliveryRegistrationFormId}" )
@PreAuthorize("@pms.hasPermission('reagent_delivery_registration_form_get')" )
// @PreAuthorize("@pms.hasPermission('reagent_delivery_registration_form_get')" )
public R<DeliveryRegistrationForm> getById(@PathVariable("deliveryRegistrationFormId" ) String deliveryRegistrationFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@@ -67,7 +69,7 @@ public class DeliveryRegistrationFormController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_delivery_registration_form_get')" )
// @PreAuthorize("@pms.hasPermission('reagent_delivery_registration_form_get')" )
public R<IPage<DeliveryRegistrationForm>> getDeliveryRegistrationFormPage(Page<DeliveryRegistrationForm> page, DeliveryRegistrationForm deliveryRegistrationForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@@ -82,70 +84,23 @@ public class DeliveryRegistrationFormController {
/**
* 新增(试剂耗材出库登记表)
* @param deliveryRegistrationForm (试剂耗材出库登记表)
* 提交(试剂耗材出库登记表)
* @param outgoingContentsDTOS (试剂耗材出库登记表)
* @return R
*/
@ApiOperation(value = "新增(试剂耗材出库登记表)", notes = "新增(试剂耗材出库登记表)")
@SysLog("新增(试剂耗材出库登记表)" )
@ApiOperation(value = "提交(试剂耗材出库登记表)", notes = "提交(试剂耗材出库登记表)")
@SysLog("提交(试剂耗材出库登记表)" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_delivery_registration_form_add')" )
public R<DeliveryRegistrationForm> postAddObject(@RequestBody DeliveryRegistrationForm deliveryRegistrationForm, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_delivery_registration_form_add')" )
public R<DeliveryRegistrationForm> postAddObject(@RequestBody List<OutgoingContentsDTO> outgoingContentsDTOS, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
deliveryRegistrationForm.setDeliveryRegistrationFormId(IdWorker.get32UUID().toUpperCase());
if (deliveryRegistrationFormService.save(deliveryRegistrationForm)) {
return R.ok(deliveryRegistrationForm, "对象创建成功");
}
else {
return R.failed(deliveryRegistrationForm, "对象创建失败");
}
}
DeliveryRegistrationForm deliveryRegistrationForm = deliveryRegistrationFormService.commitForm(outgoingContentsDTOS, dlpUser);
/**
* 修改(试剂耗材出库登记表)
* @param deliveryRegistrationForm (试剂耗材出库登记表)
* @return R
*/
@ApiOperation(value = "修改(试剂耗材出库登记表)", notes = "修改(试剂耗材出库登记表)")
@SysLog("修改(试剂耗材出库登记表)" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_delivery_registration_form_edit')" )
public R<DeliveryRegistrationForm> putUpdateById(@RequestBody DeliveryRegistrationForm deliveryRegistrationForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (deliveryRegistrationFormService.updateById(deliveryRegistrationForm)) {
return R.ok(deliveryRegistrationForm, "保存对象成功");
}
else {
return R.failed(deliveryRegistrationForm, "保存对象失败");
}
}
/**
* 通过id删除(试剂耗材出库登记表)
* @param deliveryRegistrationFormId id
* @return R
*/
@ApiOperation(value = "通过id删除(试剂耗材出库登记表)", notes = "通过id删除(试剂耗材出库登记表)")
@SysLog("通过id删除(试剂耗材出库登记表)" )
@DeleteMapping("/{deliveryRegistrationFormId}" )
@PreAuthorize("@pms.hasPermission('reagent_delivery_registration_form_del')" )
public R<DeliveryRegistrationForm> deleteById(@PathVariable String deliveryRegistrationFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
DeliveryRegistrationForm oldDeliveryRegistrationForm = deliveryRegistrationFormService.getById(deliveryRegistrationFormId);
if (deliveryRegistrationFormService.removeById(deliveryRegistrationFormId)) {
return R.ok(oldDeliveryRegistrationForm, "对象删除成功");
}
else {
return R.failed(oldDeliveryRegistrationForm, "对象删除失败");
}
}
if (deliveryRegistrationForm!=null){
return R.ok(deliveryRegistrationForm,"提交成功");
}else return R.failed("提交失败");
}
}
src/main/java/digital/laboratory/platform/reagent/controller/EvaluationFormController.java
+52 -3
View File
@@ -7,6 +7,7 @@ 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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.EvaluationFormDTO;
import digital.laboratory.platform.reagent.entity.EvaluationForm;
import digital.laboratory.platform.reagent.service.EvaluationFormService;
@@ -90,8 +91,8 @@ public class EvaluationFormController {
* @param evaluationFormDTO (服务商/供应商评价表)
* @return R
*/
@ApiOperation(value = "新增(服务商/供应商评价表)", notes = "新增(服务商/供应商评价表)")
@SysLog("新增(服务商/供应商评价表)" )
@ApiOperation(value = "录入(服务商/供应商评价表)", notes = "录入(服务商/供应商评价表)")
@SysLog("录入(服务商/供应商评价表)" )
@PostMapping
// @PreAuthorize("@pms.hasPermission('reagent_evaluation_form_add')" )
public R<EvaluationForm> postAddObject(@RequestBody EvaluationFormDTO evaluationFormDTO, HttpServletRequest theHttpServletRequest) {
@@ -100,7 +101,7 @@ public class EvaluationFormController {
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
EvaluationForm evaluationForm = evaluationFormService.addFormById(evaluationFormDTO, dlpUser);
EvaluationForm evaluationForm = evaluationFormService.editFormById(evaluationFormDTO);
if (evaluationForm!=null) {
return R.ok(evaluationForm,"保存成功");
@@ -109,5 +110,53 @@ public class EvaluationFormController {
}
}
/**
* 二级审核(服务商/供应商评价表)
* @param auditAndApproveDTO (服务商/供应商评价表)
* @return R
*/
@ApiOperation(value = "二级审核(服务商/供应商评价表)", notes = "二级审核(服务商/供应商评价表)")
@SysLog("二级审核(服务商/供应商评价表)" )
@PutMapping("/secondary")
// @PreAuthorize("@pms.hasPermission('reagent_evaluation_form_add')" )
public R<EvaluationForm> auditFormOfSecondary(@RequestBody AuditAndApproveDTO auditAndApproveDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
EvaluationForm evaluationForm = evaluationFormService.auditFormOfSecondary(auditAndApproveDTO, dlpUser);
if (evaluationForm!=null) {
return R.ok(evaluationForm,"审核成功");
}else {
return R.failed("审核失败");
}
}
/**
* 三级审核(服务商/供应商评价表)
* @param auditAndApproveDTO (服务商/供应商评价表)
* @return R
*/
@ApiOperation(value = "三级审核(服务商/供应商评价表)", notes = "三级审核(服务商/供应商评价表)")
@SysLog("三级审核(服务商/供应商评价表)" )
@PutMapping("/three_level")
// @PreAuthorize("@pms.hasPermission('reagent_evaluation_form_add')" )
public R<EvaluationForm> auditFormOfThreeLevel(@RequestBody AuditAndApproveDTO auditAndApproveDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
EvaluationForm evaluationForm = evaluationFormService.auditFormOfThreeLevel(auditAndApproveDTO, dlpUser);
if (evaluationForm!=null) {
return R.ok(evaluationForm,"审核成功");
}else {
return R.failed("审核失败");
}
}
}
src/main/java/digital/laboratory/platform/reagent/controller/PeriodVerificationImplementationController.java
+88 -32
View File
@@ -7,8 +7,11 @@ 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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.PeriodVerificationImplementationDTO;
import digital.laboratory.platform.reagent.entity.PeriodVerificationImplementation;
import digital.laboratory.platform.reagent.service.PeriodVerificationImplementationService;
import digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
import java.util.List;
/**
* (标准物质期间核查实施情况及结果记录表)
@@ -49,12 +53,12 @@ public class PeriodVerificationImplementationController {
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{periodVerificationImplementationId}" )
@PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_get')" )
// @PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_get')" )
public R<PeriodVerificationImplementation> getById(@PathVariable("periodVerificationImplementationId" ) String periodVerificationImplementationId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
PeriodVerificationImplementation periodVerificationImplementation = periodVerificationImplementationService.getById(periodVerificationImplementationId);
PeriodVerificationImplementation periodVerificationImplementation = periodVerificationImplementationService.getPeriodVerificationImplementationVO(periodVerificationImplementationId);
return R.ok(periodVerificationImplementation);
//return R.ok(periodVerificationImplementationService.getById(periodVerificationImplementationId));
}
@@ -67,12 +71,12 @@ public class PeriodVerificationImplementationController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_get')" )
public R<IPage<PeriodVerificationImplementation>> getPeriodVerificationImplementationPage(Page<PeriodVerificationImplementation> page, PeriodVerificationImplementation periodVerificationImplementation, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_get')" )
public R<IPage<PeriodVerificationImplementationVO>> getPeriodVerificationImplementationPage(Page<PeriodVerificationImplementation> page, PeriodVerificationImplementation periodVerificationImplementation, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<PeriodVerificationImplementation> periodVerificationImplementationSList = periodVerificationImplementationService.page(page, Wrappers.<PeriodVerificationImplementation>query()
IPage<PeriodVerificationImplementationVO> periodVerificationImplementationSList = periodVerificationImplementationService.getPeriodVerificationImplementationVOPage(page, Wrappers.<PeriodVerificationImplementation>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
@@ -83,20 +87,21 @@ public class PeriodVerificationImplementationController {
/**
* 新增(标准物质期间核查实施情况及结果记录表)
* @param periodVerificationImplementation (标准物质期间核查实施情况及结果记录表)
* @param periodVerificationImplementationDTOS (标准物质期间核查实施情况及结果记录表)
* @return R
*/
@ApiOperation(value = "新增(标准物质期间核查实施情况及结果记录表)", notes = "新增(标准物质期间核查实施情况及结果记录表)")
@SysLog("新增(标准物质期间核查实施情况及结果记录表)" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_add')" )
public R<PeriodVerificationImplementation> postAddObject(@RequestBody PeriodVerificationImplementation periodVerificationImplementation, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_add')" )
public R<PeriodVerificationImplementation> postAddObject(@RequestBody PeriodVerificationImplementationDTO periodVerificationImplementationDTOS, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
periodVerificationImplementation.setPeriodVerificationImplementationId(IdWorker.get32UUID().toUpperCase());
if (periodVerificationImplementationService.save(periodVerificationImplementation)) {
return R.ok(periodVerificationImplementation, "对象创建成功");
PeriodVerificationImplementation periodVerificationImplementation = periodVerificationImplementationService.addById(periodVerificationImplementationDTOS, dlpUser);
if (periodVerificationImplementation!=null) {
return R.ok(periodVerificationImplementation, "保存成功");
}
else {
return R.failed(periodVerificationImplementation, "对象创建失败");
@@ -105,47 +110,98 @@ public class PeriodVerificationImplementationController {
/**
* 修改(标准物质期间核查实施情况及结果记录表)
* @param periodVerificationImplementation (标准物质期间核查实施情况及结果记录表)
* @param periodVerificationImplementationDTO (标准物质期间核查实施情况及结果记录表)
* @return R
*/
@ApiOperation(value = "修改(标准物质期间核查实施情况及结果记录表)", notes = "修改(标准物质期间核查实施情况及结果记录表)")
@SysLog("修改(标准物质期间核查实施情况及结果记录表)" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_edit')" )
public R<PeriodVerificationImplementation> putUpdateById(@RequestBody PeriodVerificationImplementation periodVerificationImplementation, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_edit')" )
public R<PeriodVerificationImplementation> putUpdateById(@RequestBody PeriodVerificationImplementationDTO periodVerificationImplementationDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (periodVerificationImplementationService.updateById(periodVerificationImplementation)) {
return R.ok(periodVerificationImplementation, "保存对象成功");
PeriodVerificationImplementation periodVerificationImplementation = periodVerificationImplementationService.editById(periodVerificationImplementationDTO);
if (periodVerificationImplementation!=null) {
return R.ok(periodVerificationImplementation, "保存成功");
}
else {
return R.failed(periodVerificationImplementation, "保存对象失败");
return R.failed("保存对象失败");
}
}
/**
* 通过id删除(标准物质期间核查实施情况及结果记录表)
* @param periodVerificationImplementationId id
* @return R
*/
@ApiOperation(value = "通过id删除(标准物质期间核查实施情况及结果记录表)", notes = "通过id删除(标准物质期间核查实施情况及结果记录表)")
@SysLog("通过id删除(标准物质期间核查实施情况及结果记录表)" )
@DeleteMapping("/{periodVerificationImplementationId}" )
@PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_del')" )
public R<PeriodVerificationImplementation> deleteById(@PathVariable String periodVerificationImplementationId, HttpServletRequest theHttpServletRequest) {
// /**
// * 通过id删除(标准物质期间核查实施情况及结果记录表)
// * @param periodVerificationImplementationId id
// * @return R
// */
// @ApiOperation(value = "通过id删除(标准物质期间核查实施情况及结果记录表)", notes = "通过id删除(标准物质期间核查实施情况及结果记录表)")
// @SysLog("通过id删除(标准物质期间核查实施情况及结果记录表)" )
// @DeleteMapping("/{periodVerificationImplementationId}" )
// @PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_del')" )
// public R<PeriodVerificationImplementation> deleteById(@PathVariable String periodVerificationImplementationId, HttpServletRequest theHttpServletRequest) {
// Principal principal = theHttpServletRequest.getUserPrincipal();
// DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
//
// PeriodVerificationImplementation oldPeriodVerificationImplementation = periodVerificationImplementationService.getById(periodVerificationImplementationId);
//
// if (periodVerificationImplementationService.removeById(periodVerificationImplementationId)) {
// return R.ok(oldPeriodVerificationImplementation, "对象删除成功");
// }
// else {
// return R.failed(oldPeriodVerificationImplementation, "对象删除失败");
// }
//
// }
/**
* 提交(标准物质期间核查实施情况及结果记录表)
* @param periodVerificationImplementationDTO (标准物质期间核查实施情况及结果记录表)
* @return R
*/
@ApiOperation(value = "提交(标准物质期间核查实施情况及结果记录表)", notes = "提交(标准物质期间核查实施情况及结果记录表)")
@SysLog("提交(标准物质期间核查实施情况及结果记录表)" )
@PostMapping("/commit")
// @PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_edit')" )
public R<PeriodVerificationImplementation> commitById(@RequestBody PeriodVerificationImplementationDTO periodVerificationImplementationDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
PeriodVerificationImplementation periodVerificationImplementation = periodVerificationImplementationService.commitById(periodVerificationImplementationDTO,dlpUser);
if (periodVerificationImplementation!=null) {
return R.ok(periodVerificationImplementation, "提交成功");
}
else {
return R.failed("提交失败");
}
}
/**
* 审核(标准物质期间核查实施情况及结果记录表)
* @param auditAndApproveDTO (标准物质期间核查实施情况及结果记录表)
* @return R
*/
@ApiOperation(value = "审核(标准物质期间核查实施情况及结果记录表)", notes = "审核(标准物质期间核查实施情况及结果记录表)")
@SysLog("修改(标准物质期间核查实施情况及结果记录表)" )
@PutMapping("/audit")
// @PreAuthorize("@pms.hasPermission('reagent_period_verification_implementation_edit')" )
public R<PeriodVerificationImplementation> auditById(@RequestBody AuditAndApproveDTO auditAndApproveDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
PeriodVerificationImplementation oldPeriodVerificationImplementation = periodVerificationImplementationService.getById(periodVerificationImplementationId);
PeriodVerificationImplementation periodVerificationImplementation = periodVerificationImplementationService.auditById(auditAndApproveDTO,dlpUser);
if (periodVerificationImplementationService.removeById(periodVerificationImplementationId)) {
return R.ok(oldPeriodVerificationImplementation, "对象删除成功");
if (periodVerificationImplementation!=null) {
return R.ok(periodVerificationImplementation, "审核成功");
}
else {
return R.failed(oldPeriodVerificationImplementation, "对象删除失败");
return R.failed("审核失败");
}
}
}
}
src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java
+119 -66
View File
@@ -1,5 +1,7 @@
package digital.laboratory.platform.reagent.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +10,7 @@ import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.PurchaseCatalogueDTO;
import digital.laboratory.platform.reagent.dto.PurchaseCatalogueGetDTO;
import digital.laboratory.platform.reagent.entity.CatalogueDetails;
import digital.laboratory.platform.reagent.entity.PurchaseCatalogue;
import digital.laboratory.platform.reagent.service.CatalogueDetailsService;
@@ -20,6 +23,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
@@ -43,22 +47,72 @@ import java.util.List;
@RequestMapping("/purchase_catalogue")
@Api(value = "purchase_catalogue", tags = "采购目录管理")
public class PurchaseCatalogueController {
@Autowired
private final PurchaseCatalogueService purchaseCatalogueService;
@Autowired
private final CatalogueDetailsService catalogueDetailsService;
/**
* 分页查询
*
* @param
* @return
*/
@ApiOperation(value = "分页查询已发布的采购目录明细", notes = "分页查询已发布的采购目录明细")
@GetMapping("/page")
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_getPage')")
public R<PurchaseCatalogueVO> getPurchaseCataloguePage(HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
PurchaseCatalogueVO vOpage = purchaseCatalogueService.getVOpage();
return R.ok(vOpage);
}
/**
* 分页查询
*
* @param page 分页对象
* @return
*/
@ApiOperation(value = "分页查询制定编辑的采购目录", notes = "分页查询制定编辑的采购目录")
@GetMapping("/pages")
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_getPage')")
public R<IPage<PurchaseCatalogueVO>> getPurchaseCatalogueVOPage(Page<PurchaseCatalogue> page, Integer status, HttpServletRequest theHttpServletRequest) {
IPage<PurchaseCatalogueVO> purchaseCatalogueVOPage = purchaseCatalogueService.getPurchaseCatalogueVOPage(page, Wrappers.<PurchaseCatalogue>query().orderByDesc("create_time"));
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (status!=null){
IPage<PurchaseCatalogueVO> purchaseCatalogueVOPage1 = purchaseCatalogueService.getPurchaseCatalogueVOPage(page, Wrappers.<PurchaseCatalogue>query().eq("status",status).orderByDesc("create_time"));
List<PurchaseCatalogueVO> records = purchaseCatalogueVOPage.getRecords();
return R.ok(purchaseCatalogueVOPage1);}
return R.ok(purchaseCatalogueVOPage);
}
/**
* 通过id查询(采购目录)
*
* @param purchaseCatalogueId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{purchaseCatalogueId}")
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_get')")
public R<PurchaseCatalogue> getById(@PathVariable("purchaseCatalogueId") String purchaseCatalogueId, HttpServletRequest theHttpServletRequest) {
@ApiOperation(value = "主页点击一行通过id查询", notes = "主页点击一行通过id查询")
@GetMapping()
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_get')")
public R<PurchaseCatalogueVO> getById(String purchaseCatalogueId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -75,28 +129,9 @@ public class PurchaseCatalogueController {
}
/**
* 分页查询
*
* @param page 分页对象
* @param purchaseCatalogue (采购目录)
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_get')")
public R<IPage<PurchaseCatalogueVO>> getPurchaseCataloguePage(Page<PurchaseCatalogue> page, PurchaseCatalogue purchaseCatalogue, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<PurchaseCatalogueVO> purchaseCatalogueVOPage = purchaseCatalogueService.getPurchaseCatalogueVOPage(page, Wrappers.<PurchaseCatalogue>query().eq("create_by", dlpUser.getId())
.orderByDesc("create_time"));
return R.ok(purchaseCatalogueVOPage);
}
/**
@@ -105,21 +140,20 @@ public class PurchaseCatalogueController {
* @param purchaseCatalogueDTOList (采购目录)
* @return R
*/
@ApiOperation(value = "新增(采购目录)", notes = "新增(采购目录)")
@ApiOperation(value = "保存采购目录", notes = "保存采购目录")
@SysLog("新增(采购目录)")
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_add')")
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_add')")
public R<PurchaseCatalogue> postAddObject(@RequestBody List<PurchaseCatalogueDTO> purchaseCatalogueDTOList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
PurchaseCatalogue purchaseCatalogue = new PurchaseCatalogue();
PurchaseCatalogue purchaseCatalogue = purchaseCatalogueService.addCatalogue(dlpUser, purchaseCatalogueDTOList);
List<CatalogueDetails> catalogueDetailsList = purchaseCatalogueService.addCatalogue(dlpUser, purchaseCatalogueDTOList, purchaseCatalogue);
if (purchaseCatalogueService.save(purchaseCatalogue) & catalogueDetailsService.saveBatch(catalogueDetailsList)) {
if (purchaseCatalogue!=null) {
return R.ok(purchaseCatalogue, "保存成功");
} else {
return R.failed(purchaseCatalogue, "保存失败");
@@ -135,7 +169,7 @@ public class PurchaseCatalogueController {
@ApiOperation(value = "修改采购目录明细", notes = "修改采购目录明细")
@SysLog("修改明细采购目录明细")
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_catalogue_details_edit')")
public R<CatalogueDetails> putUpdateById(@RequestBody PurchaseCatalogueDTO purchaseCatalogueDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -144,13 +178,38 @@ public class PurchaseCatalogueController {
CatalogueDetails catalogueDetails = purchaseCatalogueService.editCatalogue(purchaseCatalogueDto);
if (catalogueDetailsService.updateById(catalogueDetails)) {
if (catalogueDetails!=null) {
return R.ok(catalogueDetails, "修改成功");
} else {
return R.failed(catalogueDetails, "修改失败");
}
}
/**
* 创建(采购目录)
*
* @param purchaseCatalogueDto (采购目录)
* @return R
*/
@ApiOperation(value = "创建采购目录明细", notes = "创建采购目录明细")
@SysLog("创建采购目录明细")
@PostMapping("/details")
// @PreAuthorize("@pms.hasPermission('reagent_catalogue_details_add')")
public R<CatalogueDetails> addDetails(@RequestBody PurchaseCatalogueDTO purchaseCatalogueDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
CatalogueDetails catalogueDetails = purchaseCatalogueService.addDetails(purchaseCatalogueDto);
if (catalogueDetails!=null) {
return R.ok(catalogueDetails, "创建成功");
} else {
return R.failed(catalogueDetails, "创建失败");
}
}
/**
* 通过id删除(采购目录)
*
@@ -159,32 +218,22 @@ public class PurchaseCatalogueController {
*/
@ApiOperation(value = "通过id删除采购目录", notes = "通过id删除采购目录")
@SysLog("通过id删除采购目录")
@DeleteMapping("/{purchaseCatalogueId}")
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_del')")
public R<PurchaseCatalogue> deleteById(@PathVariable String purchaseCatalogueId, HttpServletRequest theHttpServletRequest) {
@DeleteMapping("/catalogue")
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_del')")
public R<String > deleteById( String purchaseCatalogueId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
PurchaseCatalogue oldPurchaseCatalogue = purchaseCatalogueService.getById(purchaseCatalogueId);
Boolean aBoolean = purchaseCatalogueService.delCatalogue(purchaseCatalogueId);
if (oldPurchaseCatalogue == null) {
return R.failed("未能查到当前信息");
}
List<CatalogueDetails> list = purchaseCatalogueService.delCatalogue(purchaseCatalogueId);
if (list!=null) {
if (oldPurchaseCatalogue.getStatus()==0&catalogueDetailsService.removeBatchByIds(list)&purchaseCatalogueService.removeById(oldPurchaseCatalogue)){
return R.ok(oldPurchaseCatalogue, "目录删除成功");
}else return R.failed("目录删除失败");
} else {
if (oldPurchaseCatalogue.getStatus()==0&purchaseCatalogueService.removeById(oldPurchaseCatalogue)){
return R.ok(oldPurchaseCatalogue, "目录删除成功");
}else return R.failed("目录删除失败");
}
if (aBoolean){
return R.ok("删除采购");
}else return R.failed("删除失败");
}
/**
* 通过id删除采购目录明细
*
@@ -193,9 +242,9 @@ public class PurchaseCatalogueController {
*/
@ApiOperation(value = "通过id删除采购目录明细", notes = "通过id删除采购目录明细")
@SysLog("通过id删除采购目录")
@DeleteMapping("details/{catalogueDetailsId}")
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_del')")
public R<CatalogueDetails> deleteDetailsById(@PathVariable String catalogueDetailsId, HttpServletRequest theHttpServletRequest) {
@DeleteMapping("/details")
// @PreAuthorize("@pms.hasPermission('reagent_catalogue_details_del')")
public R<CatalogueDetails> deleteDetailsById(String catalogueDetailsId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -213,18 +262,22 @@ public class PurchaseCatalogueController {
/**
* 提交采购目录
*
* @param purchaseCatalogueId
* @param purchaseCatalogueDTOList
* @return R
*/
@ApiOperation(value = "提交采购目录", notes = "提交采购目录")
@SysLog("提交采购目录")
@PutMapping("/commit/{purchaseCatalogueId}")
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_edit')")
public R<PurchaseCatalogue> commitById(@PathVariable String purchaseCatalogueId, HttpServletRequest theHttpServletRequest) {
@PostMapping("/commit")
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_commit')")
public R<PurchaseCatalogue> commitById(@RequestBody List<PurchaseCatalogueDTO> purchaseCatalogueDTOList , HttpServletRequest theHttpServletRequest) {
PurchaseCatalogue purchaseCatalogue = purchaseCatalogueService.commitById(purchaseCatalogueId);
Principal principal = theHttpServletRequest.getUserPrincipal();
if (purchaseCatalogue!=null&purchaseCatalogueService.updateById(purchaseCatalogue)){
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
PurchaseCatalogue purchaseCatalogue = purchaseCatalogueService.commitById(purchaseCatalogueDTOList,dlpUser);
if (purchaseCatalogue!=null){
return R.ok(purchaseCatalogue,"提交成功");
}else {
return R.failed("提交失败");
@@ -237,10 +290,10 @@ public class PurchaseCatalogueController {
* @param auditAndApproveDto
* @return R
*/
@ApiOperation(value = "审核采购目录", notes = "审核采购目录")
@ApiOperation(value = "一级审核采购目录", notes = "一级审核采购目录")
@SysLog("一级审核采购目录")
@PutMapping("/primary/audit")
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_primary')")
public R<PurchaseCatalogue> primaryAuditCatalogue(@RequestBody AuditAndApproveDTO auditAndApproveDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -249,7 +302,7 @@ public class PurchaseCatalogueController {
PurchaseCatalogue purchaseCatalogue = purchaseCatalogueService.primaryAuditCatalogue(auditAndApproveDto,dlpUser);
if (purchaseCatalogue!=null&purchaseCatalogueService.updateById(purchaseCatalogue)){
if (purchaseCatalogue!=null){
return R.ok(purchaseCatalogue,"审核成功");
}else {
return R.failed("审核失败");
@@ -262,10 +315,10 @@ public class PurchaseCatalogueController {
* @param auditAndApproveDto
* @return R
*/
@ApiOperation(value = "审核采购目录", notes = "审核采购目录")
@ApiOperation(value = "二级审核采购目录", notes = "二级审核采购目录")
@SysLog("二级审核采购目录")
@PutMapping("/secondary/audit")
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_secondary')")
public R<PurchaseCatalogue> secondaryAuditCatalogue(@RequestBody AuditAndApproveDTO auditAndApproveDto, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -274,7 +327,7 @@ public class PurchaseCatalogueController {
PurchaseCatalogue purchaseCatalogue = purchaseCatalogueService.secondaryAuditCatalogue(auditAndApproveDto,dlpUser);
if (purchaseCatalogue!=null&purchaseCatalogueService.updateById(purchaseCatalogue)){
if (purchaseCatalogue!=null){
return R.ok(purchaseCatalogue,"审核成功");
}else {
return R.failed("审核失败");
@@ -290,12 +343,12 @@ public class PurchaseCatalogueController {
@ApiOperation(value = "发布采购目录", notes = "发布采购目录")
@SysLog("发布采购目录")
@PutMapping("/release/{purchaseCatalogueId}")
@PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_release')")
public R<PurchaseCatalogue> releaseById(@PathVariable String purchaseCatalogueId, HttpServletRequest theHttpServletRequest) {
PurchaseCatalogue purchaseCatalogue = purchaseCatalogueService.releaseCatalogue(purchaseCatalogueId);
if (purchaseCatalogue!=null&purchaseCatalogueService.updateById(purchaseCatalogue)){
if (purchaseCatalogue!=null){
return R.ok(purchaseCatalogue,"发布成功");
}else {
return R.failed("发布失败");
src/main/java/digital/laboratory/platform/reagent/controller/PurchasingPlanController.java
+51 -25
View File
@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.web.bind.annotation.*;
@@ -51,7 +52,7 @@ public class PurchasingPlanController {
* @param purchasingPlanId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@ApiOperation(value = "点击一行通过id查询采购计划明细", notes = "点击一行通过id查询采购计划明细")
@GetMapping("/{purchasingPlanId}")
// @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_get')")
public R<PurchasingPlan> getById(@PathVariable("purchasingPlanId") String purchasingPlanId, HttpServletRequest theHttpServletRequest) {
@@ -67,43 +68,43 @@ public class PurchasingPlanController {
* 分页查询
*
* @param page 分页对象
* @param purchasingPlan (采购计划)
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page")
// @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_get')")
public R<IPage<PurchasingPlanVO>> getPurchasingPlanPage(Page<PurchasingPlan> page, PurchasingPlan purchasingPlan, HttpServletRequest theHttpServletRequest) {
public R<IPage<PurchasingPlanVO>> getPurchasingPlanPage(Page<PurchasingPlan> page, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<PurchasingPlanVO> purchasingPlanVOPage = purchasingPlanService.getPurchasingPlanVOPage(page, Wrappers.<PurchasingPlan>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time"));
return R.ok(purchasingPlanVOPage);
}
/**
* 新增(采购计划)
*
* @param purchasingPlanDTOList (采购计划)
* @return R
*/
@ApiOperation(value = "新增(采购计划)", notes = "新增(采购计划)")
@ApiOperation(value = "新增(采购计划)", notes = "新增(采购计划) 参数DTO：（detailsOfCentralizedId，quantity = ，）")
@SysLog("新增(采购计划)")
@PostMapping
// @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_add')" )
public R<PurchasingPlan> postAddObject(@RequestBody List<PurchasingPlanDTO> purchasingPlanDTOList, HttpServletRequest theHttpServletRequest) {
public R<PurchasingPlanVO> postAddObject(@RequestBody List<PurchasingPlanDTO> purchasingPlanDTOList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
PurchasingPlan purchasingPlan = new PurchasingPlan();
PurchasingPlanVO purchasingPlanVO = purchasingPlanService.addById(purchasingPlanDTOList, dlpUser);
if (purchasingPlanService.addById(purchasingPlanDTOList, dlpUser, purchasingPlan)) {
return R.ok(purchasingPlan, "保存成功");
if (purchasingPlanVO!=null) {
return R.ok(purchasingPlanVO, "保存成功");
} else {
return R.failed("保存失败");
@@ -119,7 +120,7 @@ public class PurchasingPlanController {
@ApiOperation(value = "修改采购计划明细", notes = "修改采购计划明细")
@SysLog("修改(采购计划)")
@PutMapping
// @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_edit')")
// @PreAuthorize("@pms.hasPermission('reagent_procurement_content_edit')")
public R<ProcurementContent> putUpdateById(@RequestBody PurchasingPlanDTO purchasingPlanDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -136,30 +137,30 @@ public class PurchasingPlanController {
}
/**
* 通过id删除(采购计划)
* 修改采购计划合并明细
*
* @param purchasingPlanId id
* @param purchasingPlanDTO (采购计划DTO)
* @return R
*/
@ApiOperation(value = "通过id删除(采购计划)", notes = "通过id删除(采购计划)")
@SysLog("通过id删除(采购计划)")
@DeleteMapping("/{purchasingPlanId}")
// @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_del')")
public R<String> deleteById(@PathVariable String purchasingPlanId, HttpServletRequest theHttpServletRequest) {
@ApiOperation(value = "修改采购计划合并明细", notes = "修改采购计划合并明细")
@SysLog("修改(采购计划)")
@PutMapping("/details")
// @PreAuthorize("@pms.hasPermission('reagent_procurement_content_edit')")
public R<ProcurementContent> editDetails(@RequestBody PurchasingPlanDTO purchasingPlanDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (purchasingPlanService.delById(purchasingPlanId)) {
return R.ok("删除成功");
ProcurementContent procurementContent = purchasingPlanService.editDetails(purchasingPlanDTO);
if (procurementContent != null) {
return R.ok(procurementContent,"修改成功");
} else {
return R.failed("删除失败");
return R.failed("修改失败");
}
}
/**
* 通过id删除采购计划明细
*
@@ -169,7 +170,7 @@ public class PurchasingPlanController {
@ApiOperation(value = "通过id删除采购计划明细", notes = "通过id删除采购计划明细")
@SysLog("通过id删除采购计划明细")
@DeleteMapping("content/{procurementContentId}")
// @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_del')")
// @PreAuthorize("@pms.hasPermission('reagent_procurement_content_del')")
public R<String> deleteContentById(@PathVariable String procurementContentId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -192,9 +193,9 @@ public class PurchasingPlanController {
*/
@ApiOperation(value = "提交采购计划", notes = "提交采购计划")
@SysLog("修改(采购计划)")
@PutMapping("/commit/{purchasingPlanId}")
@PutMapping("/commit")
// @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_edit')")
public R<PurchasingPlan> commitById(@PathVariable String purchasingPlanId, HttpServletRequest theHttpServletRequest) {
public R<PurchasingPlan> commitById( String purchasingPlanId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -209,6 +210,31 @@ public class PurchasingPlanController {
}
}
/**
* 审核采购计划
*
* @param purchasingPlanDTO (采购计划)
* @return R
*/
@ApiOperation(value = "换货", notes = "换货")
@SysLog("(换货)")
@PutMapping("/replacement")
// @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_edit')")
public R<ProcurementContent> replacementById(@RequestBody PurchasingPlanDTO purchasingPlanDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ProcurementContent procurementContent = purchasingPlanService.replacementById(purchasingPlanDTO);
if (procurementContent != null) {
return R.ok(procurementContent,"换货成功");
} else {
return R.failed("换货成功");
}
}
/**
* 审核采购计划
*
src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java
+28 -13
View File
@@ -9,6 +9,7 @@ import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.entity.ReagentConsumableInventory;
import digital.laboratory.platform.reagent.service.ReagentConsumableInventoryService;
import digital.laboratory.platform.reagent.vo.ReagentConsumableInventoryVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
import java.util.List;
/**
* 试剂耗材库存
@@ -60,26 +62,39 @@ public class ReagentConsumableInventoryController {
}
/**
* 分页查询
* @param page 分页对象
* @param reagentConsumableInventory 试剂耗材库存
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_get')" )
public R<IPage<ReagentConsumableInventory>> getReagentConsumableInventoryPage(Page<ReagentConsumableInventory> page, ReagentConsumableInventory reagentConsumableInventory, HttpServletRequest theHttpServletRequest) {
@ApiOperation(value = "耗材列表集合", notes = "耗材列表集合")
@GetMapping("/RList" )
// @PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_get')" )
public R<List<ReagentConsumableInventoryVO>> getReagentConsumableInventoryPage(Page<ReagentConsumableInventory> page, ReagentConsumableInventory reagentConsumableInventory, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<ReagentConsumableInventory> reagentConsumableInventorySList = reagentConsumableInventoryService.page(page, Wrappers.<ReagentConsumableInventory>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
List<ReagentConsumableInventoryVO> reagentConsumableInventorySList = reagentConsumableInventoryService.getReagentConsumableInventoryVOList();
return R.ok(reagentConsumableInventorySList);
// return R.ok(reagentConsumableInventoryService.page(page, Wrappers.query(reagentConsumableInventory)));
}
/**
* 分页查询
*
* @return
*/
@ApiOperation(value = "标准物质列表", notes = "标准物质列表")
@GetMapping("/MList" )
// @PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_get')" )
public R<List<ReagentConsumableInventoryVO>> getReferenceMaterialVOList(HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
List<ReagentConsumableInventoryVO> referenceMaterialVOList = reagentConsumableInventoryService.getReferenceMaterialVOList();
return R.ok(referenceMaterialVOList);
// return R.ok(reagentConsumableInventoryService.page(page, Wrappers.query(reagentConsumableInventory)));
}
/**
* 新增试剂耗材库存
@@ -89,7 +104,7 @@ public class ReagentConsumableInventoryController {
@ApiOperation(value = "新增试剂耗材库存", notes = "新增试剂耗材库存")
@SysLog("新增试剂耗材库存" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_add')" )
// @PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_add')" )
public R<ReagentConsumableInventory> postAddObject(@RequestBody ReagentConsumableInventory reagentConsumableInventory, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@@ -111,7 +126,7 @@ public class ReagentConsumableInventoryController {
@ApiOperation(value = "修改试剂耗材库存", notes = "修改试剂耗材库存")
@SysLog("修改试剂耗材库存" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_edit')" )
// @PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_edit')" )
public R<ReagentConsumableInventory> putUpdateById(@RequestBody ReagentConsumableInventory reagentConsumableInventory, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@@ -132,7 +147,7 @@ public class ReagentConsumableInventoryController {
@ApiOperation(value = "通过id删除试剂耗材库存", notes = "通过id删除试剂耗材库存")
@SysLog("通过id删除试剂耗材库存" )
@DeleteMapping("/{reagentConsumableInventoryId}" )
@PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_del')" )
// @PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_del')" )
public R<ReagentConsumableInventory> deleteById(@PathVariable String reagentConsumableInventoryId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumablesController.java
+4 -4
View File
@@ -48,9 +48,9 @@ public class ReagentConsumablesController {
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{reagentConsumablesId}" )
@PreAuthorize("@pms.hasPermission('reagent_reagent_consumables_get')" )
public R<ReagentConsumables> getById(@PathVariable("reagentConsumablesId" ) String reagentConsumablesId, HttpServletRequest theHttpServletRequest) {
@GetMapping("" )
// @PreAuthorize("@pms.hasPermission('reagent_reagent_consumables_get')" )
public R<ReagentConsumables> getById(String reagentConsumablesId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@@ -94,7 +94,7 @@ public class ReagentConsumablesController {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
reagentConsumables.setReagentConsumablesId(IdWorker.get32UUID().toUpperCase());
reagentConsumables.setReagentConsumableId(IdWorker.get32UUID().toUpperCase());
if (reagentConsumablesService.save(reagentConsumables)) {
return R.ok(reagentConsumables, "对象创建成功");
}
src/main/java/digital/laboratory/platform/reagent/controller/RequisitionRecordController.java
+86 -85
View File
@@ -9,6 +9,7 @@ import digital.laboratory.platform.common.log.annotation.SysLog;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.entity.RequisitionRecord;
import digital.laboratory.platform.reagent.service.RequisitionRecordService;
import digital.laboratory.platform.reagent.vo.RequisitionRecordVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -42,22 +43,22 @@ public class RequisitionRecordController {
private final RequisitionRecordService requisitionRecordService;
/**
* 通过id查询(试剂耗材领用记录表)
* @param requisitionRecordId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{requisitionRecordId}" )
@PreAuthorize("@pms.hasPermission('reagent_requisition_record_get')" )
public R<RequisitionRecord> getById(@PathVariable("requisitionRecordId" ) String requisitionRecordId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
RequisitionRecord requisitionRecord = requisitionRecordService.getById(requisitionRecordId);
return R.ok(requisitionRecord);
//return R.ok(requisitionRecordService.getById(requisitionRecordId));
}
// /**
// * 通过id查询(试剂耗材领用记录表)
// * @param requisitionRecordId id
// * @return R
// */
// @ApiOperation(value = "通过id查询", notes = "通过id查询")
// @GetMapping("/{requisitionRecordId}" )
// @PreAuthorize("@pms.hasPermission('reagent_requisition_record_get')" )
// public R<RequisitionRecord> getById(@PathVariable("requisitionRecordId" ) String requisitionRecordId, HttpServletRequest theHttpServletRequest) {
// Principal principal = theHttpServletRequest.getUserPrincipal();
// DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
//
// RequisitionRecord requisitionRecord = requisitionRecordService.getById(requisitionRecordId);
// return R.ok(requisitionRecord);
// //return R.ok(requisitionRecordService.getById(requisitionRecordId));
// }
/**
* 分页查询
@@ -67,12 +68,12 @@ public class RequisitionRecordController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_requisition_record_get')" )
public R<IPage<RequisitionRecord>> getRequisitionRecordPage(Page<RequisitionRecord> page, RequisitionRecord requisitionRecord, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_requisition_record_get')" )
public R<IPage<RequisitionRecordVO>> getRequisitionRecordPage(Page<RequisitionRecord> page, RequisitionRecord requisitionRecord, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<RequisitionRecord> requisitionRecordSList = requisitionRecordService.page(page, Wrappers.<RequisitionRecord>query()
IPage<RequisitionRecordVO> requisitionRecordSList = requisitionRecordService.getRequisitionRecordVOPage(page, Wrappers.<RequisitionRecord>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
@@ -81,71 +82,71 @@ public class RequisitionRecordController {
}
/**
* 新增(试剂耗材领用记录表)
* @param requisitionRecord (试剂耗材领用记录表)
* @return R
*/
@ApiOperation(value = "新增(试剂耗材领用记录表)", notes = "新增(试剂耗材领用记录表)")
@SysLog("新增(试剂耗材领用记录表)" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_requisition_record_add')" )
public R<RequisitionRecord> postAddObject(@RequestBody RequisitionRecord requisitionRecord, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
requisitionRecord.setRequisitionRecordId(IdWorker.get32UUID().toUpperCase());
if (requisitionRecordService.save(requisitionRecord)) {
return R.ok(requisitionRecord, "对象创建成功");
}
else {
return R.failed(requisitionRecord, "对象创建失败");
}
}
/**
* 修改(试剂耗材领用记录表)
* @param requisitionRecord (试剂耗材领用记录表)
* @return R
*/
@ApiOperation(value = "修改(试剂耗材领用记录表)", notes = "修改(试剂耗材领用记录表)")
@SysLog("修改(试剂耗材领用记录表)" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_requisition_record_edit')" )
public R<RequisitionRecord> putUpdateById(@RequestBody RequisitionRecord requisitionRecord, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (requisitionRecordService.updateById(requisitionRecord)) {
return R.ok(requisitionRecord, "保存对象成功");
}
else {
return R.failed(requisitionRecord, "保存对象失败");
}
}
/**
* 通过id删除(试剂耗材领用记录表)
* @param requisitionRecordId id
* @return R
*/
@ApiOperation(value = "通过id删除(试剂耗材领用记录表)", notes = "通过id删除(试剂耗材领用记录表)")
@SysLog("通过id删除(试剂耗材领用记录表)" )
@DeleteMapping("/{requisitionRecordId}" )
@PreAuthorize("@pms.hasPermission('reagent_requisition_record_del')" )
public R<RequisitionRecord> deleteById(@PathVariable String requisitionRecordId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
RequisitionRecord oldRequisitionRecord = requisitionRecordService.getById(requisitionRecordId);
if (requisitionRecordService.removeById(requisitionRecordId)) {
return R.ok(oldRequisitionRecord, "对象删除成功");
}
else {
return R.failed(oldRequisitionRecord, "对象删除失败");
}
}
// /**
// * 新增(试剂耗材领用记录表)
// * @param requisitionRecord (试剂耗材领用记录表)
// * @return R
// */
// @ApiOperation(value = "新增(试剂耗材领用记录表)", notes = "新增(试剂耗材领用记录表)")
// @SysLog("新增(试剂耗材领用记录表)" )
// @PostMapping
// @PreAuthorize("@pms.hasPermission('reagent_requisition_record_add')" )
// public R<RequisitionRecord> postAddObject(@RequestBody RequisitionRecord requisitionRecord, HttpServletRequest theHttpServletRequest) {
// Principal principal = theHttpServletRequest.getUserPrincipal();
// DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
//
// requisitionRecord.setRequisitionRecordId(IdWorker.get32UUID().toUpperCase());
// if (requisitionRecordService.save(requisitionRecord)) {
// return R.ok(requisitionRecord, "对象创建成功");
// }
// else {
// return R.failed(requisitionRecord, "对象创建失败");
// }
// }
//
// /**
// * 修改(试剂耗材领用记录表)
// * @param requisitionRecord (试剂耗材领用记录表)
// * @return R
// */
// @ApiOperation(value = "修改(试剂耗材领用记录表)", notes = "修改(试剂耗材领用记录表)")
// @SysLog("修改(试剂耗材领用记录表)" )
// @PutMapping
// @PreAuthorize("@pms.hasPermission('reagent_requisition_record_edit')" )
// public R<RequisitionRecord> putUpdateById(@RequestBody RequisitionRecord requisitionRecord, HttpServletRequest theHttpServletRequest) {
// Principal principal = theHttpServletRequest.getUserPrincipal();
// DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
//
// if (requisitionRecordService.updateById(requisitionRecord)) {
// return R.ok(requisitionRecord, "保存对象成功");
// }
// else {
// return R.failed(requisitionRecord, "保存对象失败");
// }
// }
//
// /**
// * 通过id删除(试剂耗材领用记录表)
// * @param requisitionRecordId id
// * @return R
// */
// @ApiOperation(value = "通过id删除(试剂耗材领用记录表)", notes = "通过id删除(试剂耗材领用记录表)")
// @SysLog("通过id删除(试剂耗材领用记录表)" )
// @DeleteMapping("/{requisitionRecordId}" )
// @PreAuthorize("@pms.hasPermission('reagent_requisition_record_del')" )
// public R<RequisitionRecord> deleteById(@PathVariable String requisitionRecordId, HttpServletRequest theHttpServletRequest) {
// Principal principal = theHttpServletRequest.getUserPrincipal();
// DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
//
// RequisitionRecord oldRequisitionRecord = requisitionRecordService.getById(requisitionRecordId);
//
// if (requisitionRecordService.removeById(requisitionRecordId)) {
// return R.ok(oldRequisitionRecord, "对象删除成功");
// }
// else {
// return R.failed(oldRequisitionRecord, "对象删除失败");
// }
//
// }
}
src/main/java/digital/laboratory/platform/reagent/controller/SignedBatchListController.java
-151
View File
@@ -1,151 +0,0 @@
package digital.laboratory.platform.reagent.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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.entity.SignedBatchList;
import digital.laboratory.platform.reagent.service.SignedBatchListService;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
/**
* 签收批次明细
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收批次明细 前端控制器
*
* 这是与表示层的接口, 不应该接业务逻辑写在这里, 业务逻辑应该写在 service 中
* 这里写什么:
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 数据层在 mapper 中, 数据层不涉及业务, 只管技术上的 对象<->表 之间的转换
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/signed_batch_list" )
@Api(value = "signed_batch_list", tags = "签收批次明细管理")
public class SignedBatchListController {
private final SignedBatchListService signedBatchListService;
/**
* 通过id查询签收批次明细
* @param signedBatchListId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{signedBatchListId}" )
@PreAuthorize("@pms.hasPermission('reagent_signed_batch_list_get')" )
public R<SignedBatchList> getById(@PathVariable("signedBatchListId" ) String signedBatchListId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
SignedBatchList signedBatchList = signedBatchListService.getById(signedBatchListId);
return R.ok(signedBatchList);
//return R.ok(signedBatchListService.getById(signedBatchListId));
}
/**
* 分页查询
* @param page 分页对象
* @param signedBatchList 签收批次明细
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_signed_batch_list_get')" )
public R<IPage<SignedBatchList>> getSignedBatchListPage(Page<SignedBatchList> page, SignedBatchList signedBatchList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<SignedBatchList> signedBatchListSList = signedBatchListService.page(page, Wrappers.<SignedBatchList>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(signedBatchListSList);
// return R.ok(signedBatchListService.page(page, Wrappers.query(signedBatchList)));
}
/**
* 新增签收批次明细
* @param signedBatchList 签收批次明细
* @return R
*/
@ApiOperation(value = "新增签收批次明细", notes = "新增签收批次明细")
@SysLog("新增签收批次明细" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_signed_batch_list_add')" )
public R<SignedBatchList> postAddObject(@RequestBody SignedBatchList signedBatchList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
signedBatchList.setSignedBatchListId(IdWorker.get32UUID().toUpperCase());
if (signedBatchListService.save(signedBatchList)) {
return R.ok(signedBatchList, "对象创建成功");
}
else {
return R.failed(signedBatchList, "对象创建失败");
}
}
/**
* 修改签收批次明细
* @param signedBatchList 签收批次明细
* @return R
*/
@ApiOperation(value = "修改签收批次明细", notes = "修改签收批次明细")
@SysLog("修改签收批次明细" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_signed_batch_list_edit')" )
public R<SignedBatchList> putUpdateById(@RequestBody SignedBatchList signedBatchList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (signedBatchListService.updateById(signedBatchList)) {
return R.ok(signedBatchList, "保存对象成功");
}
else {
return R.failed(signedBatchList, "保存对象失败");
}
}
/**
* 通过id删除签收批次明细
* @param signedBatchListId id
* @return R
*/
@ApiOperation(value = "通过id删除签收批次明细", notes = "通过id删除签收批次明细")
@SysLog("通过id删除签收批次明细" )
@DeleteMapping("/{signedBatchListId}" )
@PreAuthorize("@pms.hasPermission('reagent_signed_batch_list_del')" )
public R<SignedBatchList> deleteById(@PathVariable String signedBatchListId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
SignedBatchList oldSignedBatchList = signedBatchListService.getById(signedBatchListId);
if (signedBatchListService.removeById(signedBatchListId)) {
return R.ok(oldSignedBatchList, "对象删除成功");
}
else {
return R.failed(oldSignedBatchList, "对象删除失败");
}
}
}
src/main/java/digital/laboratory/platform/reagent/controller/SigningRecordFormController.java
-169
View File
@@ -1,169 +0,0 @@
package digital.laboratory.platform.reagent.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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.SigningRecordFormDTO;
import digital.laboratory.platform.reagent.entity.SignedBatchList;
import digital.laboratory.platform.reagent.entity.SigningRecordForm;
import digital.laboratory.platform.reagent.service.SigningRecordFormService;
import digital.laboratory.platform.reagent.vo.SigningRecordFormVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
import java.util.List;
/**
* 签收记录表
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收记录表 前端控制器
* <p>
* 这是与表示层的接口, 不应该接业务逻辑写在这里, 业务逻辑应该写在 service 中
* 这里写什么:
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 数据层在 mapper 中, 数据层不涉及业务, 只管技术上的 对象<->表 之间的转换
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/signing_record_form")
@Api(value = "signing_record_form", tags = "签收记录表管理")
public class SigningRecordFormController {
private final SigningRecordFormService signingRecordFormService;
/**
* 通过id查询签收记录表
*
* @param signingRecordFormId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{signingRecordFormId}")
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_get')" )
public R<SigningRecordForm> getById(@PathVariable("signingRecordFormId") String signingRecordFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
SigningRecordFormVO signingRecordFormVO = signingRecordFormService.getSigningRecordFormVO(signingRecordFormId);
return R.ok(signingRecordFormVO);
}
/**
* 分页查询
*
* @param page 分页对象
* @param signingRecordForm 签收记录表
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page")
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_get')")
public R<IPage<SigningRecordForm>> getSigningRecordFormVOPage(Page<SigningRecordForm> page, SigningRecordForm signingRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<SigningRecordForm> signingRecordFormPage = signingRecordFormService.page(page, Wrappers.<SigningRecordForm>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time"));
return R.ok(signingRecordFormPage);
}
/**
* 新增签收记录表
*
* @param signingRecordFormDTOList 签收记录表
* @return R
*/
@ApiOperation(value = "新增签收记录表", notes = "新增签收记录表")
@SysLog("新增签收记录表")
@PostMapping
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_add')")
public R<String> postAddObject(@RequestBody List<SigningRecordFormDTO> signingRecordFormDTOList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
Boolean aBoolean = signingRecordFormService.addFormById(signingRecordFormDTOList, dlpUser);
if (aBoolean) {
return R.ok("保存成功");
} else {
return R.failed("保存失败");
}
}
/**
* 修改签收记录表
*
* @param signingRecordFormDTO 签收记录表
* @return R
*/
@ApiOperation(value = "修改签收记录表", notes = "修改签收记录表")
@SysLog("修改签收记录表")
@PutMapping
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_edit')")
public R<SignedBatchList> putUpdateById(@RequestBody SigningRecordFormDTO signingRecordFormDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
SignedBatchList signedBatchList = signingRecordFormService.editFormById(signingRecordFormDTO);
if (signedBatchList != null) {
return R.ok(signedBatchList, "修改成功");
} else {
return R.failed(signedBatchList, "修改失败");
}
}
/**
* 通过id删除签收记录表
*
* @param signingRecordFormId id
* @return R
*/
@ApiOperation(value = "通过id删除签收记录表", notes = "通过id删除签收记录表")
@SysLog("通过id删除签收记录表")
@DeleteMapping("/{signingRecordFormId}")
@PreAuthorize("@pms.hasPermission('reagent_signing_record_form_del')")
public R<SigningRecordForm> deleteById(@PathVariable String signingRecordFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
SigningRecordForm oldSigningRecordForm = signingRecordFormService.getById(signingRecordFormId);
if (signingRecordFormService.removeById(signingRecordFormId)) {
return R.ok(oldSigningRecordForm, "对象删除成功");
} else {
return R.failed(oldSigningRecordForm, "对象删除失败");
}
}
}
src/main/java/digital/laboratory/platform/reagent/controller/StandardMaterialApplicationController.java
+36 -36
View File
@@ -7,8 +7,10 @@ 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.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.StandardMaterialApplicationDTO;
import digital.laboratory.platform.reagent.entity.StandardMaterialApplication;
import digital.laboratory.platform.reagent.service.StandardMaterialApplicationService;
import digital.laboratory.platform.reagent.vo.StandardMaterialApplicationVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -49,7 +51,7 @@ public class StandardMaterialApplicationController {
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{standardMaterialApplicationId}" )
@PreAuthorize("@pms.hasPermission('reagent_standard_material_application_get')" )
// @PreAuthorize("@pms.hasPermission('reagent_standard_material_application_get')" )
public R<StandardMaterialApplication> getById(@PathVariable("standardMaterialApplicationId" ) String standardMaterialApplicationId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@@ -65,14 +67,14 @@ public class StandardMaterialApplicationController {
* @param standardMaterialApplication (标准物质领用/归还登记表)
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@ApiOperation(value = "领用分页查询", notes = "领用分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_standard_material_application_get')" )
public R<IPage<StandardMaterialApplication>> getStandardMaterialApplicationPage(Page<StandardMaterialApplication> page, StandardMaterialApplication standardMaterialApplication, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_standard_material_application_get')" )
public R<IPage<StandardMaterialApplicationVO>> getStandardMaterialApplicationPage(Page<StandardMaterialApplication> page, StandardMaterialApplication standardMaterialApplication, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<StandardMaterialApplication> standardMaterialApplicationSList = standardMaterialApplicationService.page(page, Wrappers.<StandardMaterialApplication>query()
IPage<StandardMaterialApplicationVO> standardMaterialApplicationSList = standardMaterialApplicationService.getPage(page, Wrappers.<StandardMaterialApplication>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
@@ -80,49 +82,47 @@ public class StandardMaterialApplicationController {
// return R.ok(standardMaterialApplicationService.page(page, Wrappers.query(standardMaterialApplication)));
}
/**
* 新增(标准物质领用/归还登记表)
* @param standardMaterialApplication (标准物质领用/归还登记表)
* @return R
*/
@ApiOperation(value = "新增(标准物质领用/归还登记表)", notes = "新增(标准物质领用/归还登记表)")
@SysLog("新增(标准物质领用/归还登记表)" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_standard_material_application_add')" )
public R<StandardMaterialApplication> postAddObject(@RequestBody StandardMaterialApplication standardMaterialApplication, HttpServletRequest theHttpServletRequest) {
/**
* 分页查询
* @param page 分页对象
* @param standardMaterialApplication (标准物质领用/归还登记表)
* @return
*/
@ApiOperation(value = "归还分页查询", notes = "归还分页查询")
@GetMapping("/return/page" )
// @PreAuthorize("@pms.hasPermission('reagent_standard_material_application_get')" )
public R<IPage<StandardMaterialApplicationVO>> getList(Page<StandardMaterialApplication> page, StandardMaterialApplication standardMaterialApplication, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
standardMaterialApplication.setStandardMaterialApplicationId(IdWorker.get32UUID().toUpperCase());
if (standardMaterialApplicationService.save(standardMaterialApplication)) {
return R.ok(standardMaterialApplication, "对象创建成功");
}
else {
return R.failed(standardMaterialApplication, "对象创建失败");
}
}
IPage<StandardMaterialApplicationVO> standardMaterialApplicationSList = standardMaterialApplicationService.getList(page, Wrappers.<StandardMaterialApplication>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(standardMaterialApplicationSList);
// return R.ok(standardMaterialApplicationService.page(page, Wrappers.query(standardMaterialApplication)));
}
/**
* 修改(标准物质领用/归还登记表)
* @param standardMaterialApplication (标准物质领用/归还登记表)
* 归还(标准物质领用/归还登记表)
* @param standardMaterialApplicationDTO (标准物质领用/归还登记表)
* @return R
*/
@ApiOperation(value = "修改(标准物质领用/归还登记表)", notes = "修改(标准物质领用/归还登记表)")
@ApiOperation(value = "归还(标准物质领用/归还登记表)", notes = "归还(标准物质领用/归还登记表)")
@SysLog("修改(标准物质领用/归还登记表)" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_standard_material_application_edit')" )
public R<StandardMaterialApplication> putUpdateById(@RequestBody StandardMaterialApplication standardMaterialApplication, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_standard_material_application_edit')" )
public R<StandardMaterialApplication> putUpdateById(@RequestBody StandardMaterialApplicationDTO standardMaterialApplicationDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (standardMaterialApplicationService.updateById(standardMaterialApplication)) {
return R.ok(standardMaterialApplication, "保存对象成功");
}
else {
return R.failed(standardMaterialApplication, "保存对象失败");
}
}
StandardMaterialApplication standardMaterialApplication = standardMaterialApplicationService.returnById(standardMaterialApplicationDTO);
if (standardMaterialApplication!=null){
return R.ok(standardMaterialApplication,"归还成功");
}else return R.failed("归还失败");
}
/**
* 通过id删除(标准物质领用/归还登记表)
src/main/java/digital/laboratory/platform/reagent/controller/WarehousingRecordFormController.java
+167
View File
@@ -0,0 +1,167 @@
package digital.laboratory.platform.reagent.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.common.log.annotation.SysLog;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.WarehousingRecordFormDTO;
import digital.laboratory.platform.reagent.entity.WarehousingBatchList;
import digital.laboratory.platform.reagent.entity.WarehousingRecordForm;
import digital.laboratory.platform.reagent.service.WarehousingRecordFormService;
import digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.List;
/**
* 签收记录表
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收记录表 前端控制器
* <p>
* 这是与表示层的接口, 不应该接业务逻辑写在这里, 业务逻辑应该写在 service 中
* 这里写什么:
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 数据层在 mapper 中, 数据层不涉及业务, 只管技术上的 对象<->表 之间的转换
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/warehousing_record_form")
@Api(value = "warehousing_record_form", tags = "入库记录表管理")
public class WarehousingRecordFormController {
private final WarehousingRecordFormService warehousingRecordFormService;
/**
* 通过id查询签收记录表
*
* @param warehousingRecordFormId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{warehousingRecordFormId}")
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_get')" )
public R<WarehousingRecordFormVO> getById(@PathVariable("warehousingRecordFormId") String warehousingRecordFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
WarehousingRecordFormVO warehousingRecordFormVO = warehousingRecordFormService.getWarehousingRecordFormVO(warehousingRecordFormId);
return R.ok(warehousingRecordFormVO);
}
/**
* 分页查询
*
* @param page 分页对象
* @param signingRecordForm 签收记录表
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page")
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_get')")
public R<IPage<WarehousingRecordForm>> getWarehousingRecordFormVOPage(Page<WarehousingRecordForm> page, WarehousingRecordForm signingRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<WarehousingRecordForm> signingRecordFormPage = warehousingRecordFormService.page(page, Wrappers.<WarehousingRecordForm>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time"));
return R.ok(signingRecordFormPage);
}
/**
* 新增签收记录表
*
* @param warehousingRecordFormDTOList 签收记录表
* @return R
*/
@ApiOperation(value = "新增签收记录表", notes = "新增签收记录表")
@SysLog("新增签收记录表")
@PostMapping
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_add')")
public R<String> postAddObject(@RequestBody List<WarehousingRecordFormDTO> warehousingRecordFormDTOList, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
Boolean aBoolean = warehousingRecordFormService.addFormById(warehousingRecordFormDTOList, dlpUser);
if (aBoolean) {
return R.ok("保存成功");
} else {
return R.failed("保存失败");
}
}
// /**
// * 修改签收记录表
// *
// * @param warehousingRecordFormDTO 签收记录表
// * @return R
// */
// @ApiOperation(value = "修改签收记录表", notes = "修改签收记录表")
// @SysLog("修改签收记录表")
// @PutMapping
//// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_edit')")
// public R<WarehousingBatchList> putUpdateById(@RequestBody WarehousingRecordFormDTO warehousingRecordFormDTO, HttpServletRequest theHttpServletRequest) {
//
// Principal principal = theHttpServletRequest.getUserPrincipal();
//
// DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
//
// WarehousingRecordFormDTO warehousingRecordFormDTO1 = warehousingRecordFormDTO;
//
//
// if ( != null) {
// return R.ok(signedBatchList, "修改成功");
// } else {
// return R.failed(signedBatchList, "修改失败");
// }
// }
// /**
// * 通过id删除签收记录表
// *
// * @param signingRecordFormId id
// * @return R
// */
// @ApiOperation(value = "通过id删除签收记录表", notes = "通过id删除签收记录表")
// @SysLog("通过id删除签收记录表")
// @DeleteMapping("/{signingRecordFormId}")
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_del')")
// public R<W> deleteById(@PathVariable String signingRecordFormId, HttpServletRequest theHttpServletRequest) {
// Principal principal = theHttpServletRequest.getUserPrincipal();
// DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
//
// SigningRecordForm oldSigningRecordForm = warehousingRecordFormService.getById(signingRecordFormId);
//
// if (warehousingRecordFormService.removeById(signingRecordFormId)) {
// return R.ok(oldSigningRecordForm, "对象删除成功");
// } else {
// return R.failed(oldSigningRecordForm, "对象删除失败");
// }
//
// }
}
src/main/java/digital/laboratory/platform/reagent/dto/AuditAndApproveDTO.java
+2 -2
View File
@@ -11,11 +11,11 @@ public class AuditAndApproveDTO {
private String uuId;
private String auditResult;
private Boolean auditResult;
private String auditOpinion;
private String approveResult;
private Boolean approveResult;
private String approveOpinion;
src/main/java/digital/laboratory/platform/reagent/dto/CentralizedRequestDTO.java
+12 -4
View File
@@ -1,5 +1,7 @@
package digital.laboratory.platform.reagent.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -8,20 +10,26 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "集中采购申请DTO")
public class CentralizedRequestDTO {
@ApiModelProperty(value="集中采购申请ID")
private String centralizedRequestId;
@ApiModelProperty(value="采购目录编号")
private String purchaseCatalogueNumber;
private Integer quantityPurchased;
@ApiModelProperty(value="申请数量")
private Integer numberOfApplications;
@ApiModelProperty(value="试剂耗材ID")
private String reagentConsumableId;
@ApiModelProperty(value="备注")
private String remarks;
private String catalogueDetailsId;
@ApiModelProperty(value="集中采购申请明细Id")
private String detailsOfCentralizedId;
}
src/main/java/digital/laboratory/platform/reagent/dto/DecentralizedRequestDTO.java
+58 -14
View File
@@ -1,5 +1,6 @@
package digital.laboratory.platform.reagent.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -9,20 +10,63 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
public class DecentralizedRequestDTO {
@ApiModelProperty(value = "(品牌)")
private String brand;
private String category;
private String deviationOrUncertainty;
private String packagedCopies;
private Integer quantity;
private String species;
private String reagentConsumableId;
private String specificationAndModel;
private String technicalParameter;
private String standardValueOrPurity;
private String use;
private String decentralizedRequestId;
private String decentralizeDetailsId;
private Double unitPrice;
private String brand;
@ApiModelProperty(value = "(类别)")
private String category;
@ApiModelProperty(value="偏差/不确定度")
private String deviationOrUncertainty;
@ApiModelProperty(value="包装份数")
private String packagedCopies;
@ApiModelProperty(value="(数量)")
private Integer quantity;
@ApiModelProperty(value="(种类)")
private String species;
@ApiModelProperty(value="(试剂耗材ID)")
private String reagentConsumableId;
@ApiModelProperty(value="(规格型号)")
private String specificationAndModel;
@ApiModelProperty(value="(技术参数)")
private String technicalParameter;
@ApiModelProperty(value="(标准值/纯度)")
private String standardValueOrPurity;
@ApiModelProperty(value="(用途)")
private String purpose;
private String decentralizedRequestId;
private String decentralizeDetailsId;
@ApiModelProperty(value="单价")
private Double unitPrice;
@ApiModelProperty(value="(试剂耗材名称)")
private String reagentConsumableName;
@ApiModelProperty(value="存储条件")
private String storageCondition;
@ApiModelProperty(value="别名")
private String alias;
@ApiModelProperty(value="备注")
private String remark;
@ApiModelProperty(value="(英文名)")
private String englishName;
@ApiModelProperty(value="包装单位")
private String minimumUnit;
}
src/main/java/digital/laboratory/platform/reagent/dto/PurchaseCatalogueDTO.java
+49 -13
View File
@@ -1,5 +1,7 @@
package digital.laboratory.platform.reagent.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -7,31 +9,65 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "采购目录DTO")
public class PurchaseCatalogueDTO {
/**
* (品牌)
*/
@ApiModelProperty(value="品牌")
private String brand;
@ApiModelProperty(value="类别")
private String category;
@ApiModelProperty(value="偏差/不确定度")
private String deviationOrUncertainty;
@ApiModelProperty(value="编号")
private String number;
@ApiModelProperty(value="包装份数")
private String brand;
private String packagedCopies;
@ApiModelProperty(value="采购目录ID")
private String category;
private String purchaseCatalogueId;
@ApiModelProperty(value="采购目录编号")
private String devivationOrUncertainty;
private String purchaseCatalogueNumber;
@ApiModelProperty(value="试剂耗材名称")
private String number;
private String reagentConsumableName;
@ApiModelProperty(value="种类)")
private String packagedCopies;
private String species;
@ApiModelProperty(value="规格型号")
private String purchaseCatalogueId;
private String specificationAndModel;
@ApiModelProperty(value="标准值/纯度")
private String purchaseCatalogueNumber;
private String standardValueOrPurity;
@ApiModelProperty(value="单价")
private String reagentConsumableId;
private Double unitPrice;
@ApiModelProperty(value="采购目录明细ID")
private String species;
private String catalogueDetailsId;
@ApiModelProperty(value="试剂耗材Id")
private String specificationAndModel;
private String reagentConsumableId;
@ApiModelProperty(value="存储条件")
private String standardValueOrPurity;
private String storageCondition;
@ApiModelProperty(value="别名")
private String alias;
@ApiModelProperty(value="备注")
private String remark;
@ApiModelProperty(value="包装单位")
private String minimumUnit;
@ApiModelProperty(value="英文名")
private String englishName;
private Double unitPrice;
private String catalogueDetailsId;
}
src/main/java/digital/laboratory/platform/reagent/dto/PurchaseListDTO.java
+12
View File
@@ -1,5 +1,6 @@
package digital.laboratory.platform.reagent.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -8,9 +9,20 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
public class PurchaseListDTO {
@ApiModelProperty(value="(采购清单ID)·")
private String purchaseListId;
@ApiModelProperty(value="(采购量)")
private Integer purchaseQuantity;
@ApiModelProperty(value="(试剂耗材ID)")
private String reagentConsumableId;
@ApiModelProperty(value="(备注)")
private String remarks;
@ApiModelProperty(value="(供应商ID)")
private String supplierId;
}
src/main/java/digital/laboratory/platform/reagent/dto/PurchasingPlanDTO.java
+30 -3
View File
@@ -1,5 +1,8 @@
package digital.laboratory.platform.reagent.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -7,12 +10,36 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "(采购计划DTO)")
public class PurchasingPlanDTO {
@ApiModelProperty(value="集中采购申请明细ID")
private String detailsOfCentralizedId;
@ApiModelProperty(value="采购计划id")
private String purchasingPlanId;
private Integer quantity;
@ApiModelProperty(value="申请数量)")
private Integer numberOfApplications;
@ApiModelProperty(value="采购数量)")
private Integer quantityPurchased;
@ApiModelProperty(value="试剂耗材ID")
private String reagentConsumableId;
private Double subtotal;
private Double unitPrice;
@ApiModelProperty(value="集中采购申请明细ID")
private String procurementContentId;
@ApiModelProperty(value="换货试剂耗材ID")
private String replacementReagentConsumableId;
@ApiModelProperty(value="换货数量")
private Integer replacementQuantity;
@ApiModelProperty(value="换货单价")
private Double replacementPrice;
}
src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceContent.java
+3 -55
View File
@@ -30,65 +30,13 @@ public class AcceptanceContent extends BaseEntity {
@ApiModelProperty(value="(验收记录表ID)")
private String acceptanceRecordFormId;
/**
* (数量一致)
*/
@ApiModelProperty(value="(数量一致)")
private String consistentQuantity;
/**
* (数量一致备注)
* (不合格项目)
*/
@ApiModelProperty(value="(数量一致备注)")
private String cRemark;
@ApiModelProperty(value="(不合格项目)")
private String nonconformingItem;
/**
* (供货周期)
*/
@ApiModelProperty(value="(供货周期)")
private String deliveryCycle;
/**
* (供货周期备注)
*/
@ApiModelProperty(value="(供货周期备注)")
private String dRemark;
/**
* (包装完好)
*/
@ApiModelProperty(value="(包装完好)")
private String packingSound;
/**
* (包装完好备注备注)
*/
@ApiModelProperty(value="(包装完好备注备注)")
private String pRemark;
/**
* (品牌、型号一致)
*/
@ApiModelProperty(value="(品牌、型号一致)")
private String theSameBrandAndModel;
/**
* (品牌、型号一致备注)
*/
@ApiModelProperty(value="(品牌、型号一致备注)")
private String tRemark;
/**
* (有效期)
*/
@ApiModelProperty(value="(有效期)")
private String validityPeriod;
/**
* (有效期备注)
*/
@ApiModelProperty(value="(有效期备注)")
private String vRemark;
src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceRecordForm.java
+104 -32
View File
@@ -6,8 +6,10 @@ 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;
@@ -24,124 +26,194 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "(验收记录表)")
public class AcceptanceRecordForm extends BaseEntity {
/**
* (验收结论)
* (供应商ID)
*/
@ApiModelProperty(value="(验收结论)")
private String acceptanceConclusion;
@ApiModelProperty(value = "(供应商ID)")
private String supplierId;
/**
* 部门负责人审核时间
*/
@ApiModelProperty(value="部门负责人审核时间")
private LocalDateTime auditTimeOfDepartment;
@ApiModelProperty(value = "三级审核时间")
private LocalDateTime auditTimeOfThreeLevel;
/**
* (验收日期)
*/
@ApiModelProperty(value="(验收日期)")
@ApiModelProperty(value = "(验收日期)")
private LocalDateTime dateOfAcceptance;
/**
* (部门负责人审核意见)
*/
@ApiModelProperty(value="(部门负责人审核意见)")
private String auditOpinionOfDepartment;
@ApiModelProperty(value = "(三及审核意见)")
private String auditOpinionOfThreeLevel;
/**
* (部门负责人ID)
*/
@ApiModelProperty(value="(部门负责人ID)")
private String departmentHeadId;
@ApiModelProperty(value = "(三级审核人ID)")
private String threeLevelAuditorId;
/**
* (后续处理情况)
*/
@ApiModelProperty(value="(后续处理情况)")
@ApiModelProperty(value = "(后续处理情况)")
private String followUpTreatment;
/**
* (不合格项目)
*/
@ApiModelProperty(value="(不合格项目)")
private String nonconformingItem;
/**
* (二级审核意见)
*/
@ApiModelProperty(value="(二级审核意见)")
@ApiModelProperty(value = "(二级审核意见)")
private String auditOpinionOfSecondary;
/**
* (二级审核人ID)
*/
@ApiModelProperty(value="(二级审核人ID)")
@ApiModelProperty(value = "(二级审核人ID)")
private String secondaryAuditorId;
/**
* (二级审核时间)
*/
@ApiModelProperty(value="(二级审核时间)")
private String auditTimeOfSecondary;
@ApiModelProperty(value = "(二级审核时间)")
private LocalDateTime auditTimeOfSecondary;
/**
* (试剂耗材ID)
*/
@ApiModelProperty(value="(试剂耗材ID)")
@ApiModelProperty(value = "(试剂耗材ID)")
private String reagentConsumableId;
/**
* (一级审核意见)
*/
@ApiModelProperty(value="(一级审核意见)")
@ApiModelProperty(value = "(一级审核意见)")
private String auditOpinionOfPrimary;
/**
* (一级审核时间)
*/
@ApiModelProperty(value="(一级审核时间)")
@ApiModelProperty(value = "(一级审核时间)")
private LocalDateTime auditTimeOfPrimary;
/**
* (一级审核人ID)
*/
@ApiModelProperty(value="(一级审核人ID)")
@ApiModelProperty(value = "(一级审核人ID)")
private String primaryAuditorId;
/**
* 签收批次明细ID
*/
@ApiModelProperty(value="签收批次明细ID")
@ApiModelProperty(value = "签收批次明细ID")
private String signedBatchListId;
/**
* acceptanceRecordFormId
*/
@TableId(value = "acceptance_record_form_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="acceptanceRecordFormId")
@ApiModelProperty(value = "acceptanceRecordFormId")
private String acceptanceRecordFormId;
/**
* 一级审核结果
*/
@ApiModelProperty(value="一级审核结果")
private String auditResultOfPrimary;
@ApiModelProperty(value = "一级审核结果")
private boolean auditResultOfPrimary;
/**
* 部门负责人审核结果
*/
@ApiModelProperty(value="部门负责人审核结果")
private String auditResultOfDepartment;
@ApiModelProperty(value = "三级审核结果")
private boolean auditResultOfThreeLevel;
/**
* (二级审核结果)
*/
@ApiModelProperty(value="(二级审核结果)")
private String auditResultOfSecondary;
@ApiModelProperty(value = "(二级审核结果)")
private boolean auditResultOfSecondary;
/**
* (品牌型号一致)
*/
@ApiModelProperty(value = "(品牌型号一致)")
private boolean theSameBrandAndModel;
/**
* (品牌型号一致备注)
*/
@ApiModelProperty(value = "(品牌型号一致备注)")
private String bam_remarks;
/**
* (数量一致)
*/
@ApiModelProperty(value = "(数量一致)")
private boolean consistentQuantity;
/**
* (数量一致备注)
*/
@ApiModelProperty(value = "(数量一致备注)")
private String cq_remarks;
/**
* (包装完好)
*/
@ApiModelProperty(value = "(包装完好)")
private boolean packingInGoodCondition;
/**
* (包装完好备注)
*/
@ApiModelProperty(value = "(包装完好备注)")
private String pgc_remarks;
/**
* (有效期)
*/
@ApiModelProperty(value = "(有效期)")
private boolean validityPeriod;
/**
* (有效期备注)
*/
@ApiModelProperty(value = "(有效期备注)")
private String vp_remarks;
/**
* (供货周期)
*/
@ApiModelProperty(value = "(供货周期)")
private boolean deliveryCycle;
/**
* (供货周期备注)
*/
@ApiModelProperty(value = "(供货周期备注)")
private String dc_remarks;
/**
* (验收结论)
*/
@ApiModelProperty(value = "(验收结论)")
private String acceptanceConclusion;
/**
* (不合格项目)
*/
@ApiModelProperty(value = "(不合格项目)")
private String nonconformingItem;
/**
* (状态)
*/
@ApiModelProperty(value = "(状态)")
private Integer status;
/**
* (签收物品明细Id)
*/
@ApiModelProperty(value = "(签收物品明细Id)")
private String warehousingContentId;
}
src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java
+8 -16
View File
@@ -36,11 +36,7 @@ public class ApplicationForUse extends BaseEntity {
@ApiModelProperty(value="(领用人ID)")
private String recipientId;
/**
* (备注)
*/
@ApiModelProperty(value="(备注)")
private String remarks;
/**
* (状态)
@@ -48,11 +44,7 @@ public class ApplicationForUse extends BaseEntity {
@ApiModelProperty(value="(状态)")
private Integer status;
/**
* (用途)
*/
@ApiModelProperty(value="(用途)")
private String use;
/**
* applicationForUseId
@@ -62,21 +54,21 @@ public class ApplicationForUse extends BaseEntity {
private String applicationForUseId;
/**
* deliveryRegistrationFormId
* 出库记录表
*/
@ApiModelProperty(value="deliveryRegistrationFormId")
@ApiModelProperty(value="出库记录表")
private String deliveryRegistrationFormId;
/**
* requisitionRecordId
* 领用记录表
*/
@ApiModelProperty(value="requisitionRecordId")
@ApiModelProperty(value="领用记录表")
private String requisitionRecordId;
/**
* claimCode
* 领取码
*/
@ApiModelProperty(value="claimCode")
@ApiModelProperty(value="领取码")
private String claimCode;
src/main/java/digital/laboratory/platform/reagent/entity/BatchDetails.java
+2 -2
View File
@@ -28,7 +28,7 @@ public class BatchDetails extends BaseEntity {
* (批次)
*/
@ApiModelProperty(value="(批次)")
private String batch;
private Integer batch;
/**
* (批号)
@@ -40,7 +40,7 @@ public class BatchDetails extends BaseEntity {
* (符合性检验情况)
*/
@ApiModelProperty(value="(符合性检验情况)")
private String complianceTestSituation;
private Boolean complianceTestSituation;
/**
* (上次期间核查日期)
src/main/java/digital/laboratory/platform/reagent/entity/Blacklist.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class Blacklist extends BaseEntity {
* (符合性检查结果)
*/
@ApiModelProperty(value="(符合性检查结果)")
private String resultsOfComplianceCheck;
private Boolean resultsOfComplianceCheck;
/**
* (供应商ID)
src/main/java/digital/laboratory/platform/reagent/entity/CatalogueDetails.java
+39 -13
View File
@@ -27,13 +27,19 @@ public class CatalogueDetails extends BaseEntity {
/**
* (品牌)
*/
@ApiModelProperty(value="(品牌)")
@ApiModelProperty(value="品牌)")
private String brand;
/**
* (英文名)
*/
@ApiModelProperty(value="英文名)")
private String englishName;
/**
* (类别)
*/
@ApiModelProperty(value="(类别)")
@ApiModelProperty(value="类别)")
private String category;
/**
@@ -42,12 +48,6 @@ public class CatalogueDetails extends BaseEntity {
@ApiModelProperty(value="偏差/不确定度")
private String deviationOrUncertainty;
/**
* 编号(标准物质)
*/
@ApiModelProperty(value="编号(标准物质)")
private String number;
/**
* 包装份数
*/
@@ -63,13 +63,18 @@ public class CatalogueDetails extends BaseEntity {
/**
* (采购目录编号)
*/
@ApiModelProperty(value="(采购目录编号)")
@ApiModelProperty(value="采购目录编号)")
private String purchaseCatalogueNumber;
/**
* 试剂耗材ID
* 试剂耗材名称
*/
@ApiModelProperty(value="试剂耗材ID")
@ApiModelProperty(value="试剂耗材名称")
private String reagentConsumableName;
/**
* 试剂耗材Id
*/
@ApiModelProperty(value="试剂耗材Id")
private String reagentConsumableId;
/**
@@ -81,13 +86,13 @@ public class CatalogueDetails extends BaseEntity {
/**
* (规格型号)
*/
@ApiModelProperty(value="(规格型号)")
@ApiModelProperty(value="规格型号)")
private String specificationAndModel;
/**
* (标准值/纯度)
*/
@ApiModelProperty(value="(标准值/纯度)")
@ApiModelProperty(value="标准值/纯度)")
private String standardValueOrPurity;
/**
@@ -97,8 +102,29 @@ public class CatalogueDetails extends BaseEntity {
private Double unitPrice;
/**
* 别名
*/
@ApiModelProperty(value="别名")
private String alias;
/**
* 存储条件
*/
@ApiModelProperty(value="存储条件")
private String storageCondition;
/**
* 备注
*/
@ApiModelProperty(value="备注")
private String remark;
/**
* 包装单位
*/
@ApiModelProperty(value="包装单位")
private String minimumUnit;
/**
* catalogueDetailsId
src/main/java/digital/laboratory/platform/reagent/entity/CentralizedRequest.java
+24 -29
View File
@@ -21,45 +21,27 @@ import lombok.EqualsAndHashCode;
@Data
@TableName(value = "centralized_request", autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "(集中采购申请)")
@ApiModel(value = "集中采购申请")
public class CentralizedRequest extends BaseEntity {
/**
* (编号)
*/
@ApiModelProperty(value="编号")
private String number;
/**
* (申请人ID)
*/
@ApiModelProperty(value="(申请人ID)")
@ApiModelProperty(value="申请人ID")
private String applicantId;
/**
* (审核意见)
*/
@ApiModelProperty(value="(审核意见)")
private String auditOpinion;
/**
* (审核结果)
*/
@ApiModelProperty(value="(审核结果)")
private String auditResult;
/**
* (审核时间)
*/
@ApiModelProperty(value="(审核时间)")
private LocalDateTime auditTime;
/**
* (申请日期)
*/
@ApiModelProperty(value="(申请日期)")
@ApiModelProperty(value="申请日期")
private LocalDateTime dateOfApplication;
/**
* (部门负责人ID)
*/
@ApiModelProperty(value="(审核人ID)")
private String auditorId;
/**
* 采购计划ID
*/
@@ -69,9 +51,22 @@ public class CentralizedRequest extends BaseEntity {
/**
* (状态)
*/
@ApiModelProperty(value="(状态)")
@ApiModelProperty(value="状态(0:未提交，1：已提交)")
private Integer status;
/**
* (部门名称)
*/
@ApiModelProperty(value="部门名称")
private String orgName;
/**
* (申请人名称)
*/
@ApiModelProperty(value="申请人名称")
private String applicantName;
@@ -80,7 +75,7 @@ public class CentralizedRequest extends BaseEntity {
* centralizedRequestId
*/
@TableId(value = "centralized_request_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="centralizedRequestId")
@ApiModelProperty(value="集中采购申请ID")
private String centralizedRequestId;
src/main/java/digital/laboratory/platform/reagent/entity/CheckContent.java
-22
View File
@@ -24,29 +24,7 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "(检查内容)")
public class CheckContent extends BaseEntity {
/**
* 品牌
*/
@ApiModelProperty(value="品牌")
private String brand;
/**
* (符合性检查记录表ID)
*/
@ApiModelProperty(value="(符合性检查记录表ID)")
private String complianceCheckId;
/**
* (试剂耗材ID)
*/
@ApiModelProperty(value="(试剂耗材ID)")
private String reagentConsumableId;
/**
* (规格型号)
*/
@ApiModelProperty(value="(规格型号)")
private String specificationAndModel;
/**
* checkContentId
src/main/java/digital/laboratory/platform/reagent/entity/ComplianceCheck.java
+36 -13
View File
@@ -30,6 +30,12 @@ public class ComplianceCheck extends BaseEntity {
@ApiModelProperty(value="(一级审核意见)")
private String auditOpinionOfPrimary;
/**
* (编号)
*/
@ApiModelProperty(value="(编号)")
private String number;
/**
* (二级审核意见)
*/
@@ -40,13 +46,13 @@ public class ComplianceCheck extends BaseEntity {
* (一级审核结果)
*/
@ApiModelProperty(value="(一级审核结果)")
private String auditResultOfPrimary;
private Boolean auditResultOfPrimary;
/**
* (二级审核结果)
*/
@ApiModelProperty(value="(二级审核结果)")
private String auditResultOfSecondary;
private Boolean auditResultOfSecondary;
/**
* (一级审核时间)
@@ -60,12 +66,6 @@ public class ComplianceCheck extends BaseEntity {
@ApiModelProperty(value="(二级审核时间)")
private LocalDateTime auditTimeOfSecondary;
/**
* (检查不符合项目)
*/
@ApiModelProperty(value="(检查不符合项目)")
private String checkForNonconformities;
/**
* (检查日期)
*/
@@ -78,11 +78,6 @@ public class ComplianceCheck extends BaseEntity {
@ApiModelProperty(value="(检查结论)")
private String examinationConclusion;
/**
* (执行人ID)
*/
@ApiModelProperty(value="(执行人ID)")
private String executorId;
/**
* (一级审核人ID)
@@ -108,6 +103,34 @@ public class ComplianceCheck extends BaseEntity {
@ApiModelProperty(value="(二级审核人ID)")
private String secondaryAuditorId;
/**
* 品牌
*/
@ApiModelProperty(value="品牌")
private String brand;
/**
* (试剂耗材ID)
*/
@ApiModelProperty(value="(试剂耗材ID)")
private String reagentConsumableId;
/**
* (标准物质编号)
*/
@ApiModelProperty(value="(标准物质编号)")
private String reagentConsumableNumber;
/**
* (规格型号)
*/
@ApiModelProperty(value="(规格型号)")
private String specificationAndModel;
/**
* (不合格项目)
*/
@ApiModelProperty(value="(不合格项目)")
private String nonconformingItem;
/**
* complianceCheckId
*/
src/main/java/digital/laboratory/platform/reagent/entity/DecentralizeDetails.java
+36
View File
@@ -29,6 +29,11 @@ public class DecentralizeDetails extends BaseEntity {
*/
@ApiModelProperty(value="(品牌)")
private String brand;
/**
* (英文名)
*/
@ApiModelProperty(value="(英文名)")
private String englishName;
/**
* (类别)
@@ -73,6 +78,12 @@ public class DecentralizeDetails extends BaseEntity {
@ApiModelProperty(value="(试剂耗材ID)")
private String reagentConsumableId;
/**
* (试剂耗材名称)
*/
@ApiModelProperty(value="(试剂耗材名称)")
private String reagentConsumableName;
/**
* (种类)
*/
@@ -103,6 +114,31 @@ public class DecentralizeDetails extends BaseEntity {
@ApiModelProperty(value="单价")
private Double unitPrice;
/**
* 别名
*/
@ApiModelProperty(value="别名")
private String alias;
/**
* 存储条件
*/
@ApiModelProperty(value="存储条件")
private String storageCondition;
/**
* 备注
*/
@ApiModelProperty(value="备注")
private String remark;
/**
* 包装单位
*/
@ApiModelProperty(value="包装单位")
private String minimumUnit;
/**
* (用途)
*/
src/main/java/digital/laboratory/platform/reagent/entity/DecentralizedRequest.java
+5 -5
View File
@@ -40,7 +40,7 @@ public class DecentralizedRequest extends BaseEntity {
* (审批结果)
*/
@ApiModelProperty(value="(审批结果)")
private String resultOfApproval;
private Boolean resultOfApproval;
/**
* (审批时间)
@@ -70,19 +70,19 @@ public class DecentralizedRequest extends BaseEntity {
* (一级审核结果)
*/
@ApiModelProperty(value="(一级审核结果)")
private String auditResultOfPrimary;
private Boolean auditResultOfPrimary;
/**
* (二级审核结果)
*/
@ApiModelProperty(value="(二级审核结果)")
private String auditResultOfSecondary;
private Boolean auditResultOfSecondary;
/**
* (三级审核结果)
*/
@ApiModelProperty(value="(三级审核结果)")
private String auditResultOfThreeLevel;
private Boolean auditResultOfThreeLevel;
/**
* (一级审核时间)
@@ -106,7 +106,7 @@ public class DecentralizedRequest extends BaseEntity {
* (需要符合性检验)
*/
@ApiModelProperty(value="(需要符合性检验)")
private String complianceTesting;
private Boolean complianceTesting;
/**
* (申请日期)
src/main/java/digital/laboratory/platform/reagent/entity/DetailsOfCentralized.java
+29 -6
View File
@@ -27,39 +27,62 @@ public class DetailsOfCentralized extends BaseEntity {
/**
* (集中采购申请ID)
*/
@ApiModelProperty(value="(集中采购申请ID)")
@ApiModelProperty(value="集中采购申请ID")
private String centralizedRequestId;
/**
* (采购目录编号)
*/
@ApiModelProperty(value="(采购目录编号)")
@ApiModelProperty(value="采购目录编号")
private String purchaseCatalogueNumber;
/**
* (采购数量)
*/
@ApiModelProperty(value="(采购数量)")
@ApiModelProperty(value="采购数量")
private Integer quantityPurchased;
/**
* (申请数量)
*/
@ApiModelProperty(value="申请数量")
private Integer numberOfApplications;
/**
* (试剂耗材ID)
*/
@ApiModelProperty(value="(试剂耗材ID)")
@ApiModelProperty(value="试剂耗材ID")
private String reagentConsumableId;
/**
* (备注)
*/
@ApiModelProperty(value="(备注)")
@ApiModelProperty(value="备注")
private String remarks;
/**
* (换货试剂耗材ID)
*/
@ApiModelProperty(value="换货试剂耗材ID")
private String replacementReagentConsumableId;
/**
* (采购计划明细ID)
*/
@ApiModelProperty(value="采购计划明细ID")
private String procurementContentId;
/**
* (换货数量)
*/
@ApiModelProperty(value="换货数量")
private Integer replacementQuantity;
/**
* detailsOfCentralizedId
*/
@TableId(value = "details_of_centralized_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="detailsOfCentralizedId")
@ApiModelProperty(value="集中采购明细ID")
private String detailsOfCentralizedId;
src/main/java/digital/laboratory/platform/reagent/entity/EvaluationForm.java
+8 -2
View File
@@ -55,7 +55,7 @@ public class EvaluationForm extends BaseEntity {
* (二级评价结果)
*/
@ApiModelProperty(value="(二级评价结果)")
private String commentsResultFromSecondary;
private Boolean commentsResultFromSecondary;
/**
* (三级评价意见)
@@ -73,7 +73,7 @@ public class EvaluationForm extends BaseEntity {
* (三级评价结果)
*/
@ApiModelProperty(value="(三级评价结果)")
private String commentsResultFromThreeLevel;
private Boolean commentsResultFromThreeLevel;
/**
* (联系电话)
@@ -173,6 +173,12 @@ public class EvaluationForm extends BaseEntity {
@ApiModelProperty(value="supplierInformationId")
private String supplierInformationId;
/**
* (编号)
*/
@ApiModelProperty(value="(编号)")
private String number;
/**
* supplierInformationId
*/
src/main/java/digital/laboratory/platform/reagent/entity/OutgoingContents.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class OutgoingContents extends BaseEntity {
* (出库用途)
*/
@ApiModelProperty(value="(出库用途)")
private String outboundUse;
private Integer outboundUse;
/**
* (数量)
src/main/java/digital/laboratory/platform/reagent/entity/PeriodVerificationImplementation.java
+9 -5
View File
@@ -34,7 +34,7 @@ public class PeriodVerificationImplementation extends BaseEntity {
* (技术负责人审核结果)
*/
@ApiModelProperty(value="(技术负责人审核结果)")
private String auditResultOfTechnical;
private Boolean auditResultOfTechnical;
/**
* (技术负责人审核时间)
@@ -84,11 +84,18 @@ public class PeriodVerificationImplementation extends BaseEntity {
@ApiModelProperty(value="(编号)")
private String number;
/**
* (标准物质编号)
*/
@ApiModelProperty(value="(标准物质编号)")
private String referenceMaterialNumber;
/**
* (核查人员意见)
*/
@ApiModelProperty(value="(核查人员意见)")
private String opinionOfInspector;
private boolean opinionOfInspector;
/**
* (标准物质ID)
@@ -121,9 +128,6 @@ public class PeriodVerificationImplementation extends BaseEntity {
private String verificationMethod;
/**
* periodVerificationImplementationId
*/
src/main/java/digital/laboratory/platform/reagent/entity/PeriodVerificationPlan.java
+12 -43
View File
@@ -24,30 +24,6 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "(标准物质期间核查计划和确认表)")
public class PeriodVerificationPlan extends BaseEntity {
/**
* (技术负责人审核意见)
*/
@ApiModelProperty(value="(技术负责人审核意见)")
private String auditOpinionOfTechnical;
/**
* (技术负责人审核结果)
*/
@ApiModelProperty(value="(技术负责人审核结果)")
private String auditResultOfTechnical;
/**
* (技术负责人审核时间)
*/
@ApiModelProperty(value="(技术负责人审核时间)")
private LocalDateTime auditTimeOfTechnical;
/**
* (提交状态)
*/
@ApiModelProperty(value="(提交状态)")
private Integer commitStatus;
/**
* (下次核查日期)
*/
@@ -72,29 +48,24 @@ public class PeriodVerificationPlan extends BaseEntity {
@ApiModelProperty(value="(指导书ID)")
private String instructionBookId;
/**
* (编号)
*/
@ApiModelProperty(value="(编号)")
private String number;
/**
* (计划核查周期)
*/
@ApiModelProperty(value="(计划核查周期)")
private LocalDateTime plannedVerificationCycle;
private Integer plannedVerificationCycle;
/**
* (标准物质管理员ID)
*/
@ApiModelProperty(value="(标准物质管理员ID)")
private String managerId;
/**
* (标准物质ID)
*/
@ApiModelProperty(value="(标准物质ID)")
private String referenceMaterialid;
private String referenceMaterialId;
/**
* (标准物质编号)
*/
@ApiModelProperty(value="(标准物质编号)")
private String referenceMaterialNumber;
/**
* (计划核查日期)
@@ -108,12 +79,6 @@ public class PeriodVerificationPlan extends BaseEntity {
@ApiModelProperty(value="(标准值/纯度)")
private String standardValueAndPurity;
/**
* (技术负责人ID)
*/
@ApiModelProperty(value="(技术负责人ID)")
private String technicalDirectorId;
/**
* (核查依据)
*/
@@ -132,7 +97,11 @@ public class PeriodVerificationPlan extends BaseEntity {
@ApiModelProperty(value="(核查结果)")
private String verificationResult;
/**
* checkScheduleId
*/
@ApiModelProperty(value="checkScheduleId")
private String checkScheduleId;
src/main/java/digital/laboratory/platform/reagent/entity/ProcurementContent.java
+27 -1
View File
@@ -36,7 +36,7 @@ public class ProcurementContent extends BaseEntity {
* (数量)
*/
@ApiModelProperty(value="(数量)")
private Integer quantity;
private Integer quantityPurchased;
/**
* (试剂耗材ID)
@@ -50,12 +50,38 @@ public class ProcurementContent extends BaseEntity {
@ApiModelProperty(value="(小计)")
private Double subtotal;
@ApiModelProperty(value="申请数量)")
private Integer numberOfApplications;
/**
* (单价)
*/
@ApiModelProperty(value="(单价)")
private Double unitPrice;
/**
* (集中采购申请明细ID)
*/
@ApiModelProperty(value="(集中采购申请明细ID)")
private String detailsOfCentralizedId;
/**
* (换货试剂耗材ID)
*/
@ApiModelProperty(value="(换货试剂耗材ID)")
private String replacementReagentConsumableId;
/**
* (换货数量)
*/
@ApiModelProperty(value="(换货数量)")
private Integer replacementQuantity;
/**
* (换货单价)
*/
@ApiModelProperty(value="(换货单价)")
private Double replacementPrice;
src/main/java/digital/laboratory/platform/reagent/entity/PurchaseCatalogue.java
+24 -18
View File
@@ -25,45 +25,45 @@ import lombok.EqualsAndHashCode;
public class PurchaseCatalogue extends BaseEntity {
/**
* (质量负责人审核意见)
* (一级审核意见)
*/
@ApiModelProperty(value="(一级审核意见)")
@ApiModelProperty(value="一级审核意见")
private String auditOpinionOfPrimary;
/**
* (技术负责人审核意见)
* (二级审核意见)
*/
@ApiModelProperty(value="(二级审核意见)")
@ApiModelProperty(value="二级审核意见")
private String auditOpinionOfSecondary;
/**
* (质量负责人审核结果)
* (一级审核结果)
*/
@ApiModelProperty(value="(一级审核结果)")
private String auditResultOfPrimary;
@ApiModelProperty(value="一级审核结果")
private Boolean auditResultOfPrimary;
/**
* (技术负责人审核结果)
*/
@ApiModelProperty(value="(二级审核结果)")
private String auditResultOfSecondary;
@ApiModelProperty(value="二级审核结果")
private Boolean auditResultOfSecondary;
/**
* (质量负责人审核时间)
* (一级审核时间)
*/
@ApiModelProperty(value="(一级审核时间)")
@ApiModelProperty(value="一级审核时间")
private LocalDateTime auditTimeOfPrimary;
/**
* (技术负责人审核时间)
* (二级审核时间)
*/
@ApiModelProperty(value="(二级审核时间)")
@ApiModelProperty(value="二级审核时间")
private LocalDateTime auditTimeOfSecondary;
/**
* (质量负责人ID)
* (一级审核人ID)
*/
@ApiModelProperty(value="(一级审核人ID)")
@ApiModelProperty(value="一级审核人ID")
private String primaryAuditorId;
/**
@@ -75,16 +75,22 @@ public class PurchaseCatalogue extends BaseEntity {
/**
* (状态)
*/
@ApiModelProperty(value="(状态)")
@ApiModelProperty(value="状态(0：未提交，1：已提交，2：一级审核通过，3：二级审核通过，4：已发布，-1：审核未通过)")
private Integer status;
/**
* (技术负责人ID)
* (二级审核人ID)
*/
@ApiModelProperty(value="(二级审核人ID)")
@ApiModelProperty(value="二级审核人ID")
private String secondaryAuditorId;
/**
* (编号)
*/
@ApiModelProperty(value="编号")
private String number;
/**
* purchaseCatalogueId
*/
src/main/java/digital/laboratory/platform/reagent/entity/PurchaseList.java
+5 -1
View File
@@ -31,7 +31,11 @@ public class PurchaseList extends BaseEntity {
private String name;
/**
* (编号)
*/
@ApiModelProperty(value="(编号)")
private String number;
/**
src/main/java/digital/laboratory/platform/reagent/entity/PurchasingPlan.java
+33 -16
View File
@@ -27,57 +27,68 @@ public class PurchasingPlan extends BaseEntity {
/**
* (经费预算)
*/
@ApiModelProperty(value="(经费预算)")
private String appropriationBudget;
@ApiModelProperty(value="经费预算")
private double appropriationBudget;
/**
* (制定人)
*/
@ApiModelProperty(value="(制定人)")
@ApiModelProperty(value="制定人")
private String CreateId;
/**
* (部门名称)
*/
@ApiModelProperty(value="部门名称")
private String orgName;
/**
* (申请人名称)
*/
@ApiModelProperty(value="制定人名称")
private String createName;
/**
* (审批意见)
*/
@ApiModelProperty(value="(审批意见)")
@ApiModelProperty(value="审批意见")
private String approvalOpinion;
/**
* (审批结果)
*/
@ApiModelProperty(value="(审批结果)")
private String approvalResult;
@ApiModelProperty(value="审批结果")
private Boolean approvalResult;
/**
* (审批时间)
*/
@ApiModelProperty(value="(审批时间)")
@ApiModelProperty(value="审批时间")
private LocalDateTime approvalTime;
/**
* (一级审核意见)
*/
@ApiModelProperty(value="(一级审核意见)")
@ApiModelProperty(value="一级审核意见")
private String auditOpinionOfPrimary;
/**
* (一级审核结果)
*/
@ApiModelProperty(value="(一级审核结果)")
private String auditResultOfPrimary;
@ApiModelProperty(value="一级审核结果")
private Boolean auditResultOfPrimary;
/**
* (一级审核时间)
*/
@ApiModelProperty(value="(一级审核时间)")
@ApiModelProperty(value="一级审核时间")
private LocalDateTime auditTimeOfPrimary;
/**
* (审批人ID)
*/
@ApiModelProperty(value="(审批人ID)")
@ApiModelProperty(value="审批人ID")
private String approverId;
@@ -85,13 +96,13 @@ public class PurchasingPlan extends BaseEntity {
/**
* (采购清单ID)
*/
@ApiModelProperty(value="(采购清单ID)")
@ApiModelProperty(value="采购清单ID")
private String purchaseListId;
/**
* (一级审核人ID)
*/
@ApiModelProperty(value="(一级审核人ID)")
@ApiModelProperty(value="一级审核人ID")
private String primaryAuditorId;
/**
@@ -103,14 +114,20 @@ public class PurchasingPlan extends BaseEntity {
/**
* (状态)
*/
@ApiModelProperty(value="(状态)")
@ApiModelProperty(value="状态")
private Integer status;
/**
* (编号)
*/
@ApiModelProperty(value="编号")
private String number;
/**
* purchasingPlanId
*/
@TableId(value = "purchasing_plan_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="purchasingPlanId")
@ApiModelProperty(value="采购计划ID")
private String purchasingPlanId;
src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumableInventory.java
+23 -7
View File
@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -36,6 +38,12 @@ public class ReagentConsumableInventory extends BaseEntity {
@ApiModelProperty(value="(类别)")
private String category;
/**
* (类别)
*/
@ApiModelProperty(value="(格子Id)")
private String latticeId;
/**
* 偏差/不确定度
*/
@@ -49,10 +57,10 @@ public class ReagentConsumableInventory extends BaseEntity {
private String instructionBookId;
/**
* (试剂耗材名称)
* (试剂耗材Id)
*/
@ApiModelProperty(value="(试剂耗材名称)")
private String reagentConsumablesName;
@ApiModelProperty(value="(试剂耗材Id)")
private String reagentConsumableId;
/**
* (规格型号)
@@ -60,9 +68,11 @@ public class ReagentConsumableInventory extends BaseEntity {
@ApiModelProperty(value="(规格型号)")
private String specificationAndModel;
/**
* (种类)
*/
@ApiModelProperty(value="(种类)")
private String species;
/**
* (标准值/纯度)
@@ -80,7 +90,13 @@ public class ReagentConsumableInventory extends BaseEntity {
* (总数量)
*/
@ApiModelProperty(value="(总数量)")
private String totalQuantity;
private Integer totalQuantity;
/**
* (包装份数)
*/
@ApiModelProperty(value="(包装份数)")
private String packagedCopies;
/**
* reagentConsumableInventoryId
src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumables.java
+41 -10
View File
@@ -34,7 +34,7 @@ public class ReagentConsumables extends BaseEntity {
* 类别
*/
@ApiModelProperty(value="类别")
private String catagory;
private String category;
/**
* 偏差/不确定度
@@ -46,7 +46,7 @@ public class ReagentConsumables extends BaseEntity {
* 名称
*/
@ApiModelProperty(value="名称")
private String name;
private String reagentConsumableName;
/**
* 种类
@@ -54,16 +54,22 @@ public class ReagentConsumables extends BaseEntity {
@ApiModelProperty(value="种类")
private String species;
/**
* 英文名
*/
@ApiModelProperty(value="英文名")
private String englishName;
/**
* 规格型号
*/
@ApiModelProperty(value="规格型号")
private String specificationAndModel;
/**
* 包装份数
*/
@ApiModelProperty(value="包装份数")
private String packagedCopies;
/**
* (标准值/纯度)
*/
@@ -82,12 +88,37 @@ public class ReagentConsumables extends BaseEntity {
@ApiModelProperty(value="单价")
private Double unitPrice;
/**
* 别名
*/
@ApiModelProperty(value="别名")
private String alias;
/**
* 存储条件
*/
@ApiModelProperty(value="存储条件")
private String storageCondition;
/**
* 备注
*/
@ApiModelProperty(value="备注")
private String remark;
/**
* 包装单位
*/
@ApiModelProperty(value="包装单位")
private String minimumUnit;
/**
* reagentConsumablesId
*/
@TableId(value = "reagent_consumables_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="reagentConsumablesId")
private String reagentConsumablesId;
@TableId(value = "reagent_consumable_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="reagentConsumableId")
private String reagentConsumableId;
}
src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumablesSet.java
+32 -11
View File
@@ -6,8 +6,11 @@ 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 io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -27,31 +30,49 @@ public class ReagentConsumablesSet extends BaseEntity {
/**
* (试剂耗材领用申请表ID)
*/
@ApiModelProperty(value="(试剂耗材领用申请表ID)")
@ApiModelProperty(value = "(试剂耗材领用申请表ID)")
private String applicationForUseId;
/**
* (数量)
*/
@ApiModelProperty(value="(数量)")
@ApiModelProperty(value = "(数量)")
private Integer quantity;
/**
* (用途)
*/
@ApiModelProperty(value = "(用途)")
private Integer purpose;
/**
* (备注)
*/
@ApiModelProperty(value = "(备注)")
private String remarks;
/**
* (试剂耗材ID)
*/
@ApiModelProperty(value="(试剂耗材ID)")
@ApiModelProperty(value = "(试剂耗材ID)")
private String reagentConsumableId;
/**
* (规格型号)
*/
@ApiModelProperty(value = "(规格型号)")
private String specificationAndModel;
/**
* (批次)
*/
@ApiModelProperty(value = "(批次)")
private String batchDetailsId;
/**
* reagentConsumablesSetid
* reagentConsumablesSetId
*/
@TableId(value = "reagent_consumables_setID", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="reagentConsumablesSetid")
private String reagentConsumablesSetid;
@TableId(value = "reagent_consumables_set_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value = "reagentConsumablesSetId")
private String reagentConsumablesSetId;
}
src/main/java/digital/laboratory/platform/reagent/entity/RequisitionRecord.java
+21 -17
View File
@@ -30,18 +30,6 @@ public class RequisitionRecord extends BaseEntity {
@ApiModelProperty(value="(领用日期)")
private LocalDateTime dateOfClaim;
/**
* (领用量)
*/
@ApiModelProperty(value="(领用量)")
private Integer drawingamount;
/**
* (试剂耗材ID)
*/
@ApiModelProperty(value="(试剂耗材ID)")
private String reagentConsumableId;
/**
* (领用人)
*/
@@ -54,16 +42,32 @@ public class RequisitionRecord extends BaseEntity {
@ApiModelProperty(value="(备注)")
private String remarks;
/**
* (耗材ID)
*/
@ApiModelProperty(value="(耗材ID)")
private String reagentConsumableId;
/**
* (规格型号)
* 规格型号
*/
@ApiModelProperty(value="(规格型号)")
@ApiModelProperty(value="规格型号")
private String specificationAndModel;
/**
* 领用数量
*/
@ApiModelProperty(value="领用数量")
private Integer drawingAmount;
/**
* 编号
*/
@ApiModelProperty(value="编号")
private String number;
/**
* requisitionRecordId
*/
src/main/java/digital/laboratory/platform/reagent/entity/StandardMaterialApplication.java
+30 -8
View File
@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -30,11 +32,18 @@ public class StandardMaterialApplication extends BaseEntity {
@ApiModelProperty(value="(标准物质管理员ID)")
private String administratorId;
/**
* (状态)
*/
@ApiModelProperty(value="(状态)")
private Integer status;
/**
* (领用日期)
*/
@ApiModelProperty(value="(领用日期)")
private String dateOfClaim;
private LocalDateTime dateOfClaim;
/**
* (归还日期)
@@ -43,10 +52,16 @@ public class StandardMaterialApplication extends BaseEntity {
private LocalDateTime dateOfReturn;
/**
* (用途及使用数量)
* (用途)
*/
@ApiModelProperty(value="(用途及使用数量)")
private LocalDateTime purposeAndQuantityOfUse;
@ApiModelProperty(value="(用途)")
private Integer purpose;
/**
* (使用数量)
*/
@ApiModelProperty(value="(使用数量)")
private Double purposeAndQuantity;
/**
* (领用人ID)
@@ -72,10 +87,6 @@ public class StandardMaterialApplication extends BaseEntity {
@ApiModelProperty(value="(领用数量)")
private Integer requisitionedQuantity;
/**
* (序号)
*/
@@ -88,6 +99,17 @@ public class StandardMaterialApplication extends BaseEntity {
@ApiModelProperty(value="(规格)")
private String specification;
/**
* (编号)
*/
@ApiModelProperty(value="(编号)")
private String number;
/**
* (领用登记表ID)
*/
@ApiModelProperty(value="(领用登记表ID)")
private String applicationForUseId;
/**
* standardMaterialApplicationId
*/
src/main/java/digital/laboratory/platform/reagent/entity/StandardMaterialApprovalForm.java
+85 -74
View File
@@ -24,11 +24,83 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "(标准物质停用/报废销毁/恢复/降级使用审批表)")
public class StandardMaterialApprovalForm extends BaseEntity {
/**
* (一级审核意见)
*/
@ApiModelProperty(value="(一级审核意见)")
private String auditOpinionOfPrimary;
/**
* (二级审核意见)
*/
@ApiModelProperty(value="(二级审核意见)")
private String auditOpinionOfSecondary;
/**
* (一级审核结果)
*/
@ApiModelProperty(value="(一级审核结果)")
private Boolean auditResultOfPrimary;
/**
* (二级审核结果)
*/
@ApiModelProperty(value="(二级审核结果)")
private Boolean auditResultOfSecondary;
/**
* (一级审核时间)
*/
@ApiModelProperty(value="(一级审核时间)")
private LocalDateTime auditTimeOfPrimary;
/**
* (二级审核时间)
*/
@ApiModelProperty(value="(二级审核时间)")
private LocalDateTime auditTimeOfSecondary;
/**
* (一级审核人ID)
*/
@ApiModelProperty(value="(一级审核人ID)")
private String primaryAuditorId;
/**
* (二级审核人ID)
*/
@ApiModelProperty(value="(二级审核人ID)")
private String secondaryAuditorId;
/**
* (审批人ID)
*/
@ApiModelProperty(value="(审批人ID)")
private String approverId;
/**
* (主任审批意见)
*/
@ApiModelProperty(value="(审批意见)")
private String opinionOfApproval;
/**
* (审批结果)
*/
@ApiModelProperty(value="(审批结果)")
private Boolean resultOfApproval;
/**
* (审批时间)
*/
@ApiModelProperty(value="(审批时间)")
private LocalDateTime approvalOfTime;
/**
* (经办人)
*/
@ApiModelProperty(value="(经办人)")
private String agentId;
private String agentName;
/**
* (申请人)
@@ -36,69 +108,14 @@ public class StandardMaterialApprovalForm extends BaseEntity {
@ApiModelProperty(value="(申请人)")
private String applicantId;
/**
* (申请时间)
*/
@ApiModelProperty(value="(申请时间)")
private LocalDateTime applicationTime;
/**
* (主任审批意见)
*/
@ApiModelProperty(value="(主任审批意见)")
private String approvalOpinion;
/**
* (主任审批结果)
*/
@ApiModelProperty(value="(主任审批结果)")
private String approvalResult;
/**
* (主任审批时间)
*/
@ApiModelProperty(value="(主任审批时间)")
private String approvalTime;
/**
* (标准物质管理员审核意见)
*/
@ApiModelProperty(value="(标准物质管理员审核意见)")
private String auditOpinionOfManager;
/**
* (技术负责人审核意见)
*/
@ApiModelProperty(value="(技术负责人审核意见)")
private String auditOpinionOfTechnical;
/**
* (标准物质管理员审核结果)
*/
@ApiModelProperty(value="(标准物质管理员审核结果)")
private String auditResultOfManager;
/**
* (技术负责人审核结果)
*/
@ApiModelProperty(value="(技术负责人审核结果)")
private String auditResultOfTechnical;
/**
* (标准物质管理员审核时间)
*/
@ApiModelProperty(value="(标准物质管理员审核时间)")
private String auditTimeOfManager;
/**
* (技术负责人审核时间)
*/
@ApiModelProperty(value="(技术负责人审核时间)")
private String auditTimeOfTechnical;
/**
* (批号)
@@ -112,11 +129,6 @@ public class StandardMaterialApprovalForm extends BaseEntity {
@ApiModelProperty(value="(提交状态)")
private Integer commitStatus;
/**
* (主任id)
*/
@ApiModelProperty(value="(主任id)")
private String directorId;
/**
* (定值结果)
@@ -135,6 +147,16 @@ public class StandardMaterialApprovalForm extends BaseEntity {
*/
@ApiModelProperty(value="(编号)")
private String number;
/**
* (标准物质编号)
*/
@ApiModelProperty(value="(标准物质编号)")
private String referenceMaterialNumber;
/**
* (标准物质名称)
*/
@ApiModelProperty(value="(标准物质名称)")
private String referenceMaterialName;
/**
* (处理时间)
@@ -166,12 +188,6 @@ public class StandardMaterialApprovalForm extends BaseEntity {
@ApiModelProperty(value="(标准物质id)")
private String referenceMaterialId;
/**
* (标准物质管理员ID)
*/
@ApiModelProperty(value="(标准物质管理员ID)")
private String managerId;
/**
* (备注)
*/
@@ -184,11 +200,6 @@ public class StandardMaterialApprovalForm extends BaseEntity {
@ApiModelProperty(value="(规格)")
private String specification;
/**
* (技术负责人id)
*/
@ApiModelProperty(value="(技术负责人id)")
private String technicalDirectorId;
/**
* standardMaterialApprovalFormId
src/main/java/digital/laboratory/platform/reagent/entity/StorageRegistrationForm.java
-30
View File
@@ -48,42 +48,12 @@ public class StorageRegistrationForm extends BaseEntity {
@ApiModelProperty(value="(试剂耗材ID)")
private String reagentConsumableId;
/**
* (试剂耗材编号)
*/
@ApiModelProperty(value="(试剂耗材编号)")
private String reagentConsumableNumber;
/**
* (试剂耗材类型)
*/
@ApiModelProperty(value="(试剂耗材类型)")
private String reagentConsumableType;
/**
* (备注)
*/
@ApiModelProperty(value="(备注)")
private String remarks;
/**
* (格子ID)
*/
@ApiModelProperty(value="(格子ID)")
private String latticeId;
/**
* (存储期限)
*/
@ApiModelProperty(value="(存储期限)")
private LocalDateTime storageLife;
/**
* (签收批次表ID)
*/
@ApiModelProperty(value="(签收批次表ID)")
private String signedBatchListId;
/**
* storageRegistrationFormId
*/
src/main/java/digital/laboratory/platform/reagent/entity/SupplierInformation.java
+8 -1
View File
@@ -76,7 +76,7 @@ public class SupplierInformation extends BaseEntity {
* (供应人身份证号)
*/
@ApiModelProperty(value="(供应人身份证号)")
private String supplierIdnumber;
private String supplierIdNumber;
/**
* (供应商名称)
@@ -90,6 +90,13 @@ public class SupplierInformation extends BaseEntity {
@ApiModelProperty(value="(供应人电话)")
private String supplierTelephone;
/**
* (编号)
*/
@ApiModelProperty(value="(编号)")
private String number;
/**
* supplierInformationId
*/
src/main/java/digital/laboratory/platform/reagent/entity/SignedBatchList.java → src/main/java/digital/laboratory/platform/reagent/entity/WarehousingBatchList.java
+16 -14
View File
@@ -19,10 +19,10 @@ import lombok.EqualsAndHashCode;
* @describe 签收批次明细 实体类
*/
@Data
@TableName(value = "signed_batch_list", autoResultMap = true)
@TableName(value = "warehousing_batch_list", autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "签收批次明细")
public class SignedBatchList extends BaseEntity {
@ApiModel(value = "入库批次明细")
public class WarehousingBatchList extends BaseEntity {
/**
* (批次)
@@ -36,7 +36,11 @@ public class SignedBatchList extends BaseEntity {
@ApiModelProperty(value="(批号)")
private String batchNumber;
/**
* (格子编号)
*/
@ApiModelProperty(value="(格子编号)")
private String latticeId;
/**
* (生产日期)
@@ -48,7 +52,7 @@ public class SignedBatchList extends BaseEntity {
/**
* 签收日期
*/
@ApiModelProperty(value="签收日期")
@ApiModelProperty(value="入库日期")
private LocalDateTime dateOfReceipt;
/**
@@ -63,19 +67,17 @@ public class SignedBatchList extends BaseEntity {
@ApiModelProperty(value="(数量)")
private Integer quantity;
/**
* 签收人ID
*/
@ApiModelProperty(value="签收人ID")
private String signatoryId;
@ApiModelProperty(value="入库人ID")
private String depositorId;
/**
* 签收内容表ID
*/
@ApiModelProperty(value="签收内容表ID")
private String signedContentId;
@ApiModelProperty(value="入库内容表ID")
private String warehousingContentId;
/**
* (供应商ID)
@@ -92,9 +94,9 @@ public class SignedBatchList extends BaseEntity {
/**
* signedBatchListId
*/
@TableId(value = "signed_batch_list_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="signedBatchListId")
private String signedBatchListId;
@TableId(value = "warehousing_batch_list_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="warehousingBatchListId")
private String warehousingBatchListId;
}
src/main/java/digital/laboratory/platform/reagent/entity/SigningRecordForm.java → src/main/java/digital/laboratory/platform/reagent/entity/WarehousingRecordForm.java
+6 -7
View File
@@ -19,10 +19,10 @@ import lombok.EqualsAndHashCode;
* @describe 签收记录表 实体类
*/
@Data
@TableName(value = "signing_record_form", autoResultMap = true)
@TableName(value = "warehousing_record_form", autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "签收记录表")
public class SigningRecordForm extends BaseEntity {
@ApiModel(value = "签收入库记录表")
public class WarehousingRecordForm extends BaseEntity {
/**
* 采购清单ID
@@ -30,7 +30,6 @@ public class SigningRecordForm extends BaseEntity {
@ApiModelProperty(value="采购清单ID")
private String purchaseListId;
/**
* 状态
*/
@@ -46,9 +45,9 @@ public class SigningRecordForm extends BaseEntity {
/**
* signingRecordFormId
*/
@TableId(value = "signing_record_form_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="signingRecordFormId")
private String signingRecordFormId;
@TableId(value = "warehousing_record_form_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="warehousingRecordFormId")
private String warehousingRecordFormId;
}
src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceRecordFormMapper.java
+6
View File
@@ -1,7 +1,10 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.reagent.entity.AcceptanceRecordForm;
import digital.laboratory.platform.reagent.vo.AcceptanceRecordFormVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -14,4 +17,7 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface AcceptanceRecordFormMapper extends BaseMapper<AcceptanceRecordForm> {
IPage<AcceptanceRecordFormVO> getAcceptanceRecordFormVOPage(IPage<AcceptanceRecordForm> page, QueryWrapper<AcceptanceRecordForm> qw);
AcceptanceRecordFormVO getAcceptanceRecordFormVO(String acceptanceRecordFormId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/ApplicationForUseMapper.java
+11
View File
@@ -1,10 +1,15 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.reagent.entity.ApplicationForUse;
import digital.laboratory.platform.reagent.vo.ApplicationForUseVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (试剂耗材领用申请表) Mapper 接口
*
@@ -14,4 +19,10 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface ApplicationForUseMapper extends BaseMapper<ApplicationForUse> {
ApplicationForUseVO getApplicationForUseVO(String applicationForUseId);
IPage<ApplicationForUseVO> getApplicationForUseVOPage(IPage<ApplicationForUse> page, QueryWrapper<ApplicationForUse> qw);
List<ApplicationForUseVO> getApplicationForUseVOList (QueryWrapper<ApplicationForUse> qw);
}
src/main/java/digital/laboratory/platform/reagent/mapper/CatalogueDetailsMapper.java
-1
View File
@@ -18,6 +18,5 @@ import java.util.List;
@Mapper
public interface CatalogueDetailsMapper extends BaseMapper<CatalogueDetails> {
List<CatalogueDetailsVO>getCatalogueDetailsVOList(String purchaseCatalogueId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/CheckContentMapper.java
+5
View File
@@ -2,9 +2,12 @@ package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import digital.laboratory.platform.reagent.entity.CheckContent;
import digital.laboratory.platform.reagent.vo.CheckContentVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (检查内容) Mapper 接口
*
@@ -14,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface CheckContentMapper extends BaseMapper<CheckContent> {
List<CheckContentVO> getCheckContentVOList (String complianceCheckId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/ComplianceCheckMapper.java
+10
View File
@@ -1,10 +1,15 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.reagent.entity.ComplianceCheck;
import digital.laboratory.platform.reagent.vo.ComplianceCheckVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (符合性检查记录表) Mapper 接口
*
@@ -14,4 +19,9 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface ComplianceCheckMapper extends BaseMapper<ComplianceCheck> {
IPage<ComplianceCheckVO> getComplianceCheckVOPage (IPage<ComplianceCheck> page, QueryWrapper<ComplianceCheck> qw);
List<ComplianceCheckVO> getComplianceCheckVOList (QueryWrapper<ComplianceCheck> qw) ;
ComplianceCheckVO getComplianceCheckVO(String complianceCheckId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/DecentralizeDetailsMapper.java
-1
View File
@@ -17,6 +17,5 @@ import java.util.List;
@Mapper
public interface DecentralizeDetailsMapper extends BaseMapper<DecentralizeDetails> {
List<DecentralizeDetailsVO> getDecentralizeDetailsVOList (String decentralizedRequestId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/PeriodVerificationImplementationMapper.java
+7
View File
@@ -1,7 +1,10 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.reagent.entity.PeriodVerificationImplementation;
import digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -14,4 +17,8 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface PeriodVerificationImplementationMapper extends BaseMapper<PeriodVerificationImplementation> {
IPage<PeriodVerificationImplementationVO> getPeriodVerificationImplementationVOPage(IPage<PeriodVerificationImplementation> page, QueryWrapper<PeriodVerificationImplementation>qw);
PeriodVerificationImplementationVO getPeriodVerificationImplementationVO(String periodVerificationImplementationId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/PeriodVerificationPlanMapper.java
+7
View File
@@ -1,10 +1,15 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.reagent.entity.PeriodVerificationPlan;
import digital.laboratory.platform.reagent.vo.PeriodVerificationPlanVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (标准物质期间核查计划和确认表) Mapper 接口
*
@@ -14,4 +19,6 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface PeriodVerificationPlanMapper extends BaseMapper<PeriodVerificationPlan> {
List <PeriodVerificationPlanVO> getPeriodVerificationPlanVOList (String checkScheduleId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/PurchaseListDetailsMapper.java
+2 -1
View File
@@ -2,6 +2,7 @@ package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import digital.laboratory.platform.reagent.entity.PurchaseListDetails;
import digital.laboratory.platform.reagent.vo.PurchaseListDetailsVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -15,6 +16,6 @@ import java.util.List;
@Mapper
public interface PurchaseListDetailsMapper extends BaseMapper<PurchaseListDetails> {
List<PurchaseListDetails> getPurchaseListDetailsVOList(String purchaseListId);
List<PurchaseListDetailsVO> getPurchaseListDetailsVOList(String purchaseListId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/ReagentConsumablesSetMapper.java
+2
View File
@@ -14,4 +14,6 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface ReagentConsumablesSetMapper extends BaseMapper<ReagentConsumablesSet> {
}
src/main/java/digital/laboratory/platform/reagent/mapper/RequisitionRecordMapper.java
+5
View File
@@ -1,7 +1,10 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.reagent.entity.RequisitionRecord;
import digital.laboratory.platform.reagent.vo.RequisitionRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -14,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface RequisitionRecordMapper extends BaseMapper<RequisitionRecord> {
IPage<RequisitionRecordVO> getRequisitionRecordVOPage (IPage<RequisitionRecord> page, QueryWrapper<RequisitionRecord> qw);
}
src/main/java/digital/laboratory/platform/reagent/mapper/SignedBatchListMapper.java
-22
View File
@@ -1,22 +0,0 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import digital.laboratory.platform.reagent.entity.SignedBatchList;
import digital.laboratory.platform.reagent.vo.SignedBatchListVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 签收批次明细 Mapper 接口
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收批次明细 Mapper 类
*/
@Mapper
public interface SignedBatchListMapper extends BaseMapper<SignedBatchList> {
List<SignedBatchListVO> getSignedBatchListVOList(String signedContentId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/SigningRecordFormMapper.java
-28
View File
@@ -1,28 +0,0 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.reagent.entity.SigningRecordForm;
import digital.laboratory.platform.reagent.vo.SigningRecordFormVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 签收记录表 Mapper 接口
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收记录表 Mapper 类
*/
@Mapper
public interface SigningRecordFormMapper extends BaseMapper<SigningRecordForm> {
IPage<SigningRecordFormVO> getSigningRecordFormVOPage (IPage<SigningRecordForm> page, QueryWrapper<SigningRecordForm> qw);
List<SigningRecordFormVO> getSigningRecordFormVOList (QueryWrapper<SigningRecordForm> qw);
SigningRecordFormVO getSigningRecordFormVO (String signingRecordFormId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/StandardMaterialApplicationMapper.java
+9
View File
@@ -1,7 +1,11 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.entity.StandardMaterialApplication;
import digital.laboratory.platform.reagent.vo.StandardMaterialApplicationVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -14,4 +18,9 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface StandardMaterialApplicationMapper extends BaseMapper<StandardMaterialApplication> {
IPage<StandardMaterialApplicationVO> getStandardMaterialApplicationVOPage (IPage<StandardMaterialApplication> page , QueryWrapper<StandardMaterialApplication> qw);
IPage<StandardMaterialApplicationVO> getStandardMaterialApplicationVOList (IPage<StandardMaterialApplication> page , QueryWrapper<StandardMaterialApplication> qw);
}
src/main/java/digital/laboratory/platform/reagent/mapper/WarehousingBatchListMapper.java
+21
View File
@@ -0,0 +1,21 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import digital.laboratory.platform.reagent.entity.WarehousingBatchList;
import digital.laboratory.platform.reagent.vo.WarehousingBatchListVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 签收批次明细 Mapper 接口
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收批次明细 Mapper 类
*/
@Mapper
public interface WarehousingBatchListMapper extends BaseMapper<WarehousingBatchList> {
List<WarehousingBatchListVO> getWarehousingBatchListVOList(String signedContentId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/WarehousingRecordFormMapper.java
+22
View File
@@ -0,0 +1,22 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import digital.laboratory.platform.reagent.entity.WarehousingRecordForm;
import digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 签收记录表 Mapper 接口
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收记录表 Mapper 类
*/
@Mapper
public interface WarehousingRecordFormMapper extends BaseMapper<WarehousingRecordForm> {
}
src/main/java/digital/laboratory/platform/reagent/service/AcceptanceRecordFormService.java
+21
View File
@@ -1,7 +1,13 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AcceptanceRecordFormDTO;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.entity.AcceptanceRecordForm;
import digital.laboratory.platform.reagent.vo.AcceptanceRecordFormVO;
/**
* (验收记录表)服务类
@@ -11,4 +17,19 @@ import digital.laboratory.platform.reagent.entity.AcceptanceRecordForm;
*/
public interface AcceptanceRecordFormService extends IService<AcceptanceRecordForm> {
AcceptanceRecordForm editFrom(AcceptanceRecordFormDTO acceptanceRecordFormDTO);
AcceptanceRecordForm addForm(String reagentConsumableId, String supplierId);
AcceptanceRecordForm commitForm(AcceptanceRecordFormDTO acceptanceRecordFormDTO);
IPage<AcceptanceRecordFormVO> getAcceptanceRecordFormVOPage(IPage<AcceptanceRecordForm> page, QueryWrapper<AcceptanceRecordForm> qw);
AcceptanceRecordFormVO getAcceptanceRecordFormVO(String acceptanceRecordFormId);
AcceptanceRecordForm primaryAudit(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser);
AcceptanceRecordForm secondaryAudit(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser);
AcceptanceRecordForm threeLevelAudit(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser);
}
src/main/java/digital/laboratory/platform/reagent/service/ApplicationForUseService.java
+22
View File
@@ -1,7 +1,14 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.ApplicationForUseDTO;
import digital.laboratory.platform.reagent.entity.ApplicationForUse;
import digital.laboratory.platform.reagent.vo.ApplicationForUseVO;
import java.util.List;
/**
* (试剂耗材领用申请表)服务类
@@ -11,4 +18,19 @@ import digital.laboratory.platform.reagent.entity.ApplicationForUse;
*/
public interface ApplicationForUseService extends IService<ApplicationForUse> {
ApplicationForUseVO getApplicationForUseVO(String applicationForUseId);
IPage<ApplicationForUseVO> getApplicationForUseVOPage(IPage<ApplicationForUse> page, QueryWrapper<ApplicationForUse> qw);
List<ApplicationForUseVO> getApplicationForUseVOList (QueryWrapper<ApplicationForUse> qw);
ApplicationForUse addApplication(List<ApplicationForUseDTO> applicationForUseDTOList, DLPUser dlpUser);
//
ApplicationForUse editApplication (List<ApplicationForUseDTO> applicationForUseDTOList, DLPUser dlpUser);
//提交领用申请记录
ApplicationForUse commitApplication(List<ApplicationForUseDTO> applicationForUseDTOList, DLPUser dlpUser);
Boolean delApplication(String applicationForUseId);
}
src/main/java/digital/laboratory/platform/reagent/service/BatchDetailsService.java
+4
View File
@@ -2,6 +2,9 @@ package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.reagent.entity.BatchDetails;
import digital.laboratory.platform.reagent.vo.BatchDetailsVO;
import java.util.List;
/**
* 批次明细服务类
@@ -11,4 +14,5 @@ import digital.laboratory.platform.reagent.entity.BatchDetails;
*/
public interface BatchDetailsService extends IService<BatchDetails> {
List<BatchDetailsVO> getBatchDetailsList(String reagentConsumableInventoryId);
}
src/main/java/digital/laboratory/platform/reagent/service/BlacklistService.java
+1
View File
@@ -11,4 +11,5 @@ import digital.laboratory.platform.reagent.entity.Blacklist;
*/
public interface BlacklistService extends IService<Blacklist> {
Blacklist addListById(String reagentConsumableId, String supplierId);
}
src/main/java/digital/laboratory/platform/reagent/service/CatalogueDetailsService.java
+1 -1
View File
@@ -14,7 +14,7 @@ import java.util.List;
*/
public interface CatalogueDetailsService extends IService<CatalogueDetails> {
List<CatalogueDetailsVO>getCatalogueDetailsVOList(String purchaseCatalogueId);
List<CatalogueDetails>getCatalogueDetailsList(String purchaseCatalogueId);
src/main/java/digital/laboratory/platform/reagent/service/CentralizedRequestService.java
+7 -7
View File
@@ -19,21 +19,21 @@ import java.util.List;
* @describe (集中采购申请) 服务类
*/
public interface CentralizedRequestService extends IService<CentralizedRequest> {
List<DetailsOfCentralized> saveRequestById(CentralizedRequest centralizedRequest, List<CentralizedRequestDTO> centralizedRequestDTOList, DLPUser dlpUser);
CentralizedRequest addRequest( List<CentralizedRequestDTO> centralizedRequestDTOList, DLPUser dlpUser);
CentralizedRequest commit(String centralizedRequestId);
CentralizedRequest commitRequest(List<CentralizedRequestDTO> centralizedRequestDTOList,DLPUser dlpUser);
DetailsOfCentralized editDetails(CentralizedRequestDTO centralizedRequestDto);
DetailsOfCentralized editDetailsById(CentralizedRequestDTO centralizedRequestDto);
DetailsOfCentralized addDetails(CentralizedRequestDTO centralizedRequestDto);
DetailsOfCentralized addDetailsById(CentralizedRequestDTO centralizedRequestDto);
List<DetailsOfCentralized> delRequestById(String centralizedRequestId);
CentralizedRequest checkRequest(AuditAndApproveDTO auditAndApproveDto, DLPUser dlpUser);
Boolean delRequestById(String centralizedRequestId);
IPage<CentralizedRequestVO> getCentralizedRequestVOPage(IPage<CentralizedRequest> page, QueryWrapper<CentralizedRequest> qw);
List<CentralizedRequestVO> getCentralizedRequestVOList(QueryWrapper<CentralizedRequest> qw);
CentralizedRequestVO getCentralizedRequestVO(String centralizedRequestId);
List<CentralizedRequestVO> getOrgVOList(QueryWrapper<CentralizedRequest> qw,String orgName);
}
src/main/java/digital/laboratory/platform/reagent/service/CheckContentService.java
+6
View File
@@ -2,6 +2,9 @@ package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.reagent.entity.CheckContent;
import digital.laboratory.platform.reagent.vo.CheckContentVO;
import java.util.List;
/**
* (检查内容)服务类
@@ -11,4 +14,7 @@ import digital.laboratory.platform.reagent.entity.CheckContent;
*/
public interface CheckContentService extends IService<CheckContent> {
List<CheckContentVO> getCheckContentVOList (String complianceCheckId);
}
src/main/java/digital/laboratory/platform/reagent/service/ComplianceCheckService.java
+33
View File
@@ -1,7 +1,16 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.ComplianceCheckDTO;
import digital.laboratory.platform.reagent.entity.ComplianceCheck;
import digital.laboratory.platform.reagent.vo.ComplianceCheckVO;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* (符合性检查记录表)服务类
@@ -11,4 +20,28 @@ import digital.laboratory.platform.reagent.entity.ComplianceCheck;
*/
public interface ComplianceCheckService extends IService<ComplianceCheck> {
IPage<ComplianceCheckVO> getComplianceCheckVOPage (IPage<ComplianceCheck> page, QueryWrapper<ComplianceCheck> qw);
List<ComplianceCheckVO> getComplianceCheckVOList (QueryWrapper<ComplianceCheck> qw) ;
ComplianceCheckVO getComplianceCheckVO(String complianceCheckId);
@Transactional
//新增标准物质符合性检查
ComplianceCheck addCheck(ComplianceCheckDTO complianceCheckDTO, DLPUser dlpUser);
List<ComplianceCheck> addCheckList(List<ComplianceCheckDTO> list, DLPUser dlpUser);
Boolean delCheckById(String complianceCheckId);
ComplianceCheck editCheckById(ComplianceCheckDTO complianceCheckDTO);
ComplianceCheck addScheme(ComplianceCheckDTO complianceCheckDTO);
//提交符合性检查
ComplianceCheck commitCheck(ComplianceCheckDTO complianceCheckDTO, DLPUser dlpUser);
ComplianceCheck primaryAuditCheck (AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser);
//二级审核
ComplianceCheck secondaryAuditCheck(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser);
}
src/main/java/digital/laboratory/platform/reagent/service/DecentralizeDetailsService.java
+1 -1
View File
@@ -14,6 +14,6 @@ import java.util.List;
*/
public interface DecentralizeDetailsService extends IService<DecentralizeDetails> {
List<DecentralizeDetailsVO> getDecentralizeDetailsVOList (String decentralizedRequestId);
List<DecentralizeDetails> getDecentralizeDetailsList (String decentralizedRequestId);
}
src/main/java/digital/laboratory/platform/reagent/service/DecentralizedRequestService.java
+7 -4
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.AuditDecentralizedRequestDTO;
import digital.laboratory.platform.reagent.dto.DecentralizedRequestDTO;
import digital.laboratory.platform.reagent.entity.DecentralizeDetails;
import digital.laboratory.platform.reagent.entity.DecentralizedRequest;
@@ -29,19 +30,21 @@ public interface DecentralizedRequestService extends IService<DecentralizedReque
DecentralizedRequestVO getRequestById(String decentralizedRequestId);
List<DecentralizeDetails> addRequest(List<DecentralizedRequestDTO> decentralizedRequestDTOList, DLPUser dlpUser, DecentralizedRequest decentralizedRequest);
DecentralizedRequest addRequest(List<DecentralizedRequestDTO> decentralizedRequestDTOList, DLPUser dlpUser);
DecentralizeDetails addDetails(DecentralizedRequestDTO decentralizedRequestDTO);
//修改分散采购申请明细
DecentralizeDetails editRequest(DecentralizedRequestDTO decentralizedRequestDTO);
List<DecentralizeDetails> delRequestById(String decentralizedRequestId);
Boolean delRequestById(String decentralizedRequestId);
//提交分散采购申请
DecentralizedRequest commitRequest(String decentralizedRequestId);
DecentralizedRequest commitRequest(List<DecentralizedRequestDTO> decentralizedRequestDTOList,DLPUser dlpUser);
DecentralizedRequest primaryAuditRequest(DLPUser dlpUser, AuditAndApproveDTO auditAndApproveDto);
DecentralizedRequest secondaryAuditRequest(DLPUser dlpUser, AuditAndApproveDTO auditAndApproveDto);
DecentralizedRequest threeLevelAuditRequest(DLPUser dlpUser, AuditAndApproveDTO auditAndApproveDto);
DecentralizedRequest threeLevelAuditRequest(DLPUser dlpUser, AuditDecentralizedRequestDTO auditDecentralizedRequestDTO);
DecentralizedRequest approveRequest(DLPUser dlpUser, AuditAndApproveDTO auditAndApproveDto);
}
src/main/java/digital/laboratory/platform/reagent/service/DeliveryRegistrationFormService.java
+10
View File
@@ -1,7 +1,12 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.OutgoingContentsDTO;
import digital.laboratory.platform.reagent.entity.DeliveryRegistrationForm;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* (试剂耗材出库登记表)服务类
@@ -11,4 +16,9 @@ import digital.laboratory.platform.reagent.entity.DeliveryRegistrationForm;
*/
public interface DeliveryRegistrationFormService extends IService<DeliveryRegistrationForm> {
//创建出库任务
@Transactional
DeliveryRegistrationForm addFrom(String applicationForUseId);
DeliveryRegistrationForm commitForm(List<OutgoingContentsDTO> outgoingContentsDTOS, DLPUser dlpUser);
}
src/main/java/digital/laboratory/platform/reagent/service/DetailsOfCentralizedService.java
+1
View File
@@ -21,4 +21,5 @@ public interface DetailsOfCentralizedService extends IService<DetailsOfCentraliz
List<DetailsOfCentralizedVO> getDetailsOfCentralizedVOList(String centralizedRequestId);
List<DetailsOfCentralizedVO> getDetailsOfCentralizedList(String purchasingPlanId);
}
src/main/java/digital/laboratory/platform/reagent/service/EvaluationFormService.java
+3 -1
View File
@@ -20,7 +20,9 @@ public interface EvaluationFormService extends IService<EvaluationForm> {
//增加/修改评价表
EvaluationForm addFormById(EvaluationFormDTO evaluationFormDTO,DLPUser dlpUser);
EvaluationForm addFormById(String supplierInformationId);
EvaluationForm editFormById(EvaluationFormDTO evaluationFormDTO);
EvaluationForm auditFormOfSecondary(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser);
src/main/java/digital/laboratory/platform/reagent/service/PeriodVerificationImplementationService.java
+17
View File
@@ -1,7 +1,13 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.PeriodVerificationImplementationDTO;
import digital.laboratory.platform.reagent.entity.PeriodVerificationImplementation;
import digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO;
/**
* (标准物质期间核查实施情况及结果记录表)服务类
@@ -11,4 +17,15 @@ import digital.laboratory.platform.reagent.entity.PeriodVerificationImplementati
*/
public interface PeriodVerificationImplementationService extends IService<PeriodVerificationImplementation> {
IPage<PeriodVerificationImplementationVO> getPeriodVerificationImplementationVOPage(IPage<PeriodVerificationImplementation> page, QueryWrapper<PeriodVerificationImplementation> qw);
PeriodVerificationImplementationVO getPeriodVerificationImplementationVO(String periodVerificationImplementationId);
PeriodVerificationImplementation addById(PeriodVerificationImplementationDTO periodVerificationImplementationDTO, DLPUser dlpUser);
PeriodVerificationImplementation editById(PeriodVerificationImplementationDTO periodVerificationImplementationDTO);
PeriodVerificationImplementation commitById(PeriodVerificationImplementationDTO periodVerificationImplementationDTO, DLPUser dlpUser);
PeriodVerificationImplementation auditById(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser);
}
src/main/java/digital/laboratory/platform/reagent/service/PeriodVerificationPlanService.java
+8 -1
View File
@@ -1,7 +1,14 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.PeriodVerificationPlanDTO;
import digital.laboratory.platform.reagent.entity.PeriodVerificationPlan;
import digital.laboratory.platform.reagent.vo.PeriodVerificationPlanVO;
import java.util.List;
/**
* (标准物质期间核查计划和确认表)服务类
@@ -10,5 +17,5 @@ import digital.laboratory.platform.reagent.entity.PeriodVerificationPlan;
* @describe (标准物质期间核查计划和确认表) 服务类
*/
public interface PeriodVerificationPlanService extends IService<PeriodVerificationPlan> {
List<PeriodVerificationPlanVO> getPeriodVerificationPlanVOList ( String checkScheduleId);
}
src/main/java/digital/laboratory/platform/reagent/service/ProvideServicesOrSuppliesService.java
+1
View File
@@ -16,4 +16,5 @@ public interface ProvideServicesOrSuppliesService extends IService<ProvideServic
List<ProvideServicesOrSuppliesVO> getProvideServicesOrSuppliesVOList (String provideServicesOrSuppliesId);
ProvideServicesOrSupplies addById(String supplierInformationId);
}
src/main/java/digital/laboratory/platform/reagent/service/PurchaseCatalogueService.java
+7 -3
View File
@@ -20,10 +20,12 @@ import java.util.List;
*/
public interface PurchaseCatalogueService extends IService<PurchaseCatalogue> {
List<CatalogueDetails> addCatalogue(DLPUser dlpUser, List<PurchaseCatalogueDTO> purchaseCatalogueDTOList, PurchaseCatalogue purchaseCatalogue);
PurchaseCatalogue addCatalogue(DLPUser dlpUser, List<PurchaseCatalogueDTO> purchaseCatalogueDTOList);
CatalogueDetails editCatalogue(PurchaseCatalogueDTO purchaseCatalogueDto);
List<CatalogueDetails> delCatalogue(String purchaseCatalogueId);
Boolean delCatalogue(String purchaseCatalogueId);
CatalogueDetails addDetails(PurchaseCatalogueDTO purchaseCatalogueDTO);
IPage<PurchaseCatalogueVO> getPurchaseCatalogueVOPage(IPage<PurchaseCatalogue> page, QueryWrapper<PurchaseCatalogue> qw);
@@ -32,11 +34,13 @@ public interface PurchaseCatalogueService extends IService<PurchaseCatalogue> {
PurchaseCatalogueVO getPurchaseCatalogueVO(String purchaseCatalogueId);
PurchaseCatalogue commitById(String purchaseCatalogueId);
PurchaseCatalogue commitById(List<PurchaseCatalogueDTO> purchaseCatalogueDTOList,DLPUser dlpUser);
PurchaseCatalogue primaryAuditCatalogue (AuditAndApproveDTO auditAndApproveDto, DLPUser dlpUser);
PurchaseCatalogue secondaryAuditCatalogue(AuditAndApproveDTO auditAndApproveDto, DLPUser dlpUser);
PurchaseCatalogue releaseCatalogue(String purchaseCatalogueId);
PurchaseCatalogueVO getVOpage();
}
src/main/java/digital/laboratory/platform/reagent/service/PurchaseListDetailsService.java
+2 -1
View File
@@ -2,6 +2,7 @@ package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.reagent.entity.PurchaseListDetails;
import digital.laboratory.platform.reagent.vo.PurchaseListDetailsVO;
import java.util.List;
@@ -13,6 +14,6 @@ import java.util.List;
*/
public interface PurchaseListDetailsService extends IService<PurchaseListDetails> {
List<PurchaseListDetails> getPurchaseListDetailsVOList(String purchaseListId);
List<PurchaseListDetailsVO> getPurchaseListDetailsVOList(String purchaseListId);
}
src/main/java/digital/laboratory/platform/reagent/service/PurchasingPlanService.java
+5 -3
View File
@@ -9,6 +9,7 @@ import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.dto.PurchasingPlanDTO;
import digital.laboratory.platform.reagent.entity.ProcurementContent;
import digital.laboratory.platform.reagent.entity.PurchasingPlan;
import digital.laboratory.platform.reagent.vo.ProcurementContentVO;
import digital.laboratory.platform.reagent.vo.PurchasingPlanVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.transaction.annotation.Transactional;
@@ -30,17 +31,18 @@ public interface PurchasingPlanService extends IService<PurchasingPlan> {
PurchasingPlanVO getPurchasingPlanVO (String purchasingPlanId);
@Transactional
Boolean addById(List<PurchasingPlanDTO> purchasingPlanDTOList, DLPUser user, PurchasingPlan purchasingPlan);
PurchasingPlanVO addById(List<PurchasingPlanDTO> purchasingPlanDTOList, DLPUser user);
ProcurementContent addContent(PurchasingPlanDTO purchasingPlanDTO);
ProcurementContent editById(PurchasingPlanDTO purchasingPlanDTO);
@Transactional
Boolean delById(String purchasingPlanId);
ProcurementContent editDetails(PurchasingPlanDTO purchasingPlanDTO);
Boolean delContentById(String procurementContentId);
ProcurementContent replacementById(PurchasingPlanDTO purchasingPlanDTO);
PurchasingPlan commitById(String purchasingPlanId);
PurchasingPlan auditById(AuditAndApproveDTO auditAndApproveDto, DLPUser dlpUser);
src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumableInventoryService.java
+13
View File
@@ -2,6 +2,10 @@ package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.reagent.entity.ReagentConsumableInventory;
import digital.laboratory.platform.reagent.entity.ReferenceMaterial;
import digital.laboratory.platform.reagent.vo.ReagentConsumableInventoryVO;
import java.util.List;
/**
* 试剂耗材库存服务类
@@ -11,4 +15,13 @@ import digital.laboratory.platform.reagent.entity.ReagentConsumableInventory;
*/
public interface ReagentConsumableInventoryService extends IService<ReagentConsumableInventory> {
List<ReagentConsumableInventoryVO> getReagentConsumableInventoryVOList();
ReagentConsumableInventory addById(String reagentConsumableId, Integer quantity);
ReagentConsumableInventory reduceById(String reagentConsumableId, Integer quantity);
List<ReagentConsumableInventoryVO >getReferenceMaterialVOList();
ReferenceMaterial deactivateById(String referenceMaterialId);
}
src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumablesService.java
+1
View File
@@ -11,4 +11,5 @@ import digital.laboratory.platform.reagent.entity.ReagentConsumables;
*/
public interface ReagentConsumablesService extends IService<ReagentConsumables> {
ReagentConsumables addReagentConsumables(Object object);
}
src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumablesSetService.java
+4
View File
@@ -2,6 +2,9 @@ package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.reagent.entity.ReagentConsumablesSet;
import digital.laboratory.platform.reagent.vo.ReagentConsumablesSetVO;
import java.util.List;
/**
* (试剂耗材集合)服务类
@@ -11,4 +14,5 @@ import digital.laboratory.platform.reagent.entity.ReagentConsumablesSet;
*/
public interface ReagentConsumablesSetService extends IService<ReagentConsumablesSet> {
List<ReagentConsumablesSetVO> getList(String applicationForUseId);
}
src/main/java/digital/laboratory/platform/reagent/service/RequisitionRecordService.java
+7
View File
@@ -1,7 +1,11 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.reagent.entity.OutgoingContents;
import digital.laboratory.platform.reagent.entity.RequisitionRecord;
import digital.laboratory.platform.reagent.vo.RequisitionRecordVO;
/**
* (试剂耗材领用记录表)服务类
@@ -11,4 +15,7 @@ import digital.laboratory.platform.reagent.entity.RequisitionRecord;
*/
public interface RequisitionRecordService extends IService<RequisitionRecord> {
RequisitionRecord addRecord(OutgoingContents outgoingContents);
IPage<RequisitionRecordVO> getRequisitionRecordVOPage(IPage<RequisitionRecord> page, QueryWrapper<RequisitionRecord> qw);
}
src/main/java/digital/laboratory/platform/reagent/service/SignedBatchListService.java
-20
View File
@@ -1,20 +0,0 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.reagent.entity.SignedBatchList;
import digital.laboratory.platform.reagent.vo.SignedBatchListVO;
import java.util.List;
/**
* 签收批次明细服务类
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收批次明细 服务类
*/
public interface SignedBatchListService extends IService<SignedBatchList> {
List<SignedBatchListVO> getSignedBatchListVOList(String signedContentId);
}
src/main/java/digital/laboratory/platform/reagent/service/SigningRecordFormService.java
-33
View File
@@ -1,33 +0,0 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.SigningRecordFormDTO;
import digital.laboratory.platform.reagent.entity.SignedBatchList;
import digital.laboratory.platform.reagent.entity.SigningRecordForm;
import digital.laboratory.platform.reagent.vo.SigningRecordFormVO;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 签收记录表服务类
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收记录表 服务类
*/
public interface SigningRecordFormService extends IService<SigningRecordForm> {
// IPage<SigningRecordFormVO> getSigningRecordFormVOPage (IPage<SigningRecordForm> page, QueryWrapper<SigningRecordForm> qw);
// List<SigningRecordFormVO> getSigningRecordFormVOList (QueryWrapper<SigningRecordForm> qw);
SigningRecordFormVO getSigningRecordFormVO (String signingRecordFormId);
@Transactional
Boolean addFormById(List<SigningRecordFormDTO> signingRecordFormDTOList, DLPUser dlpUser);
SignedBatchList editFormById(SigningRecordFormDTO signingRecordFormDTO);
}
src/main/java/digital/laboratory/platform/reagent/service/StandardMaterialApplicationService.java
+11
View File
@@ -1,7 +1,12 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.StandardMaterialApplicationDTO;
import digital.laboratory.platform.reagent.entity.StandardMaterialApplication;
import digital.laboratory.platform.reagent.vo.StandardMaterialApplicationVO;
/**
* (标准物质领用/归还登记表)服务类
@@ -11,4 +16,10 @@ import digital.laboratory.platform.reagent.entity.StandardMaterialApplication;
*/
public interface StandardMaterialApplicationService extends IService<StandardMaterialApplication> {
StandardMaterialApplication returnById(StandardMaterialApplicationDTO standardMaterialApplicationDTO);
IPage<StandardMaterialApplicationVO> getPage(IPage<StandardMaterialApplication> page, QueryWrapper<StandardMaterialApplication> qwl);
//归还记录
IPage <StandardMaterialApplicationVO> getList(IPage<StandardMaterialApplication> page, QueryWrapper<StandardMaterialApplication> qw);
}
src/main/java/digital/laboratory/platform/reagent/service/StorageRegistrationFormService.java
+2 -2
View File
@@ -18,6 +18,6 @@ import java.util.List;
*/
public interface StorageRegistrationFormService extends IService<StorageRegistrationForm> {
List<StorageRegistrationFormVO> getStorageRegistrationFormVOList (QueryWrapper<StorageRegistrationForm> qw);
List<StorageRegistrationForm> addFormById(List<StorageRegistrationFormDTO> storageRegistrationFormDTOList, DLPUser dlpUser);
//List<StorageRegistrationFormVO> getStorageRegistrationFormVOList (QueryWrapper<StorageRegistrationForm> qw);
//List<StorageRegistrationForm> editFormById(List<StorageRegistrationFormDTO> storageRegistrationFormDTOList, DLPUser dlpUser);
}
src/main/java/digital/laboratory/platform/reagent/service/WarehousingBatchListService.java
+20
View File
@@ -0,0 +1,20 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.reagent.entity.WarehousingBatchList;
import digital.laboratory.platform.reagent.vo.WarehousingBatchListVO;
import java.util.List;
/**
* 签收批次明细服务类
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收批次明细 服务类
*/
public interface WarehousingBatchListService extends IService<WarehousingBatchList> {
List<WarehousingBatchListVO> getWarehousingBatchListVOList(String warehousingContentId);
}
src/main/java/digital/laboratory/platform/reagent/service/WarehousingRecordFormService.java
+28
View File
@@ -0,0 +1,28 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.WarehousingRecordFormDTO;
import digital.laboratory.platform.reagent.entity.WarehousingBatchList;
import digital.laboratory.platform.reagent.entity.WarehousingRecordForm;
import digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 签收记录表服务类
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 签收记录表 服务类
*/
public interface WarehousingRecordFormService extends IService<WarehousingRecordForm> {
// IPage<SigningRecordFormVO> getSigningRecordFormVOPage (IPage<SigningRecordForm> page, QueryWrapper<SigningRecordForm> qw);
// List<SigningRecordFormVO> getSigningRecordFormVOList (QueryWrapper<SigningRecordForm> qw);
WarehousingRecordFormVO getWarehousingRecordFormVO (String warehousingFormId);
@Transactional
Boolean addFormById(List<WarehousingRecordFormDTO> warehousingRecordFormDTOList, DLPUser dlpUser);
}
src/main/java/digital/laboratory/platform/reagent/service/impl/AcceptanceRecordFormServiceImpl.java
+124
View File
@@ -1,11 +1,22 @@
package digital.laboratory.platform.reagent.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.AcceptanceRecordFormDTO;
import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO;
import digital.laboratory.platform.reagent.entity.AcceptanceRecordForm;
import digital.laboratory.platform.reagent.mapper.AcceptanceRecordFormMapper;
import digital.laboratory.platform.reagent.service.AcceptanceRecordFormService;
import digital.laboratory.platform.reagent.vo.AcceptanceRecordFormVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
/**
* (验收记录表)服务实现类
*
@@ -13,6 +24,119 @@ import org.springframework.stereotype.Service;
* @describe (验收记录表) 服务实现类
*/
@Service
@SuppressWarnings("all")
public class AcceptanceRecordFormServiceImpl extends ServiceImpl<AcceptanceRecordFormMapper, AcceptanceRecordForm> implements AcceptanceRecordFormService {
@Autowired
private AcceptanceRecordFormService acceptanceRecordFormService;
@Override
public AcceptanceRecordForm editFrom(AcceptanceRecordFormDTO acceptanceRecordFormDTO) {
AcceptanceRecordForm byId = acceptanceRecordFormService.getById(acceptanceRecordFormDTO.getAcceptanceRecordFormId());
BeanUtils.copyProperties(acceptanceRecordFormDTO, byId);
if (acceptanceRecordFormService.updateById(byId)) {
return byId;
} else {
throw new RuntimeException(String.format("保存失败"));
}
}
@Override
public AcceptanceRecordForm addForm(String reagentConsumableId, String supplierId) {
AcceptanceRecordForm acceptanceRecordForm = new AcceptanceRecordForm();
acceptanceRecordForm.setAcceptanceRecordFormId(IdWorker.get32UUID().toUpperCase());
acceptanceRecordForm.setSupplierId(supplierId);
acceptanceRecordForm.setReagentConsumableId(reagentConsumableId);
acceptanceRecordForm.setStatus(0);
if ((acceptanceRecordFormService.save(acceptanceRecordForm))) {
return acceptanceRecordForm;
} else throw new RuntimeException(String.format("创建验收任务失败"));
}
@Override
public AcceptanceRecordForm commitForm(AcceptanceRecordFormDTO acceptanceRecordFormDTO) {
AcceptanceRecordForm acceptanceRecordForm = acceptanceRecordFormService.editFrom(acceptanceRecordFormDTO);
acceptanceRecordForm.setStatus(1);
if (acceptanceRecordFormService.updateById(acceptanceRecordForm)) {
return acceptanceRecordForm;
} else throw new RuntimeException(String.format("提交失败"));
}
@Override
public IPage<AcceptanceRecordFormVO> getAcceptanceRecordFormVOPage(IPage<AcceptanceRecordForm> page, QueryWrapper<AcceptanceRecordForm> qw) {
IPage<AcceptanceRecordFormVO> acceptanceRecordFormVOPage = baseMapper.getAcceptanceRecordFormVOPage(page, qw);
return acceptanceRecordFormVOPage;
}
@Override
public AcceptanceRecordFormVO getAcceptanceRecordFormVO(String acceptanceRecordFormId) {
AcceptanceRecordFormVO acceptanceRecordFormVO = baseMapper.getAcceptanceRecordFormVO(acceptanceRecordFormId);
return acceptanceRecordFormVO;
}
@Override
public AcceptanceRecordForm primaryAudit(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser) {
AcceptanceRecordForm byId = acceptanceRecordFormService.getById(auditAndApproveDTO.getUuId());
byId.setPrimaryAuditorId(dlpUser.getId());
byId.setAuditOpinionOfPrimary(auditAndApproveDTO.getAuditOpinion());
byId.setAuditTimeOfPrimary(LocalDateTime.now());
byId.setAuditResultOfPrimary(auditAndApproveDTO.getAuditResult());
if (acceptanceRecordFormService.updateById(byId)) {
return byId;
} else throw new RuntimeException(String.format("审核失败"));
}
@Override
public AcceptanceRecordForm secondaryAudit(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser) {
AcceptanceRecordForm byId = acceptanceRecordFormService.getById(auditAndApproveDTO.getUuId());
byId.setSecondaryAuditorId(dlpUser.getId());
byId.setAuditOpinionOfSecondary(auditAndApproveDTO.getAuditOpinion());
byId.setAuditTimeOfSecondary(LocalDateTime.now());
byId.setAuditResultOfSecondary(auditAndApproveDTO.getAuditResult());
if (acceptanceRecordFormService.updateById(byId)) {
return byId;
} else throw new RuntimeException(String.format("审核失败"));
}
@Override
public AcceptanceRecordForm threeLevelAudit(AuditAndApproveDTO auditAndApproveDTO, DLPUser dlpUser) {
AcceptanceRecordForm byId = acceptanceRecordFormService.getById(auditAndApproveDTO.getUuId());
byId.setThreeLevelAuditorId(dlpUser.getId());
byId.setAuditOpinionOfThreeLevel(auditAndApproveDTO.getAuditOpinion());
byId.setAuditTimeOfThreeLevel(LocalDateTime.now());
byId.setAuditResultOfThreeLevel(auditAndApproveDTO.getAuditResult());
byId.setStatus(2);
if (acceptanceRecordFormService.updateById(byId)) {
return byId;
} else throw new RuntimeException(String.format("审核失败"));
}
}
src/main/java/digital/laboratory/platform/reagent/service/impl/ApplicationForUseServiceImpl.java
+225 -2
View File
@@ -1,10 +1,26 @@
package digital.laboratory.platform.reagent.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.reagent.entity.ApplicationForUse;
import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
import digital.laboratory.platform.reagent.dto.ApplicationForUseDTO;
import digital.laboratory.platform.reagent.dto.ComplianceCheckDTO;
import digital.laboratory.platform.reagent.entity.*;
import digital.laboratory.platform.reagent.mapper.ApplicationForUseMapper;
import digital.laboratory.platform.reagent.service.ApplicationForUseService;
import digital.laboratory.platform.reagent.service.*;
import digital.laboratory.platform.reagent.vo.ApplicationForUseVO;
import digital.laboratory.platform.reagent.vo.ReagentConsumablesSetVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
/**
* (试剂耗材领用申请表)服务实现类
@@ -12,7 +28,214 @@ import org.springframework.stereotype.Service;
* @author Zhang Xiaolong created at 2023-03-10
* @describe (试剂耗材领用申请表) 服务实现类
*/
@SuppressWarnings("all")
@Service
public class ApplicationForUseServiceImpl extends ServiceImpl<ApplicationForUseMapper, ApplicationForUse> implements ApplicationForUseService {
@Autowired
private ReagentConsumablesSetService reagentConsumablesSetService;
@Autowired
private ApplicationForUseService applicationForUseService;
@Autowired
private ReagentConsumablesService reagentConsumablesService;
@Autowired
private ReferenceMaterialService referenceMaterialService;
@Autowired
private StandardMaterialApplicationService standardMaterialApplicationService;
@Autowired
private ComplianceCheckService complianceCheckService;
@Autowired
private DeliveryRegistrationFormService deliveryRegistrationFormService;
@Autowired
private ReagentConsumableInventoryService reagentConsumableInventoryService;
@Override//通过ID查询领用申请表
public ApplicationForUseVO getApplicationForUseVO(String applicationForUseId) {
ApplicationForUseVO applicationForUseVO = baseMapper.getApplicationForUseVO(applicationForUseId);
List<ReagentConsumablesSetVO> list = reagentConsumablesSetService.getList(applicationForUseId);
applicationForUseVO.setReagentConsumablesSetVOList(list);
return applicationForUseVO;
}
@Override//分页查询
public IPage<ApplicationForUseVO> getApplicationForUseVOPage(IPage<ApplicationForUse> page, QueryWrapper<ApplicationForUse> qw) {
return baseMapper.getApplicationForUseVOPage(page, qw);
}
@Override//列表查询
public List<ApplicationForUseVO> getApplicationForUseVOList(QueryWrapper<ApplicationForUse> qw) {
return baseMapper.getApplicationForUseVOList(qw);
}
@Transactional
@Override//创建领用申请表(试剂耗材领用、标准物质领用、标准溶液领用)
public ApplicationForUse addApplication(List<ApplicationForUseDTO> applicationForUseDTOList, DLPUser dlpUser) {
//录入领用申请表
ApplicationForUse applicationForUse = new ApplicationForUse();
applicationForUse.setApplicationForUseId(IdWorker.get32UUID().toUpperCase());
applicationForUse.setStatus(0);
applicationForUse.setRecipientId(dlpUser.getId());
LambdaQueryWrapper<ReagentConsumableInventory> reagentConsumableInventoryLambdaQueryWrapper = new LambdaQueryWrapper<>();
List<ReagentConsumablesSet> reagentConsumablesSets = new ArrayList<>();
LambdaQueryWrapper<ReferenceMaterial> reagentConsumableLambdaQueryWrapper = new LambdaQueryWrapper<>();
//录入领用申请内容
for (ApplicationForUseDTO applicationForUseDTO : applicationForUseDTOList) {
//生成领用登记表集合
ReagentConsumablesSet reagentConsumablesSet = new ReagentConsumablesSet();
BeanUtils.copyProperties(applicationForUseDTO, reagentConsumablesSet);
reagentConsumablesSet.setReagentConsumablesSetId(IdWorker.get32UUID().toUpperCase());
reagentConsumablesSet.setApplicationForUseId(applicationForUse.getApplicationForUseId());
reagentConsumablesSets.add(reagentConsumablesSet);
reagentConsumableInventoryLambdaQueryWrapper.eq(ReagentConsumableInventory::getReagentConsumableId,reagentConsumablesSet.getReagentConsumableId());
Integer totalQuantity = reagentConsumableInventoryService.getOne(reagentConsumableInventoryLambdaQueryWrapper).getTotalQuantity();
if (reagentConsumablesSet.getQuantity()>totalQuantity){
throw new RuntimeException(String.format("领用数量不能大于库存量"));
}
}
if (applicationForUseService.save(applicationForUse) & reagentConsumablesSetService.saveBatch(reagentConsumablesSets)
) {
return applicationForUse;
} else return null;
}
@Transactional
@Override//修改领用申请表
public ApplicationForUse editApplication(List<ApplicationForUseDTO> applicationForUseDTOList, DLPUser dlpUser) {
ApplicationForUse applicationForUse = applicationForUseService.getById(applicationForUseDTOList.get(0).getApplicationForUseId());
LambdaQueryWrapper<ReagentConsumablesSet> reagentConsumablesSetLambdaQueryWrapper = new LambdaQueryWrapper<>();
reagentConsumablesSetLambdaQueryWrapper.eq(ReagentConsumablesSet::getApplicationForUseId, applicationForUse.getApplicationForUseId());
List<ReagentConsumablesSet> list = reagentConsumablesSetService.list(reagentConsumablesSetLambdaQueryWrapper);
//删除领用申请明细
reagentConsumablesSetService.removeBatchByIds(list);
ArrayList<ReagentConsumablesSet> reagentConsumablesSets = new ArrayList<>();
LambdaQueryWrapper<ReferenceMaterial> reagentConsumableLambdaQueryWrapper = new LambdaQueryWrapper<>();
//录入领用申请内容
for (ApplicationForUseDTO applicationForUseDTO : applicationForUseDTOList) {
//生成领用登记表集合
ReagentConsumablesSet reagentConsumablesSet = new ReagentConsumablesSet();
BeanUtils.copyProperties(applicationForUseDTO, reagentConsumablesSet);
reagentConsumablesSet.setReagentConsumablesSetId(IdWorker.get32UUID().toUpperCase());
reagentConsumablesSet.setApplicationForUseId(applicationForUse.getApplicationForUseId());
reagentConsumablesSets.add(reagentConsumablesSet);
ReagentConsumables reagentConsumables = reagentConsumablesService.getById(reagentConsumablesSet.getReagentConsumableId());
}
if (applicationForUseService.updateById(applicationForUse) & reagentConsumablesSetService.saveBatch(reagentConsumablesSets)
) {
return applicationForUse;
} else return null;
}
@Override//提交领用申请记录
public ApplicationForUse commitApplication(List<ApplicationForUseDTO> applicationForUseDTOList, DLPUser dlpUser) {
if (applicationForUseDTOList.get(0).getApplicationForUseId() == null) {
ApplicationForUse applicationForUse = applicationForUseService.addApplication(applicationForUseDTOList, dlpUser);
applicationForUse.setStatus(1);
String random = "" + Math.random();
//领取码
applicationForUse.setClaimCode(random.substring(random.length() - 4));
applicationForUse.setDateOfCollection(LocalDateTime.now());
LambdaQueryWrapper<ReagentConsumablesSet> reagentConsumablesSetLambdaQueryWrapper = new LambdaQueryWrapper<>();
reagentConsumablesSetLambdaQueryWrapper.eq(ReagentConsumablesSet::getApplicationForUseId, applicationForUse.getApplicationForUseId());
List<ReagentConsumablesSet> list = reagentConsumablesSetService.list(reagentConsumablesSetLambdaQueryWrapper);
LambdaQueryWrapper<ReagentConsumables> reagentConsumablesLambdaQueryWrapper = new LambdaQueryWrapper<>();
applicationForUseService.updateById(applicationForUse);
deliveryRegistrationFormService.addFrom(applicationForUse.getApplicationForUseId());
return applicationForUse;
} else {
LambdaQueryWrapper<ApplicationForUse> applicationForUseLambdaQueryWrapper = new LambdaQueryWrapper<>();
applicationForUseLambdaQueryWrapper.eq(ApplicationForUse::getApplicationForUseId, applicationForUseDTOList.get(0).getApplicationForUseId());
ApplicationForUse applicationForUse = applicationForUseService.getOne(applicationForUseLambdaQueryWrapper);
applicationForUse.setStatus(1);
applicationForUse.setDateOfCollection(LocalDateTime.now());
String random = "" + Math.random();
applicationForUse.setClaimCode(random.substring(random.length() - 4));
applicationForUseService.updateById(applicationForUse);
deliveryRegistrationFormService.addFrom(applicationForUse.getApplicationForUseId());
return applicationForUse;
}
}
@Override//通过ID删除领用申请表（标准物质领用/归还登记表）
public Boolean delApplication(String applicationForUseId) {
ApplicationForUse applicationForUse = applicationForUseService.getById(applicationForUseId);
LambdaQueryWrapper<ReagentConsumablesSet> reagentConsumablesSetLambdaQueryWrapper = new LambdaQueryWrapper<>();
reagentConsumablesSetLambdaQueryWrapper.eq(ReagentConsumablesSet::getApplicationForUseId, applicationForUse.getApplicationForUseId());
List<ReagentConsumablesSet> list = reagentConsumablesSetService.list(reagentConsumablesSetLambdaQueryWrapper);
LambdaQueryWrapper<StandardMaterialApplication> standardMaterialApplicationLambdaQueryWrapper = new LambdaQueryWrapper<>();
standardMaterialApplicationLambdaQueryWrapper.eq(StandardMaterialApplication::getApplicationForUseId, applicationForUse.getApplicationForUseId());
List<StandardMaterialApplication> list1 = standardMaterialApplicationService.list(standardMaterialApplicationLambdaQueryWrapper);
return reagentConsumablesSetService.removeBatchByIds(list) & standardMaterialApplicationService.removeBatchByIds(list1) & applicationForUseService.removeById(applicationForUse);
}
}

Some files were not shown because too many files have changed in this diff Show More