zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

配料下发

Browse Source
This commit is contained in:
王兴荣
2025-11-15 17:50:08 +08:00
parent 6e3e604fca
commit dddf21c94f
34 changed files with 265 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskDetailController.java
View File

@@ -87,9 +87,9 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
@GetMapping("/page")
@Operation(summary = "获得检测任务分配明细分页")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
public CommonResult<PageResult<BusinessAssayTaskDetailRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
PageResult<BusinessAssayTaskDetailDO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessAssayTaskDetailRespVO.class));
public CommonResult<PageResult<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
PageResult<BusinessAssayTaskDetailExtendRespVO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/list")
@@ -107,7 +107,7 @@ public class BusinessAssayTaskDetailController implements BusinessControllerMark
public void exportBusinessAssayTaskDetailExcel(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessAssayTaskDetailDO> list = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO).getList();
List<BusinessAssayTaskDetailExtendRespVO> list = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "检测任务分配明细.xls", "数据", BusinessAssayTaskDetailRespVO.class,
BeanUtils.toBean(list, BusinessAssayTaskDetailRespVO.class));

12
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisController.java
View File

@@ -52,6 +52,12 @@ public class SampleAnalysisController {
return success("成功");
}
//下发配料
@PostMapping("/issuedIngredients")
public CommonResult<?> issuedIngredients(Long businessAssayTaskId) {
sampleAnalysisService.issuedIngredients(businessAssayTaskId);
return success("成功");
}
@PostMapping("/submitSampleAnalysisByTaskId")
public CommonResult<?> submitSampleAnalysisByTaskId(Long businessAssayTaskId) {
@@ -65,4 +71,10 @@ public class SampleAnalysisController {
return success(json);
}
@PostMapping("/rollbackAnalysisSample")
public CommonResult<?> rollbackAnalysisSample(@RequestBody BusinessAssayTaskBackSampleReqVO req) {
sampleAnalysisService.rollbackAnalysisSample(req);
return success("成功");
}
}

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleAndQcProjectRespVO.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import com.zt.plat.module.qms.business.config.controller.vo.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -43,6 +44,13 @@ public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
/** 动态表单值 **/
private String formValue;
@Schema(description = "是否配料,1-是，0-否")
private Integer isIngredients;
@Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
private String ingredientsStatus;
/** 质量控制分析方法 **/
//private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleProjectRespVO.java
View File

@@ -6,6 +6,8 @@ import java.util.Map;
import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectCoefficientRespVO;
import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectRangeRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -44,6 +46,12 @@ public class BusinessAssayTaskAnalysisSampleProjectRespVO {
/** 动态表单值 **/
private String formValue;
@Schema(description = "是否配料,1-是，0-否")
private Integer isIngredients;
@Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
private String ingredientsStatus;
/** 分析的列 **/
private List<BatchSampleAnalysisColumnRespVO> columns;

20
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskBackSampleReqVO.java Normal file
View File

@@ -0,0 +1,20 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.util.List;
import lombok.Data;
@Data
public class BusinessAssayTaskBackSampleReqVO {
/**
* 任务明细id
*/
private List<Long> idList;
/**
* 退回描述
*/
private String backDesc;
}

48
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailExtendRespVO.java
View File

@@ -1,17 +1,41 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
/**
* <b>BusinessAssayTaskDetailExtendRespVO</b>
* <p>
* 更新历史：
* <pre> 版本 更新时间 更新者 更新内容<hr/>
* V1.0 2025年10月17日 wxr Add</pre>
* <b>Copyright (C) 云南志者竟成科技有限公司</b>
* </p>
* @author 王兴荣<wxr@wangxingrong.com>
* @version V1.0
* @since 2025年10月17日
*/
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class BusinessAssayTaskDetailExtendRespVO extends BusinessAssayTaskDetailRespVO {
@Schema(description = "分析编号")
private String sampleAssayCode;
@Schema(description = "样品主样ID", example = "23293")
private Long businessBaseSampleId;
@Schema(description = "样品分样ID", example = "15024")
private Long businessSubParentSampleId;
@Schema(description = "分样子样ID", example = "20464")
private Long businessSubSampleId;
@Schema(description = "检测方法配置ID", example = "9130")
private Long configAssayMethodId;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
private String taskType;
@Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", example = "2")
private String assayType;
@Schema(description = "检测项目")
private String assayProject;
@Schema(description = "分析部门ID", example = "16988")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "芋艿")
private String assayDepartmentName;
@Schema(description = "分析人")
private String assayOperator;
}

