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

feat:阶段性代码合并

Browse Source
This commit is contained in:
FCL
2025-11-18 10:59:14 +08:00
parent 3e40ed2e61
commit ac2295cac9
955 changed files with 51277 additions and 3330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java
View File

@@ -29,6 +29,7 @@ public interface ErrorCodeConstants {
ErrorCode DATA_FORM_NOT_EXISTS = new ErrorCode(1_032_001_000, "通用数据不存在");
ErrorCode DATA_FORM_EMPTY_COLLECTION_ID = new ErrorCode(1_032_001_000, "未指定数据集ID");
ErrorCode DICTIONARY_BUSINESS_NOT_EXISTS = new ErrorCode(1_032_001_000, "业务参数字典不存在");
ErrorCode DATA_TEMPLATE_NOT_EXISTS = new ErrorCode(1_032_001_000, "表单设计器模板不存在");
ErrorCode DICTIONARY_BUSINESS_DATA_MORE_THAN_ONE = new ErrorCode(1_032_001_000, "业务参数字典[数据]key重名，请联系管理员处理！");
ErrorCode DICTIONARY_BUSINESS_CATEGORY_MORE_THAN_ONE = new ErrorCode(1_032_001_000, "业务参数字典[分类]key重名，请联系管理员处理！");
ErrorCode DICTIONARY_BUSINESS_CLASSIFY_DUPLICATE = new ErrorCode(1_032_001_000, "分类名称重复，请重新输入");
@@ -45,6 +46,7 @@ public interface ErrorCodeConstants {
ErrorCode CONFIG_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "标准样检测项目配置不存在");
ErrorCode CONFIG_SUB_SAMPLE_PARENT_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样配置不存在");
ErrorCode CONFIG_SUB_SAMPLE_PARENT_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与检测方法配置不存在");
//ErrorCode CONFIG_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_050_000, "分样与复检配置不存在");
ErrorCode CONFIG_SUB_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样与检测方法配置不存在");
ErrorCode CONFIG_SUB_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "子样配置不存在");
ErrorCode CONFIG_SAMPLE_REPORT_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品报表关系不存在");
@@ -59,6 +61,10 @@ public interface ErrorCodeConstants {
ErrorCode CONFIG_SIMPLE_FLOW_RULE_NOT_EXISTS = new ErrorCode(1_032_050_000, "LiteFlow规则配置不存在");
ErrorCode CONFIG_SIMPLE_FLOW_CODE_NOT_EXISTS = new ErrorCode(1_032_050_000, "LiteFlow脚本配置不存在");
ErrorCode CONFIG_RULE_NOT_EXISTS = new ErrorCode(1_032_050_000, "规则配置不存在");
ErrorCode CONFIG_XRF_LINE_NOT_EXISTS = new ErrorCode(1_032_050_000, "荧光分析线不存在");
ErrorCode CONFIG_XRF_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "荧光采集检测项目配置不存在");
ErrorCode CONFIG_XRF_CONVERSION_RATE_NOT_EXISTS = new ErrorCode(1_032_050_000, "荧光数据采集特殊检测项目转换率配置不存在");
ErrorCode BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品大类管理不存在");
ErrorCode MATERIAL_ASSAY_STANDARD_DETAIL_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测标准明细不存在");
@@ -67,6 +73,7 @@ public interface ErrorCodeConstants {
ErrorCode MATERIAL_ASSAY_STANDARD_FORECAST_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "物料检测标准来样品位配置不存在");
ErrorCode CONFIG_SAMPLE_HANDOVER_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品交接配置不存在");
ErrorCode CONFIG_USER_SIGNATURE_NOT_EXISTS = new ErrorCode(1_032_050_000, "手写签名不存在");
//dictionary
ErrorCode DICTIONARY_SAMPLE_FLOW_NODE_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品流程节点字典不存在");
@@ -74,6 +81,14 @@ public interface ErrorCodeConstants {
ErrorCode DICTIONARY_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测项目字典不存在");
ErrorCode DICTIONARY_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "样品类型字典不存在");
ErrorCode CONFIG_QC_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样与检测方法配置不存在");
ErrorCode CONFIG_QC_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控与定值样关系不存在");
ErrorCode CONFIG_QC_SAMPLE_METHOD_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样检测方法参数配置不存在");
ErrorCode CONFIG_PERMISSION_NOT_EXISTS = new ErrorCode(1_032_050_000, "权限配置不存在");
ErrorCode CONFIG_PERMISSION_DUPLICATE = new ErrorCode(1_032_050_000, "权限配置数据有误");
ErrorCode CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS = new ErrorCode(1_032_050_000, "存放位置不存在");
ErrorCode CONFIG_WAREHOUSE_LOCATION_CODE_DUPLICATE = new ErrorCode(1_032_050_000, "库位编码重复，请检查库位数据，或联系管理员处理！");
/*=================================bus 检验业务 1_032_100_000 ~ 1_032_149_999==================================*/
ErrorCode BUSINESS_SAMPLE_ENTRUST_REGISTRATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记业务不存在");
ErrorCode BUSINESS_SAMPLE_ENTRUST_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记样品明细不存在");
@@ -101,11 +116,30 @@ public interface ErrorCodeConstants {
ErrorCode BUSINESS_STANDARD_SAMPLE_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "标准样检测项目业务不存在");
ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
ErrorCode BUSINESS_QC_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样业务不存在");
ErrorCode BUSINESS_QC_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");
ErrorCode BUSINESS_QC_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在");
ErrorCode BUSINESS_QC_MANAGEMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控管理样检测任务数据,管理样、标准样不存在");
ErrorCode BUSINESS_QC_MANAGEMENT_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");
ErrorCode BUSINESS_QC_MANAGEMENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在");
ErrorCode BUSINESS_QC_COEFFICIENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数任务数据,空白样、标样不存在");
ErrorCode BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数参数业务不存在");
ErrorCode BUSINESS_XRF_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "荧光采集记录不存在");
//检测报告
ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
ErrorCode REPORT_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");
ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报告类型配置不存在");
ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告类型配置不存在");
ErrorCode REPORT_DOCUMENT_MAIN_CORRELATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告主数据关系不存在");
ErrorCode BUSINESS_SAMPLE_DISPATCH_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨不存在");
ErrorCode BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "样品调拨明细不存在");
/*=================================resource 资源管理 1_032_150_000 ~ 1_032_199_999 ==================================*/
ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备信息不存在");

11
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsBpmConstant.java
View File

