From d12f6be2b2bcbac421a913f353ac0c4885ca6247 Mon Sep 17 00:00:00 2001 From: shusir <497819738@qq.com> Date: Mon, 30 Mar 2026 18:12:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E7=89=A9=E6=96=99=E6=A3=80=E5=8C=96?= =?UTF-8?q?=E9=AA=8C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/MaterialLifecycleController.java | 9 ++++++++ .../vo/MaterialCorrelationAssayRespVO.java | 22 +++++++++++++++++++ .../vo/MaterialCorrelationAssaySaveReqVO.java | 6 +++++ .../vo/MaterialLifecycleDetailRespVO.java | 7 ++++-- .../vo/MaterialLifecycleDetailSaveReqVO.java | 7 ++++-- .../vo/MaterialLifecycleSaveReqVO.java | 2 +- .../MaterialCorrelationAssayMapper.java | 13 +++++++++++ .../MaterialCorrelationAssayService.java | 8 +++++++ .../MaterialCorrelationAssayServiceImpl.java | 6 +++++ .../MaterialLifecycleDetailServiceImpl.java | 13 +++++------ .../service/MaterialLifecycleServiceImpl.java | 14 +++++++----- 11 files changed, 90 insertions(+), 17 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java index 51e362c3..45009446 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java @@ -13,6 +13,7 @@ import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIg import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.module.qms.resource.material.controller.vo.*; import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDO; +import com.zt.plat.module.qms.resource.material.listener.MaterialAssayResultListener; import com.zt.plat.module.qms.resource.material.service.MaterialLifecycleService; import com.zt.plat.module.qms.resource.material.valid.AddGroup; import com.zt.plat.module.qms.resource.material.valid.UpdateGroup; @@ -22,6 +23,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -49,6 +51,8 @@ public class MaterialLifecycleController extends AbstractFileUploadController im @Resource private MaterialLifecycleService materialLifecycleService; + @Autowired + private MaterialAssayResultListener materialAssayResultListener; @PostMapping("/create") @Operation(summary = "新建物料流程") @@ -122,6 +126,11 @@ public class MaterialLifecycleController extends AbstractFileUploadController im return success(materialLifecycleService.inventoryCheckInfomation(inventoryReqVO)); } + @GetMapping("/test") + public void test() { + materialAssayResultListener.bpmTest(); + } + @GetMapping("/export-excel") @Operation(summary = "导出物料通用流程,物料验收、退换货 Excel") @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:export')") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialCorrelationAssayRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialCorrelationAssayRespVO.java index 0a506b00..85e5b9de 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialCorrelationAssayRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialCorrelationAssayRespVO.java @@ -1,11 +1,17 @@ package com.zt.plat.module.qms.resource.material.controller.vo; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONUtil; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; +import java.util.Objects; @Schema(description = "管理后台 - 物料检化验关联信息 Response VO") @Data @@ -36,6 +42,9 @@ public class MaterialCorrelationAssayRespVO { @ExcelProperty("样品大类id,检化验业务样品大类") private Long sampleId; + @Schema(description = "样品标签模板") + private String sampleLabelTemplate; + @Schema(description = "批次id", example = "3150") @ExcelProperty("批次id") private Long batchId; @@ -48,6 +57,10 @@ public class MaterialCorrelationAssayRespVO { @ExcelProperty("检测项") private String item; + @Schema(description = "检测项列表") + @ExcelProperty("检测项列表") + private List items; + @Schema(description = "状态,未开始、进行中、已完成", example = "2") @ExcelProperty("状态,未开始、进行中、已完成") private String assayStatus; @@ -76,4 +89,13 @@ public class MaterialCorrelationAssayRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + // 设置检测项列表 + public List getItems() { + if (StrUtil.isBlank(this.item)) { + return List.of(); + } + JSONArray array = JSONUtil.parseArray(this.item); + return array.toList(Long.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/resource/material/controller/vo/MaterialCorrelationAssaySaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialCorrelationAssaySaveReqVO.java index 7d70e781..9f869e59 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialCorrelationAssaySaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialCorrelationAssaySaveReqVO.java @@ -1,8 +1,11 @@ package com.zt.plat.module.qms.resource.material.controller.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.List; + @Schema(description = "管理后台 - 物料检化验关联信息新增/修改 Request VO") @Data public class MaterialCorrelationAssaySaveReqVO { @@ -34,6 +37,9 @@ public class MaterialCorrelationAssaySaveReqVO { @Schema(description = "检测项") private String item; + @Schema(description = "检测项列表") + private List items; + @Schema(description = "状态,未开始、进行中、已完成", example = "2") private String assayStatus; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java index 7e376e82..41487389 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java @@ -98,14 +98,17 @@ public class MaterialLifecycleDetailRespVO { @ExcelProperty("是否检化验,1-是，0-否") private Integer assayFlag; + @Schema(description = "检化验信息") + private MaterialCorrelationAssayRespVO assayInfo; + @Schema(description = "检化验id") private Long assayId; - @Schema(description = "检化验样品大类") + /*@Schema(description = "检化验样品大类") private Long assaySampleId; @Schema(description = "检化验检测项") - private List assayItemIds; + private List assayItemIds;*/ @Schema(description = "物料实例id", example = "968") @ExcelProperty("物料实例id") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java index 8157513d..745a8fc3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java @@ -29,11 +29,14 @@ public class MaterialLifecycleDetailSaveReqVO { @Schema(description = "是否检化验,1-是，0-否") private Integer assayFlag; - @Schema(description = "检化验样品大类") + @Schema(description = "检化验信息") + private MaterialCorrelationAssaySaveReqVO assayInfo; + + /*@Schema(description = "检化验样品大类") private Long assaySampleId; @Schema(description = "检化验检测项") - private List assayItemIds; + private List assayItemIds;*/ @Schema(description = "物料实例id", example = "968") private Long infomationId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java index 47e17f16..17bcfa1a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java @@ -77,7 +77,7 @@ public class MaterialLifecycleSaveReqVO { @Schema(description = "盘点项") private List checkItems; - @Schema(description = "工段列表") + @Schema(description = "明细列表") private List detailList; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialCorrelationAssayMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialCorrelationAssayMapper.java index fc5d885c..1f3c1850 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialCorrelationAssayMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialCorrelationAssayMapper.java @@ -3,10 +3,15 @@ package com.zt.plat.module.qms.resource.material.dal.mapper; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigBaseSampleDO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialCorrelationAssayPageReqVO; +import com.zt.plat.module.qms.resource.material.controller.vo.MaterialCorrelationAssayRespVO; import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialCorrelationAssayDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 物料检化验关联信息 Mapper * @@ -35,4 +40,12 @@ public interface MaterialCorrelationAssayMapper extends BaseMapperX selectRespListByIds(List ids) { + MPJLambdaWrapperX wrapper = new MPJLambdaWrapperX() + .selectAll(MaterialCorrelationAssayDO.class) + .selectAs(ConfigBaseSampleDO::getPrintTemplate, MaterialCorrelationAssayRespVO::getSampleLabelTemplate) + .leftJoin(ConfigBaseSampleDO.class, ConfigBaseSampleDO::getBaseSampleId, MaterialCorrelationAssayDO::getSampleId) + .inIfPresent(MaterialCorrelationAssayDO::getId, ids); + return selectJoinList(MaterialCorrelationAssayRespVO.class, wrapper); + } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialCorrelationAssayService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialCorrelationAssayService.java index 4c4acaf2..f2e5d818 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialCorrelationAssayService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialCorrelationAssayService.java @@ -89,4 +89,12 @@ public interface MaterialCorrelationAssayService { * @param needUpdateAssays 检化验关联信息列表 */ void updateBatch(List needUpdateAssays); + + /** + * 根据id查询 + * + * @param ids id列表 + * @return 检化验关联信息列表 + */ + List getRespListByIds(List ids); } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialCorrelationAssayServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialCorrelationAssayServiceImpl.java index 764dfac6..44ade5a7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialCorrelationAssayServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialCorrelationAssayServiceImpl.java @@ -108,4 +108,10 @@ public class MaterialCorrelationAssayServiceImpl implements MaterialCorrelationA materialCorrelationAssayMapper.updateBatch(needUpdateAssays); } + @Override + public List getRespListByIds(List ids) { + if (CollUtil.isEmpty(ids)) return List.of(); + return materialCorrelationAssayMapper.selectRespListByIds(ids); + } + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailServiceImpl.java index d3cc7bfa..71e8a1d5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zt.plat.framework.common.exception.ServiceException; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.resource.material.controller.vo.MaterialCorrelationAssayRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailSaveReqVO; @@ -143,14 +144,12 @@ public class MaterialLifecycleDetailServiceImpl implements MaterialLifecycleDeta List assayDetails = details.stream().filter(detail -> detail.getAssayId() != null).toList(); if (CollUtil.isEmpty(assayDetails)) return details; List asyIds = assayDetails.stream().map(MaterialLifecycleDetailRespVO::getAssayId).toList(); - List assayDOS = materialCorrelationAssayService.getListByIds(asyIds); - if (CollUtil.isEmpty(assayDOS)) return details; - Map assayDOMapById = assayDOS.stream().collect(Collectors.toMap(MaterialCorrelationAssayDO::getId, Function.identity())); + List assayRespVOS = materialCorrelationAssayService.getRespListByIds(asyIds); + if (CollUtil.isEmpty(assayRespVOS)) return details; + Map assayRespVOMapById = assayRespVOS.stream().collect(Collectors.toMap(MaterialCorrelationAssayRespVO::getId, Function.identity())); details.forEach(detail -> { - MaterialCorrelationAssayDO assayDO = assayDOMapById.get(detail.getAssayId()); - JSONArray array = JSONUtil.parseArray(assayDO.getItem()); - detail.setAssaySampleId(assayDO.getSampleId()) - .setAssayItemIds(CollUtil.isEmpty(array) ? List.of() : array.toList(Long.class)); + MaterialCorrelationAssayRespVO assayRespVO = assayRespVOMapById.get(detail.getAssayId()); + detail.setAssayInfo(assayRespVO); }); return details; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleServiceImpl.java index 507bf199..07dfebc5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleServiceImpl.java @@ -347,18 +347,19 @@ public class MaterialLifecycleServiceImpl implements MaterialLifecycleService , List assayDOS = assayDetails.stream().map(detail -> { MaterialProductDO product = pdtMapById.get(detail.getProductId()); MaterialLifecycleDetailSaveReqVO reqVO = gongToReqMap.get(detail.getBatchGongduanId()); + MaterialCorrelationAssaySaveReqVO assayInfo = reqVO.getAssayInfo(); return new MaterialCorrelationAssayDO() .setBusinessType(MaterialAssayBusinessType.accept_assay.name()) .setProductId(detail.getProductId()) .setBatchId(detail.getBatchId()) .setGongduanId(detail.getBatchGongduanId()) // 样品大类 - .setSampleId(reqVO != null ? reqVO.getAssaySampleId() : null) + .setSampleId(assayInfo != null ? assayInfo.getSampleId() : null) .setSampleName(product.getName()) .setSampleCode(sequenceUtil.genCode(MaterialConstants.SEQUENCE_ASSAY_ACCEPT_SAMPLE_KEY)) // 检测项 - .setItem(reqVO != null && CollUtil.isNotEmpty(reqVO.getAssayItemIds()) - ? JSONUtil.toJsonStr(reqVO.getAssayItemIds()) + .setItem(assayInfo != null && CollUtil.isNotEmpty(assayInfo.getItems()) + ? JSONUtil.toJsonStr(assayInfo.getItems()) : null) .setSource(String.valueOf(detail.getId())) .setAssayStatus(QmsCommonConstant.NOT_START); @@ -674,7 +675,7 @@ public class MaterialLifecycleServiceImpl implements MaterialLifecycleService , if (CollUtil.isEmpty(lifecycleDOS)) return pageResult; lifecycleDOS.forEach(mtrlLfc -> { String formData = mtrlLfc.getFormData(); - if (formData != null) { + if (StrUtil.isNotEmpty(formData)) { String title = (String) JSONUtil.parseObj(formData).get("title"); mtrlLfc.setTitle(title); } @@ -952,6 +953,7 @@ public class MaterialLifecycleServiceImpl implements MaterialLifecycleService , variables.put("applyDepartmentId", loginUser.getVisitDeptId()); variables.put("applyTime", sdf.format(new Date())); variables.put(BPM_CALLBACK_BEAN_NAME, "materialLifecycleService"); + variables.put("assayAssignee", null); List detailList = materialLifecycleDetailService.getDetailListByLfcId(lifecycleDO.getId()); for (MaterialLifecycleDetailDO detailDO : detailList) { if (detailDO.getAssayFlag() == 1) { @@ -1117,13 +1119,15 @@ public class MaterialLifecycleServiceImpl implements MaterialLifecycleService , sampleEntrustDetail .setBaseSampleId(assay.getSampleId()) .setEntrustSampleCode(assay.getSampleCode()) + .setSampleCode(assay.getSampleCode()) .setEntrustSampleName(assay.getSampleName()) .setIsWeighing(0) .setSampleEntrustDetailProjectList(projects); entrustParam.setSampleEntrustDetailList(List.of(sampleEntrustDetail)); LiteflowResponse assayRes = sampleEntrustService.create(entrustParam); if (!assayRes.isSuccess()) throw new ServiceException(1_032_160_000, "创建检化验单失败:" + assayRes.getMessage()); - assay.setEntrustId(assayRes.getContextBean(SampleEntrustContext.class).getSampleEntrustRegistration().getId()); + assay.setEntrustId(assayRes.getContextBean(SampleEntrustContext.class).getSampleEntrustRegistration().getId()) + .setAssayStatus(QmsCommonConstant.IN_PROGRESS); needUpdateAssays.add(assay); /* 获取明细 assayRes.getContextBean(SampleEntrustContext.class).getSampleEntrustDetailList().forEach(detail -> { From f76ca9e043f008fc2afbe5ca3ef253813a422957 Mon Sep 17 00:00:00 2001 From: shusir <497819738@qq.com> Date: Mon, 30 Mar 2026 18:20:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E7=89=A9=E6=96=99=E6=A3=80=E5=8C=96?= =?UTF-8?q?=E9=AA=8C=E6=B5=8B=E8=AF=95=E8=8E=B7=E5=8F=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/MaterialAssayResultListener.java | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/listener/MaterialAssayResultListener.java diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/listener/MaterialAssayResultListener.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/listener/MaterialAssayResultListener.java new file mode 100644 index 00000000..199cc062 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/listener/MaterialAssayResultListener.java @@ -0,0 +1,48 @@ +package com.zt.plat.module.qms.resource.material.listener; + +import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.bpm.api.task.BpmTaskApi; +import com.zt.plat.module.bpm.api.task.dto.BpmTaskRespDTO; +import com.zt.plat.module.qms.resource.material.service.MaterialLifecycleService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; +import org.apache.rocketmq.spring.core.RocketMQListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +//@RequiredArgsConstructor +//@RocketMQMessageListener( +// topic = "ASSAY_RESULT_CALLBACK_TOPIC", // 检化验结果主题 +// consumerGroup = "ASSAY_RESULT_CALLBACK_CONSUMER", +// selectorExpression = "material_assay_result_callback" // 标签 +//) +//public class MaterialAssayResultListener implements RocketMQListener { +public class MaterialAssayResultListener { + + /*@Autowired + private MaterialLifecycleService materialLifecycleService;*/ + @Autowired + private BpmTaskApi bpmTaskApi; + + public void bpmTest() { + log.info("收到检化验结果回调："); + CommonResult> taskListRes = bpmTaskApi.getTaskListByProcessInstanceId("2614cd91-2c1c-11f1-8770-005056c00001"); + log.info("任务数量 {} ，任务详情 {}", taskListRes.getData().size(), taskListRes.getData()); + + // 处理当前节点 + for (BpmTaskRespDTO currentTask : taskListRes.getData()) { + log.info("当前节点信息："); + log.info(" - 任务名称：{}", currentTask.getName()); + log.info(" - 处理人：{}", currentTask.getAssignee()); + log.info(" - 状态：{}", currentTask.getStatus()); + } + } + +} From 80981bea258972e501bf3efc8ca8ba7e5185274e Mon Sep 17 00:00:00 2001 From: YBP Date: Mon, 30 Mar 2026 21:15:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/qms/enums/ErrorCodeConstants.java | 4 + .../RecordFileAttachmentController.java | 118 ++++++++++++++++++ .../vo/RecordFileAttachmentPageReqVO.java | 41 ++++++ .../vo/RecordFileAttachmentRespVO.java | 51 ++++++++ .../vo/RecordFileAttachmentSaveReqVO.java | 36 ++++++ .../recordrecord/RecordRecordController.java | 2 +- .../RecordFileAttachmentDO.java | 70 +++++++++++ .../recordrecord/RecordRecordDO.java | 23 +--- .../mapper/RecordFileAttachmentMapper.java | 31 +++++ .../RecordCategoryServiceImpl.java | 5 +- .../RecordFileAttachmentService.java | 66 ++++++++++ .../RecordFileAttachmentServiceImpl.java | 102 +++++++++++++++ .../recordrecord/RecordRecordServiceImpl.java | 54 +++++++- .../dal/mapper/RecordFileAttachmentMapper.xml | 12 ++ 14 files changed, 588 insertions(+), 27 deletions(-) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/RecordFileAttachmentController.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentPageReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentSaveReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordfileattachment/RecordFileAttachmentDO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordFileAttachmentMapper.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordfileattachment/RecordFileAttachmentService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordfileattachment/RecordFileAttachmentServiceImpl.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordFileAttachmentMapper.xml diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java index d5fcd162..d9cc53bf 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java @@ -261,4 +261,8 @@ public interface ErrorCodeConstants { // ========== 文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物 TODO 补充编号 ========== ErrorCode RECORD_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_450_000, "文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物不存在"); + + + // ========== 文件记录附件 TODO 补充编号 ========== + ErrorCode RECORD_FILE_ATTACHMENT_NOT_EXISTS = new ErrorCode(1_032_450_099, "文件记录附件不存在"); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/RecordFileAttachmentController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/RecordFileAttachmentController.java new file mode 100644 index 00000000..6f0b60d1 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/RecordFileAttachmentController.java @@ -0,0 +1,118 @@ +package com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment; + +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentPageReqVO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentRespVO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentSaveReqVO; +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 com.zt.plat.framework.business.annotation.FileUploadController; +import com.zt.plat.framework.business.controller.AbstractFileUploadController; + +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 com.zt.plat.module.qms.resource.record.dal.dataobject.recordfileattachment.RecordFileAttachmentDO; +import com.zt.plat.module.qms.resource.record.service.recordfileattachment.RecordFileAttachmentService; + +@Tag(name = "管理后台 - 文件记录附件") +@RestController +@RequestMapping("/qms/record-file-attachment") +@Validated +@FileUploadController(source = "qms.recordfileattachment") +public class RecordFileAttachmentController extends AbstractFileUploadController implements BusinessControllerMarker{ + + static { + FileUploadController annotation = RecordFileAttachmentController.class.getAnnotation(FileUploadController.class); + if (annotation != null) { + setFileUploadInfo(annotation); + } + } + + @Resource + private RecordFileAttachmentService recordFileAttachmentService; + + @PostMapping("/create") + @Operation(summary = "创建文件记录附件") + @PreAuthorize("@ss.hasPermission('qms:record-file-attachment:create')") + public CommonResult createRecordFileAttachment(@Valid @RequestBody RecordFileAttachmentSaveReqVO createReqVO) { + return success(recordFileAttachmentService.createRecordFileAttachment(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新文件记录附件") + @PreAuthorize("@ss.hasPermission('qms:record-file-attachment:update')") + public CommonResult updateRecordFileAttachment(@Valid @RequestBody RecordFileAttachmentSaveReqVO updateReqVO) { + recordFileAttachmentService.updateRecordFileAttachment(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除文件记录附件") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('qms:record-file-attachment:delete')") + public CommonResult deleteRecordFileAttachment(@RequestParam("id") Long id) { + recordFileAttachmentService.deleteRecordFileAttachment(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除文件记录附件") + @PreAuthorize("@ss.hasPermission('qms:record-file-attachment:delete')") + public CommonResult deleteRecordFileAttachmentList(@RequestBody BatchDeleteReqVO req) { + recordFileAttachmentService.deleteRecordFileAttachmentListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得文件记录附件") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('qms:record-file-attachment:query')") + public CommonResult getRecordFileAttachment(@RequestParam("id") Long id) { + RecordFileAttachmentDO recordFileAttachment = recordFileAttachmentService.getRecordFileAttachment(id); + return success(BeanUtils.toBean(recordFileAttachment, RecordFileAttachmentRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得文件记录附件分页") + @PreAuthorize("@ss.hasPermission('qms:record-file-attachment:query')") + public CommonResult> getRecordFileAttachmentPage(@Valid RecordFileAttachmentPageReqVO pageReqVO) { + PageResult pageResult = recordFileAttachmentService.getRecordFileAttachmentPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, RecordFileAttachmentRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出文件记录附件 Excel") + @PreAuthorize("@ss.hasPermission('qms:record-file-attachment:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportRecordFileAttachmentExcel(@Valid RecordFileAttachmentPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = recordFileAttachmentService.getRecordFileAttachmentPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "文件记录附件.xls", "数据", RecordFileAttachmentRespVO.class, + BeanUtils.toBean(list, RecordFileAttachmentRespVO.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/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentPageReqVO.java new file mode 100644 index 00000000..5002eca0 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentPageReqVO.java @@ -0,0 +1,41 @@ +package com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.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 RecordFileAttachmentPageReqVO extends PageParam { + + @Schema(description = "记录ID,文件记录ID", example = "23915") + private Long recordId; + + @Schema(description = "文件表ID,关联文件记录表ID", example = "28216") + private String fileId; + + @Schema(description = "原始父级Id", example = "15685") + private Long mainId; + + @Schema(description = "是否最新版") + private Integer currentFlag; + + @Schema(description = "文件版本号,文件版本号") + private String fileVersion; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentRespVO.java new file mode 100644 index 00000000..46ca2b97 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentRespVO.java @@ -0,0 +1,51 @@ +package com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.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 RecordFileAttachmentRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15260") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "记录ID,文件记录ID", example = "23915") + @ExcelProperty("记录ID,文件记录ID") + private Long recordId; + + @Schema(description = "文件表ID,关联文件记录表ID", example = "28216") + @ExcelProperty("文件表ID,关联文件记录表ID") + private String fileId; + + @Schema(description = "原始父级Id", example = "15685") + @ExcelProperty("原始父级Id") + private Long mainId; + + @Schema(description = "是否最新版") + @ExcelProperty("是否最新版") + private Integer currentFlag; + + @Schema(description = "文件版本号,文件版本号") + @ExcelProperty("文件版本号,文件版本号") + private String fileVersion; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentSaveReqVO.java new file mode 100644 index 00000000..0c04d5f1 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordfileattachment/vo/RecordFileAttachmentSaveReqVO.java @@ -0,0 +1,36 @@ +package com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.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 RecordFileAttachmentSaveReqVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15260") + private Long id; + + @Schema(description = "记录ID,文件记录ID", example = "23915") + private Long recordId; + + @Schema(description = "文件表ID,关联文件记录表ID", example = "28216") + private String fileId; + + @Schema(description = "原始父级Id", example = "15685") + private Long mainId; + + @Schema(description = "是否最新版") + private Integer currentFlag; + + @Schema(description = "文件版本号,文件版本号") + private String fileVersion; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + private String remark; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java index 128791f0..7675f230 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/controller/admin/recordrecord/RecordRecordController.java @@ -36,7 +36,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success; @RequestMapping("/qms/resource/record-record") @Validated @DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.recordrecord", codeKey = "data.fileUploadBusinessCode") +@FileUploadController(source = "qms.versionmanagement", codeKey = "data.fileUploadBusinessCode") public class RecordRecordController extends AbstractFileUploadController implements BusinessControllerMarker { static { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordfileattachment/RecordFileAttachmentDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordfileattachment/RecordFileAttachmentDO.java new file mode 100644 index 00000000..a0e03796 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordfileattachment/RecordFileAttachmentDO.java @@ -0,0 +1,70 @@ +package com.zt.plat.module.qms.resource.record.dal.dataobject.recordfileattachment; + +import lombok.*; +import java.util.*; + import java.time.LocalDateTime; + import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +/** +* 文件记录附件 DO +* +* @author 后台管理 +*/ +@TableName("t_rcd_file_atm") +@KeySequence("t_rcd_file_atm_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class RecordFileAttachmentDO extends BusinessBaseDO { + + + + /** + * 编号 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 记录ID,文件记录ID + */ + @TableField("RCD_ID") + private Long recordId; + /** + * 文件表ID,关联文件记录表ID + */ + @TableField("FILE_ID") + private String fileId; + /** + * 原始父级Id + */ + @TableField("MAIN_ID") + private Long mainId; + /** + * 是否最新版 + */ + @TableField("CRNT_FLG") + private Integer currentFlag; + /** + * 文件版本号,文件版本号 + */ + @TableField("FILE_VER") + private String fileVersion; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordrecord/RecordRecordDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordrecord/RecordRecordDO.java index 643ef629..08fee5d1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordrecord/RecordRecordDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/dataobject/recordrecord/RecordRecordDO.java @@ -1,5 +1,7 @@ package com.zt.plat.module.qms.resource.record.dal.dataobject.recordrecord; +import com.zt.plat.module.qms.resource.clientManage.controller.vo.UploadFileVo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -196,24 +198,7 @@ public class RecordRecordDO extends BusinessBaseDO { @TableField(exist = false) private Object customConfig; -// ====== 文件提交申请关联字段 ====== - - /** - * 文件提交申请ID（RecordApply.id） - */ -// @TableField(exist = false) -// private Long applyId; - -// /** -// * 文件提交流程实例ID（RecordApply.flowInstanceId） -// */ -// @TableField(exist = false) -// private String flowInstanceId; - - /** - * 文件提交业务状态（RecordApply.businessStatus） - */ -// @TableField(exist = false) -// private String applyBusinessStatus; + @TableField(exist = false) + private List files; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordFileAttachmentMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordFileAttachmentMapper.java new file mode 100644 index 00000000..959fac71 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/dal/mapper/RecordFileAttachmentMapper.java @@ -0,0 +1,31 @@ +package com.zt.plat.module.qms.resource.record.dal.mapper; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import com.zt.plat.module.qms.resource.record.dal.dataobject.recordfileattachment.RecordFileAttachmentDO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentPageReqVO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 文件记录附件 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface RecordFileAttachmentMapper extends BaseMapperX { + + default PageResult selectPage(RecordFileAttachmentPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(RecordFileAttachmentDO::getRecordId, reqVO.getRecordId()) + .eqIfPresent(RecordFileAttachmentDO::getFileId, reqVO.getFileId()) + .eqIfPresent(RecordFileAttachmentDO::getMainId, reqVO.getMainId()) + .eqIfPresent(RecordFileAttachmentDO::getCurrentFlag, reqVO.getCurrentFlag()) + .eqIfPresent(RecordFileAttachmentDO::getFileVersion, reqVO.getFileVersion()) + .eqIfPresent(RecordFileAttachmentDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .eqIfPresent(RecordFileAttachmentDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(RecordFileAttachmentDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(RecordFileAttachmentDO::getId)); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java index b6175f44..034f945d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordcategory/RecordCategoryServiceImpl.java @@ -44,13 +44,13 @@ public class RecordCategoryServiceImpl implements RecordCategoryService { public RecordCategoryRespVO createRecordCategory(RecordCategorySaveReqVO createReqVO) { // 插入 RecordCategoryDO recordCategory = BeanUtils.toBean(createReqVO, RecordCategoryDO.class); - recordCategory.setCancelFlag("-1"); // 临时数据 int insert = recordCategoryMapper.insert(recordCategory); if (insert <= 0) throw exception(RECORD_CATEGORY_NOT_EXISTS); Long id = recordCategory.getId();// 获取插入后的ID Long parentId = recordCategory.getParentId(); // 判断父节点是否为null或者0，如果是，则设置父节点ID为0，否则查询父节点信息并设置ID路径 if (parentId == null || parentId == 0L) {// 没有父节点 + recordCategory.setCancelFlag("-1"); // 临时数据标识 recordCategory.setParentId(0L); // 更新ID_Path recordCategory.setIdPath("/" + recordCategory.getParentId() + "/" + id ); @@ -61,6 +61,7 @@ public class RecordCategoryServiceImpl implements RecordCategoryService { String idPath = parent.getIdPath(); recordCategory.setIdPath(idPath + "/" + id); } + recordCategory.setCancelFlag("1"); } int i = recordCategoryMapper.updateById(recordCategory); if (i <= 0) throw exception(RECORD_CATEGORY_NOT_EXISTS); @@ -211,7 +212,7 @@ public class RecordCategoryServiceImpl implements RecordCategoryService { // 获取所有分类树 @Override public List getRecordCategoryTree(RecordCategoryPageReqVO pageReqVO) { - pageReqVO.setPageSize(9999); + pageReqVO.setPageSize(999); pageReqVO.setPageNo(1); // LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); // queryWrapper.orderByAsc(RecordCategoryDO::getSortNo); // 升序 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordfileattachment/RecordFileAttachmentService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordfileattachment/RecordFileAttachmentService.java new file mode 100644 index 00000000..bf360b4c --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordfileattachment/RecordFileAttachmentService.java @@ -0,0 +1,66 @@ +package com.zt.plat.module.qms.resource.record.service.recordfileattachment; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentPageReqVO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentRespVO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentSaveReqVO; +import com.zt.plat.module.qms.resource.record.dal.dataobject.recordfileattachment.RecordFileAttachmentDO; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * 文件记录附件 Service 接口 + * + * @author 后台管理 + */ +public interface RecordFileAttachmentService { + + /** + * 创建文件记录附件 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + RecordFileAttachmentRespVO createRecordFileAttachment(@Valid RecordFileAttachmentSaveReqVO createReqVO); + + /** + * 更新文件记录附件 + * + * @param updateReqVO 更新信息 + */ + void updateRecordFileAttachment(@Valid RecordFileAttachmentSaveReqVO updateReqVO); + + /** + * 删除文件记录附件 + * + * @param id 编号 + */ + void deleteRecordFileAttachment(Long id); + + /** + * 批量删除文件记录附件 + * + * @param ids 编号 + */ + void deleteRecordFileAttachmentListByIds(List ids); + + /** + * 获得文件记录附件 + * + * @param id 编号 + * @return 文件记录附件 + */ + RecordFileAttachmentDO getRecordFileAttachment(Long id); + + /** + * 获得文件记录附件分页 + * + * @param pageReqVO 分页查询 + * @return 文件记录附件分页 + */ + PageResult getRecordFileAttachmentPage(RecordFileAttachmentPageReqVO pageReqVO); + + int createRecordFileAttachmentBatch(List createAttachmentReqVOList); +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordfileattachment/RecordFileAttachmentServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordfileattachment/RecordFileAttachmentServiceImpl.java new file mode 100644 index 00000000..c993bba3 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordfileattachment/RecordFileAttachmentServiceImpl.java @@ -0,0 +1,102 @@ +package com.zt.plat.module.qms.resource.record.service.recordfileattachment; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.jwt.JWT; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentPageReqVO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentRespVO; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentSaveReqVO; +import com.zt.plat.module.qms.resource.record.dal.dataobject.recordfileattachment.RecordFileAttachmentDO; +import com.zt.plat.module.qms.resource.record.dal.mapper.RecordFileAttachmentMapper; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.io.OutputStream; +import java.util.List; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.RECORD_FILE_ATTACHMENT_NOT_EXISTS; + +/** + * 文件记录附件 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class RecordFileAttachmentServiceImpl implements RecordFileAttachmentService { + + @Resource + private RecordFileAttachmentMapper recordFileAttachmentMapper; + + @Override + public RecordFileAttachmentRespVO createRecordFileAttachment(RecordFileAttachmentSaveReqVO createReqVO) { + // 插入 + RecordFileAttachmentDO recordFileAttachment = BeanUtils.toBean(createReqVO, RecordFileAttachmentDO.class); + recordFileAttachmentMapper.insert(recordFileAttachment); + // 返回 + return BeanUtils.toBean(recordFileAttachment, RecordFileAttachmentRespVO.class); + } + + @Override + public void updateRecordFileAttachment(RecordFileAttachmentSaveReqVO updateReqVO) { + // 校验存在 + validateRecordFileAttachmentExists(updateReqVO.getId()); + // 更新 + RecordFileAttachmentDO updateObj = BeanUtils.toBean(updateReqVO, RecordFileAttachmentDO.class); + recordFileAttachmentMapper.updateById(updateObj); + } + + @Override + public void deleteRecordFileAttachment(Long id) { + // 校验存在 + validateRecordFileAttachmentExists(id); + // 删除 + recordFileAttachmentMapper.deleteById(id); + } + + @Override + public void deleteRecordFileAttachmentListByIds(List ids) { + // 校验存在 + validateRecordFileAttachmentExists(ids); + // 删除 + recordFileAttachmentMapper.deleteByIds(ids); + } + + private void validateRecordFileAttachmentExists(List ids) { + List list = recordFileAttachmentMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(RECORD_FILE_ATTACHMENT_NOT_EXISTS); + } + } + + private void validateRecordFileAttachmentExists(Long id) { + if (recordFileAttachmentMapper.selectById(id) == null) { + throw exception(RECORD_FILE_ATTACHMENT_NOT_EXISTS); + } + } + + @Override + public RecordFileAttachmentDO getRecordFileAttachment(Long id) { + return recordFileAttachmentMapper.selectById(id); + } + + @Override + public PageResult getRecordFileAttachmentPage(RecordFileAttachmentPageReqVO pageReqVO) { + return recordFileAttachmentMapper.selectPage(pageReqVO); + } + + @Override + public int createRecordFileAttachmentBatch(List createAttachmentReqVOList) { + List bean = BeanUtils.toBean(createAttachmentReqVOList, RecordFileAttachmentDO.class); + recordFileAttachmentMapper.insertBatch(bean); + return bean.size(); + } + + + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java index d2f95395..faae55cf 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java @@ -13,8 +13,10 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.enums.QmsCommonConstant; +import com.zt.plat.module.qms.resource.clientManage.controller.vo.UploadFileVo; import com.zt.plat.module.qms.resource.record.common.RecordCommonUtils; import com.zt.plat.module.qms.resource.record.constant.RecordConstants; +import com.zt.plat.module.qms.resource.record.controller.admin.recordfileattachment.vo.RecordFileAttachmentSaveReqVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordPageReqVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordRespVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordSaveReqVO; @@ -23,6 +25,7 @@ import com.zt.plat.module.qms.resource.record.dal.dataobject.recordpermission.Re import com.zt.plat.module.qms.resource.record.dal.dataobject.recordrecord.RecordRecordDO; import com.zt.plat.module.qms.resource.record.dal.mapper.RecordRecordMapper; import com.zt.plat.module.qms.resource.record.service.recordcategory.RecordCategoryService; +import com.zt.plat.module.qms.resource.record.service.recordfileattachment.RecordFileAttachmentService; import com.zt.plat.module.qms.resource.record.service.recordpermission.RecordPermissionService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -62,6 +65,9 @@ public class RecordRecordServiceImpl implements RecordRecordService { @Autowired private RecordCategoryService recordCategoryService; + @Resource + private RecordFileAttachmentService recordFileAttachmentService; + // 验证分类ID 是否存在 private RecordCategoryDO validateRecordCategoryIdExists(Long categoryId) { RecordCategoryDO recordCategoryDO = recordCategoryService.selectById(categoryId); @@ -87,6 +93,11 @@ public class RecordRecordServiceImpl implements RecordRecordService { recordRecordMapper.insert(recordRecordDO); recordRecordDO.setMainId(recordRecordDO.getId()); recordRecordMapper.updateById(recordRecordDO); + + // 添加文件记录附件 + List files = createReqVO.getFiles(); + createFileAttachment(files,recordRecordDO.getId()); + } catch (Exception e) { throw new RuntimeException("create record error"); } @@ -94,6 +105,26 @@ public class RecordRecordServiceImpl implements RecordRecordService { return BeanUtils.toBean(recordRecord, RecordRecordRespVO.class); } + // 添加文件记录附件 + public void createFileAttachment(List files, Long recordId) { +// List files = createReqVO.getFiles(); + if (!ObjectUtils.isEmpty(files)) { + List createAttachmentReqVOList = new ArrayList<>(); + for (UploadFileVo file : files) { + RecordFileAttachmentSaveReqVO createAttachmentReqVO = new RecordFileAttachmentSaveReqVO(); + createAttachmentReqVO.setRecordId(recordId); + createAttachmentReqVO.setFileId(file.getId()); + createAttachmentReqVO.setMainId(recordId); + createAttachmentReqVO.setCurrentFlag(1); + long l = System.currentTimeMillis(); + createAttachmentReqVO.setFileVersion(String.valueOf(l)); + createAttachmentReqVOList.add(createAttachmentReqVO); + } + + recordFileAttachmentService.createRecordFileAttachmentBatch(createAttachmentReqVOList); + } + } + /** * 计算记录状态 * @@ -137,6 +168,7 @@ public class RecordRecordServiceImpl implements RecordRecordService { lambdaQueryWrapper.eq(RecordRecordDO::getCurrentFlag, 1); // 0，旧版本 recordRecordMapper.update(recordRecordDO, lambdaQueryWrapper); + recordRecordDO.setExpirationStatus(0); // 0-正常，1-过期 recordRecordDO = judgeRootCategoryJson(recordRecordDO); //创建新版本 recordRecordDO.setId(null); @@ -144,6 +176,9 @@ public class RecordRecordServiceImpl implements RecordRecordService { recordRecordDO.setMainId(createReqVO.getMainId()); recordRecordDO.setVersion(recordRecordDO.getNewVersion());// 新版本号 recordRecordMapper.insert(recordRecordDO); + + // 添加文件记录附件 + createFileAttachment(createReqVO.getFiles(),recordRecordDO.getId()); // 返回 return BeanUtils.toBean(recordRecordDO, RecordRecordRespVO.class); } catch (Exception e) { @@ -278,6 +313,12 @@ public class RecordRecordServiceImpl implements RecordRecordService { if (ObjectUtils.isEmpty(newVersion)) { // 不是新版本，直接更新 RecordRecordDO recordRecordDO = judgeRootCategoryJson(updateObj); recordRecordMapper.updateById(recordRecordDO); + + //删除附件 + //TODO + // 保存附件 + List files = updateObj.getFiles(); + createFileAttachment(files, updateObj.getId()); } else {// 新版本 // 是否回收 Integer collectionFlag = updateReqVO.getCollectionFlag(); @@ -568,12 +609,15 @@ public class RecordRecordServiceImpl implements RecordRecordService { if (parentId == null) return PageResult.empty(); RecordCategoryDO categoryDO = recordCategoryService.selectById(parentId); + boolean b = recordPermissionService.judgeIsSuperAdmin(); // 判断是否是超级管理员 - // 判断是否有当前分类的父分类权限 （可编辑，可查看，管理员--> 任意条件） - RecordPermissionDO recordPermissionDO = new RecordPermissionDO(); - recordPermissionDO.setSourceId(parentId); - List recordPermissionDOS = recordPermissionService.selectPermissionList(recordPermissionDO); - if (ObjectUtils.isEmpty(recordPermissionDOS)) return PageResult.empty(); + if (!b) { + // 判断是否有当前分类的父分类权限 （可编辑，可查看，管理员--> 任意条件） + RecordPermissionDO recordPermissionDO = new RecordPermissionDO(); + recordPermissionDO.setSourceId(parentId); + List recordPermissionDOS = recordPermissionService.selectPermissionList(recordPermissionDO); + if (ObjectUtils.isEmpty(recordPermissionDOS)) return PageResult.empty(); + } List categoryIds = selectCategoryIds(categoryId); // 获取所有子分类 diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordFileAttachmentMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordFileAttachmentMapper.xml new file mode 100644 index 00000000..3d46095c --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/record/dal/mapper/RecordFileAttachmentMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file