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

3.22

Browse Source
This commit is contained in:
杨海航
2023-03-23 09:30:39 +08:00
parent 300f456e97
commit 3098c09e81
81 changed files with 19287 additions and 3742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logs/debug.log
+918 -270
View File
File diff suppressed because it is too large Load Diff
logs/dlp-reagent-managment/debug.log
+9467 -2699
View File
File diff suppressed because it is too large Load Diff
logs/dlp-reagent-managment/error.log
+7947
View File
File diff suppressed because it is too large Load Diff
src/main/java/digital/laboratory/platform/reagent/controller/AfterSaleSituationController.java
-148
View File
@@ -1,148 +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.service.AfterSaleSituationService;
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;
/**
* 服务商/供应商响应、资质和售后情况
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 服务商/供应商响应、资质和售后情况 前端控制器
*
* 这是与表示层的接口, 不应该接业务逻辑写在这里, 业务逻辑应该写在 service 中
* 这里写什么:
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 数据层在 mapper 中, 数据层不涉及业务, 只管技术上的 对象<->表 之间的转换
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/after_sale_situation" )
@Api(value = "after_sale_situation", tags = "服务商/供应商响应、资质和售后情况管理")
public class AfterSaleSituationController {
private final AfterSaleSituationService afterSaleSituationService;
/**
* 通过id查询服务商/供应商响应、资质和售后情况
* @param afterSaleSituationId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{afterSaleSituationId}" )
@PreAuthorize("@pms.hasPermission('reagent_after_sale_situation_get')" )
public R<AfterSaleSituation> getById(@PathVariable("afterSaleSituationId" ) String afterSaleSituationId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
AfterSaleSituation afterSaleSituation = afterSaleSituationService.getById(afterSaleSituationId);
return R.ok(afterSaleSituation);
//return R.ok(afterSaleSituationService.getById(afterSaleSituationId));
}
/**
* 分页查询
* @param page 分页对象
* @param afterSaleSituation 服务商/供应商响应、资质和售后情况
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_after_sale_situation_get')" )
public R<IPage<AfterSaleSituation>> getAfterSaleSituationPage(Page<AfterSaleSituation> page, AfterSaleSituation afterSaleSituation, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<AfterSaleSituation> afterSaleSituationSList = afterSaleSituationService.page(page, Wrappers.<AfterSaleSituation>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(afterSaleSituationSList);
// return R.ok(afterSaleSituationService.page(page, Wrappers.query(afterSaleSituation)));
}
/**
* 新增服务商/供应商响应、资质和售后情况
* @param afterSaleSituation 服务商/供应商响应、资质和售后情况
* @return R
*/
@ApiOperation(value = "新增服务商/供应商响应、资质和售后情况", notes = "新增服务商/供应商响应、资质和售后情况")
@SysLog("新增服务商/供应商响应、资质和售后情况" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_after_sale_situation_add')" )
public R<AfterSaleSituation> postAddObject(@RequestBody AfterSaleSituation afterSaleSituation, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
afterSaleSituation.setAfterSaleSituationId(IdWorker.get32UUID().toUpperCase());
if (afterSaleSituationService.save(afterSaleSituation)) {
return R.ok(afterSaleSituation, "对象创建成功");
}
else {
return R.failed(afterSaleSituation, "对象创建失败");
}
}
/**
* 修改服务商/供应商响应、资质和售后情况
* @param afterSaleSituation 服务商/供应商响应、资质和售后情况
* @return R
*/
@ApiOperation(value = "修改服务商/供应商响应、资质和售后情况", notes = "修改服务商/供应商响应、资质和售后情况")
@SysLog("修改服务商/供应商响应、资质和售后情况" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_after_sale_situation_edit')" )
public R<AfterSaleSituation> putUpdateById(@RequestBody AfterSaleSituation afterSaleSituation, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (afterSaleSituationService.updateById(afterSaleSituation)) {
return R.ok(afterSaleSituation, "保存对象成功");
}
else {
return R.failed(afterSaleSituation, "保存对象失败");
}
}
/**
* 通过id删除服务商/供应商响应、资质和售后情况
* @param afterSaleSituationId id
* @return R
*/
@ApiOperation(value = "通过id删除服务商/供应商响应、资质和售后情况", notes = "通过id删除服务商/供应商响应、资质和售后情况")
@SysLog("通过id删除服务商/供应商响应、资质和售后情况" )
@DeleteMapping("/{afterSaleSituationId}" )
@PreAuthorize("@pms.hasPermission('reagent_after_sale_situation_del')" )
public R<AfterSaleSituation> deleteById(@PathVariable String afterSaleSituationId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
AfterSaleSituation oldAfterSaleSituation = afterSaleSituationService.getById(afterSaleSituationId);
if (afterSaleSituationService.removeById(afterSaleSituationId)) {
return R.ok(oldAfterSaleSituation, "对象删除成功");
}
else {
return R.failed(oldAfterSaleSituation, "对象删除失败");
}
}
}
src/main/java/digital/laboratory/platform/reagent/controller/EvaluationFormController.java
+17 -55
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.EvaluationFormDTO;
import digital.laboratory.platform.reagent.entity.EvaluationForm;
import digital.laboratory.platform.reagent.service.EvaluationFormService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -49,12 +50,15 @@ public class EvaluationFormController {
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{evaluationFormId}" )
@PreAuthorize("@pms.hasPermission('reagent_evaluation_form_get')" )
// @PreAuthorize("@pms.hasPermission('reagent_evaluation_form_get')" )
public R<EvaluationForm> getById(@PathVariable("evaluationFormId" ) String evaluationFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
EvaluationForm evaluationForm = evaluationFormService.getById(evaluationFormId);
return R.ok(evaluationForm);
//return R.ok(evaluationFormService.getById(evaluationFormId));
}
@@ -67,7 +71,7 @@ public class EvaluationFormController {
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_evaluation_form_get')" )
// @PreAuthorize("@pms.hasPermission('reagent_evaluation_form_get')" )
public R<IPage<EvaluationForm>> getEvaluationFormPage(Page<EvaluationForm> page, EvaluationForm evaluationForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@@ -83,69 +87,27 @@ public class EvaluationFormController {
/**
* 新增(服务商/供应商评价表)
* @param evaluationForm (服务商/供应商评价表)
* @param evaluationFormDTO (服务商/供应商评价表)
* @return R
*/
@ApiOperation(value = "新增(服务商/供应商评价表)", notes = "新增(服务商/供应商评价表)")
@SysLog("新增(服务商/供应商评价表)" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_evaluation_form_add')" )
public R<EvaluationForm> postAddObject(@RequestBody EvaluationForm evaluationForm, HttpServletRequest theHttpServletRequest) {
// @PreAuthorize("@pms.hasPermission('reagent_evaluation_form_add')" )
public R<EvaluationForm> postAddObject(@RequestBody EvaluationFormDTO evaluationFormDTO, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
evaluationForm.setEvaluationFormId(IdWorker.get32UUID().toUpperCase());
if (evaluationFormService.save(evaluationForm)) {
return R.ok(evaluationForm, "对象创建成功");
}
else {
return R.failed(evaluationForm, "对象创建失败");
}
}
EvaluationForm evaluationForm = evaluationFormService.addFormById(evaluationFormDTO, dlpUser);
/**
* 修改(服务商/供应商评价表)
* @param evaluationForm (服务商/供应商评价表)
* @return R
*/
@ApiOperation(value = "修改(服务商/供应商评价表)", notes = "修改(服务商/供应商评价表)")
@SysLog("修改(服务商/供应商评价表)" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_evaluation_form_edit')" )
public R<EvaluationForm> putUpdateById(@RequestBody EvaluationForm evaluationForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (evaluationFormService.updateById(evaluationForm)) {
return R.ok(evaluationForm, "保存对象成功");
if (evaluationForm!=null) {
return R.ok(evaluationForm,"保存成功");
}else {
return R.failed("保存失败");
}
else {
return R.failed(evaluationForm, "保存对象失败");
}
}
}
/**
* 通过id删除(服务商/供应商评价表)
* @param evaluationFormId id
* @return R
*/
@ApiOperation(value = "通过id删除(服务商/供应商评价表)", notes = "通过id删除(服务商/供应商评价表)")
@SysLog("通过id删除(服务商/供应商评价表)" )
@DeleteMapping("/{evaluationFormId}" )
@PreAuthorize("@pms.hasPermission('reagent_evaluation_form_del')" )
public R<EvaluationForm> deleteById(@PathVariable String evaluationFormId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
EvaluationForm oldEvaluationForm = evaluationFormService.getById(evaluationFormId);
if (evaluationFormService.removeById(evaluationFormId)) {
return R.ok(oldEvaluationForm, "对象删除成功");
}
else {
return R.failed(oldEvaluationForm, "对象删除失败");
}
}
}
src/main/java/digital/laboratory/platform/reagent/controller/EvaluationResultController.java
-147
View File
@@ -1,147 +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 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;
/**
* (服务商/供应商评价结果)
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe (服务商/供应商评价结果) 前端控制器
*
* 这是与表示层的接口, 不应该接业务逻辑写在这里, 业务逻辑应该写在 service 中
* 这里写什么:
* 为前端提供数据, 接受前端的数据
* 为前端提供的数据, 从 service 取得后, 可以做一些适当的加工, 这种加工不是业务层面的, 只能是数据格式上, 为方便前端处理
* 接受前端的数据, 每一个函数的参数可以先做一些整理后, 再调用 service 中的函数。这里对参数的整理, 应该只是格式上的, 而不能是业务上的
* 数据层在 mapper 中, 数据层不涉及业务, 只管技术上的 对象<->表 之间的转换
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/evaluation_result" )
@Api(value = "evaluation_result", tags = "(服务商/供应商评价结果)管理")
public class EvaluationResultController {
private final EvaluationResultService evaluationResultService;
/**
* 通过id查询(服务商/供应商评价结果)
* @param evaluationResultId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{evaluationResultId}" )
@PreAuthorize("@pms.hasPermission('reagent_evaluation_result_get')" )
public R<EvaluationResult> getById(@PathVariable("evaluationResultId" ) String evaluationResultId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
EvaluationResult evaluationResult = evaluationResultService.getById(evaluationResultId);
return R.ok(evaluationResult);
//return R.ok(evaluationResultService.getById(evaluationResultId));
}
/**
* 分页查询
* @param page 分页对象
* @param evaluationResult (服务商/供应商评价结果)
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_evaluation_result_get')" )
public R<IPage<EvaluationResult>> getEvaluationResultPage(Page<EvaluationResult> page, EvaluationResult evaluationResult, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
IPage<EvaluationResult> evaluationResultSList = evaluationResultService.page(page, Wrappers.<EvaluationResult>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(evaluationResultSList);
// return R.ok(evaluationResultService.page(page, Wrappers.query(evaluationResult)));
}
/**
* 新增(服务商/供应商评价结果)
* @param evaluationResult (服务商/供应商评价结果)
* @return R
*/
@ApiOperation(value = "新增(服务商/供应商评价结果)", notes = "新增(服务商/供应商评价结果)")
@SysLog("新增(服务商/供应商评价结果)" )
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_evaluation_result_add')" )
public R<EvaluationResult> postAddObject(@RequestBody EvaluationResult evaluationResult, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
evaluationResult.setEvaluationResultId(IdWorker.get32UUID().toUpperCase());
if (evaluationResultService.save(evaluationResult)) {
return R.ok(evaluationResult, "对象创建成功");
}
else {
return R.failed(evaluationResult, "对象创建失败");
}
}
/**
* 修改(服务商/供应商评价结果)
* @param evaluationResult (服务商/供应商评价结果)
* @return R
*/
@ApiOperation(value = "修改(服务商/供应商评价结果)", notes = "修改(服务商/供应商评价结果)")
@SysLog("修改(服务商/供应商评价结果)" )
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_evaluation_result_edit')" )
public R<EvaluationResult> putUpdateById(@RequestBody EvaluationResult evaluationResult, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
if (evaluationResultService.updateById(evaluationResult)) {
return R.ok(evaluationResult, "保存对象成功");
}
else {
return R.failed(evaluationResult, "保存对象失败");
}
}
/**
* 通过id删除(服务商/供应商评价结果)
* @param evaluationResultId id
* @return R
*/
@ApiOperation(value = "通过id删除(服务商/供应商评价结果)", notes = "通过id删除(服务商/供应商评价结果)")
@SysLog("通过id删除(服务商/供应商评价结果)" )
@DeleteMapping("/{evaluationResultId}" )
@PreAuthorize("@pms.hasPermission('reagent_evaluation_result_del')" )
public R<EvaluationResult> deleteById(@PathVariable String evaluationResultId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
EvaluationResult oldEvaluationResult = evaluationResultService.getById(evaluationResultId);
if (evaluationResultService.removeById(evaluationResultId)) {
return R.ok(oldEvaluationResult, "对象删除成功");
}
else {
return R.failed(oldEvaluationResult, "对象删除失败");
}
}
}
src/main/java/digital/laboratory/platform/reagent/controller/ProvideServicesOrSuppliesController.java
+4 -4
View File
@@ -44,17 +44,17 @@ public class ProvideServicesOrSuppliesController {
/**
* 通过id查询提供服务或供应品
* @param provideServicesOrSuppliesid id
* @param provideServicesOrSuppliesId id
* @return R
*/
@ApiOperation(value = "通过id查询", notes = "通过id查询")
@GetMapping("/{provideServicesOrSuppliesid}" )
@GetMapping("/{provideServicesOrSuppliesId}" )
@PreAuthorize("@pms.hasPermission('reagent_provide_services_or_supplies_get')" )
public R<ProvideServicesOrSupplies> getById(@PathVariable("provideServicesOrSuppliesid" ) String provideServicesOrSuppliesid, HttpServletRequest theHttpServletRequest) {
public R<ProvideServicesOrSupplies> getById(@PathVariable("provideServicesOrSuppliesId" ) String provideServicesOrSuppliesId, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
ProvideServicesOrSupplies provideServicesOrSupplies = provideServicesOrSuppliesService.getById(provideServicesOrSuppliesid);
ProvideServicesOrSupplies provideServicesOrSupplies = provideServicesOrSuppliesService.getById(provideServicesOrSuppliesId);
return R.ok(provideServicesOrSupplies);
//return R.ok(provideServicesOrSuppliesService.getById(provideServicesOrSuppliesid));
}
src/main/java/digital/laboratory/platform/reagent/controller/SigningRecordFormController.java
+88 -70
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.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;
@@ -20,131 +23,146 @@ 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("/signing_record_form" )
@RequestMapping("/signing_record_form")
@Api(value = "signing_record_form", tags = "签收记录表管理")
public class SigningRecordFormController {
private final SigningRecordFormService signingRecordFormService;
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();
/**
* 通过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) {
SigningRecordForm signingRecordForm = signingRecordFormService.getById(signingRecordFormId);
return R.ok(signingRecordForm);
//return R.ok(signingRecordFormService.getById(signingRecordFormId));
}
Principal principal = theHttpServletRequest.getUserPrincipal();
/**
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
SigningRecordFormVO signingRecordFormVO = signingRecordFormService.getSigningRecordFormVO(signingRecordFormId);
return R.ok(signingRecordFormVO);
}
/**
* 分页查询
* @param page 分页对象
*
* @param page 分页对象
* @param signingRecordForm 签收记录表
* @return
*/
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('reagent_signing_record_form_get')" )
public R<IPage<SigningRecordForm>> getSigningRecordFormPage(Page<SigningRecordForm> page, SigningRecordForm signingRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
@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);
IPage<SigningRecordForm> signingRecordFormSList = signingRecordFormService.page(page, Wrappers.<SigningRecordForm>query()
.eq("create_by", dlpUser.getId())
.orderByDesc("create_time")
);
return R.ok(signingRecordFormSList);
// return R.ok(signingRecordFormService.page(page, Wrappers.query(signingRecordForm)));
}
/**
* 新增签收记录表
* @param signingRecordForm 签收记录表
*
* @param signingRecordFormDTOList 签收记录表
* @return R
*/
@ApiOperation(value = "新增签收记录表", notes = "新增签收记录表")
@SysLog("新增签收记录表" )
@SysLog("新增签收记录表")
@PostMapping
@PreAuthorize("@pms.hasPermission('reagent_signing_record_form_add')" )
public R<SigningRecordForm> postAddObject(@RequestBody SigningRecordForm signingRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_add')")
public R<String> postAddObject(@RequestBody List<SigningRecordFormDTO> signingRecordFormDTOList, HttpServletRequest theHttpServletRequest) {
signingRecordForm.setSigningRecordFormId(IdWorker.get32UUID().toUpperCase());
if (signingRecordFormService.save(signingRecordForm)) {
return R.ok(signingRecordForm, "对象创建成功");
}
else {
return R.failed(signingRecordForm, "对象创建失败");
}
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 signingRecordForm 签收记录表
*
* @param signingRecordFormDTO 签收记录表
* @return R
*/
@ApiOperation(value = "修改签收记录表", notes = "修改签收记录表")
@SysLog("修改签收记录表" )
@SysLog("修改签收记录表")
@PutMapping
@PreAuthorize("@pms.hasPermission('reagent_signing_record_form_edit')" )
public R<SigningRecordForm> putUpdateById(@RequestBody SigningRecordForm signingRecordForm, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
// @PreAuthorize("@pms.hasPermission('reagent_signing_record_form_edit')")
public R<SignedBatchList> putUpdateById(@RequestBody SigningRecordFormDTO signingRecordFormDTO, HttpServletRequest theHttpServletRequest) {
if (signingRecordFormService.updateById(signingRecordForm)) {
return R.ok(signingRecordForm, "保存对象成功");
}
else {
return R.failed(signingRecordForm, "保存对象失败");
}
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')" )
@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();
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, "对象删除失败");
}
if (signingRecordFormService.removeById(signingRecordFormId)) {
return R.ok(oldSigningRecordForm, "对象删除成功");
} else {
return R.failed(oldSigningRecordForm, "对象删除失败");
}
}
src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceRecordForm.java
+24 -24
View File
@@ -67,22 +67,22 @@ public class AcceptanceRecordForm extends BaseEntity {
private String nonconformingItem;
/**
* (质量负责人审核意见)
* (二级审核意见)
*/
@ApiModelProperty(value="(质量负责人审核意见)")
private String auditOpinionOfQuality;
@ApiModelProperty(value="(二级审核意见)")
private String auditOpinionOfSecondary;
/**
* (质量负责人ID)
* (二级审核人ID)
*/
@ApiModelProperty(value="(质量负责人ID)")
private String qualityManagerId;
@ApiModelProperty(value="(二级审核人ID)")
private String secondaryAuditorId;
/**
* (质量负责人审核时间)
* (二级审核时间)
*/
@ApiModelProperty(value="(质量负责人审核时间)")
private String auditTimeOfQuality;
@ApiModelProperty(value="(二级审核时间)")
private String auditTimeOfSecondary;
/**
* (试剂耗材ID)
@@ -91,22 +91,22 @@ public class AcceptanceRecordForm extends BaseEntity {
private String reagentConsumableId;
/**
* (试剂耗材管理员审核意见)
* (一级审核意见)
*/
@ApiModelProperty(value="(试剂耗材管理员审核意见)")
private String auditOpinionOfManage;
@ApiModelProperty(value="(一级审核意见)")
private String auditOpinionOfPrimary;
/**
* (试剂耗材管理员审核日期)
* (一级审核时间)
*/
@ApiModelProperty(value="(试剂耗材管理员审核日期)")
private LocalDateTime auditTimeOfManager;
@ApiModelProperty(value="(一级审核时间)")
private LocalDateTime auditTimeOfPrimary;
/**
* (试剂耗材管理员ID)
* (一级审核人ID)
*/
@ApiModelProperty(value="(试剂耗材管理员ID)")
private String reagentSuppliesManagerId;
@ApiModelProperty(value="(一级审核人ID)")
private String primaryAuditorId;
/**
* 签收批次明细ID
@@ -122,10 +122,10 @@ public class AcceptanceRecordForm extends BaseEntity {
private String acceptanceRecordFormId;
/**
* 试剂耗材管理员审核结果
* 一级审核结果
*/
@ApiModelProperty(value="试剂耗材管理员审核结果")
private String auditResultOfManager;
@ApiModelProperty(value="一级审核结果")
private String auditResultOfPrimary;
/**
* 部门负责人审核结果
@@ -134,10 +134,10 @@ public class AcceptanceRecordForm extends BaseEntity {
private String auditResultOfDepartment;
/**
* (质量负责人审核结果)
* (二级审核结果)
*/
@ApiModelProperty(value="(质量负责人审核结果)")
private String auditResultOfQuality;
@ApiModelProperty(value="(二级审核结果)")
private String auditResultOfSecondary;
src/main/java/digital/laboratory/platform/reagent/entity/ComplianceCheck.java
+24 -24
View File
@@ -25,40 +25,40 @@ import lombok.EqualsAndHashCode;
public class ComplianceCheck extends BaseEntity {
/**
* (部门负责人审核意见)
* (一级审核意见)
*/
@ApiModelProperty(value="(部门负责人审核意见)")
private String auditOpinionOfDepartment;
@ApiModelProperty(value="(一级审核意见)")
private String auditOpinionOfPrimary;
/**
* (技术负责人审核意见)
* (二级审核意见)
*/
@ApiModelProperty(value="(技术负责人审核意见)")
private String auditOpinionOfTechnical;
@ApiModelProperty(value="(二级审核意见)")
private String auditOpinionOfSecondary;
/**
* (部门负责人审核结果)
* (一级审核结果)
*/
@ApiModelProperty(value="(部门负责人审核结果)")
private String auditResultOfDepartment;
@ApiModelProperty(value="(一级审核结果)")
private String auditResultOfPrimary;
/**
* (技术负责人审核结果)
* (二级审核结果)
*/
@ApiModelProperty(value="(技术负责人审核结果)")
private String auditResultOfTechnical;
@ApiModelProperty(value="(二级审核结果)")
private String auditResultOfSecondary;
/**
* (部门负责人审核时间)
* (一级审核时间)
*/
@ApiModelProperty(value="(部门负责人审核时间)")
private LocalDateTime auditTimeOfDepartment;
@ApiModelProperty(value="(一级审核时间)")
private LocalDateTime auditTimeOfPrimary;
/**
* (技术负责人审核时间)
* (二级审核时间)
*/
@ApiModelProperty(value="(技术负责人审核时间)")
private LocalDateTime auditTimeOfTechnical;
@ApiModelProperty(value="(二级审核时间)")
private LocalDateTime auditTimeOfSecondary;
/**
* (检查不符合项目)
@@ -85,10 +85,10 @@ public class ComplianceCheck extends BaseEntity {
private String executorId;
/**
* (部门负责人ID)
* (一级审核人ID)
*/
@ApiModelProperty(value="(部门负责人ID)")
private String headOfDepartmentId;
@ApiModelProperty(value="(一级审核人ID)")
private String primaryAuditorId;
/**
* (检查方案)
@@ -103,10 +103,10 @@ public class ComplianceCheck extends BaseEntity {
private Integer status;
/**
* (技术负责人ID)
* (二级审核人ID)
*/
@ApiModelProperty(value="(技术负责人ID)")
private String technicalDirectorId;
@ApiModelProperty(value="(二级审核人ID)")
private String secondaryAuditorId;
/**
* complianceCheckId
src/main/java/digital/laboratory/platform/reagent/entity/EvaluationForm.java
-5
View File
@@ -104,11 +104,6 @@ public class EvaluationForm extends BaseEntity {
*/
@ApiModelProperty(value="(三级评价人ID)")
private String threeLevelUserId;
/**
* (服务商/供应商ID)
*/
@ApiModelProperty(value="(服务商/供应商ID)")
private String serviceProviderAndSupplierId;
/**
src/main/java/digital/laboratory/platform/reagent/entity/ProvideServicesOrSupplies.java
+2 -2
View File
@@ -41,9 +41,9 @@ public class ProvideServicesOrSupplies extends BaseEntity {
/**
* provideServicesOrSuppliesid
* provideServicesOrSuppliesId
*/
@TableId(value = "provide_services_or_suppliesID", type = IdType.ASSIGN_UUID)
@TableId(value = "provide_services_or_supplies_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="provideServicesOrSuppliesId")
private String provideServicesOrSuppliesId;
src/main/java/digital/laboratory/platform/reagent/entity/SignedBatchList.java
+8 -19
View File
@@ -28,13 +28,15 @@ public class SignedBatchList extends BaseEntity {
* (批次)
*/
@ApiModelProperty(value="(批次)")
private String batch;
private Integer batch;
/**
* (批号)
*/
@ApiModelProperty(value="(批号)")
private String batchnumber;
private String batchNumber;
/**
* (生产日期)
@@ -42,11 +44,6 @@ public class SignedBatchList extends BaseEntity {
@ApiModelProperty(value="(生产日期)")
private LocalDateTime dateOfProduction;
/**
* 购置日期
*/
@ApiModelProperty(value="购置日期")
private LocalDateTime dateOfPurchase;
/**
* 签收日期
@@ -68,14 +65,6 @@ public class SignedBatchList extends BaseEntity {
/**
* (试剂耗材ID)
*/
@ApiModelProperty(value="(试剂耗材ID)")
private String reagentConsumableId;
/**
* 签收人ID
*/
@@ -83,10 +72,10 @@ public class SignedBatchList extends BaseEntity {
private String signatoryId;
/**
* 签收记录表ID
* 签收内容表ID
*/
@ApiModelProperty(value="签收记录表ID")
private String signingRecordFormId;
@ApiModelProperty(value="签收内容表ID")
private String signedContentId;
/**
* (供应商ID)
@@ -98,7 +87,7 @@ public class SignedBatchList extends BaseEntity {
* (预警值)
*/
@ApiModelProperty(value="(预警值)")
private Integer warningvalue;
private Integer warningValue;
/**
* signedBatchListId
src/main/java/digital/laboratory/platform/reagent/entity/SigningRecordForm.java
+4 -13
View File
@@ -30,27 +30,18 @@ public class SigningRecordForm extends BaseEntity {
@ApiModelProperty(value="采购清单ID")
private String purchaseListId;
/**
* (签收人)
*/
@ApiModelProperty(value="(签收人)")
private String signatory;
/**
* 状态
*/
@ApiModelProperty(value="状态")
private String status;
private Integer status;
/**
* 总数量
* 采购编号
*/
@ApiModelProperty(value="总数量")
private String totalQuantity;
@ApiModelProperty(value="采购编号")
private String purchaseNumber;
/**
* signingRecordFormId
src/main/java/digital/laboratory/platform/reagent/entity/StorageRegistrationForm.java
+12 -8
View File
@@ -66,9 +66,11 @@ public class StorageRegistrationForm extends BaseEntity {
@ApiModelProperty(value="(备注)")
private String remarks;
/**
* (格子ID)
*/
@ApiModelProperty(value="(格子ID)")
private String latticeId;
/**
* (存储期限)
@@ -76,6 +78,12 @@ public class StorageRegistrationForm extends BaseEntity {
@ApiModelProperty(value="(存储期限)")
private LocalDateTime storageLife;
/**
* (签收批次表ID)
*/
@ApiModelProperty(value="(签收批次表ID)")
private String signedBatchListId;
/**
* storageRegistrationFormId
*/
@@ -83,11 +91,7 @@ public class StorageRegistrationForm extends BaseEntity {
@ApiModelProperty(value="storageRegistrationFormId")
private String storageRegistrationFormId;
/**
* signedBatchListId
*/
@ApiModelProperty(value="signedBatchListId")
private String signedBatchListId;
}
src/main/java/digital/laboratory/platform/reagent/mapper/AfterSaleSituationMapper.java
-15
View File
@@ -1,15 +0,0 @@
package digital.laboratory.platform.reagent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 服务商/供应商响应、资质和售后情况 Mapper 接口
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 服务商/供应商响应、资质和售后情况 Mapper 类
*/
@Mapper
public interface AfterSaleSituationMapper extends BaseMapper<AfterSaleSituation> {
}
src/main/java/digital/laboratory/platform/reagent/mapper/SignedBatchListMapper.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.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 接口
*
@@ -14,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface SignedBatchListMapper extends BaseMapper<SignedBatchList> {
List<SignedBatchListVO> getSignedBatchListVOList(String signedContentId);
}
src/main/java/digital/laboratory/platform/reagent/mapper/SigningRecordFormMapper.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.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 接口
*
@@ -14,4 +19,10 @@ import org.apache.ibatis.annotations.Param;
@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/StorageRegistrationFormMapper.java
+8
View File
@@ -1,10 +1,16 @@
package digital.laboratory.platform.reagent.mapper;
import cn.hutool.db.Page;
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.StorageRegistrationForm;
import digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (试剂耗材入库登记表) Mapper 接口
*
@@ -14,4 +20,6 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface StorageRegistrationFormMapper extends BaseMapper<StorageRegistrationForm> {
List<StorageRegistrationFormVO> getStorageRegistrationFormVOList(QueryWrapper<StorageRegistrationForm> qw);
}
src/main/java/digital/laboratory/platform/reagent/service/AfterSaleSituationService.java
-13
View File
@@ -1,13 +0,0 @@
package digital.laboratory.platform.reagent.service;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 服务商/供应商响应、资质和售后情况服务类
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 服务商/供应商响应、资质和售后情况 服务类
*/
public interface AfterSaleSituationService extends IService<AfterSaleSituation> {
}
src/main/java/digital/laboratory/platform/reagent/service/EvaluationFormService.java
+1 -1
View File
@@ -16,7 +16,7 @@ import java.util.List;
*/
public interface EvaluationFormService extends IService<EvaluationForm> {
EvaluationForm getEvaluationForm(String evaluationFormId);
EvaluationForm getFormById(String evaluationFormId);
//增加/修改评价表
src/main/java/digital/laboratory/platform/reagent/service/SignedBatchListService.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.SignedBatchList;
import digital.laboratory.platform.reagent.vo.SignedBatchListVO;
import java.util.List;
/**
* 签收批次明细服务类
@@ -11,4 +14,7 @@ import digital.laboratory.platform.reagent.entity.SignedBatchList;
*/
public interface SignedBatchListService extends IService<SignedBatchList> {
List<SignedBatchListVO> getSignedBatchListVOList(String signedContentId);
}
src/main/java/digital/laboratory/platform/reagent/service/SigningRecordFormService.java
+19
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.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;
/**
* 签收记录表服务类
@@ -10,5 +19,15 @@ import digital.laboratory.platform.reagent.entity.SigningRecordForm;
* @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/StorageRegistrationFormService.java
+9
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.StorageRegistrationFormDTO;
import digital.laboratory.platform.reagent.entity.StorageRegistrationForm;
import digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO;
import java.util.List;
/**
* (试剂耗材入库登记表)服务类
@@ -11,4 +18,6 @@ import digital.laboratory.platform.reagent.entity.StorageRegistrationForm;
*/
public interface StorageRegistrationFormService extends IService<StorageRegistrationForm> {
List<StorageRegistrationFormVO> getStorageRegistrationFormVOList (QueryWrapper<StorageRegistrationForm> qw);
List<StorageRegistrationForm> addFormById(List<StorageRegistrationFormDTO> storageRegistrationFormDTOList, DLPUser dlpUser);
}
src/main/java/digital/laboratory/platform/reagent/service/impl/AfterSaleSituationServiceImpl.java
-17
View File
@@ -1,17 +0,0 @@
package digital.laboratory.platform.reagent.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.reagent.mapper.AfterSaleSituationMapper;
import digital.laboratory.platform.reagent.service.AfterSaleSituationService;
import org.springframework.stereotype.Service;
/**
* 服务商/供应商响应、资质和售后情况服务实现类
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe 服务商/供应商响应、资质和售后情况 服务实现类
*/
@Service
public class AfterSaleSituationServiceImpl extends ServiceImpl<AfterSaleSituationMapper, AfterSaleSituation> implements AfterSaleSituationService {
}
src/main/java/digital/laboratory/platform/reagent/service/impl/EvaluationFormServiceImpl.java
+11 -6
View File
@@ -16,6 +16,7 @@ import digital.laboratory.platform.reagent.service.ProvideServicesOrSuppliesServ
import digital.laboratory.platform.reagent.service.PurchaseListDetailsService;
import digital.laboratory.platform.reagent.service.SupplierInformationService;
import digital.laboratory.platform.reagent.vo.EvaluationFormVO;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -30,22 +31,24 @@ import java.util.List;
* @author Zhang Xiaolong created at 2023-03-10
* @describe (服务商 / 供应商评价表) 服务实现类
*/
@SuppressWarnings("all")
@Service
@RequiredArgsConstructor
public class EvaluationFormServiceImpl extends ServiceImpl<EvaluationFormMapper, EvaluationForm> implements EvaluationFormService {
@Autowired
private EvaluationFormService evaluationFormService;
@Autowired
private ProvideServicesOrSuppliesService provideServicesOrSuppliesService;
@Autowired
private SupplierInformationService supplierInformationService;
@Autowired
private PurchaseListDetailsService purchaseListDetailsService;
@Override//通过ID查询评价表
public EvaluationForm getEvaluationForm(String evaluationFormId) {
public EvaluationForm getFormById(String evaluationFormId) {
EvaluationFormVO evaluationForm = baseMapper.getEvaluationForm(evaluationFormId);
@@ -97,7 +100,7 @@ public class EvaluationFormServiceImpl extends ServiceImpl<EvaluationFormMapper,
list.add(provideServicesOrSupplies);
}
if (evaluationFormService.save(byId) & provideServicesOrSuppliesService.saveBatch(list)) {
if (evaluationFormService.updateById(byId) & provideServicesOrSuppliesService.saveBatch(list)) {
return byId;
} else {
return null;
@@ -183,6 +186,8 @@ public class EvaluationFormServiceImpl extends ServiceImpl<EvaluationFormMapper,
byId.setCommentsResultFromThreeLevel(auditAndApproveDTO.getAuditResult());
byId.setStatus(2);
if (evaluationFormService.updateById(byId)){
return byId;
}else{
src/main/java/digital/laboratory/platform/reagent/service/impl/EvaluationResultServiceImpl.java
-16
View File
@@ -1,16 +0,0 @@
package digital.laboratory.platform.reagent.service.impl;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* (服务商/供应商评价结果)服务实现类
*
* @author Zhang Xiaolong created at 2023-03-10
* @describe (服务商/供应商评价结果) 服务实现类
*/
@Service
public class EvaluationResultServiceImpl extends ServiceImpl<EvaluationResultMapper, EvaluationResult> implements IService<EvaluationResult> {
}
src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseListServiceImpl.java
+45 -5
View File
@@ -1,13 +1,12 @@
package digital.laboratory.platform.reagent.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.reagent.dto.PurchaseListDTO;
import digital.laboratory.platform.reagent.entity.PurchaseList;
import digital.laboratory.platform.reagent.entity.PurchaseListDetails;
import digital.laboratory.platform.reagent.entity.*;
import digital.laboratory.platform.reagent.mapper.PurchaseListMapper;
import digital.laboratory.platform.reagent.service.PurchaseListDetailsService;
import digital.laboratory.platform.reagent.service.PurchaseListService;
import digital.laboratory.platform.reagent.service.*;
import digital.laboratory.platform.reagent.vo.PurchaseListVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +32,15 @@ public class PurchaseListServiceImpl extends ServiceImpl<PurchaseListMapper, Pur
@Autowired
private PurchaseListDetailsService purchaseListDetailsService;
@Autowired
private SigningRecordFormService signingRecordFormService;
@Autowired
private CatalogueDetailsService catalogueDetailsService;
@Autowired
private SignedContentService signedContentService;
@Override//通过ID查找清单
public PurchaseListVO getPurchaseList(String purchaseListId) {
@@ -58,6 +66,16 @@ public class PurchaseListServiceImpl extends ServiceImpl<PurchaseListMapper, Pur
purchaseList.setName(LocalDate.now()+"采购清单");
List<PurchaseListDetails> purchaseListDetailsList= new ArrayList<>();
//创建签收内容集合
List<SignedContent> signedContentList = new ArrayList<>();
//创建签收记录表
SigningRecordForm signingRecordForm = new SigningRecordForm();
//完善签收记录表信息
signingRecordForm.setSigningRecordFormId(IdWorker.get32UUID().toUpperCase());
signingRecordForm.setPurchaseListId(purchaseList.getPurchaseListId() );
signingRecordForm.setPurchaseNumber(LocalDate.now()+"签收任务");
for (PurchaseListDTO purchaseListDTO : purchaseListDTOList) {
@@ -70,8 +88,30 @@ public class PurchaseListServiceImpl extends ServiceImpl<PurchaseListMapper, Pur
purchaseListDetails.setPurchaselistDetailsId(IdWorker.get32UUID().toUpperCase());
purchaseListDetailsList.add(purchaseListDetails);
SignedContent signedContent = new SignedContent();
//完善签收内容信息
signedContent.setSignedContentId(IdWorker.get32UUID().toUpperCase());
signedContent.setTotalQuantity(purchaseListDetails.getPurchaseQuantity());
signedContent.setReagentConsumableId(purchaseListDetails.getReagentConsumableId());
signedContent.setSigningRecordFormId(signingRecordForm.getSigningRecordFormId());
LambdaQueryWrapper<CatalogueDetails> catalogueDetailsLambdaQueryWrapper = new LambdaQueryWrapper<>();
catalogueDetailsLambdaQueryWrapper.eq(CatalogueDetails::getReagentConsumableId,signedContent.getReagentConsumableId());
List<CatalogueDetails> list = catalogueDetailsService.list(catalogueDetailsLambdaQueryWrapper);
signedContent.setCatalogueNumber(list.get(0).getNumber());
signedContentList.add(signedContent);
}
if (purchaseListService.save(purchaseList)&purchaseListDetailsService.saveBatch(purchaseListDetailsList)){
if (purchaseListService.save(purchaseList)&purchaseListDetailsService.saveBatch(purchaseListDetailsList)&signingRecordFormService.save(signingRecordForm)
&signedContentService.saveBatch(signedContentList)){
return purchaseList;
}else {
return null;
src/main/java/digital/laboratory/platform/reagent/service/impl/PurchasingPlanServiceImpl.java
+24 -10
View File
@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* (采购计划)服务实现类
@@ -65,7 +66,6 @@ public class PurchasingPlanServiceImpl extends ServiceImpl<PurchasingPlanMapper,
return purchasingPlanVO;
}
@Transactional
@Override//创建计划
public Boolean addById(List<PurchasingPlanDTO> purchasingPlanDTOList, DLPUser user, PurchasingPlan purchasingPlan) {
@@ -76,23 +76,37 @@ public class PurchasingPlanServiceImpl extends ServiceImpl<PurchasingPlanMapper,
purchasingPlan.setStatus(0);
List<ProcurementContent> list = new ArrayList<>();
List<ProcurementContent> list = new ArrayList<>();//需要整合的集合
//给整合后集合添加元素标志，true：添加，false:不添加，其数量相加
for (PurchasingPlanDTO purchasingPlanDTO : purchasingPlanDTOList) {
ProcurementContent procurementContent = new ProcurementContent();
boolean flag = true;
BeanUtils.copyProperties(purchasingPlanDTO, procurementContent);
for (ProcurementContent procurementContent : list) {
procurementContent.setPurchasingPlanId(purchasingPlan.getPurchasingPlanId());
if (procurementContent.getReagentConsumableId().equals(purchasingPlanDTO.getReagentConsumableId())) {
procurementContent.setProcurementContentId(IdWorker.get32UUID().toUpperCase());
procurementContent.setQuantity(procurementContent.getQuantity() + purchasingPlanDTO.getQuantity());
list.add(procurementContent);
flag = false;
}
if (flag) {
ProcurementContent procurementContent1 = new ProcurementContent();
BeanUtils.copyProperties(purchasingPlanDTO, procurementContent);
procurementContent.setPurchasingPlanId(purchasingPlan.getPurchasingPlanId());
procurementContent.setProcurementContentId(IdWorker.get32UUID().toUpperCase());
list.add(procurementContent1);//给整合后集合添加子元素
}
}
}
return purchasingPlanService.save(purchasingPlan) & procurementContentService.saveBatch(list);
}
return purchasingPlanService.save(purchasingPlan)&procurementContentService.saveBatch(list);
}
@Override
public ProcurementContent addContent(PurchasingPlanDTO purchasingPlanDTO) {
src/main/java/digital/laboratory/platform/reagent/service/impl/SignedBatchListServiceImpl.java
+20
View File
@@ -1,11 +1,19 @@
package digital.laboratory.platform.reagent.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import digital.laboratory.platform.reagent.entity.SignedBatchList;
import digital.laboratory.platform.reagent.entity.SignedContent;
import digital.laboratory.platform.reagent.mapper.SignedBatchListMapper;
import digital.laboratory.platform.reagent.service.SignedBatchListService;
import digital.laboratory.platform.reagent.service.SignedContentService;
import digital.laboratory.platform.reagent.vo.SignedBatchListVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* 签收批次明细服务实现类
*
@@ -15,4 +23,16 @@ import org.springframework.stereotype.Service;
@Service
public class SignedBatchListServiceImpl extends ServiceImpl<SignedBatchListMapper, SignedBatchList> implements SignedBatchListService {
@Autowired
private SignedContentService signedContentService;
@Override
public List<SignedBatchListVO> getSignedBatchListVOList(String signedContentId) {
List<SignedBatchListVO> signedBatchListVOList = baseMapper.getSignedBatchListVOList(signedContentId);
return signedBatchListVOList;
}
}
src/main/java/digital/laboratory/platform/reagent/service/impl/SigningRecordFormServiceImpl.java
+194
View File
@@ -1,10 +1,32 @@
package digital.laboratory.platform.reagent.service.impl;
import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
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.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.SignedContent;
import digital.laboratory.platform.reagent.entity.SigningRecordForm;
import digital.laboratory.platform.reagent.entity.StorageRegistrationForm;
import digital.laboratory.platform.reagent.mapper.SigningRecordFormMapper;
import digital.laboratory.platform.reagent.service.SignedBatchListService;
import digital.laboratory.platform.reagent.service.SignedContentService;
import digital.laboratory.platform.reagent.service.SigningRecordFormService;
import digital.laboratory.platform.reagent.service.StorageRegistrationFormService;
import digital.laboratory.platform.reagent.vo.SignedBatchListVO;
import digital.laboratory.platform.reagent.vo.SignedContentVO;
import digital.laboratory.platform.reagent.vo.SigningRecordFormVO;
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.util.ArrayList;
import java.util.List;
/**
* 签收记录表服务实现类
@@ -14,5 +36,177 @@ import org.springframework.stereotype.Service;
*/
@Service
public class SigningRecordFormServiceImpl extends ServiceImpl<SigningRecordFormMapper, SigningRecordForm> implements SigningRecordFormService {
@Autowired
private SigningRecordFormService signingRecordFormService;
@Autowired
private SignedContentService signedContentService;
@Autowired
private SignedBatchListService signedBatchListService;
@Autowired
private StorageRegistrationFormService storageRegistrationFormService;
;
// @Override
// public IPage<SigningRecordFormVO> getSigningRecordFormVOPage(IPage<SigningRecordForm> page, QueryWrapper<SigningRecordForm> qw) {
//
// IPage<SigningRecordFormVO> signingRecordFormVOPage = baseMapper.getSigningRecordFormVOPage(page, qw);
//
// return signingRecordFormVOPage;
// }
// @Override
// public List<SigningRecordFormVO> getSigningRecordFormVOList(QueryWrapper<SigningRecordForm> qw) {
//
// List<SigningRecordFormVO> signingRecordFormVOList = baseMapper.getSigningRecordFormVOList(qw);
//
// return signingRecordFormVOList;
// }
@Override
public SigningRecordFormVO getSigningRecordFormVO(String signingRecordFormId) {
SigningRecordForm byId = signingRecordFormService.getById(signingRecordFormId);
SigningRecordFormVO signingRecordFormVO = new SigningRecordFormVO();
BeanUtils.copyProperties(byId, signingRecordFormVO);
List<SignedContentVO> signedContentVOList = signedContentService.getSignedContentVOList(signingRecordFormId);
signingRecordFormVO.setSignedContentVOList(signedContentVOList);
return signingRecordFormVO;
}
@Transactional
@Override//增加签收明细
public Boolean addFormById(List<SigningRecordFormDTO> signingRecordFormDTOList, DLPUser dlpUser) {
boolean flag = true;
int i = 0;
for (SigningRecordFormDTO signingRecordFormDTO : signingRecordFormDTOList) {
SignedBatchList signedBatchList = new SignedBatchList();
BeanUtils.copyProperties(signingRecordFormDTO, signedBatchList);
signedBatchList.setSignedBatchListId(IdWorker.get32UUID().toUpperCase());
signedBatchList.setSignatoryId(dlpUser.getId());
LambdaQueryWrapper<SignedBatchList> signedBatchListLambdaQueryWrapper = new LambdaQueryWrapper<>();
signedBatchListLambdaQueryWrapper.eq(SignedBatchList::getSignedContentId, signedBatchList.getSignedContentId());
//通过判断签收内容表里的签收批次表数量，进行批次字段的赋值
signedBatchList.setBatch(signedBatchListService.list(signedBatchListLambdaQueryWrapper).size() + 1);
SignedContent byId = signedContentService.getById(signedBatchList.getSignedContentId());
byId.setSignQuantity(byId.getSignQuantity() + signedBatchList.getQuantity());
if (byId.getSignQuantity() > byId.getTotalQuantity()) {
throw new RuntimeException(String.format("签收数量不能大于采购数量"));
}
//遍历签收内容，判断试剂耗材是否签收完毕
if (byId.getSignQuantity() == byId.getTotalQuantity()) {
i = i + 1;
}
//创建入库登记任务
StorageRegistrationForm storageRegistrationForm = new StorageRegistrationForm();
storageRegistrationForm.setStorageRegistrationFormId(IdWorker.get32UUID().toUpperCase());
storageRegistrationForm.setReagentConsumableId(byId.getReagentConsumableId());
storageRegistrationForm.setQuantity(signedBatchList.getQuantity());
if (signedContentService.updateById(byId) & signedBatchListService.save(signedBatchList)&storageRegistrationFormService.save(storageRegistrationForm)) {
flag = true;
} else {
flag = false;
}
}
LambdaQueryWrapper<SignedContent> signedContentLambdaQueryWrapper = new LambdaQueryWrapper<>();
String signingRecordFormId = signedContentService.getById(signingRecordFormDTOList.get(0).getSignedContentId()).getSigningRecordFormId();
signedContentLambdaQueryWrapper.eq(SignedContent::getSigningRecordFormId, signingRecordFormId);
List<SignedContent> list = signedContentService.list(signedContentLambdaQueryWrapper);
SigningRecordForm byId = signingRecordFormService.getById(signingRecordFormId);
//判断是否签收完全
if (i == list.size()) {
byId.setStatus(2);
} else {
byId.setStatus(1);
}
signingRecordFormService.updateById(byId);
return flag;
}
@Override
public SignedBatchList editFormById(SigningRecordFormDTO signingRecordFormDTO) {
int i = 0;
SignedBatchList byId = signedBatchListService.getById(signingRecordFormDTO.getSignedBatchListId());
SignedContent signedContent = signedContentService.getById(signingRecordFormDTO.getSignedContentId());
signedContent.setSignQuantity(signedContent.getSignQuantity() - byId.getQuantity() + signingRecordFormDTO.getQuantity());
BeanUtils.copyProperties(signingRecordFormDTO, byId);
LambdaQueryWrapper<SignedContent> signedContentLambdaQueryWrapper = new LambdaQueryWrapper<>();
String signingRecordFormId = signedContent.getSigningRecordFormId();
signedContentLambdaQueryWrapper.eq(SignedContent::getSigningRecordFormId, signingRecordFormId);
List<SignedContent> list = signedContentService.list(signedContentLambdaQueryWrapper);
SigningRecordForm byId1 = signingRecordFormService.getById(signingRecordFormId);
if (signedContent.getSignQuantity() > signedContent.getTotalQuantity()) {
throw new RuntimeException(String.format("签收数量不能大于采购数量"));
}
//修改入库登记任务，试剂耗材入库数量
LambdaQueryWrapper<StorageRegistrationForm> storageRegistrationFormLambdaQueryWrapper = new LambdaQueryWrapper<>();
storageRegistrationFormLambdaQueryWrapper.eq(StorageRegistrationForm::getSignedBatchListId,byId.getSignedBatchListId());
StorageRegistrationForm byId2 = storageRegistrationFormService.getById(storageRegistrationFormLambdaQueryWrapper);
byId2.setQuantity(byId.getQuantity());
if (signedContentService.updateById(signedContent) & signedBatchListService.updateById(byId)&storageRegistrationFormService.updateById(byId2)) {
//遍历签收内容，判断每个试剂耗材是否签收完毕
for (SignedContent content : list) {
if (content.getTotalQuantity() == content.getSignQuantity()) {
i = i + 1;
}
}
//判断是否签收完全
if (i == list.size()) {
byId1.setStatus(2);
signingRecordFormService.updateById(byId1);
}
return byId;
} else {
return null;
}
}
}
src/main/java/digital/laboratory/platform/reagent/service/impl/StorageRegistrationFormServiceImpl.java
+74
View File
@@ -1,11 +1,30 @@
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.StorageRegistrationFormDTO;
import digital.laboratory.platform.reagent.entity.CabinetForm;
import digital.laboratory.platform.reagent.entity.LatticeForm;
import digital.laboratory.platform.reagent.entity.StorageRegistrationForm;
import digital.laboratory.platform.reagent.entity.StorageRoomForm;
import digital.laboratory.platform.reagent.mapper.StorageRegistrationFormMapper;
import digital.laboratory.platform.reagent.service.CabinetFormService;
import digital.laboratory.platform.reagent.service.LatticeFormService;
import digital.laboratory.platform.reagent.service.StorageRegistrationFormService;
import digital.laboratory.platform.reagent.service.StorageRoomFormService;
import digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
/**
* (试剂耗材入库登记表)服务实现类
*
@@ -15,4 +34,59 @@ import org.springframework.stereotype.Service;
@Service
public class StorageRegistrationFormServiceImpl extends ServiceImpl<StorageRegistrationFormMapper, StorageRegistrationForm> implements StorageRegistrationFormService {
@Autowired
private StorageRegistrationFormService storageRegistrationFormService;
@Autowired
private LatticeFormService latticeFormService;
@Autowired
private CabinetFormService cabinetFormService;
@Autowired
private StorageRoomFormService storageRoomFormService;
@Override//分页查看
public List<StorageRegistrationFormVO> getStorageRegistrationFormVOList(QueryWrapper<StorageRegistrationForm> qw) {
List<StorageRegistrationFormVO> storageRegistrationFormVOList = baseMapper.getStorageRegistrationFormVOList(qw);
for (StorageRegistrationFormVO storageRegistrationFormVO : storageRegistrationFormVOList) {
LatticeForm byId = latticeFormService.getById(storageRegistrationFormVO.getLatticeId());
CabinetForm byId1 = cabinetFormService.getById(byId.getCabinetFormId());
StorageRoomForm byId2 = storageRoomFormService.getById(byId1.getStorageRoomFormId());
storageRegistrationFormVO.setLocation(byId2.getName() + byId1.getName() + byId.getNumber());
}
return storageRegistrationFormVOList;
}
@Override//增加入库登记表
public List<StorageRegistrationForm> addFormById(List<StorageRegistrationFormDTO> storageRegistrationFormDTOList, DLPUser dlpUser) {
List<StorageRegistrationForm> storageRegistrationForms = new ArrayList<>();
for (StorageRegistrationFormDTO storageRegistrationFormDTO : storageRegistrationFormDTOList) {
StorageRegistrationForm byId = storageRegistrationFormService.getById(storageRegistrationFormDTO.getStorageRegistrationFormId());
BeanUtils.copyProperties(storageRegistrationFormDTO, byId);
byId.setDepositorId(dlpUser.getId());
byId.setDateOfArrival(LocalDateTime.now());
storageRegistrationForms.add(byId);
}
if (storageRegistrationFormService.updateBatchById(storageRegistrationForms)) {
return storageRegistrationForms;
} else {
return null;
}
}
}
src/main/resources/mapper/AfterSaleSituationMapper.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="digital.laboratory.platform.reagent.mapper.AfterSaleSituationMapper">
<resultMap id="afterSaleSituationMap" type="digital.laboratory.platform.reagent.entity.AfterSaleSituation">
<id property="afterSaleSituationId" column="after_sale_situation_id"/>
<result property="evaluationFormId" column="evaluation_form_id"/>
<result property="supplierBusinessLicense" column="supplier_business_license"/>
<result property="supplierPassesQualityAssuranceSystem" column="supplier_passes_quality_assurance_system"/>
<result property="supplierProductCertification" column="supplier_product_certification"/>
</resultMap>
</mapper>
src/main/resources/mapper/EvaluationFormMapper.xml
+3 -3
View File
@@ -49,15 +49,15 @@
(select user.name
from dlp_base.sys_user user
where user.user_id = ef.primary_user_id)
, AS primary_user_name
AS primary_user_name,
(select user.name
from dlp_base.sys_user user
where user.user_id = ef.secondary_user_id)
, AS primary_user_name
AS secondary_user_name,
(select user.name
from dlp_base.sys_user user
where user.user_id = ef.three_level_user_id)
, AS primary_user_name
AS three_level_user_name
FROM evaluation_form ef
WHERE ef.evaluation_form_id = #{evaluationFormId}
</select>
src/main/resources/mapper/EvaluationResultMapper.xml
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="digital.laboratory.platform.reagent.mapper.EvaluationResultMapper">
<resultMap id="evaluationResultMap" type="digital.laboratory.platform.reagent.entity.EvaluationResult">
<id property="evaluationResultId" column="evaluation_result_id"/>
<result property="checkAndCalibrateEfficiencyOfSupplies" column="check_and_calibrate_efficiency_of_supplies"/>
<result property="overallSupplierServiceSatisfaction" column="overall_supplier_service_satisfaction"/>
<result property="evaluationFormId" column="evaluation_form_id"/>
<result property="supplierAttitude" column="supplier_attitude"/>
<result property="supplierEquipmentAndFacilities" column="supplier_equipment_and_facilities"/>
<result property="supplierTechnologyAndManagementCapability" column="supplier_technology_and_management_capability"/>
<result property="whetherTheSupplierDeliversOnTime" column="whether_the_supplier_delivers_on_time"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
</resultMap>
</mapper>
src/main/resources/mapper/ProvideServicesOrSuppliesMapper.xml
+1 -1
View File
@@ -25,6 +25,6 @@
from reagent_consumables rc
where rc.reagent_consumable_id = ps.reagent_consumable_id) AS reagent_consumable_name
FROM provide_services_or_supplies ps
WHERE ps.provide_services_or_suppliesID = #{provideServicesOrSuppliesId}
WHERE ps.provide_services_or_supplies_id = #{provideServicesOrSuppliesId}
</select>
</mapper>
src/main/resources/mapper/SignedBatchListMapper.xml
+41 -19
View File
@@ -4,24 +4,46 @@
<mapper namespace="digital.laboratory.platform.reagent.mapper.SignedBatchListMapper">
<resultMap id="signedBatchListMap" type="digital.laboratory.platform.reagent.entity.SignedBatchList">
<id property="signedBatchListId" column="signed_batch_list_id"/>
<result property="batch" column="batch"/>
<result property="batchnumber" column="batchnumber"/>
<result property="dateOfProduction" column="date_of_production"/>
<result property="dateOfPurchase" column="date_of_purchase"/>
<result property="dateOfReceipt" column="date_of_receipt"/>
<result property="expirationDate" column="expiration_date"/>
<result property="quantity" column="quantity"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="signatoryId" column="signatory_id"/>
<result property="signingRecordFormId" column="signing_record_form_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="warningvalue" column="warningvalue"/>
<resultMap id="signedBatchListMap" type="digital.laboratory.platform.reagent.entity.SignedBatchList">
<id property="signedBatchListId" column="signed_batch_list_id"/>
<result property="batch" column="batch"/>
<result property="batchNumber" column="batch_number"/>
<result property="dateOfProduction" column="date_of_production"/>
<result property="dateOfPurchase" column="date_of_purchase"/>
<result property="dateOfReceipt" column="date_of_receipt"/>
<result property="expirationDate" column="expiration_date"/>
<result property="quantity" column="quantity"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="signedContentId" column="signed_content_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="warningValue" column="warning_value"/>
<result property="signatoryId" column="signatory_id"/>
</resultMap>
</resultMap>
<resultMap id="signedBatchListVO" type="digital.laboratory.platform.reagent.vo.SignedBatchListVO"
extends="signedBatchListMap">
<result property="supplierName" column="supplier_name"></result>
<result property="signatoryName" column="signatory_name"></result>
</resultMap>
<select id="getSignedBatchListVOList" resultMap="signedBatchListVO"
resultType="digital.laboratory.platform.reagent.vo.SignedBatchListVO">
SELECT sbl.*,
(select user.name
from dlp_base.sys_user user
where user.user_id = sbl.signatory_id)
as signatory_name,
(
select si.supplier_name
from supplier_information si
where si.supplier_information_id =sbl.supplier_id)
as supplier_name
FROM signed_batch_list sbl
WHERE sbl.signed_content_id = #{signedContentId}
</select>
</mapper>
src/main/resources/mapper/SigningRecordFormMapper.xml
+38 -2
View File
@@ -7,13 +7,49 @@
<resultMap id="signingRecordFormMap" type="digital.laboratory.platform.reagent.entity.SigningRecordForm">
<id property="signingRecordFormId" column="signing_record_form_id"/>
<result property="purchaseListId" column="purchase_list_id"/>
<result property="signatory" column="signatory"/>
<result property="status" column="status"/>
<result property="totalQuantity" column="total_quantity"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="purchaseNumber" column="purchase_number"/>
</resultMap>
<!-- <resultMap id="signingRecordFormVO" type="digital.laboratory.platform.reagent.vo.SigningRecordFormVO" extends="signingRecordFormMap">-->
<!-- <result property="reagentConsumableName" column="reagent_consumable_name"></result>-->
<!-- </resultMap>-->
<!-- <sql id="getSigningRecordFormVOSQL">-->
<!-- SELECT srf.*,-->
<!-- (select rc.name-->
<!-- from reagent_consumables rc-->
<!-- where rc.reagent_consumable_id = srf.reagent_consumable_id)-->
<!-- , AS reagent_consumable_name-->
<!-- FROM signing_record_form srf-->
<!-- </sql>-->
<!-- <select id=" getSigningRecordFormVO" resultMap="signingRecordFormVO" resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
<!-- SELECT srf.*,-->
<!-- (select rc.name-->
<!-- from reagent_consumables rc-->
<!-- where rc.reagent_consumable_id = srf.reagent_consumable_id)-->
<!-- , AS reagent_consumable_name-->
<!-- FROM signing_record_form srf-->
<!-- WHERE signing_record_form_id = #{signingRecordFormId}-->
<!-- </select>-->
<!-- &lt;!&ndash; 根据条件取 signingRecordFormVO 列表分页 &ndash;&gt;-->
<!-- <select id="getSigningRecordFormVOPage" resultMap="signingRecordFormVO"-->
<!-- resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
<!-- <include refid="getSigningRecordFormVOSQL"/>-->
<!-- ${ew.customSqlSegment}-->
<!-- </select>-->
<!-- &lt;!&ndash; 根据条件取 signingRecordFormVO 列表 &ndash;&gt;-->
<!-- <select id="getSigningRecordFormVOPList" resultMap="signingRecordFormVO"-->
<!-- resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
<!-- <include refid="getSigningRecordFormVOSQL"/>-->
<!-- ${ew.customSqlSegment}-->
<!-- </select>-->
</mapper>
src/main/resources/mapper/StorageRegistrationFormMapper.xml
+56 -16
View File
@@ -4,21 +4,61 @@
<mapper namespace="digital.laboratory.platform.reagent.mapper.StorageRegistrationFormMapper">
<resultMap id="storageRegistrationFormMap" type="digital.laboratory.platform.reagent.entity.StorageRegistrationForm">
<id property="storageRegistrationFormId" column="storage_registration_form_id"/>
<result property="dateOfArrival" column="date_of_arrival"/>
<result property="depositorId" column="depositor_id"/>
<result property="quantity" column="quantity"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="reagentConsumableNumber" column="reagent_consumable_number"/>
<result property="reagentConsumableType" column="reagent_consumable_type"/>
<result property="remarks" column="remarks"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="storageLife" column="storage_life"/>
<resultMap id="storageRegistrationFormMap"
type="digital.laboratory.platform.reagent.entity.StorageRegistrationForm">
<id property="storageRegistrationFormId" column="storage_registration_form_id"/>
<result property="dateOfArrival" column="date_of_arrival"/>
<result property="depositorId" column="depositor_id"/>
<result property="quantity" column="quantity"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="reagentConsumableNumber" column="reagent_consumable_number"/>
<result property="reagentConsumableType" column="reagent_consumable_type"/>
<result property="remarks" column="remarks"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="storageLife" column="storage_life"/>
<result property="latticeId" column="lattice_id"/>
<result property="signedBatchListId" column="signed_batch_list_id"/>
</resultMap>
<result property="signedBatchListId" column="signed_batch_list_id"/>
</resultMap>
<resultMap id="storageRegistrationFormVO" type="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO"
extends="storageRegistrationFormMap">
<result property="depositorName" column="depositor_name"></result>
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
<result property="location" column="location"></result>
<result property="storageRoomName" column="storage_room_name"></result>
<result property="cabinetName" column="cabinet_name"></result>
<result property="latticeNumber" column="lattice_number"></result>
</resultMap>
<select id="getStorageRegistrationFormVOList" resultMap="storageRegistrationFormVO"
resultType="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO">
SELECT srf.*,
(select user.name
from dlp_base.sys_user user
where user.user_id = srf.depositor_id) as depositor_name
, (
select rc.name
from reagent_consumables rc
where rc.reagent_consumable_id = srf.reagent_consumable_id) as reagent_consumable_name,
FROM storage_registration_form srf
</select>
<select id="getStorageRegistrationFormVO" resultMap="storageRegistrationFormVO"
resultType="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO">
SELECT srf.*,
(select user.name
from dlp_base.sys_user user
where user.user_id = srf.depositor_id) as depositor_name
, (
select rc.name
from reagent_consumables rc
where rc.reagent_consumable_id = srf.reagent_consumable_id) as reagent_consumable_name,
FROM storage_registration_form srf
WHERE srf.storage_registration_form_id = #{storageRegistrationFormId}
</select>
</mapper>
target/classes/digital/laboratory/platform/reagent/controller/AfterSaleSituationController.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/controller/EvaluationFormController.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/controller/EvaluationResultController.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/controller/ProvideServicesOrSuppliesController.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/controller/SigningRecordFormController.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/entity/AfterSaleSituation.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/entity/EvaluationForm.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/entity/EvaluationResult.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/entity/ProvideServicesOrSupplies.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/entity/SignedBatchList.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/entity/SigningRecordForm.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/entity/StorageRegistrationForm.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/mapper/AfterSaleSituationMapper.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/mapper/EvaluationFormMapper.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/mapper/EvaluationResultMapper.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/mapper/ProvideServicesOrSuppliesMapper.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/mapper/SignedBatchListMapper.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/mapper/SigningRecordFormMapper.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/mapper/StorageRegistrationFormMapper.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/AfterSaleSituationService.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/EvaluationFormService.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/EvaluationResultService.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/ProvideServicesOrSuppliesService.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/SignedBatchListService.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/SigningRecordFormService.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/StorageRegistrationFormService.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/AfterSaleSituationServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/EvaluationFormServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/EvaluationResultServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/ProvideServicesOrSuppliesServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/PurchaseListServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/PurchasingPlanServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/SignedBatchListServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/SigningRecordFormServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/digital/laboratory/platform/reagent/service/impl/StorageRegistrationFormServiceImpl.class
BIN
View File
Binary file not shown.
target/classes/mapper/AfterSaleSituationMapper.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="digital.laboratory.platform.reagent.mapper.AfterSaleSituationMapper">
<resultMap id="afterSaleSituationMap" type="digital.laboratory.platform.reagent.entity.AfterSaleSituation">
<id property="afterSaleSituationId" column="after_sale_situation_id"/>
<result property="evaluationFormId" column="evaluation_form_id"/>
<result property="supplierBusinessLicense" column="supplier_business_license"/>
<result property="supplierPassesQualityAssuranceSystem" column="supplier_passes_quality_assurance_system"/>
<result property="supplierProductCertification" column="supplier_product_certification"/>
</resultMap>
</mapper>
target/classes/mapper/EvaluationFormMapper.xml
+57 -18
View File
@@ -4,22 +4,61 @@
<mapper namespace="digital.laboratory.platform.reagent.mapper.EvaluationFormMapper">
<resultMap id="evaluationFormMap" type="digital.laboratory.platform.reagent.entity.EvaluationForm">
<id property="evaluationFormId" column="evaluation_form_id"/>
<result property="commentsFromThePurchasingManager" column="comments_from_the_purchasing_manager"/>
<result property="commentsFromTheTechnicalDirector" column="comments_from_the_technical_director"/>
<result property="contactNumber" column="contact_number"/>
<result property="contactPerson" column="contact_person"/>
<result property="purchasingManagerId" column="purchasing_manager_id"/>
<result property="qualitySupervisorEvaluationComments" column="quality_supervisor_evaluation_comments"/>
<result property="qualitySupervisorId" column="quality_supervisor_id"/>
<result property="serviceProviderAndSupplierId" column="service_provider_and_supplier_id"/>
<result property="technicalDirectorId" column="technical_director_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="supplierInformationId" column="supplier_information_id"/>
</resultMap>
<resultMap id="evaluationFormMap" type="digital.laboratory.platform.reagent.entity.EvaluationForm">
<id property="evaluationFormId" column="evaluation_form_id"/>
<result property="commentsFromPrimary" column="comments_from_primary"/>
<result property="commentsFromThreeLevel" column="comments_from_three_level"/>
<result property="contactNumber" column="contact_number"/>
<result property="contactPerson" column="contact_person"/>
<result property="primaryUserId" column="primary_user_id"/>
<result property="commentsFromSecondary" column="comments_from_secondary"/>
<result property="secondaryUserId" column="secondary_user_id"/>
<result property="serviceProviderAndSupplierId" column="service_provider_and_supplier_id"/>
<result property="threeLevelUserId" column="three_level_user_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="commentsDateFromPrimary" column="comments_date_from_primary"/>
<result property="commentsResultFromSecondary" column="comments_result_from_secondary"/>
<result property="commentsDateFromSecondary" column="comments_date_from_secondary"/>
<result property="commentsResultFromThreeLevel" column="comments_result_from_three_level"/>
<result property="commentsDateFromThreeLevel" column="comments_date_from_three_level"/>
<result property="supplierBusinessLicense" column="supplier_business_license"/>
<result property="supplierPassesQualityAssuranceSystem" column="supplier_passes_quality_assurance_system"/>
<result property="supplierProductCertification" column="supplier_product_certification"/>
<result property="checkAndCalibrateEfficiencyOfSupplies" column="check_and_calibrate_efficiency_of_supplies"/>
<result property="overallSupplierServiceSatisfaction" column="overall_supplier_service_satisfaction"/>
<result property="supplierAttitude" column="supplier_attitude"/>
<result property="supplierEquipmentAndFacilities" column="supplier_equipment_and_facilities"/>
<result property="supplierTechnologyAndManagementCapability"
column="supplier_technology_and_management_capability"/>
<result property="whetherTheSupplierDeliversOnTime" column="whether_the_supplier_delivers_on_time"/>
<result property="supplierInformationId" column="supplier_information_id"/>
<result property="status" column="status"/>
</resultMap>
<resultMap id="evaluationFormVO" type="digital.laboratory.platform.reagent.vo.EvaluationFormVO"
extends="evaluationFormMap">
<result property="primaryUserName" column="primary_user_name"></result>
<result property="secondaryUserName" column="secondary_user_name"></result>
<result property="threeLevelUserName" column="three_level_user_name"></result>
</resultMap>
<select id="getEvaluationForm" resultMap="evaluationFormVO"
resultType="digital.laboratory.platform.reagent.vo.EvaluationFormVO">
SELECT ef.*,
(select user.name
from dlp_base.sys_user user
where user.user_id = ef.primary_user_id)
AS primary_user_name,
(select user.name
from dlp_base.sys_user user
where user.user_id = ef.secondary_user_id)
AS secondary_user_name,
(select user.name
from dlp_base.sys_user user
where user.user_id = ef.three_level_user_id)
AS three_level_user_name
FROM evaluation_form ef
WHERE ef.evaluation_form_id = #{evaluationFormId}
</select>
</mapper>
target/classes/mapper/EvaluationResultMapper.xml
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="digital.laboratory.platform.reagent.mapper.EvaluationResultMapper">
<resultMap id="evaluationResultMap" type="digital.laboratory.platform.reagent.entity.EvaluationResult">
<id property="evaluationResultId" column="evaluation_result_id"/>
<result property="checkAndCalibrateEfficiencyOfSupplies" column="check_and_calibrate_efficiency_of_supplies"/>
<result property="overallSupplierServiceSatisfaction" column="overall_supplier_service_satisfaction"/>
<result property="evaluationFormId" column="evaluation_form_id"/>
<result property="supplierAttitude" column="supplier_attitude"/>
<result property="supplierEquipmentAndFacilities" column="supplier_equipment_and_facilities"/>
<result property="supplierTechnologyAndManagementCapability" column="supplier_technology_and_management_capability"/>
<result property="whetherTheSupplierDeliversOnTime" column="whether_the_supplier_delivers_on_time"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
</resultMap>
</mapper>
target/classes/mapper/ProvideServicesOrSuppliesMapper.xml
+14 -1
View File
@@ -5,7 +5,7 @@
<mapper namespace="digital.laboratory.platform.reagent.mapper.ProvideServicesOrSuppliesMapper">
<resultMap id="provideServicesOrSuppliesMap" type="digital.laboratory.platform.reagent.entity.ProvideServicesOrSupplies">
<id property="provideServicesOrSuppliesid" column="provide_services_or_suppliesID"/>
<id property="provideServicesOrSuppliesId" column="provide_services_or_supplies_id"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="evaluationFormId" column="evaluation_form_id"/>
<result property="createTime" column="create_time"/>
@@ -14,4 +14,17 @@
<result property="updateBy" column="update_by"/>
</resultMap>
<resultMap id="provideServicesOrSuppliesVO" type="digital.laboratory.platform.reagent.vo.ProvideServicesOrSuppliesVO" extends="provideServicesOrSuppliesMap">
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
</resultMap>
<select id="getProvideServicesOrSuppliesVOList" resultMap="provideServicesOrSuppliesVO" resultType="digital.laboratory.platform.reagent.vo.ProvideServicesOrSuppliesVO">
SELECT ps.*,
(select rc.name
from reagent_consumables rc
where rc.reagent_consumable_id = ps.reagent_consumable_id) AS reagent_consumable_name
FROM provide_services_or_supplies ps
WHERE ps.provide_services_or_supplies_id = #{provideServicesOrSuppliesId}
</select>
</mapper>
target/classes/mapper/SignedBatchListMapper.xml
+41 -19
View File
@@ -4,24 +4,46 @@
<mapper namespace="digital.laboratory.platform.reagent.mapper.SignedBatchListMapper">
<resultMap id="signedBatchListMap" type="digital.laboratory.platform.reagent.entity.SignedBatchList">
<id property="signedBatchListId" column="signed_batch_list_id"/>
<result property="batch" column="batch"/>
<result property="batchnumber" column="batchnumber"/>
<result property="dateOfProduction" column="date_of_production"/>
<result property="dateOfPurchase" column="date_of_purchase"/>
<result property="dateOfReceipt" column="date_of_receipt"/>
<result property="expirationDate" column="expiration_date"/>
<result property="quantity" column="quantity"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="signatoryId" column="signatory_id"/>
<result property="signingRecordFormId" column="signing_record_form_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="warningvalue" column="warningvalue"/>
<resultMap id="signedBatchListMap" type="digital.laboratory.platform.reagent.entity.SignedBatchList">
<id property="signedBatchListId" column="signed_batch_list_id"/>
<result property="batch" column="batch"/>
<result property="batchNumber" column="batch_number"/>
<result property="dateOfProduction" column="date_of_production"/>
<result property="dateOfPurchase" column="date_of_purchase"/>
<result property="dateOfReceipt" column="date_of_receipt"/>
<result property="expirationDate" column="expiration_date"/>
<result property="quantity" column="quantity"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="signedContentId" column="signed_content_id"/>
<result property="supplierId" column="supplier_id"/>
<result property="warningValue" column="warning_value"/>
<result property="signatoryId" column="signatory_id"/>
</resultMap>
</resultMap>
<resultMap id="signedBatchListVO" type="digital.laboratory.platform.reagent.vo.SignedBatchListVO"
extends="signedBatchListMap">
<result property="supplierName" column="supplier_name"></result>
<result property="signatoryName" column="signatory_name"></result>
</resultMap>
<select id="getSignedBatchListVOList" resultMap="signedBatchListVO"
resultType="digital.laboratory.platform.reagent.vo.SignedBatchListVO">
SELECT sbl.*,
(select user.name
from dlp_base.sys_user user
where user.user_id = sbl.signatory_id)
as signatory_name,
(
select si.supplier_name
from supplier_information si
where si.supplier_information_id =sbl.supplier_id)
as supplier_name
FROM signed_batch_list sbl
WHERE sbl.signed_content_id = #{signedContentId}
</select>
</mapper>
target/classes/mapper/SigningRecordFormMapper.xml
+38 -2
View File
@@ -7,13 +7,49 @@
<resultMap id="signingRecordFormMap" type="digital.laboratory.platform.reagent.entity.SigningRecordForm">
<id property="signingRecordFormId" column="signing_record_form_id"/>
<result property="purchaseListId" column="purchase_list_id"/>
<result property="signatory" column="signatory"/>
<result property="status" column="status"/>
<result property="totalQuantity" column="total_quantity"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="purchaseNumber" column="purchase_number"/>
</resultMap>
<!-- <resultMap id="signingRecordFormVO" type="digital.laboratory.platform.reagent.vo.SigningRecordFormVO" extends="signingRecordFormMap">-->
<!-- <result property="reagentConsumableName" column="reagent_consumable_name"></result>-->
<!-- </resultMap>-->
<!-- <sql id="getSigningRecordFormVOSQL">-->
<!-- SELECT srf.*,-->
<!-- (select rc.name-->
<!-- from reagent_consumables rc-->
<!-- where rc.reagent_consumable_id = srf.reagent_consumable_id)-->
<!-- , AS reagent_consumable_name-->
<!-- FROM signing_record_form srf-->
<!-- </sql>-->
<!-- <select id=" getSigningRecordFormVO" resultMap="signingRecordFormVO" resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
<!-- SELECT srf.*,-->
<!-- (select rc.name-->
<!-- from reagent_consumables rc-->
<!-- where rc.reagent_consumable_id = srf.reagent_consumable_id)-->
<!-- , AS reagent_consumable_name-->
<!-- FROM signing_record_form srf-->
<!-- WHERE signing_record_form_id = #{signingRecordFormId}-->
<!-- </select>-->
<!-- &lt;!&ndash; 根据条件取 signingRecordFormVO 列表分页 &ndash;&gt;-->
<!-- <select id="getSigningRecordFormVOPage" resultMap="signingRecordFormVO"-->
<!-- resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
<!-- <include refid="getSigningRecordFormVOSQL"/>-->
<!-- ${ew.customSqlSegment}-->
<!-- </select>-->
<!-- &lt;!&ndash; 根据条件取 signingRecordFormVO 列表 &ndash;&gt;-->
<!-- <select id="getSigningRecordFormVOPList" resultMap="signingRecordFormVO"-->
<!-- resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
<!-- <include refid="getSigningRecordFormVOSQL"/>-->
<!-- ${ew.customSqlSegment}-->
<!-- </select>-->
</mapper>
target/classes/mapper/StorageRegistrationFormMapper.xml
+56 -16
View File
@@ -4,21 +4,61 @@
<mapper namespace="digital.laboratory.platform.reagent.mapper.StorageRegistrationFormMapper">
<resultMap id="storageRegistrationFormMap" type="digital.laboratory.platform.reagent.entity.StorageRegistrationForm">
<id property="storageRegistrationFormId" column="storage_registration_form_id"/>
<result property="dateOfArrival" column="date_of_arrival"/>
<result property="depositorId" column="depositor_id"/>
<result property="quantity" column="quantity"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="reagentConsumableNumber" column="reagent_consumable_number"/>
<result property="reagentConsumableType" column="reagent_consumable_type"/>
<result property="remarks" column="remarks"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="storageLife" column="storage_life"/>
<resultMap id="storageRegistrationFormMap"
type="digital.laboratory.platform.reagent.entity.StorageRegistrationForm">
<id property="storageRegistrationFormId" column="storage_registration_form_id"/>
<result property="dateOfArrival" column="date_of_arrival"/>
<result property="depositorId" column="depositor_id"/>
<result property="quantity" column="quantity"/>
<result property="reagentConsumableId" column="reagent_consumable_id"/>
<result property="reagentConsumableNumber" column="reagent_consumable_number"/>
<result property="reagentConsumableType" column="reagent_consumable_type"/>
<result property="remarks" column="remarks"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="storageLife" column="storage_life"/>
<result property="latticeId" column="lattice_id"/>
<result property="signedBatchListId" column="signed_batch_list_id"/>
</resultMap>
<result property="signedBatchListId" column="signed_batch_list_id"/>
</resultMap>
<resultMap id="storageRegistrationFormVO" type="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO"
extends="storageRegistrationFormMap">
<result property="depositorName" column="depositor_name"></result>
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
<result property="location" column="location"></result>
<result property="storageRoomName" column="storage_room_name"></result>
<result property="cabinetName" column="cabinet_name"></result>
<result property="latticeNumber" column="lattice_number"></result>
</resultMap>
<select id="getStorageRegistrationFormVOList" resultMap="storageRegistrationFormVO"
resultType="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO">
SELECT srf.*,
(select user.name
from dlp_base.sys_user user
where user.user_id = srf.depositor_id) as depositor_name
, (
select rc.name
from reagent_consumables rc
where rc.reagent_consumable_id = srf.reagent_consumable_id) as reagent_consumable_name,
FROM storage_registration_form srf
</select>
<select id="getStorageRegistrationFormVO" resultMap="storageRegistrationFormVO"
resultType="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO">
SELECT srf.*,
(select user.name
from dlp_base.sys_user user
where user.user_id = srf.depositor_id) as depositor_name
, (
select rc.name
from reagent_consumables rc
where rc.reagent_consumable_id = srf.reagent_consumable_id) as reagent_consumable_name,
FROM storage_registration_form srf
WHERE srf.storage_registration_form_id = #{storageRegistrationFormId}
</select>
</mapper>