From bf8aba849ffe2b2065e371c3161b13fbf495cf58 Mon Sep 17 00:00:00 2001 From: FCL Date: Mon, 20 Oct 2025 18:23:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessAssayReportDataController.java | 9 ++++ .../vo/BusinessAssayReportDataPageReqVO.java | 9 ++++ .../vo/BusinessAssayReportDataRespVO.java | 12 +++++ .../dataobject/BusinessAssayReportDataDO.java | 8 +++ .../mapper/BusinessAssayReportDataMapper.java | 6 +++ .../BusinessAssayReportDataService.java | 5 ++ .../BusinessAssayReportDataServiceImpl.java | 11 ++++ .../dal/mapper/ConfigReportFieldMapper.java | 2 +- .../admin/ReportDocumentDataController.java | 25 +++++++-- .../admin/ReportDocumentMainController.java | 53 +++++++++++++++++++ .../vo/ReportDocumentDataRespVO.java | 9 ++++ .../vo/ReportDocumentMainPageReqVO.java | 3 ++ .../vo/ReportDocumentMainRespVO.java | 4 ++ .../vo/ReportDocumentMainSaveReqVO.java | 4 ++ .../dal/dataobject/ReportDocumentDataDO.java | 11 ++++ .../dal/dataobject/ReportDocumentMainDO.java | 6 +++ .../service/ReportDocumentMainService.java | 3 ++ .../ReportDocumentMainServiceImpl.java | 6 ++- .../mapper/BusinessAssayReportDataMapper.xml | 50 ++++++++++++++++- 19 files changed, 228 insertions(+), 8 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java index 9eee3be..a05bcb8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayReportDataController.java @@ -105,4 +105,13 @@ public class BusinessAssayReportDataController implements BusinessControllerMark BeanUtils.toBean(list, BusinessAssayReportDataRespVO.class)); } + @GetMapping("/queryWaitingToAddData") + @Operation(summary = "待编制报表数据查询") + @Parameter(name = "mainId", description = "报告id", required = true, example = "1024") + public CommonResult> queryWaitingToAddData(BusinessAssayReportDataPageReqVO pageReqVO) { + PageResult page = businessAssayReportDataService.queryWaitingDataForReport(pageReqVO); + + return success(BeanUtils.toBean(page, BusinessAssayReportDataRespVO.class)); + } + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java index 826de2c..bb1ec58 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java @@ -56,4 +56,13 @@ public class BusinessAssayReportDataPageReqVO extends PageParam { @Schema(description = "备注") private String remark; + //==================扩展字段=========== + + @Schema(description = "样品名称") + private String sampleName; + + @Schema(description = "主样创建时间范围") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] baseSampleCreateTime; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataRespVO.java index 5866b49..93cf652 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataRespVO.java @@ -1,5 +1,6 @@ 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.*; @@ -7,6 +8,8 @@ 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 @@ -69,4 +72,13 @@ public class BusinessAssayReportDataRespVO { @ExcelProperty("备注") private String remark; + //=====自定义字段 + @Schema(description = "样品名称") + @ExcelProperty("样品名称") + private String sampleName; + + @Schema(description = "样品创建时间") + @ExcelProperty("样品创建时间") + private LocalDateTime baseSampleCreateTime; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayReportDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayReportDataDO.java index f70d202..f78420c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayReportDataDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayReportDataDO.java @@ -97,4 +97,12 @@ public class BusinessAssayReportDataDO extends BusinessBaseDO { @TableField("RMK") private String remark; + //==================扩展字段=========== + //样品名称 + @TableField(exist = false) + private String sampleName; + + //样品创建时间 + @TableField(exist = false) + private LocalDateTime baseSampleCreateTime; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.java index 0b846da..bb5434e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.java @@ -1,5 +1,7 @@ package com.zt.plat.module.qms.business.bus.dal.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.qms.business.bus.controller.vo.*; @@ -10,6 +12,7 @@ import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import java.util.List; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 检测报表数据业务 Mapper @@ -43,4 +46,7 @@ public interface BusinessAssayReportDataMapper extends BaseMapperX queryWaitingDataForReport(IPage page, @Param("param") BusinessAssayReportDataPageReqVO param); + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayReportDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayReportDataService.java index e20c9d4..b39a6b6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayReportDataService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayReportDataService.java @@ -66,4 +66,9 @@ public interface BusinessAssayReportDataService { List listByIds(List ids); + /** + * 查询待编制报告数据 + * */ + PageResult queryWaitingDataForReport(BusinessAssayReportDataPageReqVO pageReqVO); + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayReportDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayReportDataServiceImpl.java index 93d6598..198273a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayReportDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayReportDataServiceImpl.java @@ -1,6 +1,8 @@ package com.zt.plat.module.qms.business.bus.service; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -94,4 +96,13 @@ public class BusinessAssayReportDataServiceImpl implements BusinessAssayReportDa public List listByIds(List ids) { return businessAssayReportDataMapper.selectByIds(ids); } + + + @Override + public PageResult queryWaitingDataForReport(BusinessAssayReportDataPageReqVO pageReqVO) { + IPage page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + Page pageList = businessAssayReportDataMapper.queryWaitingDataForReport(page, pageReqVO); + PageResult pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal()); + return pageResult; + } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigReportFieldMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigReportFieldMapper.java index 4f953bc..9f585e6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigReportFieldMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigReportFieldMapper.java @@ -39,7 +39,7 @@ public interface ConfigReportFieldMapper extends BaseMapperX selectList(ConfigReportFieldReqVO reqVO) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java index bc4f9ee..e2593f5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java @@ -14,7 +14,11 @@ import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentDat import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentDataRespVO; import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentDataSaveReqVO; import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentDataDO; +import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO; +import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentTypeDO; import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentDataService; +import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentMainService; +import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -26,7 +30,9 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.IOException; +import java.util.HashMap; import java.util.List; +import java.util.Map; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static com.zt.plat.framework.common.pojo.CommonResult.success; @@ -45,15 +51,24 @@ public class ReportDocumentDataController extends AbstractFileUploadController i } } - @Resource - private ReportDocumentDataService reportDocumentDataService; + @Resource private ReportDocumentDataService reportDocumentDataService; + @Resource private ReportDocumentMainService reportDocumentMainService; + @Resource private ReportDocumentTypeService reportDocumentTypeService; + @GetMapping("/queryAddedData") @Operation(summary = "已编制报表数据查询") - @Parameter(name = "mianId", description = "报告数据id", required = true, example = "1024") - public CommonResult> queryAddedData(@RequestParam("mianId") Long mianId) { - List list = reportDocumentDataService.listByMainDataId(mianId).getData(); + @Parameter(name = "mainId", description = "报告id", required = true, example = "1024") + public CommonResult> queryAddedData(@RequestParam("mainId") Long mainId) { + + ReportDocumentMainDO mainDO = reportDocumentMainService.getReportDocumentMain(mainId); + Long typeId = mainDO.getReportDocumentTypeId(); + ReportDocumentTypeDO typeDO = reportDocumentTypeService.getReportDocumentType(typeId); + Long confId = typeDO.getConfigReportTypeId(); + Map param = new HashMap<>(); + + List list = reportDocumentDataService.listByMainDataId(mainId).getData(); return success(BeanUtils.toBean(list, ReportDocumentDataRespVO.class)); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java index 0f79625..de05c94 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java @@ -11,11 +11,16 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.framework.security.core.LoginUser; +import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; +import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi; +import com.zt.plat.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import com.zt.plat.module.qms.business.reportdoc.controller.vo.*; import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO; import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentTypeDO; import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentMainService; import com.zt.plat.module.qms.business.reportdoc.service.ReportDocumentTypeService; +import com.zt.plat.module.qms.enums.ErrorCodeConstants; import com.zt.plat.module.qms.enums.QmsCommonConstant; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -24,16 +29,23 @@ import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.IOException; import java.util.List; +import java.util.Map; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception0; import static com.zt.plat.framework.common.pojo.CommonResult.error; import static com.zt.plat.framework.common.pojo.CommonResult.success; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.ERROR_CODE_MODULE_COMMON; import static com.zt.plat.module.qms.enums.ErrorCodeConstants.REPORT_DOCUMENT_TYPE_NOT_EXISTS; +import static com.zt.plat.module.qms.enums.QmsBpmConstant.BPM_CALLBACK_BEAN_NAME; @Tag(name = "管理后台 - 检测报告业务") @RestController @@ -72,12 +84,53 @@ public class ReportDocumentMainController extends AbstractFileUploadController i } vo.setFlowKey(typeDO.getFlowKey()); vo.setDocumentType(typeDO.getDocumentType()); + vo.setConfigReportTypeId(typeDO.getConfigReportTypeId()); vo.setDocumentConfig(JSONObject.toJSONString(typeDO)); vo.setFlowStatus(QmsCommonConstant.NOT_START); vo.setCancelFlag("-1"); return success(reportDocumentMainService.createReportDocumentMain(vo)); } + @Resource private BpmProcessInstanceApi bpmProcessInstanceApi; + + @Override + @Transactional(rollbackFor = Exception.class) + public CommonResult createProcessInstance(ReportDocumentMainSaveReqVO entity) { + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + Long id = entity.getId(); + DataFormDO dataForm = getDataForm(id); + Long dataCollectionId = dataForm.getDataCollectionId(); + DataCollectionDO dataCollection = dataCollectionService.getDataCollection(dataCollectionId); + if(dataCollection == null) + throw exception(ErrorCodeConstants.DATA_FORM_EMPTY_COLLECTION_ID); + if(ObjectUtils.isEmpty(dataCollection.getFlowKey())) + throw exception(ErrorCodeConstants.DATA_COLLECTION_EMPTY_WF_KEY); + JSONObject formData = new JSONObject(); + if(dataForm.getFormData() != null) + formData = JSONObject.parseObject(dataForm.getFormData()); + formData.put("mainId", id); + formData.put("applyUser", dataForm.getApplyUser()); + formData.put("applyUserId", dataForm.getApplyUserId()); + formData.put("applyDepartment", dataForm.getApplyDepartment()); + formData.put("applyDepartmentId", dataForm.getApplyDepartmentId()); + formData.put("applyTime", dataForm.getApplyTime()); + Map variables = formData.toJavaObject(Map.class); + variables.put(BPM_CALLBACK_BEAN_NAME, "dataFormService"); + BpmProcessInstanceCreateReqDTO reqDTO = new BpmProcessInstanceCreateReqDTO(); + reqDTO.setBusinessKey(String.valueOf(id)); + reqDTO.setProcessDefinitionKey(dataCollection.getFlowKey()); + reqDTO.setVariables(variables); + CommonResult result = bpmProcessInstanceApi.createProcessInstance(loginUser.getId(), reqDTO); + if(!result.isSuccess()){ + throw exception0(ERROR_CODE_MODULE_COMMON, result.getMsg()); + } + String wfInsId = result.getData(); + dataForm.setFlowInstanceId(wfInsId); + dataFormMapper.updateById(dataForm); + return BeanUtils.toBean(dataForm, DataFormRespVO.class); + } + + @PostMapping("/execAddData") @Operation(summary = "增加数据") public CommonResult execAddData(@RequestBody ReportDocumentMainSaveReqVO vo) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentDataRespVO.java index fad1f19..f37adfd 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentDataRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentDataRespVO.java @@ -40,4 +40,13 @@ public class ReportDocumentDataRespVO { @ExcelProperty("备注") private String remark; + //==================扩展字段=========== + @Schema(description = "样品名称") + @ExcelProperty("样品名称") + private String sampleName; + + @Schema(description = "样品创建时间") + @ExcelProperty("样品创建时间") + private LocalDateTime baseSampleCreateTime; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java index 27fe8c7..e3ad7b0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java @@ -83,4 +83,7 @@ public class ReportDocumentMainPageReqVO extends PageParam { @Schema(description = "发布时间") private String publishTime; + @Schema(description = "报表类型ID") + private Long configReportTypeId; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java index 7b4d4c5..d33f7d3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java @@ -106,4 +106,8 @@ public class ReportDocumentMainRespVO { @ExcelProperty("发布时间") private String publishTime; + @Schema(description = "报表类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15805") + @ExcelProperty("报表类型ID") + private Long configReportTypeId; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java index 41bb690..f0135e9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.qms.business.reportdoc.controller.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -76,6 +77,9 @@ public class ReportDocumentMainSaveReqVO { @Schema(description = "发布时间") private String publishTime; + @Schema(description = "报表类型ID") + private Long configReportTypeId; + @Schema(description = "报表数据ids") private String businessAssayReportDataIds; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentDataDO.java index 0feb27a..7a233e0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentDataDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentDataDO.java @@ -3,6 +3,9 @@ package com.zt.plat.module.qms.business.reportdoc.dal.dataobject; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; + +import java.time.LocalDateTime; + /** * 检测报告明细 DO * @@ -54,4 +57,12 @@ public class ReportDocumentDataDO extends BusinessBaseDO { @TableField("RMK") private String remark; + //==================扩展字段=========== + //样品名称 + @TableField(exist = false) + private String sampleName; + + //样品创建时间 + @TableField(exist = false) + private LocalDateTime baseSampleCreateTime; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java index d341bad..56c7b10 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java @@ -132,4 +132,10 @@ public class ReportDocumentMainDO extends BusinessBaseDO { //发布时间 @TableField("PUB_USER_TIME") private String publishTime; + + /** + * 报表类型ID + */ + @TableField("CFG_RPT_TP_ID") + private Long configReportTypeId; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainService.java index d70b299..debc753 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainService.java @@ -68,4 +68,7 @@ public interface ReportDocumentMainService { */ PageResult getReportDocumentMainPage(ReportDocumentMainPageReqVO pageReqVO); + //发起流程 + CommonResult createProcessInstance(ReportDocumentMainSaveReqVO entity); + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java index ac4d83e..35d956e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java @@ -171,4 +171,8 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService return reportDocumentMainMapper.selectPage(pageReqVO); } -} \ No newline at end of file + @Override + public CommonResult createProcessInstance(ReportDocumentMainSaveReqVO entity) { + return null; + } +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml index 9c0eeba..42e8513 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml @@ -9,4 +9,52 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - \ No newline at end of file + + + + +