@@ -7,6 +7,17 @@ public class QmsBpmConstant {
* */
public static final String BPM_CALLBACK_BEAN_NAME = "bpmCallbackBean";
/**
* 流程回调时使用的ActivityId Key
* */
public static final String BPM_CALLBACK_ACTIVITY_ID = "bpmCallbackActivityId";
public static final String BPM_FIELD_EXTENSIONS = "bpmFieldExtensions";
public static final String BPM_FIRST_ACTIVITY_FLAG = "firstActivityFlag";
public static final String BPM_LAST_ACTIVITY_FLAG = "lastActivityFlag";
//驳回标记前缀
public static final String BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY = "RETURN_FLAG_";
/**
* 流程回调时使用的beanName Key
* */

54
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java
View File

@@ -82,7 +82,10 @@ public interface QmsCommonConstant {
/** 已完成 **/
String COMPLETED = "completed";
/** 已下架 **/
String TAKEN_OFF = "taken_off";
/** 分配任务 **/
String TASK_ASSIGN = "task_assign";
@@ -105,23 +108,56 @@ public interface QmsCommonConstant {
String ENTRUST_INSPECTION = "entrust_inspection";
/** 中心收样 **/
String FLOW_NODE_CENTER_RECEIVE = "flw_zx_receive";
String FLOW_NODE_CENTER_RECEIVE = "flw_center_receive";
/** 中心送样 **/
String FLOW_NODE_CENTER_SEND = "flw_zx_send";
String FLOW_NODE_CENTER_SEND = "flw_center_send";
/** 班组收样 **/
String FLOW_NODE_TEAM_RECEIVE = "flw_bz_receive";
String FLOW_NODE_TEAM_RECEIVE = "flw_team_receive";
/** 样品编密 **/
String FlOW_NODE_SAMPLE_ENCRYPT = "flw_ypbm";
/** 样品编密(内部简码) **/
String FlOW_NODE_SAMPLE_ENCRYPT = "flw_sample_encrypt";
/** 分析收样 **/
String FLOW_NODE_ANALYSIS_RECEIVE = "flw_fx_receive";
String FLOW_NODE_ANALYSIS_RECEIVE = "flw_analysis_receive";
/** 分析送样 **/
String FLOW_NODE_ANALYSIS_SEND = "flw_fx_send";
String FLOW_NODE_ANALYSIS_SEND = "flw_analysis_send";
/** 班组送样 **/
String FLOW_NODE_TEAM_SEND = "flw_bz_send";
String FLOW_NODE_TEAM_SEND = "flw_team_send";
/** 样品归库 **/
String FLOW_SAMPLE_STORAGE = "flw_sample_storage";
/** 结束 **/
String FLOW_NODE_END = "flw_end";
/** 单杯 **/
String ASSAY_TYPE_SINGLE_CUP = "single_cup";
/** 双杯 **/
String ASSAY_TYPE_DOUBLE_CUP = "double_cup";
/** 平行 **/
String ASSAY_TYPE_SINGLE_PARALLEL = "single_parallel";
/** 配料 **/
String ASSAY_PROJECT_USAGE_INGREDIENT = "ingredient";
/** 报出 **/
String ASSAY_PROJECT_USAGE_REPORT = "report";
/** 配料和报出 **/
String ASSAY_PROJECT_USAGE_INGREDIENT_REPORT = "ingredient_report";
/** 品质控制 **/
String ASSAY_PROJECT_USAGE_QUALITY_CONTROL = "quality_control";
/** 检验完成状态-完成 **/
String CHECKED = "checked";
/** 检验完成状态-未完成 **/
String UNCHECKED = "unchecked";
}

23
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsPermissionConstant.java Normal file
View File

@@ -0,0 +1,23 @@
package com.zt.plat.module.qms.enums;
/**
* 权限模块常量
*/
public interface QmsPermissionConstant {
//目标权限类型-角色
String TARGET_TYPE_ROLE = "role";
//目标权限类型-用户
String TARGET_TYPE_USER = "user";
//目标权限类型-部门
String TARGET_TYPE_DEPT = "dept";
//目标权限类型-自定义
String TARGET_TYPE_CUSTOM = "custom";
//======================各业务模块权限常量=============================
//报告发起权限
String REPORT_DOCUMENT_TYPE_START = "report_document_type_start";
}

21
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsWarehouseLocationConstant.java Normal file
View File

@@ -0,0 +1,21 @@
package com.zt.plat.module.qms.enums;
/**
* 权限模块常量
*/
public interface QmsWarehouseLocationConstant {
//数据类型
String DATA_TYPE_LOCATION = "库位";
String DATA_TYPE_WAREHOUSE = "仓库";
//仓库分类
String WAREHOUSE_TYPE_SAMPLE = "样品库";
String WAREHOUSE_TYPE_MATERIAL = "物料试剂";
//样品下架操作方式
String SAMPLE_TAKE_OFF_ACTION_WAY_SAMPLE = "sample";
String SAMPLE_TAKE_OFF_ACTION_WAY_LOCATION = "warehouseLocation";
}

12
zt-module-qms/zt-module-qms-server/pom.xml
View File

@@ -17,7 +17,7 @@
QMS模块。
</description>
<properties>
<zzjc.tio.version>3.8.3.v20230112-RELEASE</zzjc.tio.version>
<zzjc.tio.version>3.9.1.v20251013-RELEASE</zzjc.tio.version>
</properties>
<dependencies>
<!-- Spring Cloud 基础 -->
@@ -189,11 +189,11 @@
</dependency>
<!-- zzjc.tio -->
<!-- <dependency>-->
<!-- <groupId>tech.zzjc.tio</groupId>-->
<!-- <artifactId>zzjc-tio-spring-boot-starter</artifactId>-->
<!-- <version>${zzjc.tio.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>tech.zzjc.tio</groupId>
<artifactId>zzjc-tio-spring-boot-starter</artifactId>
<version>${zzjc.tio.version}</version>
</dependency>
</dependencies>
<repositories>

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

@@ -1,5 +1,9 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +14,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -20,9 +23,8 @@ import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
@@ -42,14 +44,14 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@PostMapping("/create")
@Operation(summary = "创建检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:create')")
public CommonResult<BusinessAssayParameterDataRespVO> createBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO createReqVO) {
return success(businessAssayParameterDataService.createBusinessAssayParameterData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:update')")
public CommonResult<Boolean> updateBusinessAssayParameterData(@Valid @RequestBody BusinessAssayParameterDataSaveReqVO updateReqVO) {
businessAssayParameterDataService.updateBusinessAssayParameterData(updateReqVO);
return success(true);
@@ -58,7 +60,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@DeleteMapping("/delete")
@Operation(summary = "删除检测参数数据业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayParameterData(@RequestParam("id") Long id) {
businessAssayParameterDataService.deleteBusinessAssayParameterData(id);
return success(true);
@@ -67,7 +69,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayParameterDataList(@RequestBody BatchDeleteReqVO req) {
businessAssayParameterDataService.deleteBusinessAssayParameterDataListByIds(req.getIds());
return success(true);
@@ -76,7 +78,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@GetMapping("/get")
@Operation(summary = "获得检测参数数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
public CommonResult<BusinessAssayParameterDataRespVO> getBusinessAssayParameterData(@RequestParam("id") Long id) {
BusinessAssayParameterDataDO businessAssayParameterData = businessAssayParameterDataService.getBusinessAssayParameterData(id);
return success(BeanUtils.toBean(businessAssayParameterData, BusinessAssayParameterDataRespVO.class));
@@ -84,7 +86,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@GetMapping("/page")
@Operation(summary = "获得检测参数数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:query')")
public CommonResult<PageResult<BusinessAssayParameterDataRespVO>> getBusinessAssayParameterDataPage(@Valid BusinessAssayParameterDataPageReqVO pageReqVO) {
PageResult<BusinessAssayParameterDataDO> pageResult = businessAssayParameterDataService.getBusinessAssayParameterDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessAssayParameterDataRespVO.class));
@@ -92,7 +94,7 @@ public class BusinessAssayParameterDataController implements BusinessControllerM
@GetMapping("/export-excel")
@Operation(summary = "导出检测参数数据业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-parameter-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayParameterDataExcel(@Valid BusinessAssayParameterDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

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

@@ -1,5 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -43,14 +45,14 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@PostMapping("/create")
@Operation(summary = "创建检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:create')")
public CommonResult<BusinessAssayProjectDataRespVO> createBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO createReqVO) {
return success(businessAssayProjectDataService.createBusinessAssayProjectData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:update')")
public CommonResult<Boolean> updateBusinessAssayProjectData(@Valid @RequestBody BusinessAssayProjectDataSaveReqVO updateReqVO) {
businessAssayProjectDataService.updateBusinessAssayProjectData(updateReqVO);
return success(true);
@@ -59,7 +61,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@DeleteMapping("/delete")
@Operation(summary = "删除检测项目数据业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayProjectData(@RequestParam("id") Long id) {
businessAssayProjectDataService.deleteBusinessAssayProjectData(id);
return success(true);
@@ -68,7 +70,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayProjectDataList(@RequestBody BatchDeleteReqVO req) {
businessAssayProjectDataService.deleteBusinessAssayProjectDataListByIds(req.getIds());
return success(true);
@@ -77,7 +79,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@GetMapping("/get")
@Operation(summary = "获得检测项目数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
public CommonResult<BusinessAssayProjectDataRespVO> getBusinessAssayProjectData(@RequestParam("id") Long id) {
BusinessAssayProjectDataDO businessAssayProjectData = businessAssayProjectDataService.getBusinessAssayProjectData(id);
return success(BeanUtils.toBean(businessAssayProjectData, BusinessAssayProjectDataRespVO.class));
@@ -85,7 +87,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@GetMapping("/page")
@Operation(summary = "获得检测项目数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:query')")
public CommonResult<PageResult<BusinessAssayProjectDataRespVO>> getBusinessAssayProjectDataPage(@Valid BusinessAssayProjectDataPageReqVO pageReqVO) {
PageResult<BusinessAssayProjectDataDO> pageResult = businessAssayProjectDataService.getBusinessAssayProjectDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessAssayProjectDataRespVO.class));
@@ -93,7 +95,7 @@ public class BusinessAssayProjectDataController implements BusinessControllerMar
@GetMapping("/export-excel")
@Operation(summary = "导出检测项目数据业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-project-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayProjectDataExcel(@Valid BusinessAssayProjectDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

117
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java Normal file
View File

@@ -0,0 +1,117 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayReportDataPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayReportDataRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayReportDataSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayReportDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessAssayReportDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 检测报表数据业务")
@RestController
@RequestMapping("/qms/business-assay-report-data")
@Validated
public class BusinessAssayReportDataController implements BusinessControllerMarker {
@Resource
private BusinessAssayReportDataService businessAssayReportDataService;
@PostMapping("/create")
@Operation(summary = "创建检测报表数据业务")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:create')")
public CommonResult<BusinessAssayReportDataRespVO> createBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO createReqVO) {
return success(businessAssayReportDataService.createBusinessAssayReportData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检测报表数据业务")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:update')")
public CommonResult<Boolean> updateBusinessAssayReportData(@Valid @RequestBody BusinessAssayReportDataSaveReqVO updateReqVO) {
businessAssayReportDataService.updateBusinessAssayReportData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检测报表数据业务")
@Parameter(name = "id", description = "编号", required = true)
//@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayReportData(@RequestParam("id") Long id) {
businessAssayReportDataService.deleteBusinessAssayReportData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测报表数据业务")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayReportDataList(@RequestBody BatchDeleteReqVO req) {
businessAssayReportDataService.deleteBusinessAssayReportDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检测报表数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
public CommonResult<BusinessAssayReportDataRespVO> getBusinessAssayReportData(@RequestParam("id") Long id) {
BusinessAssayReportDataDO businessAssayReportData = businessAssayReportDataService.getBusinessAssayReportData(id);
return success(BeanUtils.toBean(businessAssayReportData, BusinessAssayReportDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得检测报表数据业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:query')")
public CommonResult<PageResult<BusinessAssayReportDataRespVO>> getBusinessAssayReportDataPage(@Valid BusinessAssayReportDataPageReqVO pageReqVO) {
PageResult<BusinessAssayReportDataDO> pageResult = businessAssayReportDataService.getBusinessAssayReportDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessAssayReportDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出检测报表数据业务 Excel")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-report-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayReportDataExcel(@Valid BusinessAssayReportDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessAssayReportDataDO> list = businessAssayReportDataService.getBusinessAssayReportDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "检测报表数据业务.xls", "数据", BusinessAssayReportDataRespVO.class,
BeanUtils.toBean(list, BusinessAssayReportDataRespVO.class));
}
@GetMapping("/queryWaitingToAddData")
@Operation(summary = "待编制报表数据查询")
@Parameter(name = "mainId", description = "报告id", required = true, example = "1024")
public CommonResult<PageResult<BusinessAssayReportDataRespVO>> queryWaitingToAddData(BusinessAssayReportDataPageReqVO pageReqVO) {
PageResult<BusinessAssayReportDataDO> page = businessAssayReportDataService.queryWaitingDataForReport(pageReqVO);
return success(BeanUtils.toBean(page, BusinessAssayReportDataRespVO.class));
}
}

117
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayTaskController.java Normal file
View File

@@ -0,0 +1,117 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskExtendRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO;
import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 检测任务分配业务")
@RestController
@RequestMapping("/qms/business-assay-task")
@Validated
public class BusinessAssayTaskController implements BusinessControllerMarker {
@Resource
private BusinessAssayTaskService businessAssayTaskService;
@PostMapping("/create")
@Operation(summary = "创建检测任务分配业务")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:create')")
public CommonResult<BusinessAssayTaskRespVO> createBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO createReqVO) {
return success(businessAssayTaskService.createBusinessAssayTask(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检测任务分配业务")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:update')")
public CommonResult<Boolean> updateBusinessAssayTask(@Valid @RequestBody BusinessAssayTaskSaveReqVO updateReqVO) {
businessAssayTaskService.updateBusinessAssayTask(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检测任务分配业务")
@Parameter(name = "id", description = "编号", required = true)
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
public CommonResult<Boolean> deleteBusinessAssayTask(@RequestParam("id") Long id) {
businessAssayTaskService.deleteBusinessAssayTask(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测任务分配业务")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:delete')")
public CommonResult<Boolean> deleteBusinessAssayTaskList(@RequestBody BatchDeleteReqVO req) {
businessAssayTaskService.deleteBusinessAssayTaskListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检测任务分配业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
public CommonResult<BusinessAssayTaskExtendRespVO> getBusinessAssayTask(@RequestParam("id") Long id) {
BusinessAssayTaskExtendRespVO businessAssayTask = businessAssayTaskService.getBusinessAssayTask(id);
return success(businessAssayTask);
}
@GetMapping("/page")
@Operation(summary = "获得检测任务分配业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
public CommonResult<PageResult<BusinessAssayTaskExtendRespVO>> getBusinessAssayTaskPage(@Valid BusinessAssayTaskPageReqVO pageReqVO) {
PageResult<BusinessAssayTaskExtendRespVO> pageResult = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/list")
@Operation(summary = "获得检测任务分配业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:query')")
public CommonResult<List<BusinessAssayTaskExtendRespVO>> getBusinessAssayTaskList(@Valid BusinessAssayTaskPageReqVO reqVO) {
List<BusinessAssayTaskExtendRespVO> listResult = businessAssayTaskService.getBusinessAssayTaskList(reqVO);
return success(listResult);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检测任务分配业务 Excel")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayTaskExcel(@Valid BusinessAssayTaskPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessAssayTaskExtendRespVO> list = businessAssayTaskService.getBusinessAssayTaskPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "检测任务分配业务.xls", "数据", BusinessAssayTaskRespVO.class,
BeanUtils.toBean(list, BusinessAssayTaskRespVO.class));
}
}

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

@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +42,14 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@PostMapping("/create")
@Operation(summary = "创建子样检测任务业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:create')")
public CommonResult<BusinessAssayTaskDataRespVO> createBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO createReqVO) {
return success(businessAssayTaskDataService.createBusinessAssayTaskData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新子样检测任务业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:update')")
public CommonResult<Boolean> updateBusinessAssayTaskData(@Valid @RequestBody BusinessAssayTaskDataSaveReqVO updateReqVO) {
businessAssayTaskDataService.updateBusinessAssayTaskData(updateReqVO);
return success(true);
@@ -58,7 +58,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@DeleteMapping("/delete")
@Operation(summary = "删除子样检测任务业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayTaskData(@RequestParam("id") Long id) {
businessAssayTaskDataService.deleteBusinessAssayTaskData(id);
return success(true);
@@ -67,7 +67,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样检测任务业务")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:delete')")
public CommonResult<Boolean> deleteBusinessAssayTaskDataList(@RequestBody BatchDeleteReqVO req) {
businessAssayTaskDataService.deleteBusinessAssayTaskDataListByIds(req.getIds());
return success(true);
@@ -76,7 +76,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/get")
@Operation(summary = "获得子样检测任务业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<BusinessAssayTaskDataRespVO> getBusinessAssayTaskData(@RequestParam("id") Long id) {
BusinessAssayTaskDataDO businessAssayTaskData = businessAssayTaskDataService.getBusinessAssayTaskData(id);
return success(BeanUtils.toBean(businessAssayTaskData, BusinessAssayTaskDataRespVO.class));
@@ -84,15 +84,23 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/getUnAssayTaskGroupList")
@Operation(summary = "获得未指派的子样检测任务业务分组列表")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<?> getUnAssayTaskGroupList() {
List<Map<String, Object>> list = businessAssayTaskDataService.getUnAssayTaskGroupList();
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<?> getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAssayTaskGroupList(reqVO);
return success(list);
}
@GetMapping("/getUnAuditTaskGroupList")
@Operation(summary = "获得未审核的子样检测任务业务分组列表")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<?> getUnAuditTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
List<BusinessAssayTaskDataGroupRespVO> list = businessAssayTaskDataService.getUnAuditTaskGroupList(reqVO);
return success(list);
}
@GetMapping("/list")
@Operation(summary = "获得子样检测任务业务列表")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<List<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataReqVO reqVO) {
List<BusinessAssayTaskDataExtendRespVO> listResult = businessAssayTaskDataService.getBusinessAssayTaskDataList(reqVO);
return success(listResult);
@@ -100,7 +108,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/page")
@Operation(summary = "获得子样检测任务业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:query')")
public CommonResult<PageResult<BusinessAssayTaskDataExtendRespVO>> getBusinessAssayTaskDataPage(@Valid BusinessAssayTaskDataPageReqVO pageReqVO) {
PageResult<BusinessAssayTaskDataExtendRespVO> pageResult = businessAssayTaskDataService.getBusinessAssayTaskDataPage(pageReqVO);
return success(pageResult);
@@ -108,7 +116,7 @@ public class BusinessAssayTaskDataController implements BusinessControllerMarker
@GetMapping("/export-excel")
@Operation(summary = "导出子样检测任务业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayTaskDataExcel(@Valid BusinessAssayTaskDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

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

@@ -0,0 +1,116 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskDetailService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 检测任务分配明细")
@RestController
@RequestMapping("/qms/business-assay-task-detail")
@Validated
public class BusinessAssayTaskDetailController implements BusinessControllerMarker {
@Resource
private BusinessAssayTaskDetailService businessAssayTaskDetailService;
@PostMapping("/create")
@Operation(summary = "创建检测任务分配明细")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:create')")
public CommonResult<BusinessAssayTaskDetailRespVO> createBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO createReqVO) {
return success(businessAssayTaskDetailService.createBusinessAssayTaskDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检测任务分配明细")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:update')")
public CommonResult<Boolean> updateBusinessAssayTaskDetail(@Valid @RequestBody BusinessAssayTaskDetailSaveReqVO updateReqVO) {
businessAssayTaskDetailService.updateBusinessAssayTaskDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检测任务分配明细")
@Parameter(name = "id", description = "编号", required = true)
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
public CommonResult<Boolean> deleteBusinessAssayTaskDetail(@RequestParam("id") Long id) {
businessAssayTaskDetailService.deleteBusinessAssayTaskDetail(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除检测任务分配明细")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:delete')")
public CommonResult<Boolean> deleteBusinessAssayTaskDetailList(@RequestBody BatchDeleteReqVO req) {
businessAssayTaskDetailService.deleteBusinessAssayTaskDetailListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检测任务分配明细")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
public CommonResult<BusinessAssayTaskDetailRespVO> getBusinessAssayTaskDetail(@RequestParam("id") Long id) {
BusinessAssayTaskDetailDO businessAssayTaskDetail = businessAssayTaskDetailService.getBusinessAssayTaskDetail(id);
return success(BeanUtils.toBean(businessAssayTaskDetail, BusinessAssayTaskDetailRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得检测任务分配明细分页")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
public CommonResult<PageResult<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailPage(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO) {
PageResult<BusinessAssayTaskDetailExtendRespVO> pageResult = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/list")
@Operation(summary = "获得检测任务分配明细分页")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:query')")
public CommonResult<List<BusinessAssayTaskDetailExtendRespVO>> getBusinessAssayTaskDetailList(@Valid BusinessAssayTaskDetailReqVO reqVO) {
List<BusinessAssayTaskDetailExtendRespVO> resultList = businessAssayTaskDetailService.getBusinessAssayTaskDetailList(reqVO);
return success(resultList);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检测任务分配明细 Excel")
//@PreAuthorize("@ss.hasPermission('qms:business-assay-task-detail:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessAssayTaskDetailExcel(@Valid BusinessAssayTaskDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessAssayTaskDetailExtendRespVO> list = businessAssayTaskDetailService.getBusinessAssayTaskDetailPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "检测任务分配明细.xls", "数据", BusinessAssayTaskDetailRespVO.class,
BeanUtils.toBean(list, BusinessAssayTaskDetailRespVO.class));
}
}

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

@@ -1,5 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSamplePageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSampleRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessBaseSampleSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +44,14 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@PostMapping("/create")
@Operation(summary = "创建主样业务")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:create')")
public CommonResult<BusinessBaseSampleRespVO> createBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO createReqVO) {
return success(businessBaseSampleService.createBusinessBaseSample(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新主样业务")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:update')")
public CommonResult<Boolean> updateBusinessBaseSample(@Valid @RequestBody BusinessBaseSampleSaveReqVO updateReqVO) {
businessBaseSampleService.updateBusinessBaseSample(updateReqVO);
return success(true);
@@ -58,7 +60,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete")
@Operation(summary = "删除主样业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
public CommonResult<Boolean> deleteBusinessBaseSample(@RequestParam("id") Long id) {
businessBaseSampleService.deleteBusinessBaseSample(id);
return success(true);
@@ -67,7 +69,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除主样业务")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:delete')")
public CommonResult<Boolean> deleteBusinessBaseSampleList(@RequestBody BatchDeleteReqVO req) {
businessBaseSampleService.deleteBusinessBaseSampleListByIds(req.getIds());
return success(true);
@@ -76,7 +78,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@GetMapping("/get")
@Operation(summary = "获得主样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
public CommonResult<BusinessBaseSampleRespVO> getBusinessBaseSample(@RequestParam("id") Long id) {
BusinessBaseSampleDO businessBaseSample = businessBaseSampleService.getBusinessBaseSample(id);
return success(BeanUtils.toBean(businessBaseSample, BusinessBaseSampleRespVO.class));
@@ -84,7 +86,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@GetMapping("/page")
@Operation(summary = "获得主样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:query')")
public CommonResult<PageResult<BusinessBaseSampleRespVO>> getBusinessBaseSamplePage(@Valid BusinessBaseSamplePageReqVO pageReqVO) {
PageResult<BusinessBaseSampleDO> pageResult = businessBaseSampleService.getBusinessBaseSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessBaseSampleRespVO.class));
@@ -92,7 +94,7 @@ public class BusinessBaseSampleController implements BusinessControllerMarker {
@GetMapping("/export-excel")
@Operation(summary = "导出主样业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-base-sample:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessBaseSampleExcel(@Valid BusinessBaseSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

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

@@ -1,5 +1,9 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubExtendRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessHandoverRecordSubSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +14,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +45,14 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@PostMapping("/create")
@Operation(summary = "创建子样交接记录业务")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:create')")
public CommonResult<BusinessHandoverRecordSubRespVO> createBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO createReqVO) {
return success(businessHandoverRecordSubService.createBusinessHandoverRecordSub(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新子样交接记录业务")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:update')")
public CommonResult<Boolean> updateBusinessHandoverRecordSub(@Valid @RequestBody BusinessHandoverRecordSubSaveReqVO updateReqVO) {
businessHandoverRecordSubService.updateBusinessHandoverRecordSub(updateReqVO);
return success(true);
@@ -58,7 +61,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@DeleteMapping("/delete")
@Operation(summary = "删除子样交接记录业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
public CommonResult<Boolean> deleteBusinessHandoverRecordSub(@RequestParam("id") Long id) {
businessHandoverRecordSubService.deleteBusinessHandoverRecordSub(id);
return success(true);
@@ -67,7 +70,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样交接记录业务")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:delete')")
public CommonResult<Boolean> deleteBusinessHandoverRecordSubList(@RequestBody BatchDeleteReqVO req) {
businessHandoverRecordSubService.deleteBusinessHandoverRecordSubListByIds(req.getIds());
return success(true);
@@ -76,7 +79,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@GetMapping("/get")
@Operation(summary = "获得子样交接记录业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
public CommonResult<BusinessHandoverRecordSubRespVO> getBusinessHandoverRecordSub(@RequestParam("id") Long id) {
BusinessHandoverRecordSubDO businessHandoverRecordSub = businessHandoverRecordSubService.getBusinessHandoverRecordSub(id);
return success(BeanUtils.toBean(businessHandoverRecordSub, BusinessHandoverRecordSubRespVO.class));
@@ -84,7 +87,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@GetMapping("/page")
@Operation(summary = "获得子样交接记录业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:query')")
public CommonResult<PageResult<BusinessHandoverRecordSubExtendRespVO>> getBusinessHandoverRecordSubPage(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO) {
PageResult<BusinessHandoverRecordSubExtendRespVO> pageResult = businessHandoverRecordSubService.getBusinessHandoverRecordSubPage(pageReqVO);
return success(pageResult);
@@ -92,7 +95,7 @@ public class BusinessHandoverRecordSubController implements BusinessControllerMa
@GetMapping("/export-excel")
@Operation(summary = "导出子样交接记录业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-handover-record-sub:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessHandoverRecordSubExcel(@Valid BusinessHandoverRecordSubPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

114
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java Normal file
View File

@@ -0,0 +1,114 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQCCoefficientDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控样检测系数任务数据,空白样、标样")
@RestController
@RequestMapping("/qms/business-qc-coefficient-data")
@Validated
public class BusinessQCCoefficientDataController implements BusinessControllerMarker {
@Resource
private BusinessQCCoefficientDataService businessQCCoefficientDataService;
@PostMapping("/create")
@Operation(summary = "创建质控样检测系数任务数据,空白样、标样")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:create')")
public CommonResult<BusinessQCCoefficientDataRespVO> createBusinessQCCoefficientData(@Valid @RequestBody BusinessQCCoefficientDataSaveReqVO createReqVO) {
return success(businessQCCoefficientDataService.createBusinessQCCoefficientData(createReqVO));
}
@PostMapping("/update")
@Operation(summary = "更新质控样检测系数任务数据,空白样、标样")
// @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:update')")
public CommonResult<Boolean> updateBusinessQCCoefficientData(@Valid @RequestBody BusinessQCCoefficientDataSaveReqVO updateReqVO) {
businessQCCoefficientDataService.updateBusinessQCCoefficientData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控样检测系数任务数据,空白样、标样")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:delete')")
public CommonResult<Boolean> deleteBusinessQCCoefficientData(@RequestParam("id") Long id) {
businessQCCoefficientDataService.deleteBusinessQCCoefficientData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样检测系数任务数据,空白样、标样")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:delete')")
public CommonResult<Boolean> deleteBusinessQCCoefficientDataList(@RequestBody BatchDeleteReqVO req) {
businessQCCoefficientDataService.deleteBusinessQCCoefficientDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控样检测系数任务数据,空白样、标样")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
public CommonResult<BusinessQCCoefficientDataRespVO> getBusinessQCCoefficientData(@RequestParam("id") Long id) {
BusinessQCCoefficientDataDO businessQCCoefficientData = businessQCCoefficientDataService.getBusinessQCCoefficientData(id);
return success(BeanUtils.toBean(businessQCCoefficientData, BusinessQCCoefficientDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
public CommonResult<PageResult<BusinessQCCoefficientDataRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO) {
PageResult<BusinessQCCoefficientDataDO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class));
}
@GetMapping("/list")
@Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页")
// @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')")
public CommonResult<List<BusinessQCCoefficientDataRespVO>> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataReqVO reqVO) {
List<BusinessQCCoefficientDataDO> pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataList(reqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控样检测系数任务数据,空白样、标样 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQCCoefficientDataExcel(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQCCoefficientDataDO> list = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控样检测系数任务数据,空白样、标样.xls", "数据", BusinessQCCoefficientDataRespVO.class,
BeanUtils.toBean(list, BusinessQCCoefficientDataRespVO.class));
}
}

106
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientParameterDataController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQCCoefficientParameterDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控样检测系数参数业务")
@RestController
@RequestMapping("/qms/business-qc-coefficient-parameter-data")
@Validated
public class BusinessQCCoefficientParameterDataController implements BusinessControllerMarker {
@Resource
private BusinessQCCoefficientParameterDataService businessQCCoefficientParameterDataService;
@PostMapping("/create")
@Operation(summary = "创建质控样检测系数参数业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:create')")
public CommonResult<BusinessQCCoefficientParameterDataRespVO> createBusinessQCCoefficientParameterData(@Valid @RequestBody BusinessQCCoefficientParameterDataSaveReqVO createReqVO) {
return success(businessQCCoefficientParameterDataService.createBusinessQCCoefficientParameterData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新质控样检测系数参数业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:update')")
public CommonResult<Boolean> updateBusinessQCCoefficientParameterData(@Valid @RequestBody BusinessQCCoefficientParameterDataSaveReqVO updateReqVO) {
businessQCCoefficientParameterDataService.updateBusinessQCCoefficientParameterData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控样检测系数参数业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessQCCoefficientParameterData(@RequestParam("id") Long id) {
businessQCCoefficientParameterDataService.deleteBusinessQCCoefficientParameterData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样检测系数参数业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessQCCoefficientParameterDataList(@RequestBody BatchDeleteReqVO req) {
businessQCCoefficientParameterDataService.deleteBusinessQCCoefficientParameterDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控样检测系数参数业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:query')")
public CommonResult<BusinessQCCoefficientParameterDataRespVO> getBusinessQCCoefficientParameterData(@RequestParam("id") Long id) {
BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterData = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterData(id);
return success(BeanUtils.toBean(businessQCCoefficientParameterData, BusinessQCCoefficientParameterDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控样检测系数参数业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:query')")
public CommonResult<PageResult<BusinessQCCoefficientParameterDataRespVO>> getBusinessQCCoefficientParameterDataPage(@Valid BusinessQCCoefficientParameterDataPageReqVO pageReqVO) {
PageResult<BusinessQCCoefficientParameterDataDO> pageResult = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientParameterDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控样检测系数参数业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQCCoefficientParameterDataExcel(@Valid BusinessQCCoefficientParameterDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQCCoefficientParameterDataDO> list = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控样检测系数参数业务.xls", "数据", BusinessQCCoefficientParameterDataRespVO.class,
BeanUtils.toBean(list, BusinessQCCoefficientParameterDataRespVO.class));
}
}

113
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCDataController.java Normal file
View File

@@ -0,0 +1,113 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQCDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控样业务")
@RestController
@RequestMapping("/qms/business-qc-data")
@Validated
public class BusinessQCDataController implements BusinessControllerMarker {
@Resource
private BusinessQCDataService businessQCDataService;
@PostMapping("/create")
@Operation(summary = "创建质控样业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-data:create')")
public CommonResult<BusinessQCDataRespVO> createBusinessQCData(@Valid @RequestBody BusinessQCDataSaveReqVO createReqVO) {
return success(businessQCDataService.createBusinessQCData(createReqVO));
}
@PostMapping("/update")
@Operation(summary = "更新质控样业务")
//@PreAuthorize("@ss.hasPermission('qms:business-QC-data:update')")
public CommonResult<Boolean> updateBusinessQCData(@Valid @RequestBody BusinessQCDataSaveReqVO updateReqVO) {
businessQCDataService.updateBusinessQCData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控样业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-QC-data:delete')")
public CommonResult<Boolean> deleteBusinessQCData(@RequestParam("id") Long id) {
businessQCDataService.deleteBusinessQCData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-data:delete')")
public CommonResult<Boolean> deleteBusinessQCDataList(@RequestBody BatchDeleteReqVO req) {
businessQCDataService.deleteBusinessQCDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-QC-data:query')")
public CommonResult<BusinessQCDataRespVO> getBusinessQCData(@RequestParam("id") Long id) {
BusinessQCDataDO businessQCData = businessQCDataService.getBusinessQCData(id);
return success(BeanUtils.toBean(businessQCData, BusinessQCDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-QC-data:query')")
public CommonResult<PageResult<BusinessQCDataExtendRespVO>> getBusinessQCDataPage(@Valid BusinessQCDataPageReqVO pageReqVO) {
PageResult<BusinessQCDataExtendRespVO> pageResult = businessQCDataService.getBusinessQCDataPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/list")
@Operation(summary = "获得质控样业务列表")
public CommonResult<List<BusinessQCDataExtendRespVO>> getBusinessQCDataList(BusinessQCDataReqVO reqVO) {
List<BusinessQCDataExtendRespVO> list = businessQCDataService.getBusinessQCDataList(reqVO);
return success(list);
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控样业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-QC-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQCDataExcel(@Valid BusinessQCDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQCDataExtendRespVO> list = businessQCDataService.getBusinessQCDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控样业务.xls", "数据", BusinessQCDataRespVO.class,
BeanUtils.toBean(list, BusinessQCDataRespVO.class));
}
}

114
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java Normal file
View File

@@ -0,0 +1,114 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控管理样检测任务数据,管理样、标准样")
@RestController
@RequestMapping("/qms/business-qc-management-data")
@Validated
public class BusinessQCManagementDataController implements BusinessControllerMarker {
@Resource
private BusinessQCManagementDataService businessQCManagementDataService;
@PostMapping("/create")
@Operation(summary = "创建质控管理样检测任务数据,管理样、标准样")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:create')")
public CommonResult<BusinessQCManagementDataRespVO> createBusinessQCManagementData(@Valid @RequestBody BusinessQCManagementDataSaveReqVO createReqVO) {
return success(businessQCManagementDataService.createBusinessQCManagementData(createReqVO));
}
@PostMapping("/update")
@Operation(summary = "更新质控管理样检测任务数据,管理样、标准样")
// @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:update')")
public CommonResult<Boolean> updateBusinessQCManagementData(@Valid @RequestBody BusinessQCManagementDataSaveReqVO updateReqVO) {
businessQCManagementDataService.updateBusinessQCManagementData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控管理样检测任务数据,管理样、标准样")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:delete')")
public CommonResult<Boolean> deleteBusinessQCManagementData(@RequestParam("id") Long id) {
businessQCManagementDataService.deleteBusinessQCManagementData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控管理样检测任务数据,管理样、标准样")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:delete')")
public CommonResult<Boolean> deleteBusinessQCManagementDataList(@RequestBody BatchDeleteReqVO req) {
businessQCManagementDataService.deleteBusinessQCManagementDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控管理样检测任务数据,管理样、标准样")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
public CommonResult<BusinessQCManagementDataRespVO> getBusinessQCManagementData(@RequestParam("id") Long id) {
BusinessQCManagementDataDO businessQCManagementData = businessQCManagementDataService.getBusinessQCManagementData(id);
return success(BeanUtils.toBean(businessQCManagementData, BusinessQCManagementDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控管理样检测任务数据,管理样、标准样分页")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
public CommonResult<PageResult<BusinessQCManagementDataRespVO>> getBusinessQCManagementDataPage(@Valid BusinessQCManagementDataPageReqVO pageReqVO) {
PageResult<BusinessQCManagementDataDO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class));
}
@GetMapping("/list")
@Operation(summary = "获得质控管理样检测任务数据,管理样、标准样列表")
// @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')")
public CommonResult<List<BusinessQCManagementDataRespVO>> getBusinessQCManagementDataList(@Valid BusinessQCManagementDataReqVO reqVO) {
List<BusinessQCManagementDataDO> pageResult = businessQCManagementDataService.getBusinessQCManagementDataList(reqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控管理样检测任务数据,管理样、标准样 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQCManagementDataExcel(@Valid BusinessQCManagementDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQCManagementDataDO> list = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控管理样检测任务数据,管理样、标准样.xls", "数据", BusinessQCManagementDataRespVO.class,
BeanUtils.toBean(list, BusinessQCManagementDataRespVO.class));
}
}

106
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementParameterDataController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementParameterDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控样检测参数数据业务")
@RestController
@RequestMapping("/qms/business-qc-management-parameter-data")
@Validated
public class BusinessQCManagementParameterDataController implements BusinessControllerMarker {
@Resource
private BusinessQCManagementParameterDataService businessQCManagementParameterDataService;
@PostMapping("/create")
@Operation(summary = "创建质控样检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:create')")
public CommonResult<BusinessQCManagementParameterDataRespVO> createBusinessQCManagementParameterData(@Valid @RequestBody BusinessQCManagementParameterDataSaveReqVO createReqVO) {
return success(businessQCManagementParameterDataService.createBusinessQCManagementParameterData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新质控样检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:update')")
public CommonResult<Boolean> updateBusinessQCManagementParameterData(@Valid @RequestBody BusinessQCManagementParameterDataSaveReqVO updateReqVO) {
businessQCManagementParameterDataService.updateBusinessQCManagementParameterData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控样检测参数数据业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessQCManagementParameterData(@RequestParam("id") Long id) {
businessQCManagementParameterDataService.deleteBusinessQCManagementParameterData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessQCManagementParameterDataList(@RequestBody BatchDeleteReqVO req) {
businessQCManagementParameterDataService.deleteBusinessQCManagementParameterDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控样检测参数数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:query')")
public CommonResult<BusinessQCManagementParameterDataRespVO> getBusinessQCManagementParameterData(@RequestParam("id") Long id) {
BusinessQCManagementParameterDataDO businessQCManagementParameterData = businessQCManagementParameterDataService.getBusinessQCManagementParameterData(id);
return success(BeanUtils.toBean(businessQCManagementParameterData, BusinessQCManagementParameterDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控样检测参数数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:query')")
public CommonResult<PageResult<BusinessQCManagementParameterDataRespVO>> getBusinessQCManagementParameterDataPage(@Valid BusinessQCManagementParameterDataPageReqVO pageReqVO) {
PageResult<BusinessQCManagementParameterDataDO> pageResult = businessQCManagementParameterDataService.getBusinessQCManagementParameterDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCManagementParameterDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控样检测参数数据业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQCManagementParameterDataExcel(@Valid BusinessQCManagementParameterDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQCManagementParameterDataDO> list = businessQCManagementParameterDataService.getBusinessQCManagementParameterDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控样检测参数数据业务.xls", "数据", BusinessQCManagementParameterDataRespVO.class,
BeanUtils.toBean(list, BusinessQCManagementParameterDataRespVO.class));
}
}

106
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementProjectDataController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementProjectDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控样检测项目数据业务")
@RestController
@RequestMapping("/qms/business-qc-management-project-data")
@Validated
public class BusinessQCManagementProjectDataController implements BusinessControllerMarker {
@Resource
private BusinessQCManagementProjectDataService businessQCManagementProjectDataService;
@PostMapping("/create")
@Operation(summary = "创建质控样检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:create')")
public CommonResult<BusinessQCManagementProjectDataRespVO> createBusinessQCManagementProjectData(@Valid @RequestBody BusinessQCManagementProjectDataSaveReqVO createReqVO) {
return success(businessQCManagementProjectDataService.createBusinessQCManagementProjectData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新质控样检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:update')")
public CommonResult<Boolean> updateBusinessQCManagementProjectData(@Valid @RequestBody BusinessQCManagementProjectDataSaveReqVO updateReqVO) {
businessQCManagementProjectDataService.updateBusinessQCManagementProjectData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控样检测项目数据业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:delete')")
public CommonResult<Boolean> deleteBusinessQCManagementProjectData(@RequestParam("id") Long id) {
businessQCManagementProjectDataService.deleteBusinessQCManagementProjectData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:delete')")
public CommonResult<Boolean> deleteBusinessQCManagementProjectDataList(@RequestBody BatchDeleteReqVO req) {
businessQCManagementProjectDataService.deleteBusinessQCManagementProjectDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控样检测项目数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:query')")
public CommonResult<BusinessQCManagementProjectDataRespVO> getBusinessQCManagementProjectData(@RequestParam("id") Long id) {
BusinessQCManagementProjectDataDO businessQCManagementProjectData = businessQCManagementProjectDataService.getBusinessQCManagementProjectData(id);
return success(BeanUtils.toBean(businessQCManagementProjectData, BusinessQCManagementProjectDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控样检测项目数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:query')")
public CommonResult<PageResult<BusinessQCManagementProjectDataRespVO>> getBusinessQCManagementProjectDataPage(@Valid BusinessQCManagementProjectDataPageReqVO pageReqVO) {
PageResult<BusinessQCManagementProjectDataDO> pageResult = businessQCManagementProjectDataService.getBusinessQCManagementProjectDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCManagementProjectDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控样检测项目数据业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQCManagementProjectDataExcel(@Valid BusinessQCManagementProjectDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQCManagementProjectDataDO> list = businessQCManagementProjectDataService.getBusinessQCManagementProjectDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控样检测项目数据业务.xls", "数据", BusinessQCManagementProjectDataRespVO.class,
BeanUtils.toBean(list, BusinessQCManagementProjectDataRespVO.class));
}
}

106
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCParameterDataController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCParameterDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQCParameterDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控样检测参数数据业务")
@RestController
@RequestMapping("/qms/business-qc-parameter-data")
@Validated
public class BusinessQCParameterDataController implements BusinessControllerMarker {
@Resource
private BusinessQCParameterDataService businessQCParameterDataService;
@PostMapping("/create")
@Operation(summary = "创建质控样检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:create')")
public CommonResult<BusinessQCParameterDataRespVO> createBusinessQCParameterData(@Valid @RequestBody BusinessQCParameterDataSaveReqVO createReqVO) {
return success(businessQCParameterDataService.createBusinessQCParameterData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新质控样检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:update')")
public CommonResult<Boolean> updateBusinessQCParameterData(@Valid @RequestBody BusinessQCParameterDataSaveReqVO updateReqVO) {
businessQCParameterDataService.updateBusinessQCParameterData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控样检测参数数据业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessQCParameterData(@RequestParam("id") Long id) {
businessQCParameterDataService.deleteBusinessQCParameterData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样检测参数数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:delete')")
public CommonResult<Boolean> deleteBusinessQCParameterDataList(@RequestBody BatchDeleteReqVO req) {
businessQCParameterDataService.deleteBusinessQCParameterDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控样检测参数数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:query')")
public CommonResult<BusinessQCParameterDataRespVO> getBusinessQCParameterData(@RequestParam("id") Long id) {
BusinessQCParameterDataDO businessQCParameterData = businessQCParameterDataService.getBusinessQCParameterData(id);
return success(BeanUtils.toBean(businessQCParameterData, BusinessQCParameterDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控样检测参数数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:query')")
public CommonResult<PageResult<BusinessQCParameterDataRespVO>> getBusinessQCParameterDataPage(@Valid BusinessQCParameterDataPageReqVO pageReqVO) {
PageResult<BusinessQCParameterDataDO> pageResult = businessQCParameterDataService.getBusinessQCParameterDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCParameterDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控样检测参数数据业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-QC-parameter-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQCParameterDataExcel(@Valid BusinessQCParameterDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQCParameterDataDO> list = businessQCParameterDataService.getBusinessQCParameterDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控样检测参数数据业务.xls", "数据", BusinessQCParameterDataRespVO.class,
BeanUtils.toBean(list, BusinessQCParameterDataRespVO.class));
}
}

106
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCProjectDataController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCProjectDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQCProjectDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控样检测项目数据业务")
@RestController
@RequestMapping("/qms/business-qc-project-data")
@Validated
public class BusinessQCProjectDataController implements BusinessControllerMarker {
@Resource
private BusinessQCProjectDataService businessQCProjectDataService;
@PostMapping("/create")
@Operation(summary = "创建质控样检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:create')")
public CommonResult<BusinessQCProjectDataRespVO> createBusinessQCProjectData(@Valid @RequestBody BusinessQCProjectDataSaveReqVO createReqVO) {
return success(businessQCProjectDataService.createBusinessQCProjectData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新质控样检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:update')")
public CommonResult<Boolean> updateBusinessQCProjectData(@Valid @RequestBody BusinessQCProjectDataSaveReqVO updateReqVO) {
businessQCProjectDataService.updateBusinessQCProjectData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控样检测项目数据业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:delete')")
public CommonResult<Boolean> deleteBusinessQCProjectData(@RequestParam("id") Long id) {
businessQCProjectDataService.deleteBusinessQCProjectData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样检测项目数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:delete')")
public CommonResult<Boolean> deleteBusinessQCProjectDataList(@RequestBody BatchDeleteReqVO req) {
businessQCProjectDataService.deleteBusinessQCProjectDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控样检测项目数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:query')")
public CommonResult<BusinessQCProjectDataRespVO> getBusinessQCProjectData(@RequestParam("id") Long id) {
BusinessQCProjectDataDO businessQCProjectData = businessQCProjectDataService.getBusinessQCProjectData(id);
return success(BeanUtils.toBean(businessQCProjectData, BusinessQCProjectDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控样检测项目数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:query')")
public CommonResult<PageResult<BusinessQCProjectDataRespVO>> getBusinessQCProjectDataPage(@Valid BusinessQCProjectDataPageReqVO pageReqVO) {
PageResult<BusinessQCProjectDataDO> pageResult = businessQCProjectDataService.getBusinessQCProjectDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQCProjectDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控样检测项目数据业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-QC-project-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQCProjectDataExcel(@Valid BusinessQCProjectDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQCProjectDataDO> list = businessQCProjectDataService.getBusinessQCProjectDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控样检测项目数据业务.xls", "数据", BusinessQCProjectDataRespVO.class,
BeanUtils.toBean(list, BusinessQCProjectDataRespVO.class));
}
}

108
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQualityControlSampleProjectController.java Normal file
View File

@@ -0,0 +1,108 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQualityControlSampleProjectPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQualityControlSampleProjectRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQualityControlSampleProjectSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQualityControlSampleProjectDO;
import com.zt.plat.module.qms.business.bus.service.BusinessQualityControlSampleProjectService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 质控样检测项目业务")
@RestController
@RequestMapping("/qms/business-quality-control-sample-project")
@Validated
public class BusinessQualityControlSampleProjectController implements BusinessControllerMarker {
@Resource
private BusinessQualityControlSampleProjectService businessQualityControlSampleProjectService;
@PostMapping("/create")
@Operation(summary = "创建质控样检测项目业务")
//@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:create')")
public CommonResult<BusinessQualityControlSampleProjectRespVO> createBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO createReqVO) {
return success(businessQualityControlSampleProjectService.createBusinessQualityControlSampleProject(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新质控样检测项目业务")
//@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:update')")
public CommonResult<Boolean> updateBusinessQualityControlSampleProject(@Valid @RequestBody BusinessQualityControlSampleProjectSaveReqVO updateReqVO) {
businessQualityControlSampleProjectService.updateBusinessQualityControlSampleProject(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除质控样检测项目业务")
@Parameter(name = "id", description = "编号", required = true)
//@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
public CommonResult<Boolean> deleteBusinessQualityControlSampleProject(@RequestParam("id") Long id) {
businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProject(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除质控样检测项目业务")
//@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:delete')")
public CommonResult<Boolean> deleteBusinessQualityControlSampleProjectList(@RequestBody BatchDeleteReqVO req) {
businessQualityControlSampleProjectService.deleteBusinessQualityControlSampleProjectListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得质控样检测项目业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
public CommonResult<BusinessQualityControlSampleProjectRespVO> getBusinessQualityControlSampleProject(@RequestParam("id") Long id) {
BusinessQualityControlSampleProjectDO businessQualityControlSampleProject = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProject(id);
return success(BeanUtils.toBean(businessQualityControlSampleProject, BusinessQualityControlSampleProjectRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得质控样检测项目业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:query')")
public CommonResult<PageResult<BusinessQualityControlSampleProjectRespVO>> getBusinessQualityControlSampleProjectPage(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO) {
PageResult<BusinessQualityControlSampleProjectDO> pageResult = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessQualityControlSampleProjectRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出质控样检测项目业务 Excel")
//@PreAuthorize("@ss.hasPermission('qms:business-quality-control-sample-project:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessQualityControlSampleProjectExcel(@Valid BusinessQualityControlSampleProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessQualityControlSampleProjectDO> list = businessQualityControlSampleProjectService.getBusinessQualityControlSampleProjectPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "质控样检测项目业务.xls", "数据", BusinessQualityControlSampleProjectRespVO.class,
BeanUtils.toBean(list, BusinessQualityControlSampleProjectRespVO.class));
}
}

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

@@ -1,5 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleAssayResultPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleAssayResultRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleAssayResultSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +44,14 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@PostMapping("/create")
@Operation(summary = "创建委检登记来样品位")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:create')")
public CommonResult<BusinessSampleAssayResultRespVO> createBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO createReqVO) {
return success(businessSampleAssayResultService.createBusinessSampleAssayResult(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新委检登记来样品位")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:update')")
public CommonResult<Boolean> updateBusinessSampleAssayResult(@Valid @RequestBody BusinessSampleAssayResultSaveReqVO updateReqVO) {
businessSampleAssayResultService.updateBusinessSampleAssayResult(updateReqVO);
return success(true);
@@ -58,7 +60,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@DeleteMapping("/delete")
@Operation(summary = "删除委检登记来样品位")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
public CommonResult<Boolean> deleteBusinessSampleAssayResult(@RequestParam("id") Long id) {
businessSampleAssayResultService.deleteBusinessSampleAssayResult(id);
return success(true);
@@ -67,7 +69,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除委检登记来样品位")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:delete')")
public CommonResult<Boolean> deleteBusinessSampleAssayResultList(@RequestBody BatchDeleteReqVO req) {
businessSampleAssayResultService.deleteBusinessSampleAssayResultListByIds(req.getIds());
return success(true);
@@ -76,7 +78,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@GetMapping("/get")
@Operation(summary = "获得委检登记来样品位")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
public CommonResult<BusinessSampleAssayResultRespVO> getBusinessSampleAssayResult(@RequestParam("id") Long id) {
BusinessSampleAssayResultDO businessSampleAssayResult = businessSampleAssayResultService.getBusinessSampleAssayResult(id);
return success(BeanUtils.toBean(businessSampleAssayResult, BusinessSampleAssayResultRespVO.class));
@@ -84,7 +86,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@GetMapping("/page")
@Operation(summary = "获得委检登记来样品位分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:query')")
public CommonResult<PageResult<BusinessSampleAssayResultRespVO>> getBusinessSampleAssayResultPage(@Valid BusinessSampleAssayResultPageReqVO pageReqVO) {
PageResult<BusinessSampleAssayResultDO> pageResult = businessSampleAssayResultService.getBusinessSampleAssayResultPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleAssayResultRespVO.class));
@@ -92,7 +94,7 @@ public class BusinessSampleAssayResultController implements BusinessControllerMa
@GetMapping("/export-excel")
@Operation(summary = "导出委检登记来样品位 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-assay-result:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleAssayResultExcel(@Valid BusinessSampleAssayResultPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

166
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchController.java Normal file
View File

@@ -0,0 +1,166 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.alibaba.fastjson.JSONObject;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleDispatchPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleDispatchRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleDispatchSaveReqVO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleService;
import com.zt.plat.module.qms.enums.QmsCommonConstant;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.BUSINESS_SUB_SAMPLE_NOT_EXISTS;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleDispatchDO;
import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchService;
@Tag(name = "管理后台 - 样品调拨")
@RestController
@RequestMapping("/qms/business-sample-dispatch")
@Validated
public class BusinessSampleDispatchController implements BusinessControllerMarker {
@Resource private BusinessSampleDispatchService businessSampleDispatchService;
@Resource private BusinessSubSampleService businessSubSampleService;
@PostMapping("/createTempData")
@Operation(summary = "创建临时数据")
public CommonResult<BusinessSampleDispatchRespVO> createTempData() {
BusinessSampleDispatchSaveReqVO vo = new BusinessSampleDispatchSaveReqVO();
vo.setCancelStatus("-1");
return success(businessSampleDispatchService.createBusinessSampleDispatch(vo));
}
@PutMapping("/update")
@Operation(summary = "更新样品调拨")
public CommonResult<Boolean> updateBusinessSampleDispatch(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
updateReqVO.setCancelStatus("0");
businessSampleDispatchService.updateBusinessSampleDispatch(updateReqVO);
return success(true);
}
@PutMapping("/addOrRemoveSample")
@Operation(summary = "增加或移除样品")
public CommonResult<Boolean> addOrRemoveSample(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
businessSampleDispatchService.addOrRemoveSample(updateReqVO);
return success(true);
}
@PutMapping("/addBySampleCode")
@Operation(summary = "增加或移除样品")
public CommonResult<Boolean> addBySampleCode(HttpServletRequest request) {
String id = request.getParameter("id");
String sampleCode = request.getParameter("sampleCode");
BusinessSubSampleDO businessSubSampleDO = businessSubSampleService.getBySampleCode(sampleCode);
if(businessSubSampleDO == null)
return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "未查询到此样品！");
//判断样品状态
String returnStatus = businessSubSampleDO.getReturnStatus();
if(!QmsCommonConstant.COMPLETED.equals(returnStatus)){
return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "样品状态为："+returnStatus+"，不能调拨！");
}
String dispatchStatus = businessSubSampleDO.getDispatchStatus();
if("1".equals(dispatchStatus)){
return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "样品已被调拨：请归还后再调拨！");
}
List<Long> sampleIds = new ArrayList<>();
sampleIds.add(businessSubSampleDO.getId());
BusinessSampleDispatchSaveReqVO updateReqVO = new BusinessSampleDispatchSaveReqVO();
updateReqVO.setId(Long.valueOf(id));
updateReqVO.setAddSubSampleIds(sampleIds);
businessSampleDispatchService.addOrRemoveSample(updateReqVO);
return success(true);
}
@PostMapping("/createProcessInstance")
@Operation(summary = "发起流程")
public CommonResult<BusinessSampleDispatchRespVO> createProcessInstance(@Valid @RequestBody BusinessSampleDispatchSaveReqVO vo) {
return businessSampleDispatchService.createProcessInstance(vo);
}
@PostMapping("/execDispatch")
@Operation(summary = "执行调拨")
public CommonResult<String> execDispatch(@Valid @RequestBody BusinessSampleDispatchSaveReqVO vo) {
return businessSampleDispatchService.execDispatch(vo);
}
@PostMapping("/execGiveback")
@Operation(summary = "调拨归还")
public CommonResult<String> execGiveback(@RequestBody JSONObject vo) {
return businessSampleDispatchService.execGiveback(vo);
}
@DeleteMapping("/delete")
@Operation(summary = "删除样品调拨")
@Parameter(name = "id", description = "编号", required = true)
// @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:delete')")
public CommonResult<Boolean> deleteBusinessSampleDispatch(@RequestParam("id") Long id) {
businessSampleDispatchService.deleteBusinessSampleDispatch(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品调拨")
@PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:delete')")
public CommonResult<Boolean> deleteBusinessSampleDispatchList(@RequestBody BatchDeleteReqVO req) {
businessSampleDispatchService.deleteBusinessSampleDispatchListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得样品调拨")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
// @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:query')")
public CommonResult<BusinessSampleDispatchRespVO> getBusinessSampleDispatch(@RequestParam("id") Long id) {
BusinessSampleDispatchDO businessSampleDispatch = businessSampleDispatchService.getBusinessSampleDispatch(id);
return success(BeanUtils.toBean(businessSampleDispatch, BusinessSampleDispatchRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得样品调拨分页")
// @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:query')")
public CommonResult<PageResult<BusinessSampleDispatchRespVO>> getBusinessSampleDispatchPage(@Valid BusinessSampleDispatchPageReqVO pageReqVO) {
PageResult<BusinessSampleDispatchDO> pageResult = businessSampleDispatchService.getBusinessSampleDispatchPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleDispatchRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出样品调拨 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleDispatchExcel(@Valid BusinessSampleDispatchPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessSampleDispatchDO> list = businessSampleDispatchService.getBusinessSampleDispatchPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "样品调拨.xls", "数据", BusinessSampleDispatchRespVO.class,
BeanUtils.toBean(list, BusinessSampleDispatchRespVO.class));
}
}

133
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchDetailController.java Normal file
View File

@@ -0,0 +1,133 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleService;
import com.zt.plat.module.qms.enums.QmsCommonConstant;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS;
import static com.zt.plat.module.qms.enums.ErrorCodeConstants.BUSINESS_SUB_SAMPLE_NOT_EXISTS;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleDispatchDetailDO;
import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchDetailService;
@Tag(name = "管理后台 - 样品调拨明细")
@RestController
@RequestMapping("/qms/business-sample-dispatch-detail")
@Validated
public class BusinessSampleDispatchDetailController implements BusinessControllerMarker {
@Resource private BusinessSampleDispatchDetailService businessSampleDispatchDetailService;
@Resource private BusinessSubSampleService businessSubSampleService;
@GetMapping("/searchBySampleCode")
@Operation(summary = "扫码查询待归还样品")
public CommonResult<BusinessSampleDispatchDetailExtendRespVO> searchBySampleCode(HttpServletRequest request) {
String sampleCode = request.getParameter("sampleCode");
if(ObjectUtils.isEmpty(sampleCode))
return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "请输入样品编号！");
BusinessSampleDispatchDetailPageReqVO reqVO = new BusinessSampleDispatchDetailPageReqVO();
reqVO.setSampleCode(sampleCode);
reqVO.setBorrowStatus("1");
reqVO.setGivebackStatus("0");
PageResult<BusinessSampleDispatchDetailExtendRespVO> pageResult = businessSampleDispatchDetailService.getBusinessSampleDispatchDetailPage(reqVO);
if(pageResult.getTotal() == 0)
return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "未查询到此样品！");
if(pageResult.getList().size() > 1)
return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "样品编号重复，请联系管理员检查数据！");
BusinessSampleDispatchDetailExtendRespVO businessSampleDispatchDetailExtendRespVO = pageResult.getList().get(0);
return success(businessSampleDispatchDetailExtendRespVO);
}
@PostMapping("/create")
@Operation(summary = "创建样品调拨明细")
// @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:create')")
public CommonResult<BusinessSampleDispatchDetailRespVO> createBusinessSampleDispatchDetail(@Valid @RequestBody BusinessSampleDispatchDetailSaveReqVO createReqVO) {
return success(businessSampleDispatchDetailService.createBusinessSampleDispatchDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新样品调拨明细")
// @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:update')")
public CommonResult<Boolean> updateBusinessSampleDispatchDetail(@Valid @RequestBody BusinessSampleDispatchDetailSaveReqVO updateReqVO) {
businessSampleDispatchDetailService.updateBusinessSampleDispatchDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除样品调拨明细")
@Parameter(name = "id", description = "编号", required = true)
// @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:delete')")
public CommonResult<Boolean> deleteBusinessSampleDispatchDetail(@RequestParam("id") Long id) {
businessSampleDispatchDetailService.deleteBusinessSampleDispatchDetail(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品调拨明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:delete')")
public CommonResult<Boolean> deleteBusinessSampleDispatchDetailList(@RequestBody BatchDeleteReqVO req) {
businessSampleDispatchDetailService.deleteBusinessSampleDispatchDetailListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得样品调拨明细")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
// @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:query')")
public CommonResult<BusinessSampleDispatchDetailRespVO> getBusinessSampleDispatchDetail(@RequestParam("id") Long id) {
BusinessSampleDispatchDetailDO businessSampleDispatchDetail = businessSampleDispatchDetailService.getBusinessSampleDispatchDetail(id);
return success(BeanUtils.toBean(businessSampleDispatchDetail, BusinessSampleDispatchDetailRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得样品调拨明细分页")
// @PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:query')")
public CommonResult<PageResult<BusinessSampleDispatchDetailExtendRespVO>> getBusinessSampleDispatchDetailPage(@Valid BusinessSampleDispatchDetailPageReqVO pageReqVO) {
PageResult<BusinessSampleDispatchDetailExtendRespVO> pageResult = businessSampleDispatchDetailService.getBusinessSampleDispatchDetailPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/export-excel")
@Operation(summary = "导出样品调拨明细 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-dispatch-detail:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleDispatchDetailExcel(@Valid BusinessSampleDispatchDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessSampleDispatchDetailExtendRespVO> list = businessSampleDispatchDetailService.getBusinessSampleDispatchDetailPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "样品调拨明细.xls", "数据", BusinessSampleDispatchDetailRespVO.class,
BeanUtils.toBean(list, BusinessSampleDispatchDetailRespVO.class));
}
}

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

@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +42,14 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@PostMapping("/create")
@Operation(summary = "创建委检登记样品明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:create')")
public CommonResult<BusinessSampleEntrustDetailRespVO> createBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO createReqVO) {
return success(businessSampleEntrustDetailService.createBusinessSampleEntrustDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新委检登记样品明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:update')")
public CommonResult<Boolean> updateBusinessSampleEntrustDetail(@Valid @RequestBody BusinessSampleEntrustDetailSaveReqVO updateReqVO) {
businessSampleEntrustDetailService.updateBusinessSampleEntrustDetail(updateReqVO);
return success(true);
@@ -58,7 +58,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@DeleteMapping("/delete")
@Operation(summary = "删除委检登记样品明细")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustDetail(@RequestParam("id") Long id) {
businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetail(id);
return success(true);
@@ -67,7 +67,7 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除委检登记样品明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustDetailList(@RequestBody BatchDeleteReqVO req) {
businessSampleEntrustDetailService.deleteBusinessSampleEntrustDetailListByIds(req.getIds());
return success(true);
@@ -76,30 +76,37 @@ public class BusinessSampleEntrustDetailController implements BusinessController
@GetMapping("/get")
@Operation(summary = "获得委检登记样品明细")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
public CommonResult<BusinessSampleEntrustDetailRespVO> getBusinessSampleEntrustDetail(@RequestParam("id") Long id) {
BusinessSampleEntrustDetailDO businessSampleEntrustDetail = businessSampleEntrustDetailService.getBusinessSampleEntrustDetail(id);
return success(BeanUtils.toBean(businessSampleEntrustDetail, BusinessSampleEntrustDetailRespVO.class));
}
@GetMapping("/list")
@Operation(summary = "获得委检登记样品明细列表")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
public CommonResult<List<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailList(@Valid BusinessSampleEntrustDetailReqVO reqVO) {
List<BusinessSampleEntrustDetailExtendRespVO> listResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailList(reqVO);
return success(listResult);
}
@GetMapping("/page")
@Operation(summary = "获得委检登记样品明细分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
public CommonResult<PageResult<BusinessSampleEntrustDetailRespVO>> getBusinessSampleEntrustDetailPage(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustDetailDO> pageResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustDetailRespVO.class));
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:query')")
public CommonResult<PageResult<BusinessSampleEntrustDetailExtendRespVO>> getBusinessSampleEntrustDetailPage(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustDetailExtendRespVO> pageResult = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/export-excel")
@Operation(summary = "导出委检登记样品明细 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-detail:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleEntrustDetailExcel(@Valid BusinessSampleEntrustDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessSampleEntrustDetailDO> list = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO).getList();
List<BusinessSampleEntrustDetailExtendRespVO> list = businessSampleEntrustDetailService.getBusinessSampleEntrustDetailPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "委检登记样品明细.xls", "数据", BusinessSampleEntrustDetailRespVO.class,
BeanUtils.toBean(list, BusinessSampleEntrustDetailRespVO.class));

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

@@ -1,5 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustProjectPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustProjectRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustProjectSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +44,14 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@PostMapping("/create")
@Operation(summary = "创建委检样品检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:create')")
public CommonResult<BusinessSampleEntrustProjectRespVO> createBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO createReqVO) {
return success(businessSampleEntrustProjectService.createBusinessSampleEntrustProject(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新委检样品检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:update')")
public CommonResult<Boolean> updateBusinessSampleEntrustProject(@Valid @RequestBody BusinessSampleEntrustProjectSaveReqVO updateReqVO) {
businessSampleEntrustProjectService.updateBusinessSampleEntrustProject(updateReqVO);
return success(true);
@@ -58,7 +60,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@DeleteMapping("/delete")
@Operation(summary = "删除委检样品检测项目业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustProject(@RequestParam("id") Long id) {
businessSampleEntrustProjectService.deleteBusinessSampleEntrustProject(id);
return success(true);
@@ -67,7 +69,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除委检样品检测项目业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustProjectList(@RequestBody BatchDeleteReqVO req) {
businessSampleEntrustProjectService.deleteBusinessSampleEntrustProjectListByIds(req.getIds());
return success(true);
@@ -76,7 +78,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@GetMapping("/get")
@Operation(summary = "获得委检样品检测项目业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
public CommonResult<BusinessSampleEntrustProjectRespVO> getBusinessSampleEntrustProject(@RequestParam("id") Long id) {
BusinessSampleEntrustProjectDO businessSampleEntrustProject = businessSampleEntrustProjectService.getBusinessSampleEntrustProject(id);
return success(BeanUtils.toBean(businessSampleEntrustProject, BusinessSampleEntrustProjectRespVO.class));
@@ -84,7 +86,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@GetMapping("/page")
@Operation(summary = "获得委检样品检测项目业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:query')")
public CommonResult<PageResult<BusinessSampleEntrustProjectRespVO>> getBusinessSampleEntrustProjectPage(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustProjectDO> pageResult = businessSampleEntrustProjectService.getBusinessSampleEntrustProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleEntrustProjectRespVO.class));
@@ -92,7 +94,7 @@ public class BusinessSampleEntrustProjectController implements BusinessControlle
@GetMapping("/export-excel")
@Operation(summary = "导出委检样品检测项目业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-project:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleEntrustProjectExcel(@Valid BusinessSampleEntrustProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

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

@@ -1,5 +1,9 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +14,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -43,14 +46,14 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@PostMapping("/create")
@Operation(summary = "创建委检登记业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:create')")
public CommonResult<BusinessSampleEntrustRegistrationRespVO> createBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO createReqVO) {
return success(businessSampleEntrustRegistrationService.createBusinessSampleEntrustRegistration(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新委检登记业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:update')")
public CommonResult<Boolean> updateBusinessSampleEntrustRegistration(@Valid @RequestBody BusinessSampleEntrustRegistrationSaveReqVO updateReqVO) {
businessSampleEntrustRegistrationService.updateBusinessSampleEntrustRegistration(updateReqVO);
return success(true);
@@ -59,7 +62,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@DeleteMapping("/delete")
@Operation(summary = "删除委检登记业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustRegistration(@RequestParam("id") Long id) {
businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistration(id);
return success(true);
@@ -68,7 +71,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除委检登记业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:delete')")
public CommonResult<Boolean> deleteBusinessSampleEntrustRegistrationList(@RequestBody BatchDeleteReqVO req) {
businessSampleEntrustRegistrationService.deleteBusinessSampleEntrustRegistrationListByIds(req.getIds());
return success(true);
@@ -77,7 +80,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@GetMapping("/get")
@Operation(summary = "获得委检登记业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
public CommonResult<BusinessSampleEntrustRegistrationRespVO> getBusinessSampleEntrustRegistration(@RequestParam("id") Long id) {
BusinessSampleEntrustRegistrationDO businessSampleEntrustRegistration = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistration(id);
return success(BeanUtils.toBean(businessSampleEntrustRegistration, BusinessSampleEntrustRegistrationRespVO.class));
@@ -85,7 +88,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@GetMapping("/page")
@Operation(summary = "获得委检登记业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:query')")
public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> getBusinessSampleEntrustRegistrationPage(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustRegistrationExtendRespVO> pageResult = businessSampleEntrustRegistrationService.getBusinessSampleEntrustRegistrationPage(pageReqVO);
return success(pageResult);
@@ -93,7 +96,7 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
@GetMapping("/export-excel")
@Operation(summary = "导出委检登记业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-entrust-registration:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleEntrustRegistrationExcel(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -104,4 +107,11 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
BeanUtils.toBean(list, BusinessSampleEntrustRegistrationRespVO.class));
}
@GetMapping("/queryWaitingDataForReport")
@Operation(summary = "查询待编制数据")
public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> queryWaitingDataForReport(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustRegistrationExtendRespVO> result = businessSampleEntrustRegistrationService.queryWaitingDataForReport(pageReqVO);
return success(result);
}
}

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

@@ -1,5 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -27,6 +29,7 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleHandoverDO;
import com.zt.plat.module.qms.business.bus.service.BusinessSampleHandoverService;
import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@@ -42,14 +45,14 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@PostMapping("/create")
@Operation(summary = "创建样品交接单业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:create')")
public CommonResult<BusinessSampleHandoverRespVO> createBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO createReqVO) {
return success(businessSampleHandoverService.createBusinessSampleHandover(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新样品交接单业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:update')")
public CommonResult<Boolean> updateBusinessSampleHandover(@Valid @RequestBody BusinessSampleHandoverSaveReqVO updateReqVO) {
businessSampleHandoverService.updateBusinessSampleHandover(updateReqVO);
return success(true);
@@ -58,7 +61,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@DeleteMapping("/delete")
@Operation(summary = "删除样品交接单业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
public CommonResult<Boolean> deleteBusinessSampleHandover(@RequestParam("id") Long id) {
businessSampleHandoverService.deleteBusinessSampleHandover(id);
return success(true);
@@ -67,7 +70,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品交接单业务")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:delete')")
public CommonResult<Boolean> deleteBusinessSampleHandoverList(@RequestBody BatchDeleteReqVO req) {
businessSampleHandoverService.deleteBusinessSampleHandoverListByIds(req.getIds());
return success(true);
@@ -76,15 +79,23 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@GetMapping("/get")
@Operation(summary = "获得样品交接单业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
public CommonResult<BusinessSampleHandoverRespVO> getBusinessSampleHandover(@RequestParam("id") Long id) {
BusinessSampleHandoverDO businessSampleHandover = businessSampleHandoverService.getBusinessSampleHandover(id);
return success(BeanUtils.toBean(businessSampleHandover, BusinessSampleHandoverRespVO.class));
}
@GetMapping("/reportDetail")
@Operation(summary = "除样品交接详情数据")
public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
JSONObject jsonObject = businessSampleHandoverService.reportDetail(id);
return success(jsonObject);
}
@GetMapping("/page")
@Operation(summary = "获得样品交接单业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:query')")
public CommonResult<PageResult<BusinessSampleHandoverRespVO>> getBusinessSampleHandoverPage(@Valid BusinessSampleHandoverPageReqVO pageReqVO) {
PageResult<BusinessSampleHandoverDO> pageResult = businessSampleHandoverService.getBusinessSampleHandoverPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverRespVO.class));
@@ -92,7 +103,7 @@ public class BusinessSampleHandoverController implements BusinessControllerMarke
@GetMapping("/export-excel")
@Operation(summary = "导出样品交接单业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleHandoverExcel(@Valid BusinessSampleHandoverPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

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

@@ -1,5 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverDetailPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverDetailRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverDetailSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +44,14 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@PostMapping("/create")
@Operation(summary = "创建样品交接明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:create')")
public CommonResult<BusinessSampleHandoverDetailRespVO> createBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO createReqVO) {
return success(businessSampleHandoverDetailService.createBusinessSampleHandoverDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新样品交接明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:update')")
public CommonResult<Boolean> updateBusinessSampleHandoverDetail(@Valid @RequestBody BusinessSampleHandoverDetailSaveReqVO updateReqVO) {
businessSampleHandoverDetailService.updateBusinessSampleHandoverDetail(updateReqVO);
return success(true);
@@ -58,7 +60,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@DeleteMapping("/delete")
@Operation(summary = "删除样品交接明细")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
public CommonResult<Boolean> deleteBusinessSampleHandoverDetail(@RequestParam("id") Long id) {
businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetail(id);
return success(true);
@@ -67,7 +69,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除样品交接明细")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:delete')")
public CommonResult<Boolean> deleteBusinessSampleHandoverDetailList(@RequestBody BatchDeleteReqVO req) {
businessSampleHandoverDetailService.deleteBusinessSampleHandoverDetailListByIds(req.getIds());
return success(true);
@@ -76,7 +78,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@GetMapping("/get")
@Operation(summary = "获得样品交接明细")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
public CommonResult<BusinessSampleHandoverDetailRespVO> getBusinessSampleHandoverDetail(@RequestParam("id") Long id) {
BusinessSampleHandoverDetailDO businessSampleHandoverDetail = businessSampleHandoverDetailService.getBusinessSampleHandoverDetail(id);
return success(BeanUtils.toBean(businessSampleHandoverDetail, BusinessSampleHandoverDetailRespVO.class));
@@ -84,7 +86,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@GetMapping("/page")
@Operation(summary = "获得样品交接明细分页")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')")
public CommonResult<PageResult<BusinessSampleHandoverDetailRespVO>> getBusinessSampleHandoverDetailPage(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO) {
PageResult<BusinessSampleHandoverDetailDO> pageResult = businessSampleHandoverDetailService.getBusinessSampleHandoverDetailPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverDetailRespVO.class));
@@ -92,7 +94,7 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle
@GetMapping("/export-excel")
@Operation(summary = "导出样品交接明细 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSampleHandoverDetailExcel(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

117
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java Normal file
View File

@@ -0,0 +1,117 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleDO;
import com.zt.plat.module.qms.business.bus.service.BusinessStandardSampleService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 标准样业务")
@RestController
@RequestMapping("/qms/business-standard-sample")
@Validated
public class BusinessStandardSampleController implements BusinessControllerMarker {
@Resource
private BusinessStandardSampleService businessStandardSampleService;
@PostMapping("/create")
@Operation(summary = "创建标准样业务")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:create')")
public CommonResult<BusinessStandardSampleRespVO> createBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO createReqVO) {
return success(businessStandardSampleService.createBusinessStandardSample(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新标准样业务")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:update')")
public CommonResult<Boolean> updateBusinessStandardSample(@Valid @RequestBody BusinessStandardSampleSaveReqVO updateReqVO) {
businessStandardSampleService.updateBusinessStandardSample(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除标准样业务")
@Parameter(name = "id", description = "编号", required = true)
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
public CommonResult<Boolean> deleteBusinessStandardSample(@RequestParam("id") Long id) {
businessStandardSampleService.deleteBusinessStandardSample(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除标准样业务")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:delete')")
public CommonResult<Boolean> deleteBusinessStandardSampleList(@RequestBody BatchDeleteReqVO req) {
businessStandardSampleService.deleteBusinessStandardSampleListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得标准样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
public CommonResult<BusinessStandardSampleRespVO> getBusinessStandardSample(@RequestParam("id") Long id) {
BusinessStandardSampleDO businessStandardSample = businessStandardSampleService.getBusinessStandardSample(id);
return success(BeanUtils.toBean(businessStandardSample, BusinessStandardSampleRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得标准样业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:query')")
public CommonResult<PageResult<BusinessStandardSampleRespVO>> getBusinessStandardSamplePage(@Valid BusinessStandardSamplePageReqVO pageReqVO) {
PageResult<BusinessStandardSampleDO> pageResult = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class));
}
// @GetMapping("/getBusinessStandardSampleByConfigQCSampleMethodId")
// public CommonResult<?> getBusinessStandardSampleByConfigQCSampleMethodId(@RequestParam("configQCSampleMethodId") Long configQCSampleMethodId) {
// List<BusinessStandardSampleExtendRespVO> list = businessStandardSampleService.getBusinessStandardSampleByConfigQCSampleMethodId(configQCSampleMethodId);
// return success(list);
// }
@GetMapping("/getBusinessStandardSampleLeafList")
public CommonResult<?> getBusinessStandardSampleLeafList() {
List<BusinessStandardSampleExtendRespVO> list = businessStandardSampleService.getBusinessStandardSampleLeafList();
return success(list);
}
@GetMapping("/export-excel")
@Operation(summary = "导出标准样业务 Excel")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessStandardSampleExcel(@Valid BusinessStandardSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessStandardSampleDO> list = businessStandardSampleService.getBusinessStandardSamplePage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "标准样业务.xls", "数据", BusinessStandardSampleRespVO.class,
BeanUtils.toBean(list, BusinessStandardSampleRespVO.class));
}
}

108
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleProjectController.java Normal file
View File

@@ -0,0 +1,108 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleProjectPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleProjectRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSampleProjectSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleProjectDO;
import com.zt.plat.module.qms.business.bus.service.BusinessStandardSampleProjectService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 标准样检测项目业务")
@RestController
@RequestMapping("/qms/business-standard-sample-project")
@Validated
public class BusinessStandardSampleProjectController implements BusinessControllerMarker {
@Resource
private BusinessStandardSampleProjectService businessStandardSampleProjectService;
@PostMapping("/create")
@Operation(summary = "创建标准样检测项目业务")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:create')")
public CommonResult<BusinessStandardSampleProjectRespVO> createBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO createReqVO) {
return success(businessStandardSampleProjectService.createBusinessStandardSampleProject(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新标准样检测项目业务")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:update')")
public CommonResult<Boolean> updateBusinessStandardSampleProject(@Valid @RequestBody BusinessStandardSampleProjectSaveReqVO updateReqVO) {
businessStandardSampleProjectService.updateBusinessStandardSampleProject(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除标准样检测项目业务")
@Parameter(name = "id", description = "编号", required = true)
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
public CommonResult<Boolean> deleteBusinessStandardSampleProject(@RequestParam("id") Long id) {
businessStandardSampleProjectService.deleteBusinessStandardSampleProject(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除标准样检测项目业务")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:delete')")
public CommonResult<Boolean> deleteBusinessStandardSampleProjectList(@RequestBody BatchDeleteReqVO req) {
businessStandardSampleProjectService.deleteBusinessStandardSampleProjectListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得标准样检测项目业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
public CommonResult<BusinessStandardSampleProjectRespVO> getBusinessStandardSampleProject(@RequestParam("id") Long id) {
BusinessStandardSampleProjectDO businessStandardSampleProject = businessStandardSampleProjectService.getBusinessStandardSampleProject(id);
return success(BeanUtils.toBean(businessStandardSampleProject, BusinessStandardSampleProjectRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得标准样检测项目业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:query')")
public CommonResult<PageResult<BusinessStandardSampleProjectRespVO>> getBusinessStandardSampleProjectPage(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO) {
PageResult<BusinessStandardSampleProjectDO> pageResult = businessStandardSampleProjectService.getBusinessStandardSampleProjectPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessStandardSampleProjectRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出标准样检测项目业务 Excel")
//@PreAuthorize("@ss.hasPermission('qms:business-standard-sample-project:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessStandardSampleProjectExcel(@Valid BusinessStandardSampleProjectPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessStandardSampleProjectDO> list = businessStandardSampleProjectService.getBusinessStandardSampleProjectPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "标准样检测项目业务.xls", "数据", BusinessStandardSampleProjectRespVO.class,
BeanUtils.toBean(list, BusinessStandardSampleProjectRespVO.class));
}
}

106
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubParentSampleAssessmentController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
import com.zt.plat.module.qms.business.bus.service.BusinessSubParentSampleAssessmentService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 班组判定数据业务")
@RestController
@RequestMapping("/qms/business-sub-parent-sample-assessment")
@Validated
public class BusinessSubParentSampleAssessmentController implements BusinessControllerMarker {
@Resource
private BusinessSubParentSampleAssessmentService businessSubParentSampleAssessmentService;
@PostMapping("/create")
@Operation(summary = "创建班组判定数据业务")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:create')")
public CommonResult<BusinessSubParentSampleAssessmentRespVO> createBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO createReqVO) {
return success(businessSubParentSampleAssessmentService.createBusinessSubParentSampleAssessment(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新班组判定数据业务")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:update')")
public CommonResult<Boolean> updateBusinessSubParentSampleAssessment(@Valid @RequestBody BusinessSubParentSampleAssessmentSaveReqVO updateReqVO) {
businessSubParentSampleAssessmentService.updateBusinessSubParentSampleAssessment(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除班组判定数据业务")
@Parameter(name = "id", description = "编号", required = true)
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
public CommonResult<Boolean> deleteBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessment(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除班组判定数据业务")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:delete')")
public CommonResult<Boolean> deleteBusinessSubParentSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
businessSubParentSampleAssessmentService.deleteBusinessSubParentSampleAssessmentListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得班组判定数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
public CommonResult<BusinessSubParentSampleAssessmentRespVO> getBusinessSubParentSampleAssessment(@RequestParam("id") Long id) {
BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessment = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessment(id);
return success(BeanUtils.toBean(businessSubParentSampleAssessment, BusinessSubParentSampleAssessmentRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得班组判定数据业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:query')")
public CommonResult<PageResult<BusinessSubParentSampleAssessmentRespVO>> getBusinessSubParentSampleAssessmentPage(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO) {
PageResult<BusinessSubParentSampleAssessmentDO> pageResult = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleAssessmentRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出班组判定数据业务 Excel")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample-assessment:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubParentSampleAssessmentExcel(@Valid BusinessSubParentSampleAssessmentPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessSubParentSampleAssessmentDO> list = businessSubParentSampleAssessmentService.getBusinessSubParentSampleAssessmentPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "班组判定数据业务.xls", "数据", BusinessSubParentSampleAssessmentRespVO.class,
BeanUtils.toBean(list, BusinessSubParentSampleAssessmentRespVO.class));
}
}

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

@@ -1,5 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSamplePageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +44,14 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@PostMapping("/create")
@Operation(summary = "创建分样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:create')")
public CommonResult<BusinessSubParentSampleRespVO> createBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO createReqVO) {
return success(businessSubParentSampleService.createBusinessSubParentSample(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新分样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:update')")
public CommonResult<Boolean> updateBusinessSubParentSample(@Valid @RequestBody BusinessSubParentSampleSaveReqVO updateReqVO) {
businessSubParentSampleService.updateBusinessSubParentSample(updateReqVO);
return success(true);
@@ -58,7 +60,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@DeleteMapping("/delete")
@Operation(summary = "删除分样业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
public CommonResult<Boolean> deleteBusinessSubParentSample(@RequestParam("id") Long id) {
businessSubParentSampleService.deleteBusinessSubParentSample(id);
return success(true);
@@ -67,7 +69,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除分样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:delete')")
public CommonResult<Boolean> deleteBusinessSubParentSampleList(@RequestBody BatchDeleteReqVO req) {
businessSubParentSampleService.deleteBusinessSubParentSampleListByIds(req.getIds());
return success(true);
@@ -76,7 +78,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@GetMapping("/get")
@Operation(summary = "获得分样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
public CommonResult<BusinessSubParentSampleRespVO> getBusinessSubParentSample(@RequestParam("id") Long id) {
BusinessSubParentSampleDO businessSubParentSample = businessSubParentSampleService.getBusinessSubParentSample(id);
return success(BeanUtils.toBean(businessSubParentSample, BusinessSubParentSampleRespVO.class));
@@ -84,7 +86,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@GetMapping("/page")
@Operation(summary = "获得分样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:query')")
public CommonResult<PageResult<BusinessSubParentSampleRespVO>> getBusinessSubParentSamplePage(@Valid BusinessSubParentSamplePageReqVO pageReqVO) {
PageResult<BusinessSubParentSampleDO> pageResult = businessSubParentSampleService.getBusinessSubParentSamplePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubParentSampleRespVO.class));
@@ -92,7 +94,7 @@ public class BusinessSubParentSampleController implements BusinessControllerMark
@GetMapping("/export-excel")
@Operation(summary = "导出分样业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-parent-sample:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubParentSampleExcel(@Valid BusinessSubParentSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

108
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleAnalysisGroupController.java Normal file
View File

@@ -0,0 +1,108 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAnalysisGroupPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAnalysisGroupRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAnalysisGroupSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO;
import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleAnalysisGroupService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 子样分析班组业务")
@RestController
@RequestMapping("/qms/business-sub-sample-analysis-group")
@Validated
public class BusinessSubSampleAnalysisGroupController implements BusinessControllerMarker {
@Resource
private BusinessSubSampleAnalysisGroupService businessSubSampleAnalysisGroupService;
@PostMapping("/create")
@Operation(summary = "创建子样分析班组业务")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:create')")
public CommonResult<BusinessSubSampleAnalysisGroupRespVO> createBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO createReqVO) {
return success(businessSubSampleAnalysisGroupService.createBusinessSubSampleAnalysisGroup(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新子样分析班组业务")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:update')")
public CommonResult<Boolean> updateBusinessSubSampleAnalysisGroup(@Valid @RequestBody BusinessSubSampleAnalysisGroupSaveReqVO updateReqVO) {
businessSubSampleAnalysisGroupService.updateBusinessSubSampleAnalysisGroup(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除子样分析班组业务")
@Parameter(name = "id", description = "编号", required = true)
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) {
businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroup(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样分析班组业务")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleAnalysisGroupList(@RequestBody BatchDeleteReqVO req) {
businessSubSampleAnalysisGroupService.deleteBusinessSubSampleAnalysisGroupListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得子样分析班组业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
public CommonResult<BusinessSubSampleAnalysisGroupRespVO> getBusinessSubSampleAnalysisGroup(@RequestParam("id") Long id) {
BusinessSubSampleAnalysisGroupDO businessSubSampleAnalysisGroup = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroup(id);
return success(BeanUtils.toBean(businessSubSampleAnalysisGroup, BusinessSubSampleAnalysisGroupRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得子样分析班组业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:query')")
public CommonResult<PageResult<BusinessSubSampleAnalysisGroupRespVO>> getBusinessSubSampleAnalysisGroupPage(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO) {
PageResult<BusinessSubSampleAnalysisGroupDO> pageResult = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroupPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubSampleAnalysisGroupRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出子样分析班组业务 Excel")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-analysis-group:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubSampleAnalysisGroupExcel(@Valid BusinessSubSampleAnalysisGroupPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessSubSampleAnalysisGroupDO> list = businessSubSampleAnalysisGroupService.getBusinessSubSampleAnalysisGroupPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "子样分析班组业务.xls", "数据", BusinessSubSampleAnalysisGroupRespVO.class,
BeanUtils.toBean(list, BusinessSubSampleAnalysisGroupRespVO.class));
}
}

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

@@ -1,5 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleAssessmentSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -42,14 +44,14 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@PostMapping("/create")
@Operation(summary = "创建子样判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:create')")
public CommonResult<BusinessSubSampleAssessmentRespVO> createBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO createReqVO) {
return success(businessSubSampleAssessmentService.createBusinessSubSampleAssessment(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新子样判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:update')")
public CommonResult<Boolean> updateBusinessSubSampleAssessment(@Valid @RequestBody BusinessSubSampleAssessmentSaveReqVO updateReqVO) {
businessSubSampleAssessmentService.updateBusinessSubSampleAssessment(updateReqVO);
return success(true);
@@ -58,7 +60,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@DeleteMapping("/delete")
@Operation(summary = "删除子样判定数据业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleAssessment(@RequestParam("id") Long id) {
businessSubSampleAssessmentService.deleteBusinessSubSampleAssessment(id);
return success(true);
@@ -67,7 +69,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样判定数据业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleAssessmentList(@RequestBody BatchDeleteReqVO req) {
businessSubSampleAssessmentService.deleteBusinessSubSampleAssessmentListByIds(req.getIds());
return success(true);
@@ -76,7 +78,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@GetMapping("/get")
@Operation(summary = "获得子样判定数据业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
public CommonResult<BusinessSubSampleAssessmentRespVO> getBusinessSubSampleAssessment(@RequestParam("id") Long id) {
BusinessSubSampleAssessmentDO businessSubSampleAssessment = businessSubSampleAssessmentService.getBusinessSubSampleAssessment(id);
return success(BeanUtils.toBean(businessSubSampleAssessment, BusinessSubSampleAssessmentRespVO.class));
@@ -84,7 +86,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@GetMapping("/page")
@Operation(summary = "获得子样判定数据业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:query')")
public CommonResult<PageResult<BusinessSubSampleAssessmentRespVO>> getBusinessSubSampleAssessmentPage(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO) {
PageResult<BusinessSubSampleAssessmentDO> pageResult = businessSubSampleAssessmentService.getBusinessSubSampleAssessmentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubSampleAssessmentRespVO.class));
@@ -92,7 +94,7 @@ public class BusinessSubSampleAssessmentController implements BusinessController
@GetMapping("/export-excel")
@Operation(summary = "导出子样判定数据业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-assessment:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubSampleAssessmentExcel(@Valid BusinessSubSampleAssessmentPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {

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

@@ -1,5 +1,7 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import com.alibaba.fastjson.JSONObject;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -10,7 +12,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -26,7 +27,9 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
import com.zt.plat.module.qms.business.bus.service.BusinessAssayTaskDataService;
import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleService;
import com.zt.plat.module.qms.enums.QmsCommonConstant;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@@ -39,17 +42,20 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@Resource
private BusinessSubSampleService businessSubSampleService;
@Resource
private BusinessAssayTaskDataService businessAssayTaskDataService;
@PostMapping("/create")
@Operation(summary = "创建子样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:create')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:create')")
public CommonResult<BusinessSubSampleRespVO> createBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO createReqVO) {
return success(businessSubSampleService.createBusinessSubSample(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新子样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:update')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:update')")
public CommonResult<Boolean> updateBusinessSubSample(@Valid @RequestBody BusinessSubSampleSaveReqVO updateReqVO) {
businessSubSampleService.updateBusinessSubSample(updateReqVO);
return success(true);
@@ -58,7 +64,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete")
@Operation(summary = "删除子样业务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
public CommonResult<Boolean> deleteBusinessSubSample(@RequestParam("id") Long id) {
businessSubSampleService.deleteBusinessSubSample(id);
return success(true);
@@ -67,7 +73,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除子样业务")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleList(@RequestBody BatchDeleteReqVO req) {
businessSubSampleService.deleteBusinessSubSampleListByIds(req.getIds());
return success(true);
@@ -76,15 +82,17 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@GetMapping("/get")
@Operation(summary = "获得子样业务")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<BusinessSubSampleRespVO> getBusinessSubSample(@RequestParam("id") Long id) {
BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id);
return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class));
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<BusinessSubSampleExtendRespVO> getBusinessSubSample(@RequestParam("id") Long id) {
// BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id);
// return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class));
BusinessSubSampleExtendRespVO result = businessSubSampleService.getBusinessSubSample(id);
return success(result);
}
@GetMapping("/list")
@Operation(summary = "获得子样业务列表")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<?> getBusinessSubSampleList(@Valid BusinessSubSampleReqVO reqVO) {
List<BusinessSubSampleExtendRespVO> listResult = businessSubSampleService.getBusinessSubSampleList(reqVO);
return success(listResult);
@@ -92,11 +100,34 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@GetMapping("/page")
@Operation(summary = "获得子样业务分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSamplePage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
return success(pageResult);
}
@GetMapping("/page-stock")
@Operation(summary = "查询样品库分页数据")
public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> pageStock(@Valid BusinessSubSamplePageReqVO pageReqVO) {
PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
return success(pageResult);
}
@GetMapping("/page-task")
@Operation(summary = "获得子样业务分页")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
public CommonResult<PageResult<BusinessSubSampleExtendRespVO>> getBusinessSubSampleAndTaskPage(@Valid BusinessSubSamplePageReqVO pageReqVO) {
PageResult<BusinessSubSampleExtendRespVO> pageResult = businessSubSampleService.getBusinessSubSamplePage(pageReqVO);
List<BusinessSubSampleExtendRespVO> list = pageResult.getList();
for (BusinessSubSampleExtendRespVO businessSubSampleExtendRespVO : list) {
BusinessAssayTaskDataReqVO search = new BusinessAssayTaskDataReqVO();
search.setBusinessSubSampleId(businessSubSampleExtendRespVO.getId());
search.setIsAssignTasked(QmsCommonConstant.NO);
List<BusinessAssayTaskDataExtendRespVO> businessAssayTaskDataList = businessAssayTaskDataService.getBusinessAssayTaskDataList(search);
businessSubSampleExtendRespVO.setBusinessAssayTaskDataList(businessAssayTaskDataList);
}
return success(pageResult);
}
@GetMapping("/getBySampleCodeAndFlowKey")
@Operation(summary = "根据样品编号及样品流程节点key获取样品信息")
@@ -107,7 +138,7 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
@GetMapping("/export-excel")
@Operation(summary = "导出子样业务 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:export')")
//@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubSampleExcel(@Valid BusinessSubSamplePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -118,4 +149,24 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
BeanUtils.toBean(list, BusinessSubSampleRespVO.class));
}
@PostMapping("/execReturnToStock")
@Operation(summary = "样品归库")
public CommonResult<BusinessSubSampleRespVO> execReturnToStock(@Valid @RequestBody BusinessSubSampleSaveReqVO reqVO) {
return success(businessSubSampleService.execReturnToStock(reqVO));
}
@PostMapping("/execTakeOff")
@Operation(summary = "样品下架")
public CommonResult<Integer> execTakeOff(@RequestBody JSONObject reqVO) {
Integer count = businessSubSampleService.execTakeOff(reqVO);
return success(count);
}
@PostMapping("/execChangeLocation")
@Operation(summary = "库位变更")
public CommonResult<Integer> execChangeLocation(@RequestBody JSONObject reqVO) {
Integer count = businessSubSampleService.execChangeLocation(reqVO);
return success(count);
}
}

106
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleParentRecheckController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleParentRecheckDO;
import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleParentRecheckService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 分样复检业务数据")
@RestController
@RequestMapping("/qms/business-sub-sample-parent-recheck")
@Validated
public class BusinessSubSampleParentRecheckController implements BusinessControllerMarker {
@Resource
private BusinessSubSampleParentRecheckService businessSubSampleParentRecheckService;
@PostMapping("/create")
@Operation(summary = "创建分样复检业务数据")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:create')")
public CommonResult<BusinessSubSampleParentRecheckRespVO> createBusinessSubSampleParentRecheck(@Valid @RequestBody BusinessSubSampleParentRecheckSaveReqVO createReqVO) {
return success(businessSubSampleParentRecheckService.createBusinessSubSampleParentRecheck(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新分样复检业务数据")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:update')")
public CommonResult<Boolean> updateBusinessSubSampleParentRecheck(@Valid @RequestBody BusinessSubSampleParentRecheckSaveReqVO updateReqVO) {
businessSubSampleParentRecheckService.updateBusinessSubSampleParentRecheck(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除分样复检业务数据")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleParentRecheck(@RequestParam("id") Long id) {
businessSubSampleParentRecheckService.deleteBusinessSubSampleParentRecheck(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除分样复检业务数据")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:delete')")
public CommonResult<Boolean> deleteBusinessSubSampleParentRecheckList(@RequestBody BatchDeleteReqVO req) {
businessSubSampleParentRecheckService.deleteBusinessSubSampleParentRecheckListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得分样复检业务数据")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:query')")
public CommonResult<BusinessSubSampleParentRecheckRespVO> getBusinessSubSampleParentRecheck(@RequestParam("id") Long id) {
BusinessSubSampleParentRecheckDO businessSubSampleParentRecheck = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheck(id);
return success(BeanUtils.toBean(businessSubSampleParentRecheck, BusinessSubSampleParentRecheckRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得分样复检业务数据分页")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:query')")
public CommonResult<PageResult<BusinessSubSampleParentRecheckRespVO>> getBusinessSubSampleParentRecheckPage(@Valid BusinessSubSampleParentRecheckPageReqVO pageReqVO) {
PageResult<BusinessSubSampleParentRecheckDO> pageResult = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheckPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessSubSampleParentRecheckRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出分样复检业务数据 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-sub-sample-parent-recheck:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessSubSampleParentRecheckExcel(@Valid BusinessSubSampleParentRecheckPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessSubSampleParentRecheckDO> list = businessSubSampleParentRecheckService.getBusinessSubSampleParentRecheckPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "分样复检业务数据.xls", "数据", BusinessSubSampleParentRecheckRespVO.class,
BeanUtils.toBean(list, BusinessSubSampleParentRecheckRespVO.class));
}
}

105
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessXRFDataController.java Normal file
View File

@@ -0,0 +1,105 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.object.BeanUtils;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessXRFDataDO;
import com.zt.plat.module.qms.business.bus.service.BusinessXRFDataService;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@Tag(name = "管理后台 - 荧光采集记录")
@RestController
@RequestMapping("/qms/business-xrf-data")
@Validated
public class BusinessXRFDataController implements BusinessControllerMarker {
@Resource
private BusinessXRFDataService businessXRFDataService;
@PostMapping("/create")
@Operation(summary = "创建荧光采集记录")
@PreAuthorize("@ss.hasPermission('qms:business-XRF-data:create')")
public CommonResult<BusinessXRFDataRespVO> createBusinessXRFData(@Valid @RequestBody BusinessXRFDataSaveReqVO createReqVO) {
return success(businessXRFDataService.createBusinessXRFData(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新荧光采集记录")
@PreAuthorize("@ss.hasPermission('qms:business-XRF-data:update')")
public CommonResult<Boolean> updateBusinessXRFData(@Valid @RequestBody BusinessXRFDataSaveReqVO updateReqVO) {
businessXRFDataService.updateBusinessXRFData(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除荧光采集记录")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('qms:business-XRF-data:delete')")
public CommonResult<Boolean> deleteBusinessXRFData(@RequestParam("id") Long id) {
businessXRFDataService.deleteBusinessXRFData(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除荧光采集记录")
@PreAuthorize("@ss.hasPermission('qms:business-XRF-data:delete')")
public CommonResult<Boolean> deleteBusinessXRFDataList(@RequestBody BatchDeleteReqVO req) {
businessXRFDataService.deleteBusinessXRFDataListByIds(req.getIds());
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得荧光采集记录")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('qms:business-XRF-data:query')")
public CommonResult<BusinessXRFDataRespVO> getBusinessXRFData(@RequestParam("id") Long id) {
BusinessXRFDataDO businessXRFData = businessXRFDataService.getBusinessXRFData(id);
return success(BeanUtils.toBean(businessXRFData, BusinessXRFDataRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得荧光采集记录分页")
@PreAuthorize("@ss.hasPermission('qms:business-XRF-data:query')")
public CommonResult<PageResult<BusinessXRFDataRespVO>> getBusinessXRFDataPage(@Valid BusinessXRFDataPageReqVO pageReqVO) {
PageResult<BusinessXRFDataDO> pageResult = businessXRFDataService.getBusinessXRFDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, BusinessXRFDataRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出荧光采集记录 Excel")
@PreAuthorize("@ss.hasPermission('qms:business-XRF-data:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportBusinessXRFDataExcel(@Valid BusinessXRFDataPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<BusinessXRFDataDO> list = businessXRFDataService.getBusinessXRFDataPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "荧光采集记录.xls", "数据", BusinessXRFDataRespVO.class,
BeanUtils.toBean(list, BusinessXRFDataRespVO.class));
}
}

116
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisAuditController.java Normal file
View File

@@ -0,0 +1,116 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
import com.zt.plat.module.qms.enums.QmsCommonConstant;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
/**
* 分析审核
*/
@Tag(name = "管理后台 - 样品分析")
@RestController
@RequestMapping("/qms/bus/sample/analysis-audit")
@Validated
public class SampleAnalysisAuditController {
@Resource
private SampleAnalysisAuditService sampleAnalysisAuditService;
@GetMapping("/crossAuditByTaskId")
public CommonResult<?> crossAuditByTaskId(Long businessAssayTaskId) {
JSONObject result = sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId);
return success(result);
}
/**
* 交叉审核
* @return
*/
@PostMapping("/crossAudit")
public CommonResult<?> crossAudit(Long businessAssayTaskId, String auditStatus) {
sampleAnalysisAuditService.crossAuditByByTaskId(businessAssayTaskId, auditStatus);
return success("成功");
}
@GetMapping("/getSampleResultAssessmentList")
public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String assessmentStatus) {
JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, assessmentStatus);
return success(result);
}
@GetMapping("/getResultAssessment")
public CommonResult<?> getResultAssessment(String assayType, Long sampleId, Long configAssayMethodId) {
JSONObject result = null;
if (QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL.equals(assayType)) {//平行
result = sampleAnalysisAuditService.getParallelResultAssessment(sampleId, configAssayMethodId);
} else if (QmsCommonConstant.ASSAY_TYPE_DOUBLE_CUP.equals(assayType)) {//双杯
result = sampleAnalysisAuditService.getDoubleCupResultAssessment(sampleId, configAssayMethodId);
}
return success(result);
}
//平行分析结果判定
@GetMapping("/getParallelResultAssessment")
public CommonResult<?> getParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId) {
JSONObject result = sampleAnalysisAuditService.getParallelResultAssessment(businessSubSampleId, configAssayMethodId);
return success(result);
}
//双杯分析结果判定
@GetMapping("/getDoubleCupResultAssessment")
public CommonResult<?> getDoubleCupResultAssessment(Long businessSubParentSampleId, Long configAssayMethodId) {
JSONObject result = sampleAnalysisAuditService.getDoubleCupResultAssessment(businessSubParentSampleId, configAssayMethodId);
return success(result);
}
//修改结果判定
@PostMapping("/modifyResultAssessment")
public CommonResult<?> modifyResultAssessment(@RequestBody ModifyResultAssessmentReqVO reqVO) {
JSONObject result = null;
if (QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL.equals(reqVO.getAssayType())) {//平行
result = sampleAnalysisAuditService.modifyParallelResultAssessment(reqVO.getSampleId(), reqVO.getConfigAssayMethodId(), reqVO.getSampleAssessmentId(), reqVO.getBusinessAssayProjectDataIds());
} else if (QmsCommonConstant.ASSAY_TYPE_DOUBLE_CUP.equals(reqVO.getAssayType())) {//双杯
}
return success(result);
}
//判定数据上报
@PostMapping("/assessmentDataReporting")
public CommonResult<?> assessmentDataReporting(Long businessSubSampleId, Long configAssayMethodId) {
sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleId, configAssayMethodId);
return success("成功");
}
@PostMapping("/batchAssessmentDataReporting")
public CommonResult<?> batchAssessmentDataReporting(@RequestBody BatchAssessmentDataReportingReqVO reqVO) {
for (Long businessSubSampleId : reqVO.getBusinessSubSampleIds()) {
sampleAnalysisAuditService.assessmentDataReporting(businessSubSampleId, reqVO.getConfigAssayMethodId());
}
return success("成功");
}
//重新创建复检委托
@PostMapping("/createReAnalysis")
public CommonResult<?> createReAnalysis(Long businessSubSampleId, Long configAssayMethodId) {
sampleAnalysisAuditService.createReAnalysis(businessSubSampleId, configAssayMethodId);
return success("成功");
}
}

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

@@ -0,0 +1,80 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
/**
* 样品分析
*/
@Tag(name = "管理后台 - 样品分析")
@RestController
@RequestMapping("/qms/bus/sample/analysis")
@Validated
public class SampleAnalysisController {
@Resource
private SampleAnalysisService sampleAnalysisService ;
@GetMapping("/batchSampleAnalysisByTaskId")
public CommonResult<?> batchSampleAnalysisByTaskId(Long businessAssayTaskId) {
BusinessAssayTaskAnalysisSampleProjectRespVO businessAssayTaskAnalysisSampleProject = sampleAnalysisService.batchSampleAnalysisByTaskId(businessAssayTaskId);
return success(businessAssayTaskAnalysisSampleProject);
}
@PostMapping("/saveBatchSampleAnalysis")
public CommonResult<?> saveBatchSampleAnalysis(@RequestBody BusinessAssayTaskAnalysisSampleProjectRespVO vo) {
sampleAnalysisService.saveBatchSampleAnalysis(vo);
return success("成功");
}
@GetMapping("/batchSampleAndQcAnalysisByTaskId")
public CommonResult<?> batchSampleAndQcAnalysisByTaskId(Long businessAssayTaskId) {
BusinessAssayTaskAnalysisSampleAndQcProjectRespVO businessAssayTaskAnalysisSampleAndQcProject = sampleAnalysisService.batchSampleAndQcAnalysisByTaskId(businessAssayTaskId);
return success(businessAssayTaskAnalysisSampleAndQcProject);
}
@PostMapping("/saveBatchSmpleAndQcAnalysis")
public CommonResult<?> saveBatchSmpleAndQcAnalysis(@RequestBody BusinessAssayTaskAnalysisSampleAndQcProjectRespVO vo) {
sampleAnalysisService.saveBatchSmpleAndQcAnalysis(vo);
return success("成功");
}
//下发配料
@PostMapping("/issuedIngredients")
public CommonResult<?> issuedIngredients(Long businessAssayTaskId) {
sampleAnalysisService.issuedIngredients(businessAssayTaskId);
return success("成功");
}
@PostMapping("/submitSampleAnalysisByTaskId")
public CommonResult<?> submitSampleAnalysisByTaskId(Long businessAssayTaskId) {
sampleAnalysisService.submitSampleAnalysisByTaskId(businessAssayTaskId);
return success("成功");
}
@GetMapping("/getSampleAnalysisDataByTaskDataId")
public CommonResult<?> getSampleAnalysisDataByTaskDataId(Long businessAssayTaskDataId) {
JSONObject json = sampleAnalysisService.getSampleAnalysisDataByTaskDataId(businessAssayTaskDataId);
return success(json);
}
@PostMapping("/rollbackAnalysisSample")
public CommonResult<?> rollbackAnalysisSample(@RequestBody BusinessAssayTaskBackSampleReqVO req) {
sampleAnalysisService.rollbackAnalysisSample(req);
return success("成功");
}
}

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

@@ -3,10 +3,8 @@ package com.zt.plat.module.qms.business.bus.controller.admin;
import static com.zt.plat.framework.common.pojo.CommonResult.error;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationSubmitReqVO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -16,16 +14,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.tenant.core.context.TenantContextHolder;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustDetail;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustDetailProject;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustParam;
import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleEntrustContext;
import com.zt.plat.module.qms.business.bus.service.SampleEntrustService;
@@ -54,7 +49,7 @@ public class SampleEntrustController {
if (response.isSuccess()) {
return success(response.getContextBean(SampleEntrustContext.class));
} else {
return error(500, response.getMessage());
return error(1_032_100_000, response.getMessage());
}
}
@@ -64,6 +59,14 @@ public class SampleEntrustController {
BusinessSampleEntrustRegistrationExtendRespVO sampleEntrustRegistration = sampleEntrustService.detail(id);
return success(sampleEntrustRegistration);
}
@GetMapping("/reportDetail")
@Operation(summary = "委托单详情数据")
public CommonResult<?> reportDetail(@RequestParam("id") Long id) {
JSONObject jsonObject = sampleEntrustService.reportDetail(id);
return success(jsonObject);
}
@PostMapping("/update")
@Operation(summary = "修改委托登记")
@@ -72,7 +75,7 @@ public class SampleEntrustController {
if (response.isSuccess()) {
return success(response.getContextBean(SampleEntrustContext.class));
} else {
return error(500, response.getMessage());
return error(1_032_100_000, response.getMessage());
}
}
@@ -103,71 +106,4 @@ public class SampleEntrustController {
return success(true);
}
@PostMapping("/test")
public CommonResult<?> test() {
Long tenantId = TenantContextHolder.getRequiredTenantId();
SampleEntrustDetail sampleEntrustDetail_1 = new SampleEntrustDetail();
sampleEntrustDetail_1.setBaseSampleId(1000000000000000001L);//铜精矿(结算样)
sampleEntrustDetail_1.setDictionaryBusinessId(1965289473129664514L);
sampleEntrustDetail_1.setSampleName("铜精矿");
sampleEntrustDetail_1.setEntrustSampleCode("SRC0001");
sampleEntrustDetail_1.setEntrustSampleName("来样名称-铜精矿");
sampleEntrustDetail_1.setSort(1);
sampleEntrustDetail_1.setAssayProject("");
sampleEntrustDetail_1.setForecastResult("");
sampleEntrustDetail_1.setRemark("");
List<SampleEntrustDetailProject> sampleEntrustDetailProjectList_1 = new ArrayList<>();
SampleEntrustDetailProject sampleEntrustDetailProject_1_1 = new SampleEntrustDetailProject();
sampleEntrustDetailProject_1_1.setMaterialAssayStandardDetailId(1000000000000000001L);
sampleEntrustDetailProject_1_1.setIsEnabled(1);
sampleEntrustDetailProjectList_1.add(sampleEntrustDetailProject_1_1);
sampleEntrustDetail_1.setSampleEntrustDetailProjectList(sampleEntrustDetailProjectList_1);
SampleEntrustDetail sampleEntrustDetail_2 = new SampleEntrustDetail();
sampleEntrustDetail_2.setBaseSampleId(1000000000000000001L);//铜精矿(结算样)
sampleEntrustDetail_2.setDictionaryBusinessId(1965289473129664514L);
sampleEntrustDetail_2.setSampleName("铜精矿");
sampleEntrustDetail_2.setEntrustSampleCode("SRC0002");
sampleEntrustDetail_2.setEntrustSampleName("来样名称-铜精矿");
sampleEntrustDetail_2.setSort(2);
sampleEntrustDetail_2.setAssayProject("");
sampleEntrustDetail_2.setForecastResult("");
sampleEntrustDetail_2.setRemark("");
List<SampleEntrustDetailProject> sampleEntrustDetailProjectList_2 = new ArrayList<>();
SampleEntrustDetailProject sampleEntrustDetailProject_2_1 = new SampleEntrustDetailProject();
sampleEntrustDetailProject_2_1.setMaterialAssayStandardDetailId(1000000000000000001L);
sampleEntrustDetailProject_2_1.setIsEnabled(1);
sampleEntrustDetailProjectList_2.add(sampleEntrustDetailProject_2_1);
sampleEntrustDetail_2.setSampleEntrustDetailProjectList(sampleEntrustDetailProjectList_2);
List<SampleEntrustDetail> sampleEntrustDetailList = new ArrayList<>();
sampleEntrustDetailList.add(sampleEntrustDetail_1);
sampleEntrustDetailList.add(sampleEntrustDetail_2);
SampleEntrustParam sampleEntrustParam = new SampleEntrustParam();
sampleEntrustParam.setId(1965960610828763137L);
sampleEntrustParam.setEntrustUnit("西南铜业");
sampleEntrustParam.setSampleSender("送样人");
sampleEntrustParam.setConfigEntrustSourceId(1000000000000000001L);
sampleEntrustParam.setSampleSendDate(LocalDateTime.now());
sampleEntrustParam.setSampleQuantity(2);
sampleEntrustParam.setRemaineSampleRequirement("放弃1");
sampleEntrustParam.setSampleEntrustDetailList(sampleEntrustDetailList);
String jsonString = JSON.toJSONString(sampleEntrustParam);
System.out.println(jsonString);
LiteflowResponse response = flowExecutor.execute2Resp("sampleEntrustChain" + tenantId, sampleEntrustParam, SampleEntrustContext.class);
if (response.isSuccess()) {
return success(response.getContextBean(SampleEntrustContext.class));
} else {
return error(500, response.getMessage());
}
//return success(FlowBus.getNodeMap());
}
}

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

@@ -47,4 +47,136 @@ public class SampleFlowController {
return success(response.getContextBean(SampleFlowContext.class));
}
@GetMapping("/test")
public CommonResult<?> test() {
SampleFlowDefinition sampleFlowDefinition = new SampleFlowDefinition();
sampleFlowDefinition.setFlowKey("flw_sub_sample_process");
sampleFlowDefinition.setFlowName("子样样品流转流程");
List<SampleFlowNode> flowNodeList = new ArrayList<>();
SampleFlowNode zxr = new SampleFlowNode();
zxr.setNodeName("中心收样");
zxr.setNodeKey("flw_center_receive");
zxr.setSort(3100);
SampleFlowNode zxs = new SampleFlowNode();
zxs.setNodeName("中心送样");
zxs.setNodeKey("flw_center_send");
zxs.setSort(3200);
SampleFlowNode bzr = new SampleFlowNode();
bzr.setNodeName("班组收样");
bzr.setNodeKey("flw_team_receive");
bzr.setSort(3300);
SampleFlowNode ypbm = new SampleFlowNode();
ypbm.setNodeName("样品编密");
ypbm.setNodeKey("flw_sample_encrypt");
ypbm.setSort(3400);
// SampleFlowNode fxr = new SampleFlowNode();
// fxr.setNodeName("分析收样");
// fxr.setNodeKey("flw_analysis_receive");
// fxr.setSort(3500);
//
SampleFlowNode fx = new SampleFlowNode();
fx.setNodeName("样品分析");
fx.setNodeKey("flw_analysis");
fx.setSort(3550);
//
// SampleFlowNode fxs = new SampleFlowNode();
// fxs.setNodeName("分析送样");
// fxs.setNodeKey("flw_analysis_send");
// fxs.setSort(3600);
SampleFlowNode bzs = new SampleFlowNode();
bzs.setNodeName("班组送样");
bzs.setNodeKey("flw_team_send");
bzs.setSort(3700);
SampleFlowNode ypgk = new SampleFlowNode();
ypgk.setNodeName("样品归库");
ypgk.setNodeKey("flw_sample_storage");
ypgk.setSort(3800);
ypgk.setNextFlowNodeList(null);
flowNodeList.add(ypgk);
zxr.setNextFlowNodeList(new ArrayList<SampleFlowNode>() {
{
add(BeanUtils.toBean(zxs,SampleFlowNode.class).setIsDefault(true));
}
});
flowNodeList.add(zxr);
zxs.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(bzr,SampleFlowNode.class).setIsDefault(true));
}});
flowNodeList.add(zxs);
bzr.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
}});
flowNodeList.add(bzr);
ypbm.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true));
}});
flowNodeList.add(ypbm);
// fxr.setNextFlowNodeList(new ArrayList<>() {{
// add(BeanUtils.toBean(fxs,SampleFlowNode.class).setIsDefault(true));
// }});
// flowNodeList.add(fxr);
//
//
// fxs.setNextFlowNodeList(new ArrayList<>() {{
// add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
// }});
// flowNodeList.add(fxs);
fx.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
}});
flowNodeList.add(fx);
bzs.setNextFlowNodeList(new ArrayList<>() {{
add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("当前部门数据已全部判断上报"));
add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("当前样品所有分析任务已全部上报完"));
}});
flowNodeList.add(bzs);
sampleFlowDefinition.setFlowNodeList(flowNodeList);
String jsonSampleFlowDefinition = JSON.toJSONString(sampleFlowDefinition);
System.out.println(jsonSampleFlowDefinition);
Long tenantId = TenantContextHolder.getRequiredTenantId();
List<SampleFlowInfo> sampleFlowInfoList = new ArrayList<>();
sampleFlowInfoList.add(new SampleFlowInfo().setId(1967550576457330690L).setIsWeighing(0));
SampleFlowParam sampleFlowParam = new SampleFlowParam();
sampleFlowParam.setSampleSourceType(2);
sampleFlowParam.setCurrentSampleFlowKey("P3000");
sampleFlowParam.setSampleFlowInfoList(sampleFlowInfoList);
LiteflowResponse response = flowExecutor.execute2Resp("sampleFlowChain" + tenantId, sampleFlowParam, SampleFlowContext.class);
if (response.isSuccess()) {
return success(response.getContextBean(SampleFlowContext.class));
} else {
return error(1_032_100_000, response.getMessage());
}
//return success(FlowBus.getNodeMap());
}
}

86
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleResultReportingController.java Normal file
View File

@@ -0,0 +1,86 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson2.JSONObject;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.service.SampleResultReportingService;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import java.util.List;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* 结果上报
*/
@Tag(name = "管理后台 - 结果上报")
@RestController
@RequestMapping("/qms/bus/sample/result-reporting")
@Validated
public class SampleResultReportingController {
@Resource
private SampleResultReportingService sampleResultReportingService;
//获取未上报的方法
@GetMapping("/getUnReportMethodGroupList")
public CommonResult<?> getUnReportMethodGroupList() {
List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList();
return success(list);
}
//获取方法对应的样品
@GetMapping("/getSampleResultReportingList")
public CommonResult<?> getSampleResultReportingList(Long configAssayMethodId) {
JSONObject result = sampleResultReportingService.getSampleResultReportingList(configAssayMethodId);
return success(result);
}
//获取复检方法
@GetMapping("/getRecheckAssayMethodList")
public CommonResult<?> getRecheckMethodList(Long baseSampleId, Long businessSubParentSampleId, Long configAssayMethodId) {
List<RecheckSubSampleParentMethodRespVO> list = sampleResultReportingService.getRecheckAssayMethodList(baseSampleId, businessSubParentSampleId, configAssayMethodId);
return success(list);
}
//创建复检样
@PostMapping("/createRecheckSample")
public CommonResult<?> createRecheckSample(@RequestBody RecheckSubSampleParentCreateReqVO reqVO) {
sampleResultReportingService.createRecheckSample(reqVO);
return success("成功");
}
//上报
@PostMapping("/batchResultDataReporting")
public CommonResult<?> batchResultDataReporting(@RequestBody BatchResultDataReportingReqVO reqVO) {
sampleResultReportingService.batchResultDataReporting(reqVO);
return success("成功");
}
//结果单个结果查询
@GetMapping("/getSingleSampleResultReportingList")
public CommonResult<?> getSingleSampleResultReportingList(Long businessSubParentSampleId, Long configAssayMethodId) {
JSONObject result = sampleResultReportingService.getSingleSampleResultReportingList(businessSubParentSampleId, configAssayMethodId);
return success(result);
}
//修改结果
@PostMapping("/modifySampleResultReporting")
public CommonResult<?> modifySampleResultReporting(@RequestBody ModifySampleResultReportingReqVO reqVO) {
sampleResultReportingService.modifySampleResultReporting(reqVO);
return success("成功");
}
}

108
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java Normal file
View File

@@ -0,0 +1,108 @@
package com.zt.plat.module.qms.business.bus.controller.admin;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import java.util.List;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignManualParam;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethodParam;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam;
import com.zt.plat.module.qms.business.bus.service.SampleTaskAssignService;
import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@Tag(name = "管理后台 - 样品任务分配")
@RestController
@RequestMapping("/qms/bus/sample/task-assign")
@Validated
public class SampleTaskAssignController {
@Resource
private SampleTaskAssignService sampleTaskAssignService;
@Operation(description = "获取分配人员列表")
@GetMapping("/getAssignUserList")
public CommonResult<?> getAssignUserList() {
List<AdminUserRespDTO> list = sampleTaskAssignService.getAssignUserList();
return success(list);
}
@GetMapping("/getAssaySampleList")
public CommonResult<?> getAssaySampleList() {
List<UnAssignTaskedSubSampleRespVO> list = sampleTaskAssignService.getAssaySampleList();
return success(list);
}
@GetMapping("/getAssayMethodList")
public CommonResult<?> getAssayMethodList(Long businessSubSampleId, Long configAssayMethodId) {
List<Object> list = sampleTaskAssignService.getAssayMethodList(businessSubSampleId, configAssayMethodId);
return success(list);
}
@PostMapping("/changeMethod")
public CommonResult<?> changeMethod(@RequestBody ChangeAssayMethodReqVO req) {
sampleTaskAssignService.changeMethod(req);
return success("成功");
}
@PostMapping("/methodAssign")
public CommonResult<?> methodAssign(@RequestBody SampleTaskAssignMethodParam param) {
sampleTaskAssignService.methodAssign(param);
return success("成功");
}
@PostMapping("/manualAssign")
public CommonResult<?> manualAssign(@RequestBody SampleTaskAssignManualParam param) {
sampleTaskAssignService.manualAssign(param);
return success("成功");
}
@PostMapping("/sampleAssign")
public CommonResult<?> sampleAssign(@RequestBody SampleTaskAssignSampleParam param) {
sampleTaskAssignService.sampleAssign(param);
return success("成功");
}
@PostMapping("/removeAssignTaskDetail")
public CommonResult<?> removeAssignTaskDetail(@RequestBody BatchDeleteReqVO req) {
sampleTaskAssignService.removeAssignTaskDetail(req);
return success("成功");
}
@PostMapping("/createQcSample")
public CommonResult<?> createQcSample(@RequestBody CreateQcSampleReqVO req) {
sampleTaskAssignService.createQcSample(req);
return success("成功");
}
@PostMapping("/deleteQcSample")
public CommonResult<?> deleteQcSample(@RequestBody DeleteQcSampleReqVO req) {
sampleTaskAssignService.deleteQcSample(req);
return success("成功");
}
@PostMapping("/submitAssign")
public CommonResult<?> submitAssign(Long id) {
sampleTaskAssignService.submitAssign(id);
return success("成功");
}
@PostMapping("/voidAssign")
public CommonResult<?> voidAssign(Long id) {
sampleTaskAssignService.voidAssign(id);
return success("成功");
}
}

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

@@ -0,0 +1,13 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.util.List;
import lombok.Data;
@Data
public class BatchAssessmentDataReportingReqVO {
private List<Long> businessSubSampleIds;
private Long configAssayMethodId;
}

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

@@ -0,0 +1,13 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.util.List;
import lombok.Data;
@Data
public class BatchResultDataReportingReqVO {
private List<Long> businessSubParentSampleIds;
private Long configAssayMethodId;
}

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

@@ -0,0 +1,81 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.io.Serializable;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* <b>BatchSampleAnalysisColumn</b>
* <p>
* 更新历史：
* <pre> 版本 更新时间 更新者 更新内容<hr/>
* V1.0 2025年9月22日 wxr Add</pre>
* <b>Copyright (C) 云南志者竟成科技有限公司</b>
* </p>
* @author 王兴荣<wxr@wangxingrong.com>
* @version V1.0
* @since 2025年9月22日
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BatchSampleAnalysisColumnRespVO implements Serializable {
private static final long serialVersionUID = 4283609584147441164L;
@Schema(description = "列字索引名称")
private String fieldIndex;
@Schema(description = "列字段名")
private String field;
@Schema(description = "标题")
private String title;
@Schema(description = "列宽度")
private String width;
@Schema(description = "最小列宽度")
private String minWidth;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
private String dataType;
@Schema(description = "小数位数")
private Integer decimalPosition;
@Schema(description = "数字间隔")
private Float step;
@Schema(description = "计算公式")
private String formula;
@Schema(description = "参数编号")
private Integer paramNo;
@Schema(description = "是否允许编辑")
private Boolean isEdit;
@Schema(description = "单位")
private String unit;
/** 类型（project：元素，parameter：参数） **/
@Schema(description = "类型（project：元素，parameter：参数）")
private String type;
@Schema(description = "填写方式")
private String fillingWay;
@Schema(description = "参数分组_ID")
private Long groupDictionaryBusinessId;
@Schema(description = "参数分组_Key")
private String groupDictionaryBusinessKey;
@Schema(description = "参数分组_Name")
private String groupDictionaryBusinessName;
}

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

@@ -13,19 +13,19 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class BusinessAssayParameterDataPageReqVO extends PageParam {
@Schema(description = "检测项目业务ID", example = "31068")
@Schema(description = "检测项目业务ID", example = "4202")
private Long businessAssayProjectDataId;
@Schema(description = "检测方法分析项目参数配置表ID", example = "10849")
@Schema(description = "检测方法分析项目参数配置表ID", example = "9808")
private Long configAssayMethodProjectParameterId;
@Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "25302")
@Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "22549")
private Long dictionaryParameterId;
@Schema(description = "参数值")
@Schema(description = "值")
private String value;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
private String dataType;
@Schema(description = "小数位")
@@ -34,11 +34,11 @@ public class BusinessAssayParameterDataPageReqVO extends PageParam {
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "乐观锁", example = "7696")
@Schema(description = "乐观锁", example = "30975")
private Integer updateCount;
@Schema(description = "备注")

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

@@ -0,0 +1,47 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 检测参数数据业务分页 Request VO")
@Data
public class BusinessAssayParameterDataReqVO {
@Schema(description = "检测项目业务ID", example = "31068")
private Long businessAssayProjectDataId;
@Schema(description = "检测方法分析项目参数配置表ID", example = "10849")
private Long configAssayMethodProjectParameterId;
@Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "25302")
private Long dictionaryParameterId;
@Schema(description = "参数值")
private String value;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
private String dataType;
@Schema(description = "小数位")
private Integer decimalPosition;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "乐观锁", example = "7696")
private Integer updateCount;
@Schema(description = "备注")
private String remark;
}

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

@@ -12,28 +12,28 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class BusinessAssayParameterDataRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15246")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4344")
@ExcelProperty("ID")
private Long id;
@Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31068")
@Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4202")
@ExcelProperty("检测项目业务ID")
private Long businessAssayProjectDataId;
@Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10849")
@Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9808")
@ExcelProperty("检测方法分析项目参数配置表ID")
private Long configAssayMethodProjectParameterId;
@Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "25302")
@Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "22549")
@ExcelProperty("参数ID,字典表【T_DIC_PRM】")
private Long dictionaryParameterId;
@Schema(description = "参数值")
@ExcelProperty("参数值")
@Schema(description = "值")
@ExcelProperty("值")
private String value;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
private String dataType;
@Schema(description = "小数位")
@@ -44,11 +44,11 @@ public class BusinessAssayParameterDataRespVO {
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建日期")
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "7696")
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30975")
@ExcelProperty("乐观锁")
private Integer updateCount;

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

@@ -9,37 +9,35 @@ import jakarta.validation.constraints.*;
@Data
public class BusinessAssayParameterDataSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15246")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4344")
private Long id;
@Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31068")
@Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4202")
@NotNull(message = "检测项目业务ID不能为空")
private Long businessAssayProjectDataId;
@Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10849")
@Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9808")
@NotNull(message = "检测方法分析项目参数配置表ID不能为空")
private Long configAssayMethodProjectParameterId;
@Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "25302")
@Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "22549")
@NotNull(message = "参数ID,字典表【T_DIC_PRM】不能为空")
private Long dictionaryParameterId;
@Schema(description = "参数值")
@Schema(description = "值")
private String value;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
private String dataType;
@Schema(description = "小数位")
private Integer decimalPosition;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "所属部门不能为空")
private String systemDepartmentCode;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "7696")
@NotNull(message = "乐观锁不能为空")
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30975")
private Integer updateCount;
@Schema(description = "备注")

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

@@ -0,0 +1,72 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.io.Serializable;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 分析项目与参数
*/
@Data
public class BusinessAssayProjectAndParameterRespVO implements Serializable {
private static final long serialVersionUID = 2468650244768205378L;
/** id主键 **/
private Long id;
/** 元素或参数字典id **/
private Long dicId;
/** 元素或参数字典key **/
private String dicKey;
/** 元素或参数名称 **/
@Schema(description = "元素或参数名称")
private String name;
@Schema(description = "元素或参数显示名称")
private String showName;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
private String dataType;
@Schema(description = "小数位数")
private Integer decimalPosition;
/** 元素或参数单位 **/
@Schema(description = "元素或参数单位")
private String unit;
/** 结果值 **/
@Schema(description = "结果值")
private String value;
@Schema(description = "是否允许为空")
private Integer isNull;
/** 计算公式 **/
@Schema(description = "计算公式")
private String formula;
/** 元素或参数配置参数编号 **/
@Schema(description = "元素或参数配置参数编号")
private Integer paramNo;
/** 类型（project：元素，parameter：参数） **/
@Schema(description = "类型（project：元素，parameter：参数）")
private String type;
@Schema(description = "填写方式")
private String fillingWay;
@Schema(description = "参数分组_ID")
private Long groupDictionaryBusinessId;
@Schema(description = "参数分组_Key")
private String groupDictionaryBusinessKey;
@Schema(description = "参数分组_Name")
private String groupDictionaryBusinessName;
}

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

@@ -0,0 +1,50 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class BusinessAssayProjectDataExtendRespVO extends BusinessAssayProjectDataRespVO {
@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")
private Long businessAssayTaskId;
@Schema(description = "样品名称", example = "张三")
private String sampleName;
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "分析编号")
private String sampleAssayCode;
@Schema(description = "归库编号")
private String sampleReturnCode;
@Schema(description = "分析人员")
private String assayOperator;
@Schema(description = "检测项目key")
private String dictionaryProjectKey;
@Schema(description = "检测项目缩写")
private String simpleName;
@Schema(description = "显示名称")
private String showName;
@Schema(description = "单位")
private String dictionaryProjectUnit;
@Schema(description = "分析次数")
private Integer analysisCount;
}

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

@@ -13,19 +13,25 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class BusinessAssayProjectDataPageReqVO extends PageParam {
@Schema(description = "检测任务ID", example = "16505")
@Schema(description = "检测任务ID", example = "15606")
private Long businessAssayTaskDataId;
@Schema(description = "检测方法分析项目配置ID", example = "15654")
@Schema(description = "检测方法分析项目配置ID", example = "17620")
private Long configAssayMethodProjectId;
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "5352")
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "19038")
private Long dictionaryProjectId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "值")
private String value;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
private String dataType;
@Schema(description = "小数位")
@@ -34,16 +40,19 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam {
@Schema(description = "是否不参与超差判定")
private Integer isNotAssessment;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否启用")
private Integer isEnabled;
@Schema(description = "乐观锁", example = "30037")
@Schema(description = "乐观锁", example = "30046")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

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

@@ -0,0 +1,68 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 检测项目数据业务分页 Request VO")
@Data
public class BusinessAssayProjectDataReqVO {
@Schema(description = "分样子样ID", example = "20464")
private Long businessSubSampleId;
@Schema(description = "检测方法配置ID", example = "9130")
private Long configAssayMethodId;
@Schema(description = "检测任务ID", example = "16505")
private Long businessAssayTaskDataId;
@Schema(description = "检测方法分析项目配置ID", example = "15654")
private Long configAssayMethodProjectId;
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "5352")
private Long dictionaryProjectId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "值")
private String value;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "1")
private String dataType;
@Schema(description = "小数位")
private Integer decimalPosition;
@Schema(description = "是否不参与超差判定")
private Integer isNotAssessment;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否启用")
private Integer isEnabled;
@Schema(description = "乐观锁", example = "30037")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注")
private String remark;
}

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

@@ -12,28 +12,34 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class BusinessAssayProjectDataRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21103")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17927")
@ExcelProperty("ID")
private Long id;
@Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16505")
@Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15606")
@ExcelProperty("检测任务ID")
private Long businessAssayTaskDataId;
@Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15654")
@Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17620")
@ExcelProperty("检测方法分析项目配置ID")
private Long configAssayMethodProjectId;
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "5352")
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "19038")
@ExcelProperty("检测项目字典ID,字典表【T_DIC_PRJ】")
private Long dictionaryProjectId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "值")
@ExcelProperty("值")
private String value;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
private String dataType;
@Schema(description = "小数位")
@@ -44,11 +50,14 @@ public class BusinessAssayProjectDataRespVO {
@ExcelProperty("是否不参与超差判定")
private Integer isNotAssessment;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否启用")
private Integer isEnabled;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30037")
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30046")
@ExcelProperty("乐观锁")
private Integer updateCount;
@@ -56,8 +65,8 @@ public class BusinessAssayProjectDataRespVO {
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建日期")
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注")

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

@@ -9,26 +9,26 @@ import jakarta.validation.constraints.*;
@Data
public class BusinessAssayProjectDataSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21103")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17927")
private Long id;
@Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16505")
@Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15606")
@NotNull(message = "检测任务ID不能为空")
private Long businessAssayTaskDataId;
@Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15654")
@NotEmpty(message = "检测方法分析项目配置ID不能为空")
@Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "17620")
@NotNull(message = "检测方法分析项目配置ID不能为空")
private Long configAssayMethodProjectId;
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "5352")
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "19038")
@NotNull(message = "检测项目字典ID,字典表【T_DIC_PRJ】不能为空")
private Long dictionaryProjectId;
@Schema(description = "值")
private String value;
@Schema(description = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "数据类型,【字典】【jy_sample_data_type】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
private String dataType;
@Schema(description = "小数位")
@@ -38,16 +38,17 @@ public class BusinessAssayProjectDataSaveReqVO {
@NotNull(message = "是否不参与超差判定不能为空")
private Integer isNotAssessment;
@Schema(description = "方法检出下限值")
private String minimumLimitValue;
@Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否启用不能为空")
private Integer isEnabled;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30037")
@NotNull(message = "乐观锁不能为空")
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "30046")
private Integer updateCount;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "所属部门不能为空")
private String systemDepartmentCode;
@Schema(description = "备注")

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

@@ -0,0 +1,76 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 检测报表数据业务分页 Request VO")
@Data
public class BusinessAssayReportDataPageReqVO extends PageParam {
@Schema(description = "报表类型ID", example = "15805")
private Long configReportTypeId;
@Schema(description = "报表配置ID", example = "24960")
private Long configSampleReportId;
@Schema(description = "样品主样ID", example = "30453")
private Long businessBaseSampleId;
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "数据来源")
private String dataSource;
@Schema(description = "分析数据")
private String assayData;
@Schema(description = "是否已全部上报")
private Integer isAllReported;
@Schema(description = "已上报数据来源")
private String reportedSource;
@Schema(description = "流程code")
private String reportFlowCode;
@Schema(description = "报告数据明细id", example = "6437")
private Long documentDataId;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "乐观锁", example = "378")
private Integer updateCount;
@Schema(description = "备注")
private String remark;
//==================扩展字段===========
@Schema(description = "id列表")
private List<Long> idList;
@Schema(description = "样品名称")
private String sampleName;
@Schema(description = "主样创建时间范围")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] baseSampleCreateTime;
@Schema(description = "委托id列表")
private List<Long> businessSampleEntrustRegistrationIdList;
@Schema(description = "报告类型ID", example = "2124")
private Long reportDocumentTypeId;
}

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

@@ -0,0 +1,84 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 检测报表数据业务 Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessAssayReportDataRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5943")
@ExcelProperty("ID")
private Long id;
@Schema(description = "报表类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15805")
@ExcelProperty("报表类型ID")
private Long configReportTypeId;
@Schema(description = "报表配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24960")
@ExcelProperty("报表配置ID")
private Long configSampleReportId;
@Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30453")
@ExcelProperty("样品主样ID")
private Long businessBaseSampleId;
@Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品编号")
private String sampleCode;
@Schema(description = "数据来源")
private String dataSource;
@Schema(description = "分析数据")
@ExcelProperty("分析数据")
private String assayData;
@Schema(description = "是否已全部上报")
private Integer isAllReported;
@Schema(description = "已上报数据来源")
private String reportedSource;
@Schema(description = "流程code")
@ExcelProperty("流程code")
private String reportFlowCode;
@Schema(description = "报告数据明细id", example = "6437")
@ExcelProperty("报告数据明细id")
private Long documentDataId;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "378")
@ExcelProperty("乐观锁")
private Integer updateCount;
@Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
//=====自定义字段
@Schema(description = "样品名称")
@ExcelProperty("样品名称")
private String sampleName;
@Schema(description = "样品创建时间")
@ExcelProperty("样品创建时间")
private LocalDateTime baseSampleCreateTime;
}

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

@@ -0,0 +1,58 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 检测报表数据业务新增/修改 Request VO")
@Data
public class BusinessAssayReportDataSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5943")
private Long id;
@Schema(description = "报表类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15805")
@NotNull(message = "报表类型ID不能为空")
private Long configReportTypeId;
@Schema(description = "报表配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24960")
@NotNull(message = "报表配置ID不能为空")
private Long configSampleReportId;
@Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30453")
@NotNull(message = "样品主样ID不能为空")
private Long businessBaseSampleId;
@Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "样品编号不能为空")
private String sampleCode;
@Schema(description = "数据来源")
private String dataSource;
@Schema(description = "分析数据")
private String assayData;
@Schema(description = "是否已全部上报")
private Integer isAllReported;
@Schema(description = "已上报数据来源")
private String reportedSource;
@Schema(description = "流程code")
private String reportFlowCode;
@Schema(description = "报告数据明细id", example = "6437")
private Long documentDataId;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
private String systemDepartmentCode;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "378")
private Integer updateCount;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,67 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.time.LocalDateTime;
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;
/**
* 分配任务单 分析样品及质控样品检测项目
*/
@Data
public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
/** 分配任务单id **/
private Long businessAssayTaskId;
/** 任务分配单编号 **/
private String businessAssayTasNo;
/** 任务分配单名称 **/
private String businessAssayTasName;
/** 分析人员 **/
private String assayOperator;
/** 分析时间 **/
private LocalDateTime assayTime;
/** 检测方法id **/
private Long configAssayMethodId;
/** 检测方法名称 **/
private String configAssayMethodName;
/** 数据集key **/
private String dataCollectionKey;
/** 数据集id **/
private Long dataCollectionId;
/** 动态表单值 **/
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;
/** 分配任务的分析数据 **/
private List<BusinessAssayTaskAnalysisDataRespVO> assayTaskAnalysisDataList;
/** 检测方法分析项目补正系数 **/
private List<ConfigAssayMethodProjectCoefficientRespVO> configAssayMethodProjectCoefficientList;
/** 检测方法范围 **/
private List<ConfigAssayMethodProjectRangeRespVO> configAssayMethodProjectRangeList;
}

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

@@ -0,0 +1,66 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.time.LocalDateTime;
import java.util.List;
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;
/**
* 分配任务单分析样品项目
*/
@Data
public class BusinessAssayTaskAnalysisSampleProjectRespVO {
/** 分配任务单id **/
private Long businessAssayTaskId;
/** 任务分配单编号 **/
private String businessAssayTasNo;
/** 任务分配单名称 **/
private String businessAssayTasName;
/** 分析人员 **/
private String assayOperator;
/** 分析时间 **/
private LocalDateTime assayTime;
/** 检测方法id **/
private Long configAssayMethodId;
/** 检测方法名称 **/
private String configAssayMethodName;
/** 数据集key **/
private String dataCollectionKey;
/** 数据集id **/
private Long dataCollectionId;
/** 动态表单值 **/
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;
/** 分析的数据 **/
private List<Map<String, Object>> datas;
/** 检测方法分析项目补正系数 **/
private List<ConfigAssayMethodProjectCoefficientRespVO> configAssayMethodProjectCoefficientList;
/** 检测方法范围 **/
private List<ConfigAssayMethodProjectRangeRespVO> configAssayMethodProjectRangeList;
}

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

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

@@ -1,10 +1,18 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.time.LocalDateTime;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataRespVO {
@Schema(description = "收样人")
private String sampleReceiver;
@Schema(description = "收样时间")
private LocalDateTime sampleReceiveTime;
/** 分析方法名称 **/
@Schema(description = "分析方法名称")
@@ -18,4 +26,7 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
@Schema(description = "分析编号")
private String sampleAssayCode;
@Schema(description = "任务单模板key")
private String configReportTemplateKey;
}

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

@@ -0,0 +1,16 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.Data;
@Data
public class BusinessAssayTaskDataGroupRespVO {
private Long configAssayMethodId;
private String configAssayMethodName;
private String assayType;
private Integer sampleTaskCount;
}

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

@@ -13,36 +13,45 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class BusinessAssayTaskDataPageReqVO extends PageParam {
@Schema(description = "样品主样ID", example = "11587")
@Schema(description = "样品主样ID", example = "23293")
private Long businessBaseSampleId;
@Schema(description = "样品分样ID", example = "2157")
@Schema(description = "样品分样ID", example = "15024")
private Long businessSubParentSampleId;
@Schema(description = "分样子样ID", example = "2427")
@Schema(description = "分样子样ID", example = "20464")
private Long businessSubSampleId;
@Schema(description = "检测方法ID", example = "21835")
@Schema(description = "检测方法配置ID", example = "9130")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "15392")
@Schema(description = "指派单ID", example = "23566")
private Long businessAssayTaskId;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
private String taskType;
@Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "1")
@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;
@Schema(description = "任务指派时间")
@Schema(description = "分配任务时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskTime;
private LocalDateTime[] assignTaskTime;
@Schema(description = "是否已指派")
private Integer isTasked;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@@ -54,19 +63,26 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reportTime;
@Schema(description = "流程节点")
private String flowNode;
@Schema(description = "样品流程配置ID", example = "10639")
private Long configSampleFlowId;
@Schema(description = "复检次数,0代表正常分析", example = "27671")
private Integer recheckCount;
@Schema(description = "样品流程节点KEY")
private String sampleFlowNodeKey;
@Schema(description = "乐观锁", example = "4946")
@Schema(description = "样品流程节点时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] sampleFlowNodeTime;
@Schema(description = "分析次数,复检的累加次数", example = "13073")
private Integer analysisCount;
@Schema(description = "乐观锁", example = "11435")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

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

@@ -13,36 +13,45 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class BusinessAssayTaskDataReqVO {
@Schema(description = "样品主样ID", example = "11587")
@Schema(description = "样品主样ID", example = "23293")
private Long businessBaseSampleId;
@Schema(description = "样品分样ID", example = "2157")
@Schema(description = "样品分样ID", example = "15024")
private Long businessSubParentSampleId;
@Schema(description = "分样子样ID", example = "2427")
@Schema(description = "分样子样ID", example = "20464")
private Long businessSubSampleId;
@Schema(description = "检测方法ID", example = "21835")
@Schema(description = "检测方法配置ID", example = "9130")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "15392")
@Schema(description = "指派单ID", example = "23566")
private Long businessAssayTaskId;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
private String taskType;
@Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", example = "1")
@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;
@Schema(description = "任务指派时间")
@Schema(description = "分配任务时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskTime;
private LocalDateTime[] assignTaskTime;
@Schema(description = "是否已指派")
private Integer isTasked;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@@ -54,19 +63,26 @@ public class BusinessAssayTaskDataReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reportTime;
@Schema(description = "流程节点")
private String flowNode;
@Schema(description = "样品流程配置ID", example = "10639")
private Long configSampleFlowId;
@Schema(description = "复检次数,0代表正常分析", example = "27671")
private Integer recheckCount;
@Schema(description = "样品流程节点KEY")
private String sampleFlowNodeKey;
@Schema(description = "乐观锁", example = "4946")
@Schema(description = "样品流程节点时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] sampleFlowNodeTime;
@Schema(description = "分析次数,复检的累加次数", example = "13073")
private Integer analysisCount;
@Schema(description = "乐观锁", example = "11435")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

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

@@ -12,27 +12,27 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class BusinessAssayTaskDataRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32383")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1089")
@ExcelProperty("ID")
private Long id;
@Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11587")
@Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23293")
@ExcelProperty("样品主样ID")
private Long businessBaseSampleId;
@Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2157")
@Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15024")
@ExcelProperty("样品分样ID")
private Long businessSubParentSampleId;
@Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2427")
@Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20464")
@ExcelProperty("分样子样ID")
private Long businessSubSampleId;
@Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21835")
@ExcelProperty("检测方法ID")
private String configAssayMethodId;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9130")
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "15392")
@Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23566")
@ExcelProperty("指派单ID")
private Long businessAssayTaskId;
@@ -40,21 +40,33 @@ public class BusinessAssayTaskDataRespVO {
@ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
private String taskType;
@Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...")
@Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...")
private String assayType;
@Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("检测项目")
private String assayProject;
@Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16988")
@ExcelProperty("分析部门ID")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "芋艿")
@ExcelProperty("分析部门名称")
private String assayDepartmentName;
@Schema(description = "分析人")
@ExcelProperty("分析人")
private String assayOperator;
@Schema(description = "任务指派时间")
@ExcelProperty("任务指派时间")
private LocalDateTime taskTime;
@Schema(description = "分配任务时间")
@ExcelProperty("分配任务时间")
private LocalDateTime assignTaskTime;
@Schema(description = "是否已指派")
@ExcelProperty("是否已指派")
private Integer isTasked;
@Schema(description = "是否已分配任务")
@ExcelProperty("是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
@ExcelProperty("是否已上报")
@@ -68,15 +80,23 @@ public class BusinessAssayTaskDataRespVO {
@ExcelProperty("上报时间")
private LocalDateTime reportTime;
@Schema(description = "流程节点", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("流程节点")
private String flowNode;
@Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10639")
@ExcelProperty("样品流程配置ID")
private Long configSampleFlowId;
@Schema(description = "复检次数,0代表正常分析", requiredMode = Schema.RequiredMode.REQUIRED, example = "27671")
@ExcelProperty("复检次数,0代表正常分析")
private Integer recheckCount;
@Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品流程节点KEY")
private String sampleFlowNodeKey;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "4946")
@Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品流程节点时间")
private LocalDateTime sampleFlowNodeTime;
@Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
@ExcelProperty("分析次数,复检的累加次数")
private Integer analysisCount;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
@ExcelProperty("乐观锁")
private Integer updateCount;
@@ -84,8 +104,8 @@ public class BusinessAssayTaskDataRespVO {
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建日期")
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注")

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

@@ -11,44 +11,56 @@ import java.time.LocalDateTime;
@Data
public class BusinessAssayTaskDataSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32383")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1089")
private Long id;
@Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11587")
@Schema(description = "样品主样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23293")
@NotNull(message = "样品主样ID不能为空")
private Long businessBaseSampleId;
@Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2157")
@Schema(description = "样品分样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15024")
@NotNull(message = "样品分样ID不能为空")
private Long businessSubParentSampleId;
@Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2427")
@Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20464")
@NotNull(message = "分样子样ID不能为空")
private Long businessSubSampleId;
@Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21835")
@NotEmpty(message = "检测方法ID不能为空")
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9130")
@NotNull(message = "检测方法配置ID不能为空")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "15392")
@Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23566")
@NotNull(message = "指派单ID不能为空")
private Long businessAssayTaskId;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
private String taskType;
@Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯、双杯、平行...不能为空")
@Schema(description = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "分析类型,【字典】【jy_sample_assay_type】单杯-single_cup、双杯-double_cup、平行-single_parallel...不能为空")
private String assayType;
@Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "检测项目不能为空")
private String assayProject;
@Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16988")
@NotNull(message = "分析部门ID不能为空")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "芋艿")
private String assayDepartmentName;
@Schema(description = "分析人")
private String assayOperator;
@Schema(description = "任务指派时间")
private LocalDateTime taskTime;
@Schema(description = "分配任务时间")
private LocalDateTime assignTaskTime;
@Schema(description = "是否已指派")
private Integer isTasked;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@@ -59,20 +71,26 @@ public class BusinessAssayTaskDataSaveReqVO {
@Schema(description = "上报时间")
private LocalDateTime reportTime;
@Schema(description = "流程节点", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "流程节点不能为空")
private String flowNode;
@Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10639")
@NotNull(message = "样品流程配置ID不能为空")
private Long configSampleFlowId;
@Schema(description = "复检次数,0代表正常分析", requiredMode = Schema.RequiredMode.REQUIRED, example = "27671")
@NotNull(message = "复检次数,0代表正常分析不能为空")
private Integer recheckCount;
@Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "样品流程节点KEY不能为空")
private String sampleFlowNodeKey;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "4946")
@NotNull(message = "乐观锁不能为空")
@Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "样品流程节点时间不能为空")
private LocalDateTime sampleFlowNodeTime;
@Schema(description = "分析次数,复检的累加次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "13073")
@NotNull(message = "分析次数,复检的累加次数不能为空")
private Integer analysisCount;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "11435")
private Integer updateCount;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "所属部门不能为空")
private String systemDepartmentCode;
@Schema(description = "备注")

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

@@ -0,0 +1,41 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
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;
}

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

@@ -13,19 +13,19 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class BusinessAssayTaskDetailPageReqVO extends PageParam {
@Schema(description = "指派单ID", example = "6438")
@Schema(description = "指派单ID", example = "21102")
private Long businessAssayTaskId;
@Schema(description = "检测任务ID", example = "16505")
private Long businessAssayTaskDataId;
@Schema(description = "样品id", example = "26703")
@Schema(description = "样品id", example = "9299")
private Long sampleId;
@Schema(description = "指派编号")
private String taskNo;
@Schema(description = "物料名称", example = "张三")
private String materialName;
@Schema(description = "样品名称", example = "芋艿")
@Schema(description = "样品名称", example = "王五")
private String sampleName;
@Schema(description = "样品编号")
@@ -37,8 +37,8 @@ public class BusinessAssayTaskDetailPageReqVO extends PageParam {
@Schema(description = "数据来源类型,【字典】【jy_assay_task_data_source_type】正常，筛上，筛下", example = "1")
private String dataSourceType;
@Schema(description = "序号")
private Integer sort;
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回", example = "1")
private String rollbackStatus;
@@ -46,7 +46,7 @@ public class BusinessAssayTaskDetailPageReqVO extends PageParam {
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

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

@@ -0,0 +1,54 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 检测任务分配明细分页 Request VO")
@Data
public class BusinessAssayTaskDetailReqVO {
@Schema(description = "指派单ID", example = "21102")
private Long businessAssayTaskId;
@Schema(description = "检测任务ID", example = "16505")
private Long businessAssayTaskDataId;
@Schema(description = "样品id", example = "9299")
private Long sampleId;
@Schema(description = "指派编号")
private String taskNo;
@Schema(description = "样品名称", example = "王五")
private String sampleName;
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "杯号")
private String cupNumber;
@Schema(description = "数据来源类型,【字典】【jy_assay_task_data_source_type】正常，筛上，筛下", example = "1")
private String dataSourceType;
@Schema(description = "排序号")
private Integer sortNo;
@Schema(description = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回", example = "1")
private String rollbackStatus;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注")
private String remark;
}

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

@@ -12,15 +12,18 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class BusinessAssayTaskDetailRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19713")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6020")
@ExcelProperty("ID")
private Long id;
@Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6438")
@Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21102")
@ExcelProperty("指派单ID")
private Long businessAssayTaskId;
@Schema(description = "检测任务ID", example = "16505")
private Long businessAssayTaskDataId;
@Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26703")
@Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9299")
@ExcelProperty("样品id")
private Long sampleId;
@@ -28,11 +31,7 @@ public class BusinessAssayTaskDetailRespVO {
@ExcelProperty("指派编号")
private String taskNo;
@Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@ExcelProperty("物料名称")
private String materialName;
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@ExcelProperty("样品名称")
private String sampleName;
@@ -48,9 +47,9 @@ public class BusinessAssayTaskDetailRespVO {
@ExcelProperty("数据来源类型,【字典】【jy_assay_task_data_source_type】正常，筛上，筛下")
private String dataSourceType;
@Schema(description = "序号")
@ExcelProperty("序号")
private Integer sort;
@Schema(description = "排序号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("排序号")
private Integer sortNo;
@Schema(description = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回")
@@ -60,8 +59,8 @@ public class BusinessAssayTaskDetailRespVO {
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建日期")
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注")

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

@@ -9,14 +9,17 @@ import jakarta.validation.constraints.*;
@Data
public class BusinessAssayTaskDetailSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19713")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6020")
private Long id;
@Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6438")
@Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21102")
@NotNull(message = "指派单ID不能为空")
private Long businessAssayTaskId;
@Schema(description = "检测任务ID", example = "16505")
private Long businessAssayTaskDataId;
@Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26703")
@Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9299")
@NotNull(message = "样品id不能为空")
private Long sampleId;
@@ -24,11 +27,7 @@ public class BusinessAssayTaskDetailSaveReqVO {
@NotEmpty(message = "指派编号不能为空")
private String taskNo;
@Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@NotEmpty(message = "物料名称不能为空")
private String materialName;
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@NotEmpty(message = "样品名称不能为空")
private String sampleName;
@@ -43,15 +42,15 @@ public class BusinessAssayTaskDetailSaveReqVO {
@NotEmpty(message = "数据来源类型,【字典】【jy_assay_task_data_source_type】正常，筛上，筛下不能为空")
private String dataSourceType;
@Schema(description = "序号")
private Integer sort;
@Schema(description = "排序号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "排序号不能为空")
private Integer sortNo;
@Schema(description = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "任务退回状态,【字典】【jy_assay_task_rollback_status】默认；审批中；已审批（已退回）；取消退回不能为空")
private String rollbackStatus;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "所属部门不能为空")
private String systemDepartmentCode;
@Schema(description = "备注")

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

@@ -0,0 +1,35 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import java.util.List;
import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
import lombok.Data;
/**
* <b>BusinessAssayTaskExtendRespVO</b>
* <p>
* 更新历史：
* <pre> 版本 更新时间 更新者 更新内容<hr/>
* V1.0 2025年9月25日 wxr Add</pre>
* <b>Copyright (C) 云南志者竟成科技有限公司</b>
* </p>
* @author 王兴荣<wxr@wangxingrong.com>
* @version V1.0
* @since 2025年9月25日
*/
@Data
public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
/** 分析方法名称 **/
private String configAssayMethodName;
/** 分析方法对应的分析项目 **/
private String configAssayMethodProjectShowNames;
/** 分析任务数 **/
private Long assayTaskCount;
/** 质量控制分析方法 **/
private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;
}

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

@@ -16,25 +16,58 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
@Schema(description = "指派编号")
private String taskNo;
@Schema(description = "指派单名称", example = "芋艿")
@Schema(description = "指派单名称", example = "张三")
private String taskName;
@Schema(description = "检测方法ID", example = "18615")
@Schema(description = "检测方法配置ID", example = "13609")
private Long configAssayMethodId;
@Schema(description = "任务单来源", example = "1")
@Schema(description = "任务单模板ID", example = "4389")
private Long configReportTemplateId;
@Schema(description = "任务单模板key")
private String configReportTemplateKey;
@Schema(description = "任务单来源,分配-task_assign、领取-task_claim", example = "1")
private String taskSourceType;
@Schema(description = "指派人")
private String taskOperator;
@Schema(description = "任务单分配人")
private String taskAssignOperator;
@Schema(description = "指派时间")
@Schema(description = "任务单分配时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskOperatorTime;
private LocalDateTime[] taskAssignTime;
@Schema(description = "指派分析人")
@Schema(description = "任务单分配状态,进行中-in_progress、已提交-submitted、作废-void", example = "2")
private String taskAssignStatus;
@Schema(description = "任务单分配提交时间")
@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;
@Schema(description = "分析时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] assayTime;
@Schema(description = "分析提交时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] assaySubmitTime;
@Schema(description = "任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted", example = "1")
private String taskAssayStatus;
@Schema(description = "分析状态列表")
private List<String> taskAssayStatusList;
@Schema(description = "上报时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reportTime;
@@ -42,37 +75,15 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
@Schema(description = "上报人")
private String reportOperator;
@Schema(description = "提交时间")
@Schema(description = "任务单完成时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] submitTime;
private LocalDateTime[] taskFinishTime;
@Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", example = "1")
private String taskStatus;
@Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", example = "2")
private String synchronousStatus;
@Schema(description = "标样业务ID", example = "21760")
private Long standardSampleId;
@Schema(description = "标样编号")
private String standardSampleCode;
@Schema(description = "标准样类型ID", example = "31587")
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 = "15616")
@Schema(description = "流程实例id", example = "19026")
private Long flowInstanceId;
@Schema(description = "顶部字段配置")
private String formConfig;
@Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "9742")
private Long formDataCollectionId;
@Schema(description = "顶部字段值")
private String formValue;
@@ -80,16 +91,16 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
@Schema(description = "签名信息")
private String documentSignature;
@Schema(description = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交", example = "2")
@Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
private String finishStatus;
@Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", example = "1")
@Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
private String flowStatus;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

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

@@ -0,0 +1,109 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 检测任务分配业务分页 Request VO")
@Data
public class BusinessAssayTaskReqVO {
@Schema(description = "指派编号")
private String taskNo;
@Schema(description = "指派单名称", example = "张三")
private String taskName;
@Schema(description = "检测方法配置ID", example = "13609")
private Long configAssayMethodId;
@Schema(description = "任务单模板ID", example = "4389")
private Long configReportTemplateId;
@Schema(description = "任务单模板key")
private String configReportTemplateKey;
@Schema(description = "任务单来源,分配-task_assign、领取-task_claim", example = "1")
private String taskSourceType;
@Schema(description = "任务单分配人")
private String taskAssignOperator;
@Schema(description = "任务单分配时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskAssignTime;
@Schema(description = "任务单分配状态,进行中-in_progress、已提交-submitted、作废-void", example = "2")
private String taskAssignStatus;
@Schema(description = "任务单分配提交时间")
@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;
@Schema(description = "分析时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] assayTime;
@Schema(description = "分析提交时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] assaySubmitTime;
@Schema(description = "任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted", example = "1")
private String taskAssayStatus;
@Schema(description = "分析状态列表")
private List<String> taskAssayStatusList;
@Schema(description = "上报时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reportTime;
@Schema(description = "上报人")
private String reportOperator;
@Schema(description = "任务单完成时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] taskFinishTime;
@Schema(description = "流程实例id", example = "19026")
private Long flowInstanceId;
@Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "9742")
private Long formDataCollectionId;
@Schema(description = "顶部字段值")
private String formValue;
@Schema(description = "签名信息")
private String documentSignature;
@Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
private String finishStatus;
@Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
private String flowStatus;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注")
private String remark;
}

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

@@ -2,8 +2,6 @@ package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@@ -12,7 +10,7 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class BusinessAssayTaskRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5973")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11667")
@ExcelProperty("ID")
private Long id;
@@ -20,30 +18,64 @@ public class BusinessAssayTaskRespVO {
@ExcelProperty("指派编号")
private String taskNo;
@Schema(description = "指派单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "指派单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@ExcelProperty("指派单名称")
private String taskName;
@Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18615")
@ExcelProperty("检测方法ID")
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13609")
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;
@Schema(description = "任务单来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("任务单来源")
@Schema(description = "任务单模板ID", example = "4389")
@ExcelProperty("任务单模板ID")
private Long configReportTemplateId;
@Schema(description = "任务单模板key")
@ExcelProperty("任务单模板key")
private String configReportTemplateKey;
@Schema(description = "任务单来源,分配-task_assign、领取-task_claim", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("任务单来源,分配-task_assign、领取-task_claim")
private String taskSourceType;
@Schema(description = "指派人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("指派人")
private String taskOperator;
@Schema(description = "任务单分配人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("任务单分配人")
private String taskAssignOperator;
@Schema(description = "指派时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("指派时间")
private LocalDateTime taskOperatorTime;
@Schema(description = "任务单分配时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("任务单分配时间")
private LocalDateTime taskAssignTime;
@Schema(description = "指派分析人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("指派分析人")
@Schema(description = "任务单分配状态,进行中-in_progress、已提交-submitted、作废-void", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("任务单分配状态,进行中-in_progress、已提交-submitted")
private String taskAssignStatus;
@Schema(description = "任务单分配提交时间")
@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;
@Schema(description = "分析时间")
@ExcelProperty("分析时间")
private LocalDateTime assayTime;
@Schema(description = "分析提交时间")
@ExcelProperty("分析提交时间")
private LocalDateTime assaySubmitTime;
@Schema(description = "任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted", example = "1")
@ExcelProperty("任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted")
private String taskAssayStatus;
@Schema(description = "上报时间")
@ExcelProperty("上报时间")
private LocalDateTime reportTime;
@@ -52,45 +84,17 @@ public class BusinessAssayTaskRespVO {
@ExcelProperty("上报人")
private String reportOperator;
@Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("提交时间")
private LocalDateTime submitTime;
@Schema(description = "任务单完成时间")
@ExcelProperty("任务单完成时间")
private LocalDateTime taskFinishTime;
@Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交")
private String taskStatus;
@Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步")
private String synchronousStatus;
@Schema(description = "标样业务ID", example = "21760")
@ExcelProperty("标样业务ID")
private Long standardSampleId;
@Schema(description = "标样编号")
@ExcelProperty("标样编号")
private String standardSampleCode;
@Schema(description = "标准样类型ID", example = "31587")
@ExcelProperty("标准样类型ID")
private Long standardSampleTypeId;
@Schema(description = "质控样编号")
@ExcelProperty("质控样编号")
private String qualitySampleCode;
@Schema(description = "质控样分析时间")
@ExcelProperty("质控样分析时间")
private LocalDateTime qualitySampleAssayTime;
@Schema(description = "流程实例id", example = "15616")
@Schema(description = "流程实例id", example = "19026")
@ExcelProperty("流程实例id")
private Long flowInstanceId;
@Schema(description = "顶部字段配置", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("顶部字段配置")
private String formConfig;
@Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "9742")
@ExcelProperty("顶部字段数据集ID,T_DAT_COLT_FLD")
private Long formDataCollectionId;
@Schema(description = "顶部字段值")
@ExcelProperty("顶部字段值")
@@ -100,20 +104,20 @@ public class BusinessAssayTaskRespVO {
@ExcelProperty("签名信息")
private String documentSignature;
@Schema(description = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交")
@Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
@ExcelProperty("完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
private String finishStatus;
@Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成")
@Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
@ExcelProperty("流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved")
private String flowStatus;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建日期")
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注")

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

@@ -5,82 +5,88 @@ import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import com.alibaba.excel.annotation.ExcelProperty;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 检测任务分配业务新增/修改 Request VO")
@Data
public class BusinessAssayTaskSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5973")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11667")
private Long id;
@Schema(description = "指派编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "指派编号不能为空")
private String taskNo;
@Schema(description = "指派单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "指派单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@NotEmpty(message = "指派单名称不能为空")
private String taskName;
@Schema(description = "检测方法ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18615")
@NotNull(message = "检测方法ID不能为空")
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13609")
@NotNull(message = "检测方法配置ID不能为空")
private Long configAssayMethodId;
@Schema(description = "任务单来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "任务单来源不能为空")
@Schema(description = "任务单模板ID", example = "4389")
private Long configReportTemplateId;
@Schema(description = "任务单模板key")
private String configReportTemplateKey;
@Schema(description = "任务单来源,分配-task_assign、领取-task_claim", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "任务单来源,分配-task_assign、领取-task_claim不能为空")
private String taskSourceType;
@Schema(description = "指派人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "指派人不能为空")
private String taskOperator;
@Schema(description = "任务单分配人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "任务单分配人不能为空")
private String taskAssignOperator;
@Schema(description = "指派时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "指派时间不能为空")
private LocalDateTime taskOperatorTime;
@Schema(description = "任务单分配时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "任务单分配时间不能为空")
private LocalDateTime taskAssignTime;
@Schema(description = "指派分析人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "指派分析人不能为空")
@Schema(description = "任务单分配状态,进行中-in_progress、已提交-submitted、作废-void", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "任务单分配状态,进行中-in_progress、已提交-submitted不能为空、作废-void")
private String taskAssignStatus;
@Schema(description = "任务单分配提交时间")
@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;
@Schema(description = "分析时间")
private LocalDateTime assayTime;
@Schema(description = "分析提交时间")
private LocalDateTime assaySubmitTime;
@Schema(description = "任务单分析状态,未开始-not_start、已保存- saved、 已提交-submitted", example = "1")
private String taskAssayStatus;
@Schema(description = "上报时间")
private LocalDateTime reportTime;
@Schema(description = "上报人")
private String reportOperator;
@Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "提交时间不能为空")
private LocalDateTime submitTime;
@Schema(description = "任务单完成时间")
private LocalDateTime taskFinishTime;
@Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交不能为空")
private String taskStatus;
@Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步不能为空")
private String synchronousStatus;
@Schema(description = "标样业务ID", example = "21760")
private Long standardSampleId;
@Schema(description = "标样编号")
private String standardSampleCode;
@Schema(description = "标准样类型ID", example = "31587")
private Long standardSampleTypeId;
@Schema(description = "质控样编号")
private String qualitySampleCode;
@Schema(description = "质控样分析时间")
private LocalDateTime qualitySampleAssayTime;
@Schema(description = "流程实例id", example = "15616")
@Schema(description = "流程实例id", example = "19026")
private Long flowInstanceId;
@Schema(description = "顶部字段配置", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "顶部字段配置不能为空")
private String formConfig;
@Schema(description = "顶部字段数据集ID,T_DAT_COLT_FLD", example = "9742")
private Long formDataCollectionId;
@Schema(description = "顶部字段值")
private String formValue;
@@ -88,16 +94,13 @@ public class BusinessAssayTaskSaveReqVO {
@Schema(description = "签名信息")
private String documentSignature;
@Schema(description = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "完成状态,【字典】【jy_assay_task_finish_status】默认；待处理；已完成（待提交）；已提交不能为空")
@Schema(description = "完成状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "2")
private String finishStatus;
@Schema(description = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "流程状态,【字典】【jy_assay_task_flow_status】默认；审批中；打回；已完成不能为空")
@Schema(description = "流程状态,未开始-not_start、审核中-running、已退回-returned、已通过-approved", example = "1")
private String flowStatus;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "所属部门不能为空")
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "备注")

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

@@ -13,53 +13,56 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class BusinessBaseSamplePageReqVO extends PageParam {
@Schema(description = "样品名称", example = "芋艿")
@Schema(description = "样品名称", example = "张三")
private String sampleName;
@Schema(description = "样品大类名称", example = "张三")
private String baseSampleName;
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "主样配置ID", example = "26608")
@Schema(description = "主样配置ID", example = "3221")
private Long configBaseSampleId;
@Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", example = "27887")
@Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", example = "32376")
private Long dictionaryBusinessId;
@Schema(description = "样品生成时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] sampleTime;
@Schema(description = "打印次数", example = "20143")
@Schema(description = "打印次数", example = "31445")
private Integer printCount;
@Schema(description = "末次打印时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] printLastTime;
@Schema(description = "样品流程ID", example = "25222")
private Long sampleFlowId;
@Schema(description = "样品流程配置ID", example = "30581")
private Long configSampleFlowId;
@Schema(description = "样品流程KEY")
private String sampleFlowKey;
@Schema(description = "样品流程节点KEY")
private String sampleFlowNodeKey;
@Schema(description = "样品流程节点时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] sampleFlowTime;
private LocalDateTime[] sampleFlowNodeTime;
@Schema(description = "样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废", example = "1")
private String sampleStatus;
@Schema(description = "操作人")
private String operator;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建人名称")
private String operator;
@Schema(description = "创建日期")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "乐观锁", example = "13116")
@Schema(description = "乐观锁", example = "24886")
private Integer updateCount;
@Schema(description = "备注")

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

@@ -12,23 +12,27 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class BusinessBaseSampleRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14424")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26968")
@ExcelProperty("ID")
private Long id;
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@ExcelProperty("样品名称")
private String sampleName;
@Schema(description = "样品大类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@ExcelProperty("样品大类名称")
private String baseSampleName;
@Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品编号")
private String sampleCode;
@Schema(description = "主样配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26608")
@Schema(description = "主样配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3221")
@ExcelProperty("主样配置ID")
private Long configBaseSampleId;
@Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", requiredMode = Schema.RequiredMode.REQUIRED, example = "27887")
@Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", requiredMode = Schema.RequiredMode.REQUIRED, example = "32376")
@ExcelProperty("主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样")
private Long dictionaryBusinessId;
@@ -36,7 +40,7 @@ public class BusinessBaseSampleRespVO {
@ExcelProperty("样品生成时间")
private LocalDateTime sampleTime;
@Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "20143")
@Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "31445")
@ExcelProperty("打印次数")
private Integer printCount;
@@ -44,35 +48,35 @@ public class BusinessBaseSampleRespVO {
@ExcelProperty("末次打印时间")
private LocalDateTime printLastTime;
@Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25222")
@ExcelProperty("样品流程ID")
private Long sampleFlowId;
@Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30581")
@ExcelProperty("样品流程配置ID")
private Long configSampleFlowId;
@Schema(description = "样品流程KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品流程KEY")
private String sampleFlowKey;
@Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品流程节点KEY")
private String sampleFlowNodeKey;
@Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品流程节点时间")
private LocalDateTime sampleFlowTime;
private LocalDateTime sampleFlowNodeTime;
@Schema(description = "样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废")
private String sampleStatus;
@Schema(description = "操作人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("操作人")
private String operator;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建人名称", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建人名称")
private String operator;
@Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建日期")
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "13116")
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "24886")
@ExcelProperty("乐观锁")
private Integer updateCount;

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

@@ -11,22 +11,26 @@ import java.time.LocalDateTime;
@Data
public class BusinessBaseSampleSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14424")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26968")
private Long id;
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@NotEmpty(message = "样品名称不能为空")
private String sampleName;
@Schema(description = "样品大类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
@NotEmpty(message = "样品大类名称不能为空")
private String baseSampleName;
@Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "样品编号不能为空")
private String sampleCode;
@Schema(description = "主样配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26608")
@Schema(description = "主样配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3221")
@NotNull(message = "主样配置ID不能为空")
private Long configBaseSampleId;
@Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", requiredMode = Schema.RequiredMode.REQUIRED, example = "27887")
@Schema(description = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样", requiredMode = Schema.RequiredMode.REQUIRED, example = "32376")
@NotNull(message = "主样类型ID,字典表：【T_DIC_BSN】结算样、抽查样、委检样不能为空")
private Long dictionaryBusinessId;
@@ -34,39 +38,37 @@ public class BusinessBaseSampleSaveReqVO {
@NotNull(message = "样品生成时间不能为空")
private LocalDateTime sampleTime;
@Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "20143")
@Schema(description = "打印次数", requiredMode = Schema.RequiredMode.REQUIRED, example = "31445")
@NotNull(message = "打印次数不能为空")
private Integer printCount;
@Schema(description = "末次打印时间")
private LocalDateTime printLastTime;
@Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25222")
@NotNull(message = "样品流程ID不能为空")
private Long sampleFlowId;
@Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30581")
@NotNull(message = "样品流程配置ID不能为空")
private Long configSampleFlowId;
@Schema(description = "样品流程KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "样品流程KEY不能为空")
private String sampleFlowKey;
@Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "样品流程节点KEY不能为空")
private String sampleFlowNodeKey;
@Schema(description = "样品流程节点时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "样品流程节点时间不能为空")
private LocalDateTime sampleFlowTime;
private LocalDateTime sampleFlowNodeTime;
@Schema(description = "样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "样品状态,【字典】【jy_sample_status】normal-正常、isolation-隔离、void-作废不能为空")
private String sampleStatus;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "所属部门不能为空")
private String systemDepartmentCode;
@Schema(description = "创建人名称", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "创建人名称不能为空")
@Schema(description = "操作人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "操作人不能为空")
private String operator;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "13116")
@NotNull(message = "乐观锁不能为空")
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
private String systemDepartmentCode;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "24886")
private Integer updateCount;
@Schema(description = "备注")

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

@@ -14,14 +14,14 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class BusinessHandoverRecordSubPageReqVO extends PageParam {
@Schema(description = "样品子样ID", example = "7268")
@Schema(description = "分样子样ID", example = "15157")
private Long businessSubSampleId;
@Schema(description = "样品流程ID", example = "27410")
private Long sampleFlowId;
@Schema(description = "样品流程配置ID", example = "9154")
private Long configSampleFlowId;
@Schema(description = "样品流程KEY")
private String sampleFlowKey;
@Schema(description = "样品流程节点KEY")
private String sampleFlowNodeKey;
@Schema(description = "样品编号")
private String sampleCode;
@@ -29,6 +29,9 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
@Schema(description = "样品重量")
private BigDecimal sampleWeight;
@Schema(description = "天平编号")
private String balanceCode;
@Schema(description = "操作时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] operationTime;
@@ -36,7 +39,7 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
@Schema(description = "操作人")
private String operator;
@Schema(description = "操作人ID", example = "9370")
@Schema(description = "操作人ID", example = "19708")
private Long operatorId;
@Schema(description = "送样人")
@@ -45,10 +48,16 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
@Schema(description = "收样人")
private String receiveSampleOperator;
@Schema(description = "上一个交接记录ID", example = "5605")
private Long upSampleRecordId;
@Schema(description = "下一个交接记录ID", example = "31634")
private Long nextSampleRecordId;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

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

@@ -13,23 +13,23 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class BusinessHandoverRecordSubRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3962")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20889")
@ExcelProperty("ID")
private Long id;
@Schema(description = "样品子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7268")
@ExcelProperty("样品子样ID")
@Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15157")
@ExcelProperty("分样子样ID")
private Long businessSubSampleId;
@Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27410")
@ExcelProperty("样品流程ID")
private Long sampleFlowId;
@Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9154")
@ExcelProperty("样品流程配置ID")
private Long configSampleFlowId;
@Schema(description = "样品流程KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品流程KEY")
private String sampleFlowKey;
@Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品流程节点KEY")
private String sampleFlowNodeKey;
@Schema(description = "样品编号")
@Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品编号")
private String sampleCode;
@@ -37,6 +37,10 @@ public class BusinessHandoverRecordSubRespVO {
@ExcelProperty("样品重量")
private BigDecimal sampleWeight;
@Schema(description = "天平编号")
@ExcelProperty("天平编号")
private String balanceCode;
@Schema(description = "操作时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("操作时间")
private LocalDateTime operationTime;
@@ -45,7 +49,7 @@ public class BusinessHandoverRecordSubRespVO {
@ExcelProperty("操作人")
private String operator;
@Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9370")
@Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19708")
@ExcelProperty("操作人ID")
private Long operatorId;
@@ -57,12 +61,20 @@ public class BusinessHandoverRecordSubRespVO {
@ExcelProperty("收样人")
private String receiveSampleOperator;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "上一个交接记录ID", example = "5605")
@ExcelProperty("上一个交接记录ID")
private Long upSampleRecordId;
@Schema(description = "下一个交接记录ID", example = "31634")
@ExcelProperty("下一个交接记录ID")
private Long nextSampleRecordId;
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建日期", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建日期")
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注")

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

@@ -12,27 +12,31 @@ import java.time.LocalDateTime;
@Data
public class BusinessHandoverRecordSubSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3962")
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20889")
private Long id;
@Schema(description = "样品子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7268")
@NotNull(message = "样品子样ID不能为空")
@Schema(description = "分样子样ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15157")
@NotNull(message = "分样子样ID不能为空")
private Long businessSubSampleId;
@Schema(description = "样品流程ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "27410")
@NotNull(message = "样品流程ID不能为空")
private Long sampleFlowId;
@Schema(description = "样品流程配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9154")
// @NotNull(message = "样品流程配置ID不能为空")
private Long configSampleFlowId;
@Schema(description = "样品流程KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "样品流程KEY不能为空")
private String sampleFlowKey;
@Schema(description = "样品流程节点KEY", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "样品流程节点KEY不能为空")
private String sampleFlowNodeKey;
@Schema(description = "样品编号")
@Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "样品编号不能为空")
private String sampleCode;
@Schema(description = "样品重量")
private BigDecimal sampleWeight;
@Schema(description = "天平编号")
private String balanceCode;
@Schema(description = "操作时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "操作时间不能为空")
private LocalDateTime operationTime;
@@ -41,20 +45,25 @@ public class BusinessHandoverRecordSubSaveReqVO {
@NotEmpty(message = "操作人不能为空")
private String operator;
@Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9370")
@Schema(description = "操作人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19708")
@NotNull(message = "操作人ID不能为空")
private Long operatorId;
@Schema(description = "送样人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "送样人不能为空")
// @NotEmpty(message = "送样人不能为空")
private String sendSampleOperator;
@Schema(description = "收样人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "收样人不能为空")
// @NotEmpty(message = "收样人不能为空")
private String receiveSampleOperator;
@Schema(description = "所属部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "所属部门不能为空")
@Schema(description = "上一个交接记录ID", example = "5605")
private Long upSampleRecordId;
@Schema(description = "下一个交接记录ID", example = "31634")
private Long nextSampleRecordId;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "备注")

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

@@ -0,0 +1,79 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 质控样检测系数任务数据,空白样、标样分页 Request VO")
@Data
public class BusinessQCCoefficientDataPageReqVO extends PageParam {
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "样品名称", example = "赵六")
private String sampleName;
@Schema(description = "检测方法配置ID", example = "31198")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "28147")
private Long businessAssayTaskId;
@Schema(description = "定值样业务ID", example = "5300")
private Long businessStandardSampleId;
@Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "21660")
private Long dictionaryBusinessId;
@Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private String dictionaryBusinessKey;
@Schema(description = "检测项目")
private String assayProject;
@Schema(description = "分析部门ID", example = "12186")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "芋艿")
private String assayDepartmentName;
@Schema(description = "分析人")
private String assayOperator;
@Schema(description = "分配任务时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] assignTaskTime;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@Schema(description = "上报人")
private String reporter;
@Schema(description = "上报时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reportTime;
@Schema(description = "乐观锁", example = "6160")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,79 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 质控样检测系数任务数据,空白样、标样分页 Request VO")
@Data
public class BusinessQCCoefficientDataReqVO {
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "样品名称", example = "赵六")
private String sampleName;
@Schema(description = "检测方法配置ID", example = "31198")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "28147")
private Long businessAssayTaskId;
@Schema(description = "定值样业务ID", example = "5300")
private Long businessStandardSampleId;
@Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "21660")
private Long dictionaryBusinessId;
@Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private String dictionaryBusinessKey;
@Schema(description = "检测项目")
private String assayProject;
@Schema(description = "分析部门ID", example = "12186")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "芋艿")
private String assayDepartmentName;
@Schema(description = "分析人")
private String assayOperator;
@Schema(description = "分配任务时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] assignTaskTime;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@Schema(description = "上报人")
private String reporter;
@Schema(description = "上报时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reportTime;
@Schema(description = "乐观锁", example = "6160")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,99 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 质控样检测系数任务数据,空白样、标样 Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessQCCoefficientDataRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19352")
@ExcelProperty("ID")
private Long id;
@Schema(description = "样品编号")
@ExcelProperty("样品编号")
private String sampleCode;
@Schema(description = "样品名称", example = "赵六")
@ExcelProperty("样品名称")
private String sampleName;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31198")
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "28147")
@ExcelProperty("指派单ID")
private Long businessAssayTaskId;
@Schema(description = "定值样业务ID", example = "5300")
@ExcelProperty("定值样业务ID")
private Long businessStandardSampleId;
@Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", requiredMode = Schema.RequiredMode.REQUIRED, example = "21660")
@ExcelProperty("质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private Long dictionaryBusinessId;
@Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
@ExcelProperty("质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private String dictionaryBusinessKey;
@Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("检测项目")
private String assayProject;
@Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12186")
@ExcelProperty("分析部门ID")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "芋艿")
@ExcelProperty("分析部门名称")
private String assayDepartmentName;
@Schema(description = "分析人")
@ExcelProperty("分析人")
private String assayOperator;
@Schema(description = "分配任务时间")
@ExcelProperty("分配任务时间")
private LocalDateTime assignTaskTime;
@Schema(description = "是否已分配任务")
@ExcelProperty("是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
@ExcelProperty("是否已上报")
private Integer isReported;
@Schema(description = "上报人")
@ExcelProperty("上报人")
private String reporter;
@Schema(description = "上报时间")
@ExcelProperty("上报时间")
private LocalDateTime reportTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "6160")
@ExcelProperty("乐观锁")
private Integer updateCount;
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
}

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

@@ -0,0 +1,78 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 质控样检测系数任务数据,空白样、标样新增/修改 Request VO")
@Data
public class BusinessQCCoefficientDataSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19352")
private Long id;
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "样品名称", example = "赵六")
private String sampleName;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31198")
@NotNull(message = "检测方法配置ID不能为空")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "28147")
private Long businessAssayTaskId;
@Schema(description = "定值样业务ID", example = "5300")
private Long businessStandardSampleId;
@Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", requiredMode = Schema.RequiredMode.REQUIRED, example = "21660")
@NotNull(message = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样不能为空")
private Long dictionaryBusinessId;
@Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private String dictionaryBusinessKey;
@Schema(description = "检测项目")
private String assayProject;
@Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12186")
@NotNull(message = "分析部门ID不能为空")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "芋艿")
private String assayDepartmentName;
@Schema(description = "分析人")
private String assayOperator;
@Schema(description = "分配任务时间")
private LocalDateTime assignTaskTime;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@Schema(description = "上报人")
private String reporter;
@Schema(description = "上报时间")
private LocalDateTime reportTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "6160")
@NotNull(message = "乐观锁不能为空")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,47 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 质控样检测系数参数业务分页 Request VO")
@Data
public class BusinessQCCoefficientParameterDataPageReqVO extends PageParam {
@Schema(description = "检测项目业务ID", example = "23013")
private Long businessQCCoefficientDataId;
@Schema(description = "质控样检测方法参数配置ID", example = "870")
private Long configQCSampleMethodParameterId;
@Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "7977")
private Long dictionaryParameterId;
@Schema(description = "值")
private String value;
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
private String dataType;
@Schema(description = "小数位")
private Integer decimalPosition;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "乐观锁", example = "25016")
private Integer updateCount;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,47 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 质控样检测系数参数业务分页 Request VO")
@Data
public class BusinessQCCoefficientParameterDataReqVO {
@Schema(description = "检测项目业务ID", example = "23013")
private Long businessQCCoefficientDataId;
@Schema(description = "质控样检测方法参数配置ID", example = "870")
private Long configQCSampleMethodParameterId;
@Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "7977")
private Long dictionaryParameterId;
@Schema(description = "值")
private String value;
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2")
private String dataType;
@Schema(description = "小数位")
private Integer decimalPosition;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "乐观锁", example = "25016")
private Integer updateCount;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,59 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 质控样检测系数参数业务 Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessQCCoefficientParameterDataRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14408")
@ExcelProperty("ID")
private Long id;
@Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23013")
@ExcelProperty("检测项目业务ID")
private Long businessQCCoefficientDataId;
@Schema(description = "质控样检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "870")
@ExcelProperty("质控样检测方法参数配置ID")
private Long configQCSampleMethodParameterId;
@Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "7977")
@ExcelProperty("参数ID,字典表【T_DIC_PRM】")
private Long dictionaryParameterId;
@Schema(description = "值")
@ExcelProperty("值")
private String value;
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间")
private String dataType;
@Schema(description = "小数位")
@ExcelProperty("小数位")
private Integer decimalPosition;
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "25016")
@ExcelProperty("乐观锁")
private Integer updateCount;
@Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
}

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

@@ -0,0 +1,47 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 质控样检测系数参数业务新增/修改 Request VO")
@Data
public class BusinessQCCoefficientParameterDataSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14408")
private Long id;
@Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23013")
@NotNull(message = "检测项目业务ID不能为空")
private Long businessQCCoefficientDataId;
@Schema(description = "质控样检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "870")
@NotNull(message = "质控样检测方法参数配置ID不能为空")
private Long configQCSampleMethodParameterId;
@Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "7977")
@NotNull(message = "参数ID,字典表【T_DIC_PRM】不能为空")
private Long dictionaryParameterId;
@Schema(description = "值")
private String value;
@Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空")
private String dataType;
@Schema(description = "小数位")
private Integer decimalPosition;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "25016")
@NotNull(message = "乐观锁不能为空")
private Integer updateCount;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,8 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.Data;
@Data
public class BusinessQCDataExtendRespVO extends BusinessQCDataRespVO {
}

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

@@ -0,0 +1,79 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 质控样业务分页 Request VO")
@Data
public class BusinessQCDataPageReqVO extends PageParam {
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "样品名称", example = "赵六")
private String sampleName;
@Schema(description = "检测方法配置ID", example = "8003")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "29117")
private Long businessAssayTaskId;
@Schema(description = "定值样业务ID", example = "24895")
private Long businessStandardSampleId;
@Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "9549")
private Long dictionaryBusinessId;
@Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private String dictionaryBusinessKey;
@Schema(description = "检测项目")
private String assayProject;
@Schema(description = "分析部门ID", example = "29365")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "李四")
private String assayDepartmentName;
@Schema(description = "分析人")
private String assayOperator;
@Schema(description = "分配任务时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] assignTaskTime;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@Schema(description = "上报人")
private String reporter;
@Schema(description = "上报时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reportTime;
@Schema(description = "乐观锁", example = "24118")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,79 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 质控样业务分页 Request VO")
@Data
public class BusinessQCDataReqVO {
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "样品名称", example = "赵六")
private String sampleName;
@Schema(description = "检测方法配置ID", example = "8003")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "29117")
private Long businessAssayTaskId;
@Schema(description = "定值样业务ID", example = "24895")
private Long businessStandardSampleId;
@Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "9549")
private Long dictionaryBusinessId;
@Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private String dictionaryBusinessKey;
@Schema(description = "检测项目")
private String assayProject;
@Schema(description = "分析部门ID", example = "29365")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "李四")
private String assayDepartmentName;
@Schema(description = "分析人")
private String assayOperator;
@Schema(description = "分配任务时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] assignTaskTime;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@Schema(description = "上报人")
private String reporter;
@Schema(description = "上报时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] reportTime;
@Schema(description = "乐观锁", example = "24118")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "备注")
private String remark;
}

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

@@ -0,0 +1,96 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 质控样业务 Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessQCDataRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8465")
@ExcelProperty("ID")
private Long id;
@Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("样品编号")
private String sampleCode;
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@ExcelProperty("样品名称")
private String sampleName;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8003")
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "29117")
@ExcelProperty("指派单ID")
private Long businessAssayTaskId;
@Schema(description = "定值样业务ID", example = "24895")
private Long businessStandardSampleId;
@Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "9549")
private Long dictionaryBusinessId;
@Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private String dictionaryBusinessKey;
@Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("检测项目")
private String assayProject;
@Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29365")
@ExcelProperty("分析部门ID")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "李四")
@ExcelProperty("分析部门名称")
private String assayDepartmentName;
@Schema(description = "分析人")
@ExcelProperty("分析人")
private String assayOperator;
@Schema(description = "分配任务时间")
@ExcelProperty("分配任务时间")
private LocalDateTime assignTaskTime;
@Schema(description = "是否已分配任务")
@ExcelProperty("是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
@ExcelProperty("是否已上报")
private Integer isReported;
@Schema(description = "上报人")
@ExcelProperty("上报人")
private String reporter;
@Schema(description = "上报时间")
@ExcelProperty("上报时间")
private LocalDateTime reportTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "24118")
@ExcelProperty("乐观锁")
private Integer updateCount;
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
}

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

@@ -0,0 +1,80 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 质控样业务新增/修改 Request VO")
@Data
public class BusinessQCDataSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8465")
private Long id;
@Schema(description = "样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "样品编号不能为空")
private String sampleCode;
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotNull(message = "样品名称不能为空")
private String sampleName;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8003")
@NotNull(message = "检测方法配置ID不能为空")
private Long configAssayMethodId;
@Schema(description = "指派单ID", example = "29117")
private Long businessAssayTaskId;
@Schema(description = "定值样业务ID", example = "24895")
private Long businessStandardSampleId;
@Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "9549")
private Long dictionaryBusinessId;
@Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
private String dictionaryBusinessKey;
@Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "检测项目不能为空")
private String assayProject;
@Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "29365")
@NotNull(message = "分析部门ID不能为空")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "李四")
private String assayDepartmentName;
@Schema(description = "分析人")
private String assayOperator;
@Schema(description = "分配任务时间")
private LocalDateTime assignTaskTime;
@Schema(description = "是否已分配任务")
private Integer isAssignTasked;
@Schema(description = "是否已上报")
private Integer isReported;
@Schema(description = "上报人")
private String reporter;
@Schema(description = "上报时间")
private LocalDateTime reportTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "24118")
@NotNull(message = "乐观锁不能为空")
private Integer updateCount;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "备注")
private String remark;
}

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