22
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java
View File

@@ -45,6 +45,12 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskAssignSubmitTime;
@Schema(description = "是否配料,1-是，0-否")
private Integer isIngredients;
@Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
private String ingredientsStatus;
@Schema(description = "分析人")
private String assayOperator;
@@ -73,22 +79,6 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskFinishTime;
@Schema(description = "标样业务ID", example = "27168")
private Long standardSampleId;
@Schema(description = "标样编号")
private String standardSampleCode;
@Schema(description = "标准样类型ID", example = "11282")
private Long standardSampleTypeId;
@Schema(description = "质控样编号")
private String qualitySampleCode;
@Schema(description = "质控样分析时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] qualitySampleAssayTime;
@Schema(description = "流程实例id", example = "19026")
private Long flowInstanceId;

22
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskReqVO.java
View File

@@ -44,6 +44,12 @@ public class BusinessAssayTaskReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskAssignSubmitTime;
@Schema(description = "是否配料,1-是，0-否")
private Integer isIngredients;
@Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
private String ingredientsStatus;
@Schema(description = "分析人")
private String assayOperator;
@@ -72,22 +78,6 @@ public class BusinessAssayTaskReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskFinishTime;
@Schema(description = "标样业务ID", example = "27168")
private Long standardSampleId;
@Schema(description = "标样编号")
private String standardSampleCode;
@Schema(description = "标准样类型ID", example = "11282")
private Long standardSampleTypeId;
@Schema(description = "质控样编号")
private String qualitySampleCode;
@Schema(description = "质控样分析时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] qualitySampleAssayTime;
@Schema(description = "流程实例id", example = "19026")
private Long flowInstanceId;

26
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java
View File

@@ -54,6 +54,12 @@ public class BusinessAssayTaskRespVO {
@ExcelProperty("任务单分配提交时间")
private LocalDateTime taskAssignSubmitTime;
@Schema(description = "是否配料,1-是，0-否")
private Integer isIngredients;
@Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
private String ingredientsStatus;
@Schema(description = "分析人")
@ExcelProperty("分析人")
private String assayOperator;
@@ -82,26 +88,6 @@ public class BusinessAssayTaskRespVO {
@ExcelProperty("任务单完成时间")
private LocalDateTime taskFinishTime;
@Schema(description = "标样业务ID", example = "27168")
@ExcelProperty("标样业务ID")
private Long standardSampleId;
@Schema(description = "标样编号")
@ExcelProperty("标样编号")
private String standardSampleCode;
@Schema(description = "标准样类型ID", example = "11282")
@ExcelProperty("标准样类型ID")
private Long standardSampleTypeId;
@Schema(description = "质控样编号")
@ExcelProperty("质控样编号")
private String qualitySampleCode;
@Schema(description = "质控样分析时间")
@ExcelProperty("质控样分析时间")
private LocalDateTime qualitySampleAssayTime;
@Schema(description = "流程实例id", example = "19026")
@ExcelProperty("流程实例id")
private Long flowInstanceId;

21
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java
View File

@@ -55,6 +55,12 @@ public class BusinessAssayTaskSaveReqVO {
@ExcelProperty("任务单分配提交时间")
private LocalDateTime taskAssignSubmitTime;
@Schema(description = "是否配料,1-是，0-否")
private Integer isIngredients;
@Schema(description = "配料状态,初始状态-initial、等待配料-in_progress、可提交-allow_submit", example = "2")
private String ingredientsStatus;
@Schema(description = "分析人")
private String assayOperator;
@@ -76,21 +82,6 @@ public class BusinessAssayTaskSaveReqVO {
@Schema(description = "任务单完成时间")
private LocalDateTime taskFinishTime;
@Schema(description = "标样业务ID", example = "27168")
private Long standardSampleId;
@Schema(description = "标样编号")
private String standardSampleCode;
@Schema(description = "标准样类型ID", example = "11282")
private Long standardSampleTypeId;
@Schema(description = "质控样编号")
private String qualitySampleCode;
@Schema(description = "质控样分析时间")
private LocalDateTime qualitySampleAssayTime;
@Schema(description = "流程实例id", example = "19026")
private Long flowInstanceId;

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