feat:阶段性代码合并
This commit is contained in:
@@ -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, "设备_设备信息不存在");
|
||||
|
||||
@@ -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
|
||||
* */
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
@@ -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>
